Merge pull request '25.12.0-alpha.0' (#3) from alias-import-20251130 into main

Reviewed-on: #3

CHANGELOG.md

@@ -0,0 +1,22 @@
+# 25.12.0-alpha.0
+- New: リリースノートを記録する方針を取り始めました
+- Change: tsc-aliasによるエイリアスインポートを導入しました
+  - New: resolveFullPathsが有効です
+  - Del: それに伴いインポートから末尾の.jsを削除しました
+  - New: エイリアスに`@/`(`./src`)が追加されました
+- Change: config.d.tsの名称をconfigTypeからConfigへ変更しました
+  - Change: config.d.tsの余分なinterface定義を1つのConfigとして再定義しました
+- Change: moduleResolutionをnodeからbundlerへ変更しました
+- Change: typeRootのsrc/typesを./src/typesへ変更しました
+- Change: 同一ファイルでの使用数が1つのみのインポートを静的インポートから動的インポートへ変更しました
+- Change: ディレクトリ構造を大幅に変更しました
+  - Migrate: /src/wiatherId.tsを/src/constantsへ移動しました
+  - Migrate: /scriptを/srcへ移動しました
+  - Migrate: /typesを/src/typesへ移動しました
+  - Migrate: /src/mailer.tsを/src/libへ移動しました
+  - Migrate: /checksを/src/scriptsへ移動しました
+- Change: eventdayData.tsを単一のexport文のみに短縮しました
+- Delete: asciiart.txtの末尾に含まれている改行を削除しました
+  - Delete: それに伴いasciiart.tsの改行を削除する正規表現を削除しました
+- Delete: package.jsonのscriptsからmainを削除しました
+- Delete: successExit.tsに含まれていたデバッグ用の関数を即時実行するコードを削除しました

examples/config.ts

@@ -1,7 +1,7 @@
-import type { configTypes } from "types/config";
+import type Config from "src/types/config";
 
 // READMEの設定項目を参照
-const config: configTypes = {
+const config: Config = {
   // 時報設定
   time: {
     // 時報休止期間

main.ts

@@ -1,62 +1,48 @@
 // 起動チェック
-import Check from "./checks/main.js";
-(async () => {
-  await Check();
-})();
+(await import("@/scripts/checks/main")).default();
+(await import("@/scripts/successExit")).default();
 
-//　定期実行読み込み
-import * as cron from "node-cron";
-
-// 機能読み込み
-import timeNotice from "./scripts/timeNotice.js";
-import { weatherNotice } from "./scripts/weatherNotice.js";
-import earthquakeNotice from "./scripts/earthquakeNotice.js";
-import EventDays from "./scripts/eventday.js";
-import Commands from "./scripts/commands/main.js";
-
-// その他機能
-import asciiArt from "./scripts/asciiart.js";
-asciiArt();
-import successExit from "./scripts/successExit.js";
-successExit();
+// アスキーアート
+(await import("@/scripts/asciiart")).default();
 
 // 地震情報観測開始
-earthquakeNotice();
+(await import("@/scripts/earthquakeNotice")).default();
 
-// 時報(1時間/1回)
-cron.schedule("0 * * * *", () => {
-  timeNotice();
+// 定期実行
+import * as cron from "node-cron";
+
+/// 時報(1時間毎)
+cron.schedule("0 * * * *", async () => {
+  (await import("@/scripts/timeNotice")).default();
 });
 
-// コマンド(10分/1回)
-cron.schedule("*/10 * * * *", () => {
-  Commands();
+// コマンド(10分毎)
+cron.schedule("*/10 * * * *", async () => {
+  (await import("@/scripts/commands/main")).default();
 });
 
-// 祝日などお知らせ(毎日0:00)
-cron.schedule("0 0 * * *", () => {
-  EventDays();
+// 祝日など(毎日0:00)
+cron.schedule("0 0 * * *", async () => {
+  (await import("@/scripts/eventday")).default();
 });
 
 // 天気お知らせ(毎日7:00)
-import { setTimeout } from "timers";
-cron.schedule("0 7 * * *", () => {
-  setTimeout(() => {
-    weatherNotice();
-  }, 100);
+cron.schedule("0 7 * * *", async () => {
+  (await import("@/scripts/weatherNotice")).weatherNotice();
 });
 
 // 管理パネル
-import AdminPanel from "./panel/main.js";
-import { styleText } from "util";
-(async () => {
-  await AdminPanel();
-})();
+await (await import("./panel/main")).default()
 
 // 起動表示
 console.log("BOTサーバーが起動しました");
 
-import config from "./config.js";
-if (config.debug !== undefined) {
-  console.log(styleText(["bgRed", "cyan", "bold"], "デバッグモードで起動中"));
+if ((await import("./config")).default.debug) {
+  // TLSを任意に設定
+  process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
+  
+  console.log((await import("node:util")).styleText(
+    ["bgRed", "cyan", "bold"],
+    "デバッグモードで起動中"
+  ));
 }

miq/PersonIconLICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

miq/fonts/COPYING

@@ -1,5 +1,3 @@
-Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'
-
 This Font Software is licensed under the SIL Open Font License, Version 1.1.
 This license is copied below, and is also available with a FAQ at:
 https://openfontlicense.org

miq/main.ts

@@ -1,45 +1,93 @@
 import { createCanvas, loadImage, registerFont } from "canvas";
-import { writeFileSync } from "fs";
 import sharp from "sharp";
 import { MiQOptions } from "./miq";
+import { readFileSync } from "fs";
 
-function textReplace(
-  text: string
+// フォント読み込み
+registerFont("miq/fonts/MPLUS.ttf", {
+  family: "M PLUS Rounded 1c",
+  weight: "400",
+});
+
+function maxLengthCut(
+  text: string,
+  maxLength: number,
 ) {
-  let result = "";
-
-  // 改行削除
-  text = text.replaceAll("\n", "");
-
-  // 10文字/1回で改行を追加
-  let maxLength = 10;
   if (text.length > maxLength) {
-    for (let i = 0; i < text.length; i += maxLength) {
-      result += text.substring(i, i + maxLength) + "\n";
-    }
-    result = result.trimEnd();
-  }
-
-  // 80文字以上は「...」で省略
-  maxLength = 80;
-  if (result.length > maxLength) {
-    result = result.substring(0, maxLength)
+    text = text.substring(0, maxLength)
     + "...";
   }
 
-  return result;
+  return text;
+}
+
+function autoLineBreak(
+  text: string,
+  maxWidth: number,
+  font: string = '48px "M PLUS Rounded 1c"'
+): string {
+  const ctx = createCanvas(maxWidth, 100).getContext("2d");
+  ctx.font = font;
+
+  const lines: string[] = [];
+  let currentLine = "";
+
+  for (let i = 0; i < text.length; i++) {
+    const char = text[i];
+    const testLine = currentLine + char;
+    const width = ctx.measureText(testLine).width;
+
+    if (width > maxWidth) {
+      lines.push(currentLine);
+      currentLine = char;
+
+      while (ctx.measureText(currentLine).width > maxWidth && currentLine.length > 1) {
+        const cutPoint = currentLine.length - 1;
+        lines.push(currentLine.slice(0, cutPoint));
+        currentLine = currentLine.slice(cutPoint);
+      }
+    } else {
+      currentLine = testLine;
+    }
+  }
+
+  if (currentLine) lines.push(currentLine);
+
+  return lines.join("\n");
+}
+
+function textReplace(
+  text: string,
+  maxWidth: number,
+  font?: string
+) {
+  // 改行削除
+  text = text.replaceAll("\n", "");
+  text = text.replaceAll("\r", "");
+  // 自動改行
+  text = autoLineBreak(text, maxWidth, font);
+  // 100文字以上を省略
+  text = maxLengthCut(text, 100);
+
+  return text;
 }
 
 async function iconReplace(
   color: boolean,
-  iconURL: string,
+  iconURL: string
 ) {
   let result = "";
 
-  const buffer = await(await fetch(iconURL, {
+  const bufferReq = await fetch(iconURL, {
     method: "GET",
     cache: "no-store",
-  })).arrayBuffer();
+  });
+
+  if (bufferReq.status < 200 || bufferReq.status > 299) {
+    return readFileSync("miq/PersonIcon.txt", "utf-8");
+  }
+
+  const buffer = await bufferReq.arrayBuffer();
 
   if (color) {
     const img = await sharp(Buffer.from(buffer))
@@ -71,9 +119,6 @@ export default async function MiQ({
   userName,
   userID,
 }: MiQOptions) {
-  // フォント読み込み
-  registerFont("miq/fonts/NotoSansJP.ttf", { family: "Noto Sans JP" });
-
   // 初期化
   const canvas = createCanvas(1200, 630);
   const ctx = canvas.getContext("2d");
@@ -91,29 +136,27 @@ export default async function MiQ({
   ctx.drawImage(iconImg, 0, 0, iconSize, iconSize);
 
   // ユーザー名描画
-  ctx.font = "38px Noto Sans JP";
+  ctx.font = '38px "M PLUS Rounded 1c"';
   ctx.fillStyle = "white";
-  ctx.textAlign = "left";
+  ctx.textAlign = "center";
   ctx.textBaseline = "middle";
-  let x = 670;
+  let x = 910;
   let y = 480;
-  ctx.fillText("-", x, y);
-  ctx.fillText(userName, x+40, y, canvas.width-(x+40));
+  ctx.fillText(`- ${userName}`, x, y, canvas.width-iconSize);
 
   // ユーザーID描画
-  ctx.font = "28px Noto Sans JP";
-  ctx.fillStyle = "#3c3c3c";
-  ctx.fillText(`@${userID}`, x+120, y+50, canvas.width-(x+120));
+  ctx.font = '28px "M PLUS Rounded 1c"';
+  ctx.fillStyle = "#b4b4b4";
+  ctx.fillText(`@${userID}`, x, y+50, canvas.width-iconSize);
 
   // 本文描画
-  ctx.font = "48px Noto Sans JP";
+  const maxWidth = canvas.width - iconSize;
+  ctx.font = '48px "M PLUS Rounded 1c"';
   ctx.textAlign = "center";
   ctx.textBaseline = "middle";
   ctx.fillStyle = "white";
-  text = textReplace(text);
-  x = 870;
-  y = 30;
-  ctx.fillText(text, x, y+50);
+  text = textReplace(text, maxWidth, ctx.font);
+  ctx.fillText(text, x, 80);
 
   // フェード描画
   const fadeColor = "black";
@@ -124,11 +167,15 @@ export default async function MiQ({
   ctx.fillRect(0, 0, iconSize, canvas.height);
 
   // 返答
-  if (type === "Buffer") {
+  switch (type) {
+    case "Buffer":
       return canvas.toBuffer();
-  } else if (type === "Base64") {
+    case "Base64Data":
+      return canvas.toDataURL()
+      .replace("data:image/png;base64,", "");
+    case "Base64URL":
       return canvas.toDataURL();
-  } else {
+    default:
       return "Error: The type property is invalid.";
   }
 }

miq/miq.d.ts

@@ -1,6 +1,7 @@
 type MiQType =
-"Buffer" |
-"Base64"
+  "Buffer" |
+  "Base64Data" |
+  "Base64URL";
 
 export interface MiQOptions {
   type: MiQType;

package.json

@@ -1,15 +1,14 @@
 {
   "name": "notice-uwuzu",
-  "version": "v25.8.5@uwuzu1.6.4",
-  "tag": "v25.8.5",
+  "version": "v25.8.11@uwuzu1.6.4",
+  "tag": "v25.8.11",
   "description": "Notice Bot for uwuzu",
   "main": "dist/main.js",
   "scripts": {
     "start": "node .",
-    "build": "tsc",
-    "main": "tsc && node .",
+    "build": "tsc && tsc-alias",
     "dev": "tsx main.ts",
-    "clean": "tsc && node dist/scripts/clean/main.js"
+    "clean": "npm run build && node dist/scripts/clean/main.js"
   },
   "repository": {
     "type": "git",
@@ -52,7 +51,7 @@
     "node-cron": "^4.1.1",
     "nodemailer": "^7.0.4",
     "sharp": "^0.34.3",
-    "timers": "^0.1.1",
+    "tsc-alias": "^1.8.16",
     "typescript": "^5.9.2",
     "ws": "^8.18.3"
   },

panel/main.ts

@@ -1,15 +1,7 @@
 import express from "express";
 import * as os from "os";
-import config from "../config.js";
-import { NetworkInterfaceDetails } from "types/types";
-
-// バックエンドルーティング
-import CommandExecute from "./route/command.js";
-import ueusePost from "./route/ueuse.js";
-import WeatherUeuse from "./route/weather.js";
-import API from "./route/api.js";
-import Token from "./route/token.js";
-import Debug from "./route/debug.js";
+import config from "../config";
+import { NetworkInterfaceDetails } from "@/types/types";
 
 export default async function AdminPanel() {
   // 無効
@@ -22,12 +14,12 @@ export default async function AdminPanel() {
   const port = config.admin.panel.port;
 
   // ルーティング
-  app.use(ueusePost);
-  app.use(CommandExecute);
-  app.use(WeatherUeuse);
-  app.use(API);
-  app.use(Token);
-  app.use(Debug);
+  app.use((await import("./route/ueuse")).default);
+  app.use((await import("./route/command")).default);
+  app.use((await import("./route/weather")).default);
+  app.use((await import("./route/api")).default);
+  app.use((await import("./route/token")).default);
+  app.use((await import("./route/debug")).default);
   app.use(express.static("panel/public"));
 
   app.listen(port, () => {

panel/route/api.ts

@@ -1,7 +1,7 @@
 import express from "express";
 const API = express.Router();
 
-import config from "../../config.js";
+import config from "../../config";
 
 API.use(express.json());
 API.use(express.urlencoded({ extended: true }));

panel/route/command.ts

@@ -1,7 +1,7 @@
 import express from "express";
 const CommandExecute = express.Router();
 
-import Commands from "../../scripts/commands/main.js";
+import Commands from "@/scripts/commands/main";
 
 CommandExecute.post("/actions/command-execute", (req, res) => {
   try {

panel/route/debug.ts

@@ -1,7 +1,7 @@
 import express from "express";
 const Debug = express.Router();
 
-import config from "../../config.js";
+import config from "../../config";
 
 Debug.post("/actions/debug", (req, res, next) => {
   res.status(501)

panel/route/eventday.ts

@@ -1,7 +1,7 @@
 import express from "express";
 const EventdayUeuse = express.Router();
 
-import EventDays from "../../scripts/eventday.js";
+import EventDays from "@/scripts/eventday";
 
 EventdayUeuse.post("/actions/eventday", (req, res) => {
   try {

panel/route/token.ts

@@ -1,7 +1,7 @@
 import express from "express";
 const Token = express.Router();
 
-import config from "../../config.js";
+import config from "../../config";
 
 Token.post("/actions/token", (req, res, next) => {
   res.status(501)

panel/route/ueuse.ts

@@ -1,7 +1,7 @@
 import express from "express";
 const ueusePost = express.Router();
 
-import config from "../../config.js";
+import config from "../../config";
 
 ueusePost.use(express.json());
 ueusePost.use(express.urlencoded({ extended: true }));

panel/route/weather.ts

@@ -1,7 +1,7 @@
 import express from "express";
 const WeatherUeuse = express.Router();
 
-import { weatherNotice } from "../../scripts/weatherNotice.js";
+import { weatherNotice } from "@/scripts/weatherNotice";
 
 WeatherUeuse.post("/actions/weather", (req, res) => {
   try {

scripts/clean/main.ts

@@ -1,7 +0,0 @@
-import logsDelete from "./logsDel.js";
-import packageLockJsonDelete from "./packageLockDel.js";
-import npmInstall from "./npmInstall.js";
-
-logsDelete();
-packageLockJsonDelete();
-npmInstall();

scripts/commands/legal/privacy.ts

@@ -1,7 +0,0 @@
-import { ueuse } from "types/types";
-import { Reply } from "../main.js";
-import config from "../../../config.js";
-
-export default function PrivacyPolicy(data: ueuse) {
-  Reply(config.legal.privacy, data.uniqid);
-}

scripts/commands/legal/terms.ts

@@ -1,7 +0,0 @@
-import { ueuse } from "types/types";
-import { Reply } from "../main.js";
-import config from "../../../config.js";
-
-export default function Terms(data: ueuse) {
-  Reply(config.legal.terms, data.uniqid);
-}

scripts/commands/miq.ts

@@ -1,56 +0,0 @@
-import { ueuse } from "../../types/types";
-import MiQ from "../../miq/main.js";
-import config from "../../config.js";
-
-export default async function MakeItAQuote(data: ueuse) {
-  let color: boolean;
-  let msg: string;
-
-  if (data.abi === "color: true") {
-    msg = "カラーモードでMake it a quoteを生成しました。";
-    color = true;
-  } else if (data.abi === "color: false") {
-    msg = "モノクロモードでMake it a quoteを生成しました。";
-    color = false;
-  } else {
-    msg = "ご指定がないためモノクロモードでMake it a quoteを生成しました。";
-    color = false;
-  }
-
-  const ueuseData: ueuse = (await (
-    await fetch(`${config.uwuzu.host}/api/ueuse/get`, {
-      method: "POST",
-      cache: "no-store",
-      body: JSON.stringify({
-        token: config.uwuzu.apiToken,
-        uniqid: data.replyid,
-      }),
-    })
-  ).json())["0"];
-
-  console.log(ueuseData)
-
-  const img = await MiQ({
-    type: "Base64",
-    color: color,
-    text: ueuseData.text,
-    iconURL: ueuseData.account.user_icon,
-    userName: ueuseData.account.username,
-    userID: ueuseData.account.userid,
-  });
-
-  const req = await fetch(`${config.uwuzu.host}/api/ueuse/create`, {
-    method: "POST",
-    body: JSON.stringify({
-      token: config.uwuzu.apiToken,
-      text: msg,
-      image1: img,
-      replyid: data.uniqid,
-    }),
-    cache: "no-store",
-  });
-
-  const res = await req.json();
-
-  console.log("MiQ：", res);
-}

scripts/commands/weather.ts

@@ -1,6 +0,0 @@
-import { weatherReply } from "../weatherNotice.js";
-import { ueuse } from "types/types";
-
-export default function Weather(data: ueuse) {
-  weatherReply(data.uniqid);
-}

src/constants/eventday.ts

@@ -1,9 +1,4 @@
-interface eventdaysValue {
-  name: string;
-  message: string;
-}
-
-const eventdays = {
+export default {
   "01/01": {
     name: "元日",
     message: "はい年越した瞬間地球にいなかった～",
@@ -65,6 +60,7 @@ const eventdays = {
     name: "大晦日",
     message: "大掃除！！大掃除！！",
   },
-} as { [key: string]: eventdaysValue };
-
-export default eventdays;
+} as { [key: string]: {
+  name: string;
+  message: string;
+} };

src/constants/weather.ts

@@ -1,4 +1,4 @@
-export const cityList: Array<String> = [
+export const cityList = [
   "016010",
   "020010",
   "030010",

src/lib/mailer.ts

@@ -1,4 +1,4 @@
-import config from "../config.js";
+import config from "../../config";
 import * as nodemailer from "nodemailer";
 
 import type SMTPTransport from "nodemailer/lib/smtp-transport";

src/scripts/asciiart.ts

@@ -3,6 +3,6 @@ import * as fs from "fs";
 const version = JSON.parse(fs.readFileSync("package.json", "utf-8")).version;
 
 export default function asciiArt() {
-  console.log(fs.readFileSync("asciiart.txt", "utf-8").replace(/(\r?\n)$/, ''));
+  console.log(fs.readFileSync("asciiart.txt", "utf-8"));
   console.log(`${version}\n`);
 }

src/scripts/checks/api.ts

@@ -11,6 +11,11 @@ export default async function APICheck() {
       cache: "no-store",
     });
 
+    if (req.status < 200 || req.status > 299) {
+      console.log(styleText("red", "uwuzuサーバーから正常な返答がありませんでした"));
+      process.exit();
+    }
+
     const res = await req.json();
 
     if (res.error_code !== undefined) {

src/scripts/checks/version.ts

@@ -26,7 +26,7 @@ export default async function VersionCheck() {
 
       const releaseUrl = `${packageJson.repository.url}/releases/tag/${packageJson.tag}`;
 
-      await fetch(`${config.uwuzu.host}/api/ueuse/create`, {
+      const req = await fetch(`${config.uwuzu.host}/api/ueuse/create`, {
         method: "POST",
         body: JSON.stringify({
           token: config.uwuzu.apiToken,
@@ -37,6 +37,12 @@ export default async function VersionCheck() {
         }),
         cache: "no-store",
       });
+
+      if (req.status < 200 || req.status > 299) {
+        return;
+      }
+
+      console.log("アップデート通知：", await req.json());
     } catch (err) {
       console.log("アップデート通知にエラーが発生しました: ", err);
     }

src/scripts/clean/main.ts

@@ -0,0 +1,5 @@
+(await import("@/scripts/clean/logsDel")).default();
+(await import("@/scripts/clean/packageLockDel")).default();
+(await import("@/scripts/clean/npmInstall")).default();
+
+export {};

src/scripts/commands/delete.ts

@@ -0,0 +1,70 @@
+import { meApi, ueuse } from "@/types/types";
+import config from "../../../config";
+import { Reply } from "@/scripts/commands/main";
+
+export default async function Delete(data: ueuse) {
+  const meReq = await fetch(`${config.uwuzu.host}/api/me/`, {
+    method: "POST",
+    cache: "no-store",
+    body: JSON.stringify({
+      token: config.uwuzu.apiToken,
+    }),
+  });
+
+  if (meReq.status < 200 || meReq.status > 299) {
+    return;
+  }
+
+  const me: meApi = await meReq.json();
+
+  const replyUeuseReq = await fetch(`${config.uwuzu.host}/api/ueuse/get`, {
+    method: "POST",
+    cache: "no-store",
+    body: JSON.stringify({
+      token: config.uwuzu.apiToken,
+      uniqid: data.replyid,
+    }),
+  });
+
+  if (replyUeuseReq.status < 200 || replyUeuseReq.status > 299) {
+    return;
+  }
+
+  const replyUeuse: ueuse = (await replyUeuseReq.json())["0"];
+
+  if (me.userid === replyUeuse.account.userid) {
+    const ueuseDeleteReq = await fetch(`${config.uwuzu.host}/api/ueuse/delete`, {
+      method: "POST",
+      cache: "no-store",
+      body: JSON.stringify({
+        token: config.uwuzu.apiToken,
+        uniqid: data.replyid,
+      }),
+    });
+
+    if (ueuseDeleteReq.status < 200 || ueuseDeleteReq.status > 299) {
+      return;
+    }
+
+    const ueuseDelete = await ueuseDeleteReq.json();
+
+    console.log("削除：", ueuseDelete);
+
+    if (ueuseDelete.success === true) {
+      console.log("削除通知：", await Reply(`
+      対象のユーズを削除しました。
+      `, data.uniqid));
+    } else {
+      console.log("削除失敗通知：", await Reply(`
+      対象のユーズを削除できませんでした。
+      `, data.uniqid));
+    }
+    return;
+  } else {
+    console.log("削除失敗通知(他人)：", await Reply(`
+    削除するユーズが${me.username}のものではありません。
+    そのため削除できませんでした。
+    `, data.uniqid));
+    return;
+  }
+}

src/scripts/commands/follow.ts

@@ -1,6 +1,6 @@
-import { ueuse } from "types/types";
-import config from "../../config.js";
-import { Reply } from "./main.js";
+import { ueuse } from "@/types/types";
+import config from "../../../config";
+import { Reply } from "@/scripts/commands/main";
 
 export default async function Follow(data: ueuse) {
   const followReq = await fetch(`${config.uwuzu.host}/api/users/follow`, {
@@ -12,6 +12,10 @@ export default async function Follow(data: ueuse) {
     cache: "no-store",
   });
 
+  if (followReq.status < 200 || followReq.status > 299) {
+    return;
+  }
+
   const followRes = await followReq.json();
 
   console.log("フォロー: ", followRes);

src/scripts/commands/help.ts

@@ -1,6 +1,6 @@
-import { ueuse } from "types/types";
+import { ueuse } from "@/types/types";
 import { readFileSync } from "fs";
-import { Reply } from "./main.js";
+import { Reply } from "@/scripts/commands/main";
 
 const helpsMin = {
   "info": "このBOTについての概要を返信するコマンドです。",
@@ -8,6 +8,10 @@ const helpsMin = {
   "follow": "コマンド送信者をフォローします。",
   "unfollow": "コマンド送信者をフォロー解除します。",
   "weather": "天気を返信します。",
+  "miq": "Make it a Quoteを生成します。",
+  "miq permission": "あなたに対してのMake it a Quoteを生成する要求者を制限できます。",
+  "miq allow": "Make it a Quoteの許可制にて生成を許可します。",
+  "delete": "ユーズを削除します。",
   "report": "運営者に不具合などを報告します。",
   "legal terms": "利用規約を返信します。",
   "legal privacy": "プライバシーポリシーを返信します。",
@@ -35,6 +39,26 @@ const helpsFull = {
   毎日7:00の天気を再投稿するわけではなく、
   再取得して返信します。
   `,
+  "miq": `
+  Make it a Quoteを生成します。
+  追記に\`color: true\`と入力することでカラーモードに変更可能です。
+  \`/delete\`コマンドを使用して削除できます。
+  `,
+  "miq permission": `
+  あなたに対してのMake it a Quoteを生成する要求者を制限できます。
+  確認するには追記なしで実行してください。
+  変更するには以下のいずれかを追記に入力して実行してください。
+  - \`me\`: 自分自身のみになります。あなたのみが生成でき、あなた以外が生成を要求すると拒否されます。
+  - \`everyone\`: 全体公開になります。全てのユーザーが許可なしにあなたのユーズでMake it a Quoteを生成できます。
+  - \`consent\`: 許可制になります。生成を要求されるとあなたにメンションが届き許可するかを選択できます。
+  `,
+  "miq allow": `
+  Make it a Quoteの許可制にて生成を許可します。
+  形式が異なる場合生成されません。
+  `,
+  "delete": `
+  BOTのユーズにて返信で使用すると返信先のユーズを削除します。
+  `,
   "report": `
   不具合などを運営者にメールで報告できます。
   運営者によって有効化されていないと使用できません。
@@ -68,6 +92,14 @@ export default async function Help(data: ueuse) {
     `, data.uniqid);
 
     console.log("ヘルプ：", ueuse);
+  } else {
+    if (Object.keys(helpsFull).indexOf(data.abi) === -1) {
+      const ueuse = await Reply(`
+      不明なコマンドです。
+      機能を見る：${packageJson.repository.url}/wiki
+      `, data.uniqid);
+
+      console.log("ヘルプ(不明コマンド)：", ueuse);
     } else {
       const ueuse = await Reply(`
       ${helpsFull[data.abi]}
@@ -76,4 +108,5 @@ export default async function Help(data: ueuse) {
 
       console.log("ヘルプ：", ueuse);
     }
+  }
 }

src/scripts/commands/info.ts

@@ -1,10 +1,8 @@
-import { ueuse } from "types/types";
-import { readFileSync } from "fs";
-import { Reply } from "./main.js";
-import config from "../../config.js";
+import { ueuse } from "@/types/types";
+import config from "../../../config";
 
 export default async function Info(data: ueuse) {
-  const packageJson = JSON.parse(readFileSync("package.json", "utf-8"));
+  const packageJson = JSON.parse((await import("fs")).readFileSync("package.json", "utf-8"));
   const releaseUrl = `${packageJson.repository.url}/releases/tag/${packageJson.tag}`;
 
   let editor = "";
@@ -29,7 +27,7 @@ export default async function Info(data: ueuse) {
     isReport = "無効";
   }
 
-  const ueuse = await Reply(`
+  const ueuse = await (await import("@/scripts/commands/main")).Reply(`
   【BOTについて】
   このBOTはオープンソースソフトウェアであるnoticeUwuzuを利用して運営されています。
   noticeUwuzuはApache License 2.0によって保護されています。

src/scripts/commands/legal/privacy.ts

@@ -0,0 +1,8 @@
+import { ueuse } from "@/types/types";
+
+export default async function PrivacyPolicy(data: ueuse) {
+  (await import("@/scripts/commands/main")).Reply(
+    (await import("../../../../config")).default.legal.privacy,
+    data.uniqid
+  );
+}

src/scripts/commands/legal/terms.ts

@@ -0,0 +1,8 @@
+import { ueuse } from "@/types/types";
+
+export default async function Terms(data: ueuse) {
+  (await import("@/scripts/commands/main")).Reply(
+    (await import("../../../../config")).default.legal.terms,
+    data.uniqid
+  );
+}

src/scripts/commands/main.ts

@@ -1,31 +1,19 @@
 import * as fs from "fs";
-import config from "../../config.js";
-import type { ueuse } from "types/types";
-
-const initialFile: Array<string> = [];
-
-// コマンド読み込み
-import Info from "./info.js";
-import Help from "./help.js";
-import Follow from "./follow.js";
-import UnFollow from "./unfollow.js";
-import Weather from "./weather.js";
-import MakeItAQuote from "./miq.js";
-import Report from "./report.js";
-import Terms from "./legal/terms.js"
-import PrivacyPolicy from "./legal/privacy.js";
+import config from "../../../config";
+import type { ueuse } from "@/types/types";
 
 // 初期化
 if (!fs.existsSync("data/alreadyCommands.json")) {
   fs.writeFileSync(
     "data/alreadyCommands.json",
-    JSON.stringify(initialFile),
+    JSON.stringify([]),
     "utf-8",
   );
 }
 
 // 対応済みユーズ一覧
-const alreadyCommands: Array<string> = JSON.parse(fs.readFileSync("data/alreadyCommands.json", "utf-8"));
+const alreadyCommands: Array<string> =
+JSON.parse(fs.readFileSync("data/alreadyCommands.json", "utf-8"));
 
 function cutAfterChar(str: string, char: string) {
   const index = str.indexOf(char);
@@ -85,6 +73,10 @@ export async function Reply(text: string, reply: string) {
     cache: "no-store",
   });
 
+  if (req.status < 200 || req.status > 299) {
+    return;
+  }
+
   const res = await req.json();
 
   return res;
@@ -111,6 +103,10 @@ export default async function Commands() {
     }
   );
 
+  if (mentionsReq.status < 200 || mentionsReq.status > 299) {
+    return;
+  }
+
   const mentions: { [key: string]: ueuse } = await mentionsReq.json();
 
   console.log("----------------");
@@ -132,7 +128,7 @@ export default async function Commands() {
       if (
         data.text.charAt(0) === "!" ||
         data.text.charAt(0) === "！" ||
-        data.abi === "ignore"
+        data.abi.indexOf("ignore") !== -1
       ) {
         break;
       }
@@ -145,37 +141,45 @@ export default async function Commands() {
       console.log("--------");
 
       const commandName = await commandSearch(data.text);
-      console.log(commandName);
 
       alreadyAdd(data.uniqid);
 
       switch (commandName) {
         case "info":
-          Info(data);
+          (await import("@/scripts/commands/info")).default(data);
           break;
         case "help":
-          Help(data);
+          (await import("@/scripts/commands/help")).default(data);
           break;
         case "legal terms":
-          Terms(data);
+          (await import("@/scripts/commands/legal/terms")).default(data);
           break;
         case "legal privacy":
-          PrivacyPolicy(data);
+          (await import("@/scripts/commands/legal/privacy")).default(data);
           break;
         case "report":
-          Report(data);
+          (await import("@/scripts/commands/report")).default(data);
           break;
         case "follow":
-          Follow(data);
+          (await import("@/scripts/commands/follow")).default(data);
           break;
         case "unfollow":
-          UnFollow(data);
+          (await import("@/scripts/commands/unfollow")).default(data);
           break;
         case "weather":
-          Weather(data);
+          (await import("@/scripts/commands/weather")).default(data);
           break;
         case "miq":
-          MakeItAQuote(data);
+          (await import("@/scripts/commands/miq/main")).default(data);
+          break;
+        case "miq permission":
+          (await import("@/scripts/commands/miq/permission")).default(data);
+          break;
+        case "miq allow":
+          (await import("@/scripts/commands/miq/allow")).default(data);
+          break;
+        case "delete":
+          (await import("@/scripts/commands/delete")).default(data);
           break;
         default:
           const reply = await Reply(`

src/scripts/commands/miq/allow.ts

@@ -0,0 +1,155 @@
+import { meApi, ueuse } from "@/types/types";
+import config from "../../../../config";
+import { Reply } from "@/scripts/commands/main";
+import { Permission } from "@/scripts/commands/miq/permission";
+import MiQ from "../../../../miq/main";
+
+export default async function MiQAllow(data: ueuse) {
+  if (!config.miq) {
+    console.log("MiQ(管理者無効)：", await Reply(`
+    BOT管理者によってMake it a quoteが無効化されています。
+    そのため\`/miq\`はご利用いただけません。
+    `, data.uniqid));
+    return;
+  }
+
+  if (data.replyid === "") {
+    console.log("MiQ許可制(誤ユーズ)：", await Reply(`
+    形式が正規ではありません。
+    `, data.uniqid));
+  }
+
+  // 権限一覧取得
+  const permissions: { [user: string]: Permission } =
+  JSON.parse((await import("fs")).readFileSync("data/miqPermissions.json", "utf-8"));
+
+  if (permissions[data.account.userid] !== "consent") {
+    console.log("MiQ許可制(許可制以外)：", await Reply(`
+    あなたに対してのMake it a Quoteの生成要求者が許可制に設定されていません。
+    そのため、\`/miq allow\`はご利用いただけません。
+    `, data.uniqid));
+    return;
+  }
+
+  const confirmUeuseReq = await fetch(`${config.uwuzu.host}/api/ueuse/get`, {
+    method: "POST",
+    cache: "no-store",
+    body: JSON.stringify({
+      token: config.uwuzu.apiToken,
+      uniqid: data.replyid,
+    }),
+  });
+
+  if (confirmUeuseReq.status < 200 || confirmUeuseReq.status > 299) {
+    return;
+  }
+
+  const confirmUeuse: ueuse = (await confirmUeuseReq.json())["0"];
+
+  const meReq = await fetch(`${config.uwuzu.host}/api/me/`, {
+    method: "POST",
+    cache: "no-store",
+    body: JSON.stringify({
+      token: config.uwuzu.apiToken
+    }),
+  });
+
+  if (meReq.status < 200 || meReq.status > 299) {
+    return;
+  }
+
+  const me: meApi = await meReq.json()
+
+  if (confirmUeuse.account.userid !== me.userid) {
+    console.log("MiQ許可制(誤アカウント)：", await Reply(`
+    返信先がこのBOTではありません。
+    `, data.uniqid));
+    return;
+  }
+
+  if (confirmUeuse.replyid === "") {
+    console.log("MiQ許可制(誤ユーズ)：", await Reply(`
+    形式が正規ではありません。
+    `, data.uniqid));
+    return;
+  }
+
+  const requestUeuseReq = await fetch(`${config.uwuzu.host}/api/ueuse/get`, {
+    method: "POST",
+    cache: "no-store",
+    body: JSON.stringify({
+      token: config.uwuzu.apiToken,
+      uniqid: confirmUeuse.replyid,
+    }),
+  });
+
+  if (requestUeuseReq.status < 200 || requestUeuseReq.status > 299) {
+    return;
+  }
+
+  const requestUeuse: ueuse = (await requestUeuseReq.json())["0"];
+
+  if (requestUeuse.replyid === "") {
+    console.log("MiQ許可制(誤ユーズ)：", await Reply(`
+    形式が正規ではありません。
+    `, data.uniqid));
+    return;
+  }
+
+  const miqUeuseReq = await fetch(`${config.uwuzu.host}/api/ueuse/get`, {
+    method: "POST",
+    cache: "no-store",
+    body: JSON.stringify({
+      token: config.uwuzu.apiToken,
+      uniqid: requestUeuse.replyid,
+    }),
+  });
+
+  if (miqUeuseReq.status < 200 || miqUeuseReq.status > 299) {
+    return;
+  }
+
+  const miqUeuse: ueuse = (await miqUeuseReq.json())["0"];
+
+  let color: boolean;
+  let msg: string;
+  if (requestUeuse.abi === "color: true") {
+    msg = "カラーモードでMake it a Quoteを生成しました。";
+    color = true;
+  } else if (requestUeuse.abi === "color: false") {
+    msg = "モノクロモードでMake it a Quoteを生成しました。";
+    color = false;
+  } else {
+    msg = "ご指定がないためモノクロモードでMake it a Quoteを生成しました。";
+    color = false;
+  }
+
+  const img = await MiQ({
+    type: "Base64Data",
+    color: color,
+    text: miqUeuse.text,
+    iconURL: miqUeuse.account.user_icon,
+    userName: miqUeuse.account.username,
+    userID: miqUeuse.account.userid,
+  });
+
+  const req = await fetch(`${config.uwuzu.host}/api/ueuse/create`, {
+    method: "POST",
+    body: JSON.stringify({
+      token: config.uwuzu.apiToken,
+      text: msg,
+      image1: img,
+      nsfw: miqUeuse.nsfw,
+      replyid: data.uniqid,
+    }),
+    cache: "no-store",
+  });
+
+  if (req.status < 200 || req.status > 299) {
+    return;
+  }
+
+  const res = await req.json();
+
+  console.log("MiQ(許可制)：", res);
+}

src/scripts/commands/miq/main.ts

@@ -0,0 +1,111 @@
+import { ueuse } from "@/types/types";
+import config from "../../../../config";
+import { Reply } from "@/scripts/commands/main";
+import type { Permission } from "@/scripts/commands/miq/permission";
+
+export default async function MakeItAQuote(data: ueuse) {
+  if (!config.miq) {
+    console.log("MiQ(管理者無効)：", await Reply(`
+    BOT管理者によってMake it a quoteが無効化されています。
+    そのため\`/miq\`はご利用いただけません。
+    `, data.uniqid));
+    return;
+  }
+
+  let color: boolean;
+  let msg: string;
+
+  if (data.abi === "color: true") {
+    msg = "カラーモードでMake it a Quoteを生成しました。";
+    color = true;
+  } else if (data.abi === "color: false") {
+    msg = "モノクロモードでMake it a Quoteを生成しました。";
+    color = false;
+  } else {
+    msg = "ご指定がないためモノクロモードでMake it a Quoteを生成しました。";
+    color = false;
+  }
+
+  const ueuseDataReq = await fetch(`${config.uwuzu.host}/api/ueuse/get`, {
+    method: "POST",
+    cache: "no-store",
+    body: JSON.stringify({
+      token: config.uwuzu.apiToken,
+      uniqid: data.replyid,
+    }),
+  });
+
+  if (ueuseDataReq.status < 200 || ueuseDataReq.status > 299) {
+    return;
+  }
+
+  const ueuseData: ueuse = (await ueuseDataReq.json())["0"];
+
+  console.log(ueuseData);
+
+  // 権限一覧取得
+  const permissions: { [user: string]: Permission } =
+  JSON.parse((await import("fs")).readFileSync("data/miqPermissions.json", "utf-8"));
+
+  // 初期化
+  if (permissions[ueuseData.account.userid] === undefined) {
+    permissions[ueuseData.account.userid] = "consent";
+    (await import("fs")).writeFileSync(
+      "data/miqPermissions.json",
+      JSON.stringify(permissions),
+      "utf-8"
+    );
+  }
+
+  if (
+    permissions[ueuseData.account.userid] === "me" &&
+    ueuseData.account.userid !== data.account.userid
+  ) {
+    console.log("MiQ(自分自身専用)：", await Reply(`
+    生成元ユーズの投稿者が生成要求者を自分自身のみに設定しています。
+    しかし、あなたは投稿者自身ではないためこのユーズにMake it a Quoteを使用することはできません。
+    `, data.uniqid));
+    return;
+  }
+
+  if (
+    permissions[ueuseData.account.userid] === "consent" &&
+    data.account.userid !== ueuseData.account.userid
+  ) {
+    console.log("MiQ(許可制)：", await Reply(`
+    生成元ユーズの投稿者が生成要求者を許可制に設定しています。
+    このユーズにMake it a Quoteを使用するには、
+    @${ueuseData.account.userid}さんがこのユーズに返信で\`/miq allow\`を使用する必要があります。
+    `, data.uniqid));
+    return;
+  }
+
+  const img = await (await import("../../../../miq/main")).default({
+    type: "Base64Data",
+    color: color,
+    text: ueuseData.text,
+    iconURL: ueuseData.account.user_icon,
+    userName: ueuseData.account.username,
+    userID: ueuseData.account.userid,
+  });
+
+  const req = await fetch(`${config.uwuzu.host}/api/ueuse/create`, {
+    method: "POST",
+    body: JSON.stringify({
+      token: config.uwuzu.apiToken,
+      text: msg,
+      image1: img,
+      nsfw: data.nsfw,
+      replyid: data.uniqid,
+    }),
+    cache: "no-store",
+  });
+
+  if (req.status < 200 || req.status > 299) {
+    return;
+  }
+
+  const res = await req.json();
+
+  console.log("MiQ：", res);
+}

src/scripts/commands/miq/permission.ts

@@ -0,0 +1,78 @@
+import { ueuse } from "@/types/types";
+import { Reply } from "@/scripts/commands/main";
+import { writeFileSync } from "fs";
+
+// 初期化
+const initialFile = {};
+if (!(await import("fs")).existsSync("data/miqPermissions.json")) {
+  writeFileSync(
+    "data/miqPermissions.json",
+    JSON.stringify(initialFile),
+    "utf-8"
+  );
+}
+
+export type Permission =
+"consent" |
+"everyone" |
+"me";
+
+const PermissionsNames: { [name: string]: string } = {
+  "consent": "許可制",
+  "everyone": "全体公開",
+  "me": "自身のみ",
+}
+
+export default async function MiQPermission(data: ueuse) {
+  if (!(await import("../../../../config")).default.miq) {
+    await Reply(`
+    BOT管理者によってMake it a quoteが無効化されています。
+    そのため\`/miq\`はご利用いただけません。
+    `, data.uniqid);
+    return;
+  }
+
+  const permissions: { [user: string]: string } =
+  JSON.parse((await import("fs")).readFileSync("data/miqPermissions.json", "utf-8"));
+
+  // 初期化
+  if (permissions[data.account.userid] === undefined) {
+    permissions[data.account.userid] = "consent";
+    writeFileSync(
+      "data/miqPermissions.json",
+      JSON.stringify(permissions),
+      "utf-8"
+    );
+  }
+
+  if (
+    data.abi === "" ||
+    data.abi === "none"
+  ) {
+    await Reply(`
+    あなたに対してのMake it a Quoteを生成するための権限は「${PermissionsNames[permissions[data.account.userid]]}」です。
+    `, data.uniqid);
+    return;
+  }
+
+  const requestPermission = data.abi.trimEnd();
+
+  if (PermissionsNames[requestPermission] === undefined) {
+    await Reply(`
+    変更希望の権限「${requestPermission}」はご指定できません。
+    \`consent\`、\`everyone\`、\`me\`のいずれかからご選択ください。
+    `, data.uniqid);
+    return;
+  }
+
+  permissions[data.account.userid] = requestPermission;
+  writeFileSync(
+    "data/miqPermissions.json",
+    JSON.stringify(permissions),
+    "utf-8"
+  );
+
+  await Reply(`
+  あなたに対してのMake it a Quoteを生成するための権限を「${PermissionsNames[requestPermission]}」に変更しました。
+  `, data.uniqid);
+}

src/scripts/commands/report.ts

@@ -1,7 +1,6 @@
-import { ueuse } from "types/types";
-import { Reply } from "./main.js";
-import config from "../../config.js";
-import sendMail from "../../src/mailer.js";
+import { ueuse } from "@/types/types";
+import { Reply } from "./main";
+import config from "../../../config";
 
 export default async function Report(data: ueuse) {
   if (
@@ -40,7 +39,7 @@ export default async function Report(data: ueuse) {
   }
 
   try {
-    sendMail({
+    (await import("@/lib/mailer")).default({
       to: config.emergency.mail.to,
       subject: "【報告】BOT利用者からの報告",
       text: `

src/scripts/commands/unfollow.ts

@@ -1,6 +1,6 @@
-import { ueuse } from "types/types";
-import config from "../../config.js";
-import { Reply } from "./main.js";
+import { ueuse } from "@/types/types";
+import config from "../../../config";
+import { Reply } from "./main";
 
 export default async function UnFollow(data: ueuse) {
   const unfollowReq = await fetch(`${config.uwuzu.host}/api/users/unfollow`, {
@@ -12,6 +12,10 @@ export default async function UnFollow(data: ueuse) {
     cache: "no-store",
   });
 
+  if (unfollowReq.status < 200 || unfollowReq.status > 299) {
+    return;
+  }
+
   const unfollowRes = await unfollowReq.json();
 
   console.log("フォロー解除: ", unfollowRes);

src/scripts/commands/weather.ts

@@ -0,0 +1,6 @@
+import { weatherReply } from "@/scripts/weatherNotice";
+import { ueuse } from "@/types/types.js";
+
+export default function Weather(data: ueuse) {
+  weatherReply(data.uniqid);
+}

src/scripts/earthquakeNotice.ts

@@ -1,7 +1,6 @@
 import WebSocket from "ws";
-import sendMail from "../src/mailer.js";
-
-import config from "../config.js";
+import sendMail from "@/lib/mailer";
+import config from "../../config.js";
 
 class P2PEarthquakeClient {
   private ws: WebSocket | null = null;
@@ -494,6 +493,10 @@ async function ueuse(text: string) {
     cache: "no-store",
   });
 
+  if (res.status < 200 || res.status > 299) {
+    return;
+  }
+
   const resData = await res.json();
 
   console.log(`地震情報投稿：${JSON.stringify(resData)}`);

src/scripts/eventday.ts

@@ -1,6 +1,6 @@
 import { format } from "date-fns";
-import eventdays from "./eventdayData.js";
-import config from "../config.js";
+import eventdays from "@/constants/eventday";
+import config from "../../config";
 
 export default async function EventDays() {
   const now = format(new Date(), "MM/dd");
@@ -22,6 +22,10 @@ export default async function EventDays() {
         }),
       });
 
+      if (req.status < 200 || req.status > 299) {
+        return;
+      }
+
       const res = await req.json();
 
       console.log("祝日等ユーズ：", res);

src/scripts/successExit.ts

@@ -1,8 +1,7 @@
 import * as fs from "fs";
 import { isAfter } from "date-fns";
-
-import config from "../config.js";
-import sendMail from "../src/mailer.js";
+import config from "../../config";
+import sendMail from "@/lib/mailer";
 
 export default function successExit() {
   // 初期化
@@ -56,5 +55,3 @@ export default function successExit() {
     fs.writeFileSync("logs/boot.json", JSON.stringify(iolog), "utf-8");
   });
 }
-
-successExit();

src/scripts/timeNotice.ts

@@ -1,7 +1,6 @@
 import { format } from "date-fns";
-
-import type * as types from "types/types";
-import config from "../config.js";
+import type * as types from "@/types/types";
+import config from "../../config";
 
 export default async function timeNotice() {
   // 停止時間
@@ -39,6 +38,10 @@ export default async function timeNotice() {
       },
     );
 
+    if (resUeuse.status < 200 || resUeuse.status > 299) {
+      return;
+    }
+
     const ueuseData: types.ueuseCreateApi = await resUeuse.json();
 
     console.log("----------------");

src/scripts/weatherNotice.ts

@@ -1,8 +1,6 @@
-import { cityList } from "../src/weatherId.js";
-
-import type * as types from "types/types";
-
-import config from "../config.js";
+import { cityList } from "@/constants/weather";
+import type * as types from "@/types/types";
+import config from "../../config";
 
 export async function weatherNotice() {
   console.log("----------------");
@@ -23,6 +21,10 @@ export async function weatherNotice() {
     },
   );
 
+  if (resUeuse.status < 200 || resUeuse.status > 299) {
+    return;
+  }
+
   const ueuseData: types.ueuseCreateApi = await resUeuse.json();
 
   console.log(`天気仮投稿：${JSON.stringify(ueuseData)}`);
@@ -119,6 +121,10 @@ export async function weatherReply(uniqid: string) {
       },
     );
 
+    if (resReply.status < 200 || resReply.status > 299) {
+      return;
+    }
+
     const replyData: types.ueuseCreateApi = await resReply.json();
 
     console.log(`天気返信：${JSON.stringify(replyData)}`);

src/types/config.d.ts

@@ -0,0 +1,59 @@
+export default interface Config {
+  time: {
+    stopTimes: {
+      start: number;
+      stop: number;
+    };
+  };
+  earthquake: {
+    reconnectTimes: number;
+    websocketUrl: string;
+    areasCsvUrl: string;
+    maxScaleMin: number;
+  };
+  weather: {
+    splitCount: number;
+  };
+  miq: boolean;
+
+  emergency: {
+    isEnabled: true;
+    mail: {
+      isEnabled: true;
+      host: string;
+      port: number;
+      user: string;
+      password: string;
+      secure: boolean;
+      to: string | string[];
+    } | {
+      isEnabled: false;
+      mail: undefined;
+    };
+  } | {
+    isEnabled: false;
+  };
+  report: {
+    isEnabled: boolean;
+    message: string;
+  };
+  legal: {
+    terms: string;
+    privacy: string;
+  };
+  admin: {
+    name: string;
+    showMail: string | false;
+    panel: {
+      isEnabled: true;
+      port: number;
+    } | {
+      isEnabled: false;
+    };
+  };
+  uwuzu: {
+    apiToken: string;
+    host: string;
+  };
+  debug?: true;
+}

tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "ES2024",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "outDir": "./dist",
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
@@ -12,12 +12,16 @@
     "baseUrl": "./",
     "typeRoots": [
       "./node_modules/@types",
-      "./types"
+      "./src/types"
     ],
     "paths": {
+      "@/*": ["./src/*"],
       "ws": ["./node_modules/ws/index.js"],
       "@types/ws": ["./node_modules/@types/ws/index.d.ts"]
     },
     "removeComments": true,
   },
+  "tsc-alias": {
+    "resolveFullPaths": true,
+  },
 }

types/config.d.ts

@@ -1,87 +0,0 @@
-interface earthquakeTypes {
-  reconnectTimes: number;
-  websocketUrl: string;
-  areasCsvUrl: string;
-  maxScaleMin: number;
-}
-
-interface weatherTypes {
-  splitCount: number;
-}
-
-interface stopsTypes {
-  start: number;
-  stop: number;
-}
-
-interface timeTypes {
-  stopTimes: stopsTypes;
-}
-
-interface emergencyMailFullTypes {
-  isEnabled: true;
-  host: string;
-  port: number;
-  user: string;
-  password: string;
-  secure: boolean;
-  to: string | string[];
-}
-
-interface emergencyMailMinTypes {
-  isEnabled: false;
-  mail: undefined;
-}
-
-interface emergencyFullTypes {
-  isEnabled: true;
-  mail: emergencyMailFullTypes | emergemcyMailMinTypes;
-}
-
-interface emergencyMinTypes {
-  isEnabled: false;
-}
-
-interface reportTypes {
-  isEnabled: boolean;
-  message: string;
-}
-
-interface legalTypes {
-  terms: string;
-  privacy: string;
-}
-
-interface PanelFullTypes {
-  isEnabled: true;
-  port: number;
-}
-
-interface PanelMinTypes {
-  isEnabled: false;
-}
-
-interface adminTypes {
-  name: string;
-  showMail: string | false;
-  panel: PanelFullTypes | PanelMinTypes;
-}
-
-interface uwuzuTypes {
-  apiToken: string;
-  host: string;
-}
-
-export interface configTypes {
-  time: timeTypes,
-  earthquake: earthquakeTypes;
-  weather: weatherTypes;
-  miq: boolean;
-
-  emergency: emergencyFullTypes | emergencyMinTypes;
-  report: reportTypes;
-  legal: legalTypes;
-  admin: adminTypes;
-  uwuzu: uwuzuTypes;
-  debug?: true;
-}