Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f727ca1bf1 |
@@ -1,19 +1,3 @@
|
|||||||
# 2026.4.0-beta.0
|
|
||||||
- Feat: 地震発生情報の地域を都道府県でグループ化する機能
|
|
||||||
- Feat: ユーズの再試行
|
|
||||||
- Feat: ユーズの文字数制限回避
|
|
||||||
- Feat: ユーズ送信関数
|
|
||||||
- Feat: コマンドを並列処理
|
|
||||||
- Feat: 地震情報のWebSocket再接続
|
|
||||||
- Feat: 天気予報の分割数を自動的に計算する機能
|
|
||||||
- Feat: 最大震度の要求を設定できる機能
|
|
||||||
- Feat: 最大震度が不明な場合に投稿するかどうかを設定できる機能
|
|
||||||
- Chg: 地震発生情報の時刻に頃を追加
|
|
||||||
- Chg: weatherNotice.tsのマジックナンバーに命名
|
|
||||||
- Fix: 震度0の地震情報に対応していない問題
|
|
||||||
- Fix: コマンド処理済みのユーズのid除外が正しく動作しない問題
|
|
||||||
- Fix: miqコマンドのコンソール出力に値が存在しない問題
|
|
||||||
|
|
||||||
# 2026.4.0-alpha.2
|
# 2026.4.0-alpha.2
|
||||||
- Feat: 地震情報のid除外
|
- Feat: 地震情報のid除外
|
||||||
- Feat: 新年迎春
|
- Feat: 新年迎春
|
||||||
|
|||||||
+2
-29
@@ -1,37 +1,10 @@
|
|||||||
command:
|
command:
|
||||||
# コマンド処理の間隔(分) number
|
|
||||||
# 自然数のみが有効です。
|
|
||||||
interval: 10
|
interval: 10
|
||||||
# コマンドの最大並列処理数 number
|
weather:
|
||||||
# 例: 2を指定すると、コマンドを並列に2つずつ処理します。
|
splits: 4
|
||||||
# 並列処理の数であるため、最終的なコマンドの処理数は変わりません。
|
|
||||||
# 自然数のみが有効です。
|
|
||||||
maxParallels: 3
|
|
||||||
earthquake:
|
earthquake:
|
||||||
# 地震発生情報を投稿することに必要な最大震度 number
|
|
||||||
# 例: 30を指定すると、最大震度が震度3以上の地震発生情報のみを投稿します。
|
|
||||||
# 10(震度1), 20(震度2), 30(震度3), 40(震度4), 45(震度5弱), 50(震度5強), 55(震度6弱), 60(震度6強), 70(震度7)が有効です。
|
|
||||||
requireMaxScale: 30
|
|
||||||
# 最大震度が不明な地震発生情報を投稿するかどうか boolean
|
|
||||||
canUnknownMaxScale: true
|
|
||||||
# 過去のデバッグ用データを使用して地震情報を配信するかどうか boolean
|
|
||||||
# デバッグ用途のみで使用してください。
|
|
||||||
useHistoryData: false
|
useHistoryData: false
|
||||||
# 再接続の間隔(ミリ秒) number
|
|
||||||
# 正数のみが有効です。
|
|
||||||
reconnectInterval: 3000
|
|
||||||
uwuzu:
|
uwuzu:
|
||||||
# APIトークン string
|
|
||||||
# とくに理由がない限り、全権限を与えてください。
|
|
||||||
token: API_TOKEN
|
token: API_TOKEN
|
||||||
# uwuzuサーバーのorigin string
|
|
||||||
origin: https://uwuzu.example.com
|
origin: https://uwuzu.example.com
|
||||||
ueuse:
|
|
||||||
# 最大再試行数 number
|
|
||||||
# 自然数のみが有効です。
|
|
||||||
maxRetries: 3
|
|
||||||
# 再試行の間隔(ミリ秒) number
|
|
||||||
# 正数のみが有効です。
|
|
||||||
retryInterval: 1000
|
|
||||||
# デバッグモードにするかどうか boolean
|
|
||||||
debug: false
|
debug: false
|
||||||
+1
-5
@@ -10,7 +10,7 @@ weatherReply: |
|
|||||||
降水確率: {{ chanceOfRain }}
|
降水確率: {{ chanceOfRain }}
|
||||||
earthquakeNotice: |
|
earthquakeNotice: |
|
||||||
### ==地震発生==
|
### ==地震発生==
|
||||||
⏰時刻: {{ occuredTime }}頃
|
⏰時刻: {{ occuredTime }}
|
||||||
🫨最大震度: {{ maxScale }}
|
🫨最大震度: {{ maxScale }}
|
||||||
📍震源地: {{ epicenter }}
|
📍震源地: {{ epicenter }}
|
||||||
💪マグニチュード: {{ magnitude }}
|
💪マグニチュード: {{ magnitude }}
|
||||||
@@ -50,14 +50,10 @@ eewNotice: |
|
|||||||
📍震源地: {{ epicenter }}
|
📍震源地: {{ epicenter }}
|
||||||
💪マグニチュード: {{ magnitude }}
|
💪マグニチュード: {{ magnitude }}
|
||||||
🪨深さ: {{ depth }}{{ areas }}
|
🪨深さ: {{ depth }}{{ areas }}
|
||||||
|
|
||||||
🔬情報源: P2P地震速報
|
|
||||||
eewCancelNotice: |
|
eewCancelNotice: |
|
||||||
### ==緊急地震速報(警報)**解除**==
|
### ==緊急地震速報(警報)**解除**==
|
||||||
{{ isTest }}
|
{{ isTest }}
|
||||||
⏰発表時刻: {{ announceTime }}
|
⏰発表時刻: {{ announceTime }}
|
||||||
|
|
||||||
🔬情報源: P2P地震速報
|
|
||||||
hnyNotice: |
|
hnyNotice: |
|
||||||
あけましておめでとうございます。今年は、{{ year }}年です。
|
あけましておめでとうございます。今年は、{{ year }}年です。
|
||||||
commandNotFound: |
|
commandNotFound: |
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "notice-uwuzu",
|
"name": "notice-uwuzu",
|
||||||
"version": "26.4.0-beta.0",
|
"version": "26.4.0-alpha.2",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import client, { createUeuse } from "@/lib/client";
|
import client from "@/lib/client";
|
||||||
import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
|
|
||||||
@@ -14,8 +14,15 @@ export default async function followCommand(ueuse: ueuseModule) {
|
|||||||
|
|
||||||
console.log("フォロー:", follow.userid);
|
console.log("フォロー:", follow.userid);
|
||||||
|
|
||||||
await createUeuse({
|
const notice = await client.request("ueuse/create", {
|
||||||
text: i18next.t("followedNotification", { username: ueuse.account.username }),
|
text: i18next.t("followedNotification", { username: ueuse.account.username }),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "フォロー通知");
|
});
|
||||||
|
|
||||||
|
if (!notice.success) {
|
||||||
|
console.warn("フォロー通知に失敗:", notice.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("フォロー通知:", notice.uniqid);
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { createUeuse } from "@/lib/client";
|
import client from "@/lib/client";
|
||||||
import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
import { EOL } from "node:os";
|
import { EOL } from "node:os";
|
||||||
@@ -14,19 +14,31 @@ const helps = [
|
|||||||
export default async function helpCommand(ueuse: ueuseModule, args: string[]) {
|
export default async function helpCommand(ueuse: ueuseModule, args: string[]) {
|
||||||
if (args[1] !== undefined) {
|
if (args[1] !== undefined) {
|
||||||
if (!(helps.includes(args[1]))) {
|
if (!(helps.includes(args[1]))) {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("invalidOption", { option: args[1], command: "help" }),
|
text: i18next.t("invalidOption", { option: args[1], command: "help" }),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "無効なオプションである旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("コマンド詳細の返信に失敗:", response.error_code);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await createUeuse({
|
console.warn("コマンド詳細:", response.uniqid);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t(`fullHelp${args[1].charAt(0).toUpperCase()}${args[1].slice(1)}`),
|
text: i18next.t(`fullHelp${args[1].charAt(0).toUpperCase()}${args[1].slice(1)}`),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "コマンド詳細");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("コマンド詳細の返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.warn("コマンド詳細:", response.uniqid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,8 +52,15 @@ export default async function helpCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
summarys += `${i18next.t(`help${help.charAt(0).toUpperCase()}${help.slice(1)}`)}${EOL}`;
|
summarys += `${i18next.t(`help${help.charAt(0).toUpperCase()}${help.slice(1)}`)}${EOL}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: summarys.trim(),
|
text: summarys.trim(),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "コマンド概要");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("コマンド概要の返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.warn("コマンド概要:", response.uniqid);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import client, { createUeuse } from "@/lib/client";
|
import client from "@/lib/client";
|
||||||
import Memory from "@/lib/memory";
|
import Memory from "@/lib/memory";
|
||||||
import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
@@ -8,7 +8,6 @@ import followCommand from "@/feature/command/follow";
|
|||||||
import unfollowCommand from "@/feature/command/unfollow";
|
import unfollowCommand from "@/feature/command/unfollow";
|
||||||
import miqCommand from "@/feature/command/miq";
|
import miqCommand from "@/feature/command/miq";
|
||||||
import initI18n from "@/lib/i18n";
|
import initI18n from "@/lib/i18n";
|
||||||
import config from "@/lib/config";
|
|
||||||
|
|
||||||
await initI18n();
|
await initI18n();
|
||||||
console.log("コマンドの処理を行います");
|
console.log("コマンドの処理を行います");
|
||||||
@@ -23,17 +22,19 @@ try {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (response.success) {
|
if (response.success) {
|
||||||
const notifications = response.data.filter(notification => notification.category === "reply" && typeof notification.valueid === "string");
|
for (const [index, notification] of response.data.entries()) {
|
||||||
|
if (notification.category !== "reply")
|
||||||
const mem = Memory.memory;
|
|
||||||
const lastReadReply = mem.lastReadReply;
|
|
||||||
|
|
||||||
for (const [index, notification] of notifications.entries()) {
|
|
||||||
if (notification.category !== "reply" || typeof notification.valueid !== "string")
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (lastReadReply === notification.valueid)
|
if (!notification.valueid) {
|
||||||
|
console.warn("返信通知にvalueidが存在しないため、スキップします");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
const mem = Memory.memory;
|
||||||
|
if (mem.lastReadReply === notification.valueid) {
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
const ueuseResponse = await client.request("ueuse/get", {
|
const ueuseResponse = await client.request("ueuse/get", {
|
||||||
uniqid: notification.valueid,
|
uniqid: notification.valueid,
|
||||||
@@ -47,7 +48,6 @@ try {
|
|||||||
if (index === 0) {
|
if (index === 0) {
|
||||||
const mem = Memory.memory;
|
const mem = Memory.memory;
|
||||||
mem.lastReadReply = ueuseResponse.data[0].uniqid;
|
mem.lastReadReply = ueuseResponse.data[0].uniqid;
|
||||||
Memory.memory = mem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ueuses.push(ueuseResponse.data[0]);
|
ueuses.push(ueuseResponse.data[0]);
|
||||||
@@ -64,18 +64,17 @@ try {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (response.success) {
|
if (response.success) {
|
||||||
const mentions = response.data;
|
for (const [index, mention] of response.data.entries()) {
|
||||||
|
|
||||||
const mem = Memory.memory;
|
const mem = Memory.memory;
|
||||||
const lastReadMention = mem.lastReadMention;
|
if (mem.lastReadMention === mention.uniqid) {
|
||||||
mem.lastReadMention = mentions[0]?.uniqid ?? lastReadMention;
|
|
||||||
Memory.memory = mem;
|
|
||||||
|
|
||||||
for (const mention of mentions) {
|
|
||||||
if (lastReadMention === mention.uniqid) {
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (index === 0) {
|
||||||
|
const mem = Memory.memory;
|
||||||
|
mem.lastReadMention = mention.uniqid;
|
||||||
|
}
|
||||||
|
|
||||||
ueuses.push(mention);
|
ueuses.push(mention);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -85,10 +84,7 @@ try {
|
|||||||
|
|
||||||
ueuses = [...new Set(ueuses)];
|
ueuses = [...new Set(ueuses)];
|
||||||
|
|
||||||
for (let i = 0; i < ueuses.length; i += config.command.maxParallels) {
|
for (const ueuse of ueuses) {
|
||||||
const chunk = ueuses.slice(i, i + config.command.maxParallels);
|
|
||||||
|
|
||||||
await Promise.all(chunk.map(async (ueuse) => {
|
|
||||||
const mem = Memory.memory;
|
const mem = Memory.memory;
|
||||||
let text = ueuse.text;
|
let text = ueuse.text;
|
||||||
text = text.replace(`@${mem.userid}`, "");
|
text = text.replace(`@${mem.userid}`, "");
|
||||||
@@ -100,12 +96,14 @@ try {
|
|||||||
if (!commandRow || commandRow === "") {
|
if (!commandRow || commandRow === "") {
|
||||||
console.warn("コマンドが本文から参照できません");
|
console.warn("コマンドが本文から参照できません");
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("commandNotFound"),
|
text: i18next.t("commandNotFound"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "コマンドが見つからない旨");
|
});
|
||||||
|
|
||||||
return;
|
if (!response.success)
|
||||||
|
console.warn("ユーズの作成に失敗しました:", response.error_code);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
const args = commandRow.replace("/", "").split(" ");
|
const args = commandRow.replace("/", "").split(" ");
|
||||||
@@ -129,14 +127,15 @@ try {
|
|||||||
default:
|
default:
|
||||||
console.warn("不明なコマンドが入力されました:", args[0]);
|
console.warn("不明なコマンドが入力されました:", args[0]);
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("unknownCommand", { command: args[0] }),
|
text: i18next.t("unknownCommand", { command: args[0] }),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "コマンドが不明である旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success)
|
||||||
|
console.warn("ユーズの作成に失敗しました:", response.error_code);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
process.exit(0);
|
process.exit(0);
|
||||||
|
|||||||
+161
-45
@@ -1,4 +1,4 @@
|
|||||||
import client, { createUeuse } from "@/lib/client";
|
import client from "@/lib/client";
|
||||||
import Memory from "@/lib/memory";
|
import Memory from "@/lib/memory";
|
||||||
import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
@@ -7,10 +7,14 @@ import { EOL } from "node:os";
|
|||||||
|
|
||||||
export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
||||||
if (!args[1]) {
|
if (!args[1]) {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("lackOption", { command: "miq" }),
|
text: i18next.t("lackOption", { command: "miq" }),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "オプションが不足している旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -28,10 +32,14 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
? itUeuse.error_code
|
? itUeuse.error_code
|
||||||
: "データなし");
|
: "データなし");
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("replySourceFailed"),
|
text: i18next.t("replySourceFailed"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "ソースが見つからない旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.log("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -41,19 +49,27 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
switch (permission) {
|
switch (permission) {
|
||||||
case "me":
|
case "me":
|
||||||
if (itUeuse.data[0].account.userid !== ueuse.account.userid) {
|
if (itUeuse.data[0].account.userid !== ueuse.account.userid) {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("miqPermissionMe"),
|
text: i18next.t("miqPermissionMe"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "権限が自分自身のみである旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
case "consent":
|
case "consent":
|
||||||
if (itUeuse.data[0].account.userid !== ueuse.account.userid) {
|
if (itUeuse.data[0].account.userid !== ueuse.account.userid) {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("miqPermissionConsent", { userid: itUeuse.data[0].account.userid }),
|
text: i18next.t("miqPermissionConsent", { userid: itUeuse.data[0].account.userid }),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "権限が許可制である旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -69,15 +85,19 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!(typeof result === "string")) {
|
if (!(typeof result === "string")) {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("miqGenerateFailed"),
|
text: i18next.t("miqGenerateFailed"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "Make it a Quoteの生成に失敗した旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("miqSuccess", { message: (args[2] ?? "") === "color"
|
text: i18next.t("miqSuccess", { message: (args[2] ?? "") === "color"
|
||||||
? "カラーモードで生成しました。"
|
? "カラーモードで生成しました。"
|
||||||
: "モノクロモードで生成しました。"
|
: "モノクロモードで生成しました。"
|
||||||
@@ -86,7 +106,14 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
photo: [result],
|
photo: [result],
|
||||||
},
|
},
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "Make it a Quote");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("MiQを生成:", response.uniqid);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case "permission":
|
case "permission":
|
||||||
@@ -94,21 +121,33 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
mem = Memory.memory;
|
mem = Memory.memory;
|
||||||
const permission = mem["permissions"][ueuse.account.userid] ?? "consent";
|
const permission = mem["permissions"][ueuse.account.userid] ?? "consent";
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("permissionResponse", { permission }),
|
text: i18next.t("permissionResponse", { permission }),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "権限");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("返信:", response.uniqid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const availablePermission = ["me", "everyone", "consent"];
|
const availablePermission = ["me", "everyone", "consent"];
|
||||||
if (!(availablePermission.includes(args[2]))) {
|
if (!(availablePermission.includes(args[2]))) {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("invalidOption", { option: args[2], command: "miq" }),
|
text: i18next.t("invalidOption", { option: args[2], command: "miq" }),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "無効なオプションである旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("返信:", response.uniqid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,20 +156,33 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
mem["permissions"][ueuse.account.userid] = args[2];
|
mem["permissions"][ueuse.account.userid] = args[2];
|
||||||
Memory.memory = mem;
|
Memory.memory = mem;
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("permissionChangeSuccess", { username: ueuse.account.username, permission: args[2] }),
|
text: i18next.t("permissionChangeSuccess", { username: ueuse.account.username, permission: args[2] }),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "権限の変更に成功した旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("返信:", response.uniqid);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case "allow":
|
case "allow":
|
||||||
if (ueuse.replyid === "") {
|
if (ueuse.replyid === "") {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("injusticeFormat"),
|
text: i18next.t("injusticeFormat"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "形式が異なる旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("返信:", response.uniqid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,11 +191,17 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
const permission = mem["permissions"][ueuse.account.userid] ?? "consent";
|
const permission = mem["permissions"][ueuse.account.userid] ?? "consent";
|
||||||
|
|
||||||
if (permission !== "consent") {
|
if (permission !== "consent") {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("permisionIsNotConsent"),
|
text: i18next.t("permisionIsNotConsent"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "権限が許可制ではない旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("返信:", response.uniqid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -157,20 +215,30 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
? confirmUeuse.error_code
|
? confirmUeuse.error_code
|
||||||
: "データなし");
|
: "データなし");
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("replySourceFailed"),
|
text: i18next.t("replySourceFailed"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "ソースが見つからない旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.log("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (confirmUeuse.data[0].replyid === "") {
|
if (confirmUeuse.data[0].replyid === "") {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("injusticeFormat"),
|
text: i18next.t("injusticeFormat"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "形式が異なる旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("返信:", response.uniqid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,10 +248,14 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
? confirmUeuse.error_code
|
? confirmUeuse.error_code
|
||||||
: "データなし");
|
: "データなし");
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("replySourceIsNotThis"),
|
text: i18next.t("replySourceIsNotThis"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "返信元がこのBotではない旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.log("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -197,19 +269,30 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
? requestUeuse.error_code
|
? requestUeuse.error_code
|
||||||
: "データなし");
|
: "データなし");
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("replySourceFailed"),
|
text: i18next.t("replySourceFailed"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "ソースが見つからない旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.log("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (requestUeuse.data[0].replyid === "") {
|
if (requestUeuse.data[0].replyid === "") {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("injusticeFormat"),
|
text: i18next.t("injusticeFormat"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "形式が異なる旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("返信:", response.uniqid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -222,19 +305,29 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
? sourceUeuse.error_code
|
? sourceUeuse.error_code
|
||||||
: "データなし");
|
: "データなし");
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("replySourceFailed"),
|
text: i18next.t("replySourceFailed"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "ソースが見つからない旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.log("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sourceUeuse.data[0].account.userid !== ueuse.account.userid) {
|
if (sourceUeuse.data[0].account.userid !== ueuse.account.userid) {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("replySourceIsNotSourceUser"),
|
text: i18next.t("replySourceIsNotSourceUser"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "ソースのユーズと/miq allowのユーザーが一致しない旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.log("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.warn("ソースのユーズと/miq allowのユーザーが一致しない:", );
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -251,15 +344,27 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
if (!commandRow || commandRow === "") {
|
if (!commandRow || commandRow === "") {
|
||||||
console.warn("コマンドが本文から参照できません");
|
console.warn("コマンドが本文から参照できません");
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("commandNotFound"),
|
text: i18next.t("commandNotFound"),
|
||||||
replyid: requestUeuse.data[0].uniqid,
|
replyid: requestUeuse.data[0].uniqid,
|
||||||
}, "コマンドが見つからない旨");
|
});
|
||||||
|
|
||||||
await createUeuse({
|
if (!response.success)
|
||||||
|
console.warn("ユーズの作成に失敗しました:", response.error_code);
|
||||||
|
|
||||||
|
{
|
||||||
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("injusticeFormat"),
|
text: i18next.t("injusticeFormat"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "形式が異なる旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("返信:", response.uniqid);
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -276,15 +381,19 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (!(typeof result === "string")) {
|
if (!(typeof result === "string")) {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("miqGenerateFailed"),
|
text: i18next.t("miqGenerateFailed"),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "Make it a Quoteの生成に失敗した旨");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("miqSuccess", { message: ((requestUeuseArgs[2] ?? "") === "color"
|
text: i18next.t("miqSuccess", { message: ((requestUeuseArgs[2] ?? "") === "color"
|
||||||
? "カラーモードで生成しました。"
|
? "カラーモードで生成しました。"
|
||||||
: "モノクロモードで生成しました。")
|
: "モノクロモードで生成しました。")
|
||||||
@@ -294,7 +403,14 @@ export default async function miqCommand(ueuse: ueuseModule, args: string[]) {
|
|||||||
photo: [result],
|
photo: [result],
|
||||||
},
|
},
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "Make it a Quote");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("返信に失敗:", response.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("MiQを生成:", response.uniqid);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import client, { createUeuse } from "@/lib/client";
|
import client from "@/lib/client";
|
||||||
import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
import ueuseModule from "better-uwuzu-sdk/types/1.6.8/types/modules/ueuse";
|
||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
|
|
||||||
@@ -14,8 +14,15 @@ export default async function unfollowCommand(ueuse: ueuseModule) {
|
|||||||
|
|
||||||
console.log("フォロー解除:", unfollow.userid);
|
console.log("フォロー解除:", unfollow.userid);
|
||||||
|
|
||||||
await createUeuse({
|
const notice = await client.request("ueuse/create", {
|
||||||
text: i18next.t("unfollowedNotification", { username: ueuse.account.username }),
|
text: i18next.t("unfollowedNotification", { username: ueuse.account.username }),
|
||||||
replyid: ueuse.uniqid,
|
replyid: ueuse.uniqid,
|
||||||
}, "フォロー解除通知");
|
});
|
||||||
|
|
||||||
|
if (!notice.success) {
|
||||||
|
console.warn("フォロー解除通知に失敗:", notice.error_code);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("フォロー解除通知:", notice.uniqid);
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { createUeuse } from "@/lib/client";
|
import client from "@/lib/client";
|
||||||
import config from "@/lib/config";
|
import config from "@/lib/config";
|
||||||
import initI18n from "@/lib/i18n";
|
import initI18n from "@/lib/i18n";
|
||||||
import Memory from "@/lib/memory";
|
import Memory from "@/lib/memory";
|
||||||
@@ -21,7 +21,6 @@ if (config.earthquake?.useHistoryData) {
|
|||||||
i++;
|
i++;
|
||||||
}, 10 * 1000);
|
}, 10 * 1000);
|
||||||
} else {
|
} else {
|
||||||
const connect = () => {
|
|
||||||
const WEBSOCKET_URL = config.debug
|
const WEBSOCKET_URL = config.debug
|
||||||
? "wss://api-realtime-sandbox.p2pquake.net/v2/ws"
|
? "wss://api-realtime-sandbox.p2pquake.net/v2/ws"
|
||||||
: "wss://api.p2pquake.net/v2/ws";
|
: "wss://api.p2pquake.net/v2/ws";
|
||||||
@@ -33,19 +32,6 @@ if (config.earthquake?.useHistoryData) {
|
|||||||
console.log("P2P地震情報のWebSocketに接続しました");
|
console.log("P2P地震情報のWebSocketに接続しました");
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.addEventListener("close", (err) => {
|
|
||||||
const interval = config.earthquake.reconnectInterval;
|
|
||||||
console.log(`WebSocketが切断されました。${interval / 1000}秒後に再接続します:`, err.reason);
|
|
||||||
setTimeout(() => {
|
|
||||||
connect();
|
|
||||||
}, interval);
|
|
||||||
});
|
|
||||||
|
|
||||||
socket.addEventListener("error", (err) => {
|
|
||||||
console.error("WebSocketでエラーが発生しました:", err);
|
|
||||||
socket.close();
|
|
||||||
});
|
|
||||||
|
|
||||||
socket.addEventListener("message", async (event) => {
|
socket.addEventListener("message", async (event) => {
|
||||||
let message;
|
let message;
|
||||||
|
|
||||||
@@ -54,7 +40,7 @@ if (config.earthquake?.useHistoryData) {
|
|||||||
? JSON.parse(event.data)
|
? JSON.parse(event.data)
|
||||||
: event.data;
|
: event.data;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("地震情報メッセージのパースでエラーが発生:", err);
|
console.error(`地震情報メッセージのパースでエラーが発生: ${err}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,14 +60,10 @@ if (config.earthquake?.useHistoryData) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
connect();
|
|
||||||
}
|
|
||||||
|
|
||||||
const processMessage = async (message: any) => {
|
const processMessage = async (message: any) => {
|
||||||
try {
|
try {
|
||||||
const scaleMessages: Record<string, string> = {
|
const scaleMessages: Record<string, string> = {
|
||||||
"-1": "不明",
|
"-1": "不明",
|
||||||
"0": "震度0",
|
|
||||||
"10": "震度1",
|
"10": "震度1",
|
||||||
"20": "震度2",
|
"20": "震度2",
|
||||||
"30": "震度3",
|
"30": "震度3",
|
||||||
@@ -103,23 +85,6 @@ const processMessage = async (message: any) => {
|
|||||||
{
|
{
|
||||||
console.log("地震発生情報を受信しました");
|
console.log("地震発生情報を受信しました");
|
||||||
|
|
||||||
if (
|
|
||||||
(message.earthquake.maxScale === -1 ||
|
|
||||||
message.earthquake.maxScale === undefined) &&
|
|
||||||
!config.earthquake.canUnknownMaxScale
|
|
||||||
) {
|
|
||||||
console.log("最大震度が不明であり、最大震度が不明な場合の投稿が許可されていないため、スキップします");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
message.earthquake.maxScale !== -1 &&
|
|
||||||
message.earthquake.maxScale < config.earthquake.requireMaxScale
|
|
||||||
) {
|
|
||||||
console.log("投稿に必要な最大震度に満たないため、スキップします");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
const domesticTsunamiMessages: Record<string, string> = {
|
const domesticTsunamiMessages: Record<string, string> = {
|
||||||
"None": "😌この地震による**国内**の津波の心配はありません。",
|
"None": "😌この地震による**国内**の津波の心配はありません。",
|
||||||
"Unknown": "😕この地震による**国内**の***津波情報は***不明です。",
|
"Unknown": "😕この地震による**国内**の***津波情報は***不明です。",
|
||||||
@@ -142,36 +107,34 @@ const processMessage = async (message: any) => {
|
|||||||
"Potential": "🚨この地震によって**一般的に**この規模では津波の可能性があると考えられています。",
|
"Potential": "🚨この地震によって**一般的に**この規模では津波の可能性があると考えられています。",
|
||||||
}
|
}
|
||||||
|
|
||||||
const grouped: Record<string, { scale: number; prefs: Record<string, string[]> }> = {};
|
let points: Record<string, any[]> = {};
|
||||||
|
|
||||||
for (const point of message.points) {
|
for (const point of message.points) {
|
||||||
const { addr, scale, pref } = point;
|
const scaleMsg = scaleMessages[String(point.scale)];
|
||||||
|
if (!scaleMsg)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
points[scaleMsg]?.push(point);
|
||||||
|
}
|
||||||
|
|
||||||
|
const grouped: Record<string, { scale: number; addrs: string[] }> = {};
|
||||||
|
for (const point of message.points) {
|
||||||
|
const { addr, scale } = point;
|
||||||
const label = scaleMessages[String(scale)] ?? "不明";
|
const label = scaleMessages[String(scale)] ?? "不明";
|
||||||
|
|
||||||
if (!grouped[label]) {
|
if (!grouped[label]) {
|
||||||
grouped[label] = { scale, prefs: {} };
|
grouped[label] = { scale, addrs: [] };
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!grouped[label].prefs[pref]) {
|
grouped[label].addrs.push(addr);
|
||||||
grouped[label].prefs[pref] = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
grouped[label].prefs[pref].push(addr);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const pointsMsg = Object.entries(grouped)
|
const pointsMsg = Object.entries(grouped)
|
||||||
.sort((a, b) => b[1].scale - a[1].scale)
|
.sort((a, b) => b[1].scale - a[1].scale)
|
||||||
.map(([label, { prefs }]) => {
|
.map(([label, { addrs }]) =>
|
||||||
const prefLines = Object.entries(prefs)
|
`【${label}】${EOL}${addrs.join("・")}`)
|
||||||
.map(([pref, addrs]) => `${pref}: ${addrs.join("・")}`)
|
.join(EOL.repeat(2)).trim();
|
||||||
.join(EOL);
|
|
||||||
|
|
||||||
return `【${label}】${EOL}${prefLines}`;
|
const response = await client.request("ueuse/create", {
|
||||||
})
|
|
||||||
.join(EOL.repeat(2))
|
|
||||||
.trim();
|
|
||||||
|
|
||||||
await createUeuse({
|
|
||||||
text: i18next.t("earthquakeNotice", {
|
text: i18next.t("earthquakeNotice", {
|
||||||
occuredTime: format(new Date(message.earthquake.time), "yyyy年M月d日 H:mm"),
|
occuredTime: format(new Date(message.earthquake.time), "yyyy年M月d日 H:mm"),
|
||||||
maxScale: scaleMessages[String(message.earthquake.maxScale)],
|
maxScale: scaleMessages[String(message.earthquake.maxScale)],
|
||||||
@@ -196,7 +159,14 @@ const processMessage = async (message: any) => {
|
|||||||
? ""
|
? ""
|
||||||
: EOL + message.comments.freeFormComment + EOL,
|
: EOL + message.comments.freeFormComment + EOL,
|
||||||
}),
|
}),
|
||||||
}, "地震発生情報");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("ユーズの作成に失敗しました:", response.error_code);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("地震発生情報を投稿:", response.uniqid);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 552:
|
case 552:
|
||||||
@@ -204,12 +174,19 @@ const processMessage = async (message: any) => {
|
|||||||
console.log("津波予報情報を受信しました");
|
console.log("津波予報情報を受信しました");
|
||||||
|
|
||||||
if (message.cancelled) {
|
if (message.cancelled) {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("tsunamiCancelNotice", {
|
text: i18next.t("tsunamiCancelNotice", {
|
||||||
announceTime: format(new Date(message.issue.time), "yyyy年M月d日 H:mm:ss"),
|
announceTime: format(new Date(message.issue.time), "yyyy年M月d日 H:mm:ss"),
|
||||||
source: message.issue.source ?? "不明",
|
source: message.issue.source ?? "不明",
|
||||||
}),
|
}),
|
||||||
}, "津波予報解除情報");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("ユーズの作成に失敗しました:", response.error_code);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("津波予報解除情報を投稿:", response.uniqid);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,13 +217,20 @@ const processMessage = async (message: any) => {
|
|||||||
}) + EOL.repeat(2);
|
}) + EOL.repeat(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("tsunamiForecastNotice", {
|
text: i18next.t("tsunamiForecastNotice", {
|
||||||
announceTime: format(new Date(message.issue.time), "yyyy年M月d日 H:mm:ss"),
|
announceTime: format(new Date(message.issue.time), "yyyy年M月d日 H:mm:ss"),
|
||||||
areasMsg: areasMsg.trim(),
|
areasMsg: areasMsg.trim(),
|
||||||
source: message.issue.source ?? "不明",
|
source: message.issue.source ?? "不明",
|
||||||
}),
|
}),
|
||||||
}, "津波予報情報");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("ユーズの作成に失敗しました:", response.error_code);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("津波予報情報を投稿:", response.uniqid);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 556:
|
case 556:
|
||||||
@@ -254,14 +238,21 @@ const processMessage = async (message: any) => {
|
|||||||
console.log("緊急地震速報(警報)を受信しました");
|
console.log("緊急地震速報(警報)を受信しました");
|
||||||
|
|
||||||
if (message.cancelled) {
|
if (message.cancelled) {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("eewCancelNotice", {
|
text: i18next.t("eewCancelNotice", {
|
||||||
isTest: message.test
|
isTest: message.test
|
||||||
? "⚒️これは**テストです。**"
|
? "⚒️これは**テストです。**"
|
||||||
: "🚨これは**テストではありません。**",
|
: "🚨これは**テストではありません。**",
|
||||||
announceTime: format(new Date(message.issue.time), "yyyy年M月d日 H:mm:ss"),
|
announceTime: format(new Date(message.issue.time), "yyyy年M月d日 H:mm:ss"),
|
||||||
}),
|
}),
|
||||||
}, "緊急地震速報(警報)解除情報");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("ユーズの作成に失敗しました:", response.error_code);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("緊急地震速報(警報)解除情報を投稿:", response.uniqid);
|
||||||
}
|
}
|
||||||
|
|
||||||
const kindMessages: Record<string, string> = {
|
const kindMessages: Record<string, string> = {
|
||||||
@@ -287,7 +278,7 @@ const processMessage = async (message: any) => {
|
|||||||
}) + EOL.repeat(2);
|
}) + EOL.repeat(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("eewNotice", {
|
text: i18next.t("eewNotice", {
|
||||||
isTest: message.test
|
isTest: message.test
|
||||||
? "⚒️これは**テストです。**"
|
? "⚒️これは**テストです。**"
|
||||||
@@ -311,7 +302,14 @@ const processMessage = async (message: any) => {
|
|||||||
? EOL.repeat(2) + areasMsg.trim()
|
? EOL.repeat(2) + areasMsg.trim()
|
||||||
: "",
|
: "",
|
||||||
}),
|
}),
|
||||||
}, "緊急地震速報(警報)情報");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("ユーズの作成に失敗しました:", response.error_code);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("緊急地震速報(警報)情報を投稿:", response.uniqid);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { createUeuse } from "@/lib/client";
|
import client from "@/lib/client";
|
||||||
import initI18n from "@/lib/i18n";
|
import initI18n from "@/lib/i18n";
|
||||||
import { format } from "date-fns";
|
import { format } from "date-fns";
|
||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
@@ -10,11 +10,16 @@ parentPort?.on("message", async () => {
|
|||||||
console.log("新年迎春の投稿を行います");
|
console.log("新年迎春の投稿を行います");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("hnyNotice", { year: String(new Date().getFullYear()) }),
|
text: i18next.t("hnyNotice", { year: String(new Date().getFullYear()) }),
|
||||||
}, "新年迎春");
|
});
|
||||||
|
|
||||||
console.log("新年迎春投稿時刻:", format(new Date(), "yyyy/M/d H:mm:ss:SSS"));
|
if (!response.success) {
|
||||||
|
console.warn("新年迎春投稿に失敗しました:", response.error_code);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("新年迎春投稿:", `${response.uniqid} (${format(new Date(), "yyyy/M/d H:mm:ss:SSS")})`);
|
||||||
process.exit(0);
|
process.exit(0);
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
console.error("message" in err
|
console.error("message" in err
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { createUeuse } from "@/lib/client";
|
import client from "@/lib/client";
|
||||||
import initI18n from "@/lib/i18n";
|
import initI18n from "@/lib/i18n";
|
||||||
import { format } from "date-fns";
|
import { format } from "date-fns";
|
||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
@@ -7,10 +7,16 @@ await initI18n();
|
|||||||
console.log("時報の投稿を行います");
|
console.log("時報の投稿を行います");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await createUeuse({
|
const response = await client.request("ueuse/create", {
|
||||||
text: i18next.t("timeNotice", { time: format(new Date(), "H:mm") }),
|
text: i18next.t("timeNotice", { time: format(new Date(), "H:mm") }),
|
||||||
}, "時報");
|
});
|
||||||
|
|
||||||
|
if (!response.success) {
|
||||||
|
console.warn("時報投稿に失敗しました:", response.error_code);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log("時報投稿:", response.uniqid);
|
||||||
process.exit(0);
|
process.exit(0);
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
console.error("message" in err
|
console.error("message" in err
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import client from "@/lib/client";
|
import client from "@/lib/client";
|
||||||
import config from "@/lib/config";
|
import config from "@/lib/config";
|
||||||
import initI18n from "@/lib/i18n";
|
import initI18n from "@/lib/i18n";
|
||||||
import Memory from "@/lib/memory";
|
|
||||||
import i18next from "i18next";
|
import i18next from "i18next";
|
||||||
import { readFileSync } from "node:fs";
|
import { readFileSync } from "node:fs";
|
||||||
import { EOL } from "node:os";
|
import { EOL } from "node:os";
|
||||||
@@ -62,27 +61,12 @@ if (!isMainThread && workerData === "scheduledWeatherNotice") {
|
|||||||
console.log("天気予報の投稿を行います");
|
console.log("天気予報の投稿を行います");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let provisionalUeuse;
|
const provisionalUeuse = await client.request("ueuse/create", {
|
||||||
let success = false;
|
|
||||||
|
|
||||||
for (let attempt = 1; attempt <= config.ueuse.maxRetries; attempt++) {
|
|
||||||
provisionalUeuse = await client.request("ueuse/create", {
|
|
||||||
text: i18next.t("weatherProvisional"),
|
text: i18next.t("weatherProvisional"),
|
||||||
});
|
});
|
||||||
|
|
||||||
if (provisionalUeuse.success) {
|
if (!provisionalUeuse.success) {
|
||||||
success = true;
|
console.error("天気仮投稿に失敗しました:", provisionalUeuse.error_code);
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
console.warn(`天気仮投稿に失敗しました (試行 ${attempt}/${config.ueuse.maxRetries}):`, provisionalUeuse.error_code);
|
|
||||||
if (attempt < config.ueuse.maxRetries) {
|
|
||||||
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!success || !provisionalUeuse?.success) {
|
|
||||||
console.error("天気仮投稿の全試行に失敗したため、終了します。");
|
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,9 +84,7 @@ if (!isMainThread && workerData === "scheduledWeatherNotice") {
|
|||||||
|
|
||||||
export async function weatherReply(uniqid: string) {
|
export async function weatherReply(uniqid: string) {
|
||||||
// インデックス
|
// インデックス
|
||||||
const aboutFullLength = 3100;
|
const splitCount = config.weather.splits;
|
||||||
const mem = Memory.memory;
|
|
||||||
const splitCount = Math.round(aboutFullLength / mem.max_length);
|
|
||||||
const total = cityList.length;
|
const total = cityList.length;
|
||||||
const chunkSizes = Array(splitCount).fill(0).map((_, i) =>
|
const chunkSizes = Array(splitCount).fill(0).map((_, i) =>
|
||||||
Math.floor((total + i) / splitCount)
|
Math.floor((total + i) / splitCount)
|
||||||
@@ -166,29 +148,13 @@ export async function weatherReply(uniqid: string) {
|
|||||||
|
|
||||||
// 分割投稿
|
// 分割投稿
|
||||||
for (let i = 0; i < splitCount; i++) {
|
for (let i = 0; i < splitCount; i++) {
|
||||||
let replyUeuse;
|
const replyUeuse = await client.request("ueuse/create", {
|
||||||
let success = false;
|
|
||||||
|
|
||||||
for (let attempt = 1; attempt <= config.ueuse.maxRetries; attempt++) {
|
|
||||||
replyUeuse = await client.request("ueuse/create", {
|
|
||||||
text: weatherResults[i].trim(),
|
text: weatherResults[i].trim(),
|
||||||
replyid: uniqid,
|
replyid: uniqid,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (replyUeuse.success) {
|
if (!replyUeuse.success) {
|
||||||
success = true;
|
console.error("天気返信に失敗しました:", replyUeuse.error_code);
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
console.warn(`天気返信に失敗しました (試行 ${attempt}/${config.ueuse.maxRetries}):`, replyUeuse.error_code);
|
|
||||||
if (attempt < config.ueuse.maxRetries) {
|
|
||||||
await new Promise(resolve => setTimeout(resolve, config.ueuse.retryInterval));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!success || !replyUeuse?.success) {
|
|
||||||
console.error("天気返信の全試行に失敗したため、終了します。");
|
|
||||||
process.exit(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("天気返信:", replyUeuse.uniqid);
|
console.log("天気返信:", replyUeuse.uniqid);
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
import { schedule } from "node-cron";
|
import { schedule } from "node-cron";
|
||||||
import { readFileSync } from "node:fs";
|
import { readFileSync } from "node:fs";
|
||||||
import config from "@/lib/config";
|
import config from "@/lib/config";
|
||||||
import { initData } from "@/lib/memory";
|
import { initUserID } from "@/lib/memory";
|
||||||
import { styleText } from "node:util";
|
import { styleText } from "node:util";
|
||||||
import { Worker } from "node:worker_threads";
|
import { Worker } from "node:worker_threads";
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@ try {
|
|||||||
}
|
}
|
||||||
console.log();
|
console.log();
|
||||||
|
|
||||||
await initData();
|
await initUserID();
|
||||||
|
|
||||||
new Worker(`${import.meta.dirname}/feature/earthquakeNotice.js`);
|
new Worker(`${import.meta.dirname}/feature/earthquakeNotice.js`);
|
||||||
|
|
||||||
|
|||||||
+1
-79
@@ -2,8 +2,6 @@ import uwuzu from "better-uwuzu-sdk";
|
|||||||
import config from "@/lib/config";
|
import config from "@/lib/config";
|
||||||
import Parser from "better-uwuzu-sdk/1.6.8/parser";
|
import Parser from "better-uwuzu-sdk/1.6.8/parser";
|
||||||
import ApiMap from "better-uwuzu-sdk/types/1.6.8/map";
|
import ApiMap from "better-uwuzu-sdk/types/1.6.8/map";
|
||||||
import Memory from "@/lib/memory";
|
|
||||||
import { EOL } from "node:os";
|
|
||||||
|
|
||||||
const client = new uwuzu<ApiMap>({
|
const client = new uwuzu<ApiMap>({
|
||||||
origin: config.uwuzu.origin,
|
origin: config.uwuzu.origin,
|
||||||
@@ -11,81 +9,5 @@ const client = new uwuzu<ApiMap>({
|
|||||||
});
|
});
|
||||||
|
|
||||||
client.token = config.uwuzu.token;
|
client.token = config.uwuzu.token;
|
||||||
|
|
||||||
export default client;
|
export default client;
|
||||||
|
|
||||||
export const createUeuse = async (data: ApiMap["ueuse/create"]["body"], title: string) => {
|
|
||||||
const mem = Memory.memory;
|
|
||||||
const maxLength = mem.max_length;
|
|
||||||
const excessedMessage = "👉返信に続きがあります。";
|
|
||||||
|
|
||||||
let lines = data.text.split(EOL);
|
|
||||||
let firstUniqid = "";
|
|
||||||
let count = 0;
|
|
||||||
|
|
||||||
while (lines.length > 0) {
|
|
||||||
count++;
|
|
||||||
let currentText = "";
|
|
||||||
|
|
||||||
const limit = maxLength - (excessedMessage.length + EOL.length * 2);
|
|
||||||
|
|
||||||
while (lines.length > 0) {
|
|
||||||
const nextLine = lines[0];
|
|
||||||
if (nextLine === undefined)
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (nextLine.length > limit && currentText === "") {
|
|
||||||
const targetLine = lines.shift() || "";
|
|
||||||
currentText = targetLine.slice(0, limit);
|
|
||||||
|
|
||||||
lines.unshift(targetLine.slice(limit));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
const potentialText = currentText ? currentText + EOL + nextLine : nextLine;
|
|
||||||
if (potentialText.length <= limit) {
|
|
||||||
currentText = potentialText;
|
|
||||||
lines.shift();
|
|
||||||
} else {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (lines.length > 0) {
|
|
||||||
currentText += EOL.repeat(2) + excessedMessage;
|
|
||||||
}
|
|
||||||
|
|
||||||
let postedUniqid = "";
|
|
||||||
let success = false;
|
|
||||||
|
|
||||||
for (let attempt = 1; attempt <= config.ueuse.maxRetries; attempt++) {
|
|
||||||
const response = await client.request("ueuse/create", {
|
|
||||||
...data,
|
|
||||||
text: currentText,
|
|
||||||
replyid: data.replyid === undefined && firstUniqid !== ""
|
|
||||||
? firstUniqid
|
|
||||||
: data.replyid,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (response.success) {
|
|
||||||
success = true;
|
|
||||||
postedUniqid = response.uniqid;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
console.warn(`${title}の投稿に失敗しました (試行 ${attempt}/${config.ueuse.maxRetries}):`, response.error_code);
|
|
||||||
if (attempt < config.ueuse.maxRetries) {
|
|
||||||
await new Promise(resolve => setTimeout(resolve, config.ueuse.retryInterval));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!success) {
|
|
||||||
console.error(`${title}の全試行が失敗したため、処理を中断します。`);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (firstUniqid === "")
|
|
||||||
firstUniqid = postedUniqid;
|
|
||||||
|
|
||||||
console.log(`${title}を投稿(${count}):`, postedUniqid);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+4
-19
@@ -6,24 +6,13 @@ import { EOL } from "node:os";
|
|||||||
const schema = z.object({
|
const schema = z.object({
|
||||||
command: z.object({
|
command: z.object({
|
||||||
interval: z.number().int().positive(),
|
interval: z.number().int().positive(),
|
||||||
maxParallels: z.number().int().positive(),
|
}),
|
||||||
|
weather: z.object({
|
||||||
|
splits: z.number().int().positive(),
|
||||||
}),
|
}),
|
||||||
earthquake: z.object({
|
earthquake: z.object({
|
||||||
requireMaxScale: z.union([
|
|
||||||
z.literal(10),
|
|
||||||
z.literal(20),
|
|
||||||
z.literal(30),
|
|
||||||
z.literal(40),
|
|
||||||
z.literal(45),
|
|
||||||
z.literal(50),
|
|
||||||
z.literal(55),
|
|
||||||
z.literal(60),
|
|
||||||
z.literal(70),
|
|
||||||
]),
|
|
||||||
canUnknownMaxScale: z.boolean(),
|
|
||||||
useHistoryData: z.boolean(),
|
useHistoryData: z.boolean(),
|
||||||
reconnectInterval: z.number().positive(),
|
}).optional(),
|
||||||
}),
|
|
||||||
uwuzu: z.object({
|
uwuzu: z.object({
|
||||||
token: z.string().length(64),
|
token: z.string().length(64),
|
||||||
origin: z.string().refine(data => {
|
origin: z.string().refine(data => {
|
||||||
@@ -34,10 +23,6 @@ const schema = z.object({
|
|||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
ueuse: z.object({
|
|
||||||
maxRetries: z.number().int().positive(),
|
|
||||||
retryInterval: z.number().positive(),
|
|
||||||
}),
|
|
||||||
debug: z.boolean().optional(),
|
debug: z.boolean().optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+1
-13
@@ -14,7 +14,6 @@ class MemoryClass {
|
|||||||
lastReadMention: "",
|
lastReadMention: "",
|
||||||
lastReadReply: "",
|
lastReadReply: "",
|
||||||
userid: "",
|
userid: "",
|
||||||
max_length: 0,
|
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,9 +32,7 @@ class MemoryClass {
|
|||||||
|
|
||||||
const Memory = new MemoryClass();
|
const Memory = new MemoryClass();
|
||||||
|
|
||||||
export const initData = async () => {
|
export const initUserID = async () => {
|
||||||
await Promise.all([
|
|
||||||
(async () => {
|
|
||||||
const response = await client.request("me/");
|
const response = await client.request("me/");
|
||||||
|
|
||||||
if (!response.success)
|
if (!response.success)
|
||||||
@@ -44,15 +41,6 @@ export const initData = async () => {
|
|||||||
const mem = Memory.memory;
|
const mem = Memory.memory;
|
||||||
mem.userid = response.userid;
|
mem.userid = response.userid;
|
||||||
Memory.memory = mem;
|
Memory.memory = mem;
|
||||||
})(),
|
|
||||||
(async () => {
|
|
||||||
const response = await client.request("serverinfo-api");
|
|
||||||
|
|
||||||
const mem = Memory.memory;
|
|
||||||
mem.max_length = response.server_info.max_ueuse_length;
|
|
||||||
Memory.memory = mem;
|
|
||||||
})(),
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default Memory;
|
export default Memory;
|
||||||
Reference in New Issue
Block a user