v8.0
This commit is contained in:
parent
1ff4b2c429
commit
644ba912b1
|
@ -7,7 +7,8 @@ export default async function APICheck() {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
token: config.uwuzu.apiToken,
|
token: config.uwuzu.apiToken,
|
||||||
})
|
}),
|
||||||
|
cache: "no-store",
|
||||||
});
|
});
|
||||||
|
|
||||||
const res = await req.json();
|
const res = await req.json();
|
||||||
|
|
|
@ -24,10 +24,9 @@ const config: configTypes = {
|
||||||
|
|
||||||
// 緊急時設定
|
// 緊急時設定
|
||||||
emergency: {
|
emergency: {
|
||||||
function: true, // 緊急時のコンソール表示
|
isEnabled: true, // 緊急時のコンソール表示
|
||||||
report: false, // reportコマンド
|
|
||||||
mail: {
|
mail: {
|
||||||
function: true, // 緊急時のメール送信
|
isEnabled: true, // 緊急時のメール送信
|
||||||
host: "smtp.example.com", // SMTPサーバー
|
host: "smtp.example.com", // SMTPサーバー
|
||||||
port: 465, // SMTPポート
|
port: 465, // SMTPポート
|
||||||
user: "mailUser@example.com", // BOTメール送信元
|
user: "mailUser@example.com", // BOTメール送信元
|
||||||
|
@ -47,6 +46,15 @@ const config: configTypes = {
|
||||||
admin: {
|
admin: {
|
||||||
name: "あどみん", // BOT管理者名
|
name: "あどみん", // BOT管理者名
|
||||||
showMail: false, // メールアドレスを公開するか(false:非公開/文字列:メールアドレス)
|
showMail: false, // メールアドレスを公開するか(false:非公開/文字列:メールアドレス)
|
||||||
|
panel: { // 管理パネル
|
||||||
|
isEnabled: true, // 有効/無効
|
||||||
|
port: 74919, // 配信ポート
|
||||||
|
},
|
||||||
|
},
|
||||||
|
// /report設定
|
||||||
|
report: {
|
||||||
|
isEnabled: true, // 有効/無効
|
||||||
|
message: "", // 報告者へのメッセージ
|
||||||
},
|
},
|
||||||
// uwuzuサーバー設定
|
// uwuzuサーバー設定
|
||||||
uwuzu: {
|
uwuzu: {
|
||||||
|
|
6
main.ts
6
main.ts
|
@ -43,5 +43,11 @@ cron.schedule("0 7 * * *", () => {
|
||||||
}, 100);
|
}, 100);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 管理パネル
|
||||||
|
import AdminPanel from "./panel/main.js";
|
||||||
|
(async () => {
|
||||||
|
await AdminPanel();
|
||||||
|
})();
|
||||||
|
|
||||||
// 起動表示
|
// 起動表示
|
||||||
console.log("BOTサーバーが起動しました");
|
console.log("BOTサーバーが起動しました");
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "notice-uwuzu",
|
"name": "notice-uwuzu",
|
||||||
"version": "v7.5@uwuzu1.5.4",
|
"version": "v8.0@uwuzu1.6.1",
|
||||||
"tag": "v7.5",
|
"tag": "v8.0",
|
||||||
"description": "Notice Bot for uwuzu",
|
"description": "Notice Bot for uwuzu",
|
||||||
"main": "dist/main.js",
|
"main": "dist/main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
@ -38,16 +38,18 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/date-fns": "^2.5.3",
|
"@types/date-fns": "^2.5.3",
|
||||||
"@types/dotenv": "^6.1.1",
|
"@types/dotenv": "^6.1.1",
|
||||||
|
"@types/express": "^5.0.3",
|
||||||
"@types/node": "^24.0.7",
|
"@types/node": "^24.0.7",
|
||||||
"@types/node-cron": "^3.0.11",
|
"@types/node-cron": "^3.0.11",
|
||||||
"@types/nodemailer": "^6.4.17",
|
"@types/nodemailer": "^6.4.17",
|
||||||
"@types/ws": "^8.18.1",
|
"@types/ws": "^8.18.1",
|
||||||
"child_process": "^1.0.2",
|
"child_process": "^1.0.2",
|
||||||
"date-fns": "^4.1.0",
|
"date-fns": "^4.1.0",
|
||||||
|
"express": "^5.1.0",
|
||||||
"fs": "^0.0.1-security",
|
"fs": "^0.0.1-security",
|
||||||
"node-cron": "^4.1.1",
|
"node-cron": "^4.1.1",
|
||||||
"nodemailer": "^7.0.4",
|
"nodemailer": "^7.0.4",
|
||||||
"typescript": "^5.8.3",
|
"typescript": "^5.9.2",
|
||||||
"ws": "^8.18.3"
|
"ws": "^8.18.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
@ -0,0 +1,52 @@
|
||||||
|
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";
|
||||||
|
|
||||||
|
AdminPanel();
|
||||||
|
|
||||||
|
export default async function AdminPanel() {
|
||||||
|
// 無効
|
||||||
|
if (!config.admin.panel.isEnabled) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 管理パネル
|
||||||
|
const app = express();
|
||||||
|
const port = config.admin.panel.port;
|
||||||
|
|
||||||
|
// ルーティング
|
||||||
|
app.use(ueusePost);
|
||||||
|
app.use(CommandExecute);
|
||||||
|
app.use(WeatherUeuse);
|
||||||
|
app.use(API);
|
||||||
|
app.use(express.static("panel/public"));
|
||||||
|
|
||||||
|
app.listen(port, () => {
|
||||||
|
console.log(`http://${LocalIP()}:${port} で管理パネルを起動しました`);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function LocalIP() {
|
||||||
|
const interfaces = os.networkInterfaces();
|
||||||
|
|
||||||
|
for (const name in interfaces) {
|
||||||
|
const iface: any = interfaces[name];
|
||||||
|
|
||||||
|
for (const i of iface) {
|
||||||
|
const details: NetworkInterfaceDetails = i;
|
||||||
|
|
||||||
|
if (details.family === 'IPv4' && details.internal !== true) {
|
||||||
|
return details.address;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return "localhost";
|
||||||
|
}
|
|
@ -0,0 +1,36 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>管理パネル</title>
|
||||||
|
|
||||||
|
<!-- パッケージ -->
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/@tailwindcss/browser@4"></script>
|
||||||
|
<script src="https://code.iconify.design/iconify-icon/3.0.0/iconify-icon.min.js"></script>
|
||||||
|
<script>
|
||||||
|
import "iconify-icon";
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body class="dark:bg-gray-950 dark:text-white text-center">
|
||||||
|
<h1 class="text-4xl font-bold">noticeUwuzu管理パネル</h1>
|
||||||
|
|
||||||
|
<button id="commandExec" class="border rounded-[10px] p-[5px] m-[10px] mt-[20px] cursor-pointer">
|
||||||
|
コマンド実行
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button id="weatherUeuse" class="border rounded-[10px] p-[5px] m-[10px] mt-[20px] cursor-pointer">
|
||||||
|
天気お知らせ
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button id="ueuse" class="border rounded-[10px] p-[5px] m-[10px] mt-[20px] cursor-pointer">
|
||||||
|
ユーズ投稿
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button id="api" class="border rounded-[10px] p-[5px] m-[10px] mt-[20px] cursor-pointer">
|
||||||
|
API使用
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<script src="/script.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
|
@ -0,0 +1,88 @@
|
||||||
|
document.getElementById("commandExec").addEventListener("click", async () => {
|
||||||
|
const req = await fetch("/actions/command-execute", {
|
||||||
|
method: "POST",
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await req.text();
|
||||||
|
|
||||||
|
if (res === "Accepted") {
|
||||||
|
alert("コマンド実行を受け付けました");
|
||||||
|
} else {
|
||||||
|
alert(`コマンド実行の要求にエラーが発生しました:${res}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
document.getElementById("weatherUeuse").addEventListener("click", async () => {
|
||||||
|
const req = await fetch("/actions/weatherUeuse", {
|
||||||
|
method: "POST",
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await req.text();
|
||||||
|
|
||||||
|
if (res === "Accepted") {
|
||||||
|
alert("天気お知らせを受け付けました");
|
||||||
|
} else {
|
||||||
|
alert(`天気お知らせの要求にエラーが発生しました:${res}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
document.getElementById("ueuse").addEventListener("click", async () => {
|
||||||
|
const text = prompt("ユーズ内容").toLowerCase();
|
||||||
|
|
||||||
|
if (text === "") {
|
||||||
|
alert("ユーズ内容がありません。");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const nsfw = confirm("NSFWにしますか?");
|
||||||
|
|
||||||
|
const req = await fetch("/actions/ueuse", {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
text, text,
|
||||||
|
nsfw: nsfw,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await req.text();
|
||||||
|
|
||||||
|
if (res === "Success") {
|
||||||
|
alert("ユーズ投稿を受け付けました");
|
||||||
|
} else {
|
||||||
|
alert(`ユーズ投稿の要求にエラーが発生しました:${res}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
document.getElementById("api").addEventListener("click", async () => {
|
||||||
|
const endpoint = prompt("エンドポイント", "/serverinfo-api").toLowerCase();
|
||||||
|
|
||||||
|
if (endpoint === "") {
|
||||||
|
alert("エンドポイントが設定されていません。");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const body = prompt("body(JSON)", `{"key": "value"}`).toLowerCase();
|
||||||
|
|
||||||
|
if (body === "") {
|
||||||
|
alert("bodyが設定されていません。");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const req = await fetch("/actions/api", {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
body: JSON.stringify({
|
||||||
|
endpoint: endpoint,
|
||||||
|
body: JSON.parse(body),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await req.text();
|
||||||
|
|
||||||
|
alert(res);
|
||||||
|
});
|
|
@ -0,0 +1,35 @@
|
||||||
|
import express from "express";
|
||||||
|
const API = express.Router();
|
||||||
|
|
||||||
|
import config from "../../config.js";
|
||||||
|
|
||||||
|
API.use(express.json());
|
||||||
|
API.use(express.urlencoded({ extended: true }));
|
||||||
|
|
||||||
|
API.post("/actions/api", async (req, res, next) => {
|
||||||
|
const endpoint = req.body.endpoint;
|
||||||
|
let body = req.body.body
|
||||||
|
body["token"] = config.uwuzu.apiToken;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const apiReq = await fetch(`https://${config.uwuzu.host}/api${endpoint}`, {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify(body),
|
||||||
|
});
|
||||||
|
|
||||||
|
const apiRes = await apiReq.json();
|
||||||
|
|
||||||
|
res.status(200)
|
||||||
|
.send(apiRes);
|
||||||
|
} catch(err) {
|
||||||
|
res.status(500)
|
||||||
|
.send(`Error: ${err}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
API.get("/actions/api", (req, res) => {
|
||||||
|
res.status(501)
|
||||||
|
.send("POST Only");
|
||||||
|
});
|
||||||
|
|
||||||
|
export default API;
|
|
@ -0,0 +1,25 @@
|
||||||
|
import express from "express";
|
||||||
|
const CommandExecute = express.Router();
|
||||||
|
|
||||||
|
import Commands from "../../scripts/commands/main.js";
|
||||||
|
|
||||||
|
CommandExecute.post("/actions/command-execute", (req, res) => {
|
||||||
|
try {
|
||||||
|
(async () => {
|
||||||
|
await Commands();
|
||||||
|
})();
|
||||||
|
|
||||||
|
res.status(202)
|
||||||
|
.send("Accepted");
|
||||||
|
} catch(err) {
|
||||||
|
res.status(500)
|
||||||
|
.send(`Error: ${err}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
CommandExecute.get("/actions/command-execute", (req, res) => {
|
||||||
|
res.status(501)
|
||||||
|
.send("POST Only");
|
||||||
|
});
|
||||||
|
|
||||||
|
export default CommandExecute;
|
|
@ -0,0 +1,40 @@
|
||||||
|
import express from "express";
|
||||||
|
const ueusePost = express.Router();
|
||||||
|
|
||||||
|
import config from "../../config.js";
|
||||||
|
|
||||||
|
ueusePost.use(express.json());
|
||||||
|
ueusePost.use(express.urlencoded({ extended: true }));
|
||||||
|
|
||||||
|
ueusePost.post("/actions/ueuse", async (req, res, next) => {
|
||||||
|
const text = req.body.text;
|
||||||
|
const nsfw = req.body.nsfw;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const ueuseReq = await fetch(`https://${config.uwuzu.host}/api/ueuse/create`, {
|
||||||
|
method: "POST",
|
||||||
|
body: JSON.stringify({
|
||||||
|
token: config.uwuzu.apiToken,
|
||||||
|
text: text,
|
||||||
|
nsfw: nsfw,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
const ueuseRes = await ueuseReq.json();
|
||||||
|
|
||||||
|
console.log(`ユーズ(管理パネル):${ueuseRes}`);
|
||||||
|
|
||||||
|
res.status(200)
|
||||||
|
.send("Success");
|
||||||
|
} catch(err) {
|
||||||
|
res.status(500)
|
||||||
|
.send(`Error: ${err}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
ueusePost.get("/actions/ueuse", (req, res) => {
|
||||||
|
res.status(501)
|
||||||
|
.send("POST Only");
|
||||||
|
});
|
||||||
|
|
||||||
|
export default ueusePost;
|
|
@ -0,0 +1,25 @@
|
||||||
|
import express from "express";
|
||||||
|
const WeatherUeuse = express.Router();
|
||||||
|
|
||||||
|
import { weatherNotice } from "../../scripts/weatherNotice.js";
|
||||||
|
|
||||||
|
WeatherUeuse.post("/actions/command-execute", (req, res) => {
|
||||||
|
try {
|
||||||
|
(async () => {
|
||||||
|
await weatherNotice();
|
||||||
|
})();
|
||||||
|
|
||||||
|
res.status(202)
|
||||||
|
.send("Accepted");
|
||||||
|
} catch(err) {
|
||||||
|
res.status(500)
|
||||||
|
.send(`Error: ${err}`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
WeatherUeuse.get("/actions/command-execute", (req, res) => {
|
||||||
|
res.status(501)
|
||||||
|
.send("POST Only");
|
||||||
|
});
|
||||||
|
|
||||||
|
export default WeatherUeuse;
|
|
@ -1,4 +1,4 @@
|
||||||
import { ueuse } from "types/types.js";
|
import { ueuse } from "types/types";
|
||||||
import { readFileSync, writeFileSync, existsSync } from "fs";
|
import { readFileSync, writeFileSync, existsSync } from "fs";
|
||||||
import { parse, isValid } from 'date-fns/fp';
|
import { parse, isValid } from 'date-fns/fp';
|
||||||
import { Reply } from "./main.js";
|
import { Reply } from "./main.js";
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { ueuse } from "types/types.js";
|
import { ueuse } from "types/types";
|
||||||
import config from "../../config.js";
|
import config from "../../config.js";
|
||||||
import { Reply } from "./main.js";
|
import { Reply } from "./main.js";
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { ueuse } from "types/types.js";
|
import { ueuse } from "types/types";
|
||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
import { Reply } from "./main.js";
|
import { Reply } from "./main.js";
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { ueuse } from "types/types.js";
|
import { ueuse } from "types/types";
|
||||||
import { readFileSync } from "fs";
|
import { readFileSync } from "fs";
|
||||||
import { Reply } from "./main.js";
|
import { Reply } from "./main.js";
|
||||||
import config from "../../config.js";
|
import config from "../../config.js";
|
||||||
|
@ -23,7 +23,7 @@ export default async function Info(data: ueuse) {
|
||||||
|
|
||||||
let isReport;
|
let isReport;
|
||||||
|
|
||||||
if (config.emergency.report) {
|
if (config.report.isEnabled) {
|
||||||
isReport = "有効";
|
isReport = "有効";
|
||||||
} else {
|
} else {
|
||||||
isReport = "無効";
|
isReport = "無効";
|
||||||
|
@ -50,6 +50,9 @@ export default async function Info(data: ueuse) {
|
||||||
運営者へ報告が必要ですか?
|
運営者へ報告が必要ですか?
|
||||||
\`/report\`をご利用ください。
|
\`/report\`をご利用ください。
|
||||||
|
|
||||||
|
利用規約をお探しですか?
|
||||||
|
\`/legal terms\`をご利用ください。
|
||||||
|
|
||||||
プライバシーポリシーをお探しですか?
|
プライバシーポリシーをお探しですか?
|
||||||
\`/legal privacy\`をご利用ください。
|
\`/legal privacy\`をご利用ください。
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { ueuse } from "types/types.js";
|
import { ueuse } from "types/types";
|
||||||
import { Reply } from "../main.js";
|
import { Reply } from "../main.js";
|
||||||
import config from "../../../config.js";
|
import config from "../../../config.js";
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { ueuse } from "types/types.js";
|
import { ueuse } from "types/types";
|
||||||
import { Reply } from "../main.js";
|
import { Reply } from "../main.js";
|
||||||
import config from "../../../config.js";
|
import config from "../../../config.js";
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import * as fs from "fs";
|
import * as fs from "fs";
|
||||||
import config from "../../config.js";
|
import config from "../../config.js";
|
||||||
import type { ueuse } from "types/types.js";
|
import type { ueuse } from "types/types";
|
||||||
|
|
||||||
const initialFile: Array<string> = [];
|
const initialFile: Array<string> = [];
|
||||||
|
|
||||||
|
@ -16,16 +16,16 @@ import Terms from "./legal/terms.js"
|
||||||
import PrivacyPolicy from "./legal/privacy.js";
|
import PrivacyPolicy from "./legal/privacy.js";
|
||||||
|
|
||||||
// 初期化
|
// 初期化
|
||||||
if (!fs.existsSync("logs/alreadyCommands.json")) {
|
if (!fs.existsSync("data/alreadyCommands.json")) {
|
||||||
fs.writeFileSync(
|
fs.writeFileSync(
|
||||||
"logs/alreadyCommands.json",
|
"data/alreadyCommands.json",
|
||||||
JSON.stringify(initialFile),
|
JSON.stringify(initialFile),
|
||||||
"utf-8",
|
"utf-8",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 対応済みユーズ一覧
|
// 対応済みユーズ一覧
|
||||||
const alreadyCommands: Array<string> = JSON.parse(fs.readFileSync("logs/alreadyCommands.json", "utf-8"));
|
const alreadyCommands: Array<string> = JSON.parse(fs.readFileSync("data/alreadyCommands.json", "utf-8"));
|
||||||
|
|
||||||
function cutAfterChar(str: string, char: string) {
|
function cutAfterChar(str: string, char: string) {
|
||||||
const index = str.indexOf(char);
|
const index = str.indexOf(char);
|
||||||
|
@ -57,7 +57,7 @@ function alreadyAdd(data: string) {
|
||||||
alreadyCommands[alreadyCommands.length] = data;
|
alreadyCommands[alreadyCommands.length] = data;
|
||||||
|
|
||||||
fs.writeFileSync(
|
fs.writeFileSync(
|
||||||
"logs/alreadyCommands.json",
|
"data/alreadyCommands.json",
|
||||||
JSON.stringify(alreadyCommands),
|
JSON.stringify(alreadyCommands),
|
||||||
"utf-8",
|
"utf-8",
|
||||||
);
|
);
|
||||||
|
@ -74,72 +74,74 @@ export default async function Commands() {
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
const mentions: Array<ueuse> = await mentionsReq.json();
|
const mentions: { [key: string]: ueuse } = await mentionsReq.json();
|
||||||
|
|
||||||
console.log("----------------");
|
console.log("----------------");
|
||||||
console.log("コマンド処理");
|
console.log("コマンド処理");
|
||||||
|
|
||||||
for (let i = 0; i < mentions.length; i++) {
|
for (const key in mentions) {
|
||||||
const data = mentions[i];
|
if (mentions.hasOwnProperty(key)) {
|
||||||
|
const data = mentions[key];
|
||||||
|
|
||||||
// 除外ユーズ
|
// 除外ユーズ
|
||||||
if (alreadyCommands.indexOf(data.uniqid) !== -1) {
|
if (alreadyCommands.indexOf(data.uniqid) !== -1) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
data.text.charAt(0) === "!" ||
|
data.text.charAt(0) === "!" ||
|
||||||
data.text.charAt(0) === "!" ||
|
data.text.charAt(0) === "!" ||
|
||||||
data.abi === "ignore"
|
data.abi === "ignore"
|
||||||
) {
|
) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// コマンド処理
|
// コマンド処理
|
||||||
console.log("--------");
|
console.log("--------");
|
||||||
|
|
||||||
const commandName = cutAfterChar(data.text, "/");
|
const commandName = cutAfterChar(data.text, "/");
|
||||||
|
|
||||||
alreadyAdd(data.uniqid);
|
alreadyAdd(data.uniqid);
|
||||||
|
|
||||||
switch (commandName) {
|
switch (commandName) {
|
||||||
case "":
|
case "":
|
||||||
break;
|
break;
|
||||||
case "info":
|
case "info":
|
||||||
Info(data);
|
Info(data);
|
||||||
break;
|
break;
|
||||||
case "help":
|
case "help":
|
||||||
Help(data);
|
Help(data);
|
||||||
break;
|
break;
|
||||||
case "legal terms":
|
case "legal terms":
|
||||||
Terms(data);
|
Terms(data);
|
||||||
break;
|
break;
|
||||||
case "legal privacy":
|
case "legal privacy":
|
||||||
PrivacyPolicy(data);
|
PrivacyPolicy(data);
|
||||||
break;
|
break;
|
||||||
case "report":
|
case "report":
|
||||||
Report(data);
|
Report(data);
|
||||||
break;
|
break;
|
||||||
case "follow":
|
case "follow":
|
||||||
Follow(data);
|
Follow(data);
|
||||||
break;
|
break;
|
||||||
case "unfollow":
|
case "unfollow":
|
||||||
UnFollow(data);
|
UnFollow(data);
|
||||||
break;
|
break;
|
||||||
case "weather":
|
case "weather":
|
||||||
Weather(data);
|
Weather(data);
|
||||||
break;
|
break;
|
||||||
case "birthday":
|
case "birthday":
|
||||||
Birthday(data);
|
Birthday(data);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
const reply = await Reply(`
|
const reply = await Reply(`
|
||||||
不明なコマンドです。
|
不明なコマンドです。
|
||||||
コマンド実行を除外する場合は1文字目に\`!\`を入れてください。
|
コマンド実行を除外する場合は1文字目に\`!\`を入れてください。
|
||||||
`, data.uniqid);
|
`, data.uniqid);
|
||||||
|
|
||||||
console.log("未対応コマンド: ", reply);
|
console.log("未対応コマンド: ", reply);
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { ueuse } from "types/types.js";
|
import { ueuse } from "types/types";
|
||||||
import { Reply } from "./main.js";
|
import { Reply } from "./main.js";
|
||||||
import config from "../../config.js";
|
import config from "../../config.js";
|
||||||
import sendMail from "../../src/mailer.js";
|
import sendMail from "../../src/mailer.js";
|
||||||
|
@ -15,7 +15,15 @@ export default async function Report(data: ueuse) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!config.emergency.mail.function) {
|
if (!config.emergency.isEnabled) {
|
||||||
|
console.log("報告(重要通知オフ):", await Reply(`
|
||||||
|
BOTの運営者によって重要通知が無効化されています。
|
||||||
|
そのため報告機能はご利用いただけません。
|
||||||
|
`, data.uniqid));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!config.emergency.mail.isEnabled) {
|
||||||
console.log("報告(メールオフ):", await Reply(`
|
console.log("報告(メールオフ):", await Reply(`
|
||||||
BOTの運営者によってメール送信機能が無効化されています。
|
BOTの運営者によってメール送信機能が無効化されています。
|
||||||
そのため報告機能はご利用いただけません。
|
そのため報告機能はご利用いただけません。
|
||||||
|
@ -23,7 +31,7 @@ export default async function Report(data: ueuse) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!config.emergency.report) {
|
if (!config.report.isEnabled) {
|
||||||
console.log("報告(機能オフ):", await Reply(`
|
console.log("報告(機能オフ):", await Reply(`
|
||||||
BOTの運営者によって報告機能が無効化されています。
|
BOTの運営者によって報告機能が無効化されています。
|
||||||
そのため報告機能はご利用いただけません。
|
そのため報告機能はご利用いただけません。
|
||||||
|
@ -49,7 +57,8 @@ export default async function Report(data: ueuse) {
|
||||||
console.log("報告(完了):", await Reply(`
|
console.log("報告(完了):", await Reply(`
|
||||||
報告が完了しました。
|
報告が完了しました。
|
||||||
運営者は報告者、ユーズのURL、内容を確認できます。
|
運営者は報告者、ユーズのURL、内容を確認できます。
|
||||||
場合によっては運営者、BOTからブロックされる可能性があります。
|
--運営者からのメッセージ--
|
||||||
|
${config.report.message}
|
||||||
`, data.uniqid));
|
`, data.uniqid));
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { ueuse } from "types/types.js";
|
import { ueuse } from "types/types";
|
||||||
import config from "../../config.js";
|
import config from "../../config.js";
|
||||||
import { Reply } from "./main.js";
|
import { Reply } from "./main.js";
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { weatherReply } from "../weatherNotice.js";
|
import { weatherReply } from "../weatherNotice.js";
|
||||||
import { ueuse } from "types/types.js";
|
import { ueuse } from "types/types";
|
||||||
|
|
||||||
export default function Weather(data: ueuse) {
|
export default function Weather(data: ueuse) {
|
||||||
weatherReply(data.uniqid);
|
weatherReply(data.uniqid);
|
||||||
|
|
|
@ -276,7 +276,7 @@ async function event(earthquakeInfo: any): Promise<void> {
|
||||||
if (
|
if (
|
||||||
earthquakeInfo.earthquake.maxScale !== undefined &&
|
earthquakeInfo.earthquake.maxScale !== undefined &&
|
||||||
earthquakeInfo.earthquake.maxScale >= 60 &&
|
earthquakeInfo.earthquake.maxScale >= 60 &&
|
||||||
config.emergency.function
|
config.emergency.isEnabled
|
||||||
) {
|
) {
|
||||||
console.log("----------------");
|
console.log("----------------");
|
||||||
|
|
||||||
|
@ -284,7 +284,7 @@ async function event(earthquakeInfo: any): Promise<void> {
|
||||||
console.log("サーバーがダウンする可能性があります");
|
console.log("サーバーがダウンする可能性があります");
|
||||||
|
|
||||||
// メール送信
|
// メール送信
|
||||||
if (config.emergency.function) {
|
if (config.emergency.isEnabled) {
|
||||||
sendMail({
|
sendMail({
|
||||||
to: config.emergency.mail.to,
|
to: config.emergency.mail.to,
|
||||||
subject: "【警告】震度6強以上の地震を受信しました",
|
subject: "【警告】震度6強以上の地震を受信しました",
|
||||||
|
|
|
@ -15,7 +15,7 @@ export default function successExit() {
|
||||||
|
|
||||||
const iolog = JSON.parse(fs.readFileSync("logs/boot.json", "utf-8"));
|
const iolog = JSON.parse(fs.readFileSync("logs/boot.json", "utf-8"));
|
||||||
|
|
||||||
if (config.emergency.function) {
|
if (config.emergency.isEnabled) {
|
||||||
// 前回の終了確認
|
// 前回の終了確認
|
||||||
const start = iolog.start;
|
const start = iolog.start;
|
||||||
const stop = iolog.stop;
|
const stop = iolog.stop;
|
||||||
|
@ -23,7 +23,7 @@ export default function successExit() {
|
||||||
if (isAfter(start, stop)) {
|
if (isAfter(start, stop)) {
|
||||||
console.log("前回の終了が適切でない可能性があります");
|
console.log("前回の終了が適切でない可能性があります");
|
||||||
|
|
||||||
if (config.emergency.mail.function) {
|
if (config.emergency.mail.isEnabled) {
|
||||||
sendMail({
|
sendMail({
|
||||||
to: config.emergency.mail.to,
|
to: config.emergency.mail.to,
|
||||||
subject: "【警告】前回終了が不適切な可能性",
|
subject: "【警告】前回終了が不適切な可能性",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import { cityList } from "../src/weatherId.js";
|
import { cityList } from "../src/weatherId.js";
|
||||||
|
|
||||||
import type * as types from "types/types.js";
|
import type * as types from "types/types";
|
||||||
|
|
||||||
import config from "../config.js";
|
import config from "../config.js";
|
||||||
|
|
||||||
|
|
|
@ -11,42 +11,54 @@ export interface EmailMessage {
|
||||||
}
|
}
|
||||||
|
|
||||||
async function createTransporter() {
|
async function createTransporter() {
|
||||||
const transporter = nodemailer.createTransport({
|
if (
|
||||||
host: config.emergency.mail.host,
|
config.emergency.isEnabled &&
|
||||||
port: config.emergency.mail.port,
|
config.emergency.mail.isEnabled
|
||||||
secure: config.emergency.mail.secure,
|
) {
|
||||||
auth: {
|
const transporter = nodemailer.createTransport({
|
||||||
user: config.emergency.mail.user,
|
host: config.emergency.mail.host,
|
||||||
pass: config.emergency.mail.password,
|
port: config.emergency.mail.port,
|
||||||
},
|
secure: config.emergency.mail.secure,
|
||||||
} as SMTPTransport.Options);
|
auth: {
|
||||||
|
user: config.emergency.mail.user,
|
||||||
|
pass: config.emergency.mail.password,
|
||||||
|
},
|
||||||
|
} as SMTPTransport.Options);
|
||||||
|
|
||||||
// 接続テスト
|
// 接続テスト
|
||||||
try {
|
try {
|
||||||
await transporter.verify();
|
await transporter.verify();
|
||||||
console.log("SMTPサーバーに接続できました");
|
console.log("SMTPサーバーに接続できました");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("SMTP接続テストに失敗:", error);
|
console.error("SMTP接続テストに失敗:", error);
|
||||||
throw error;
|
throw error;
|
||||||
|
}
|
||||||
|
|
||||||
|
return transporter;
|
||||||
}
|
}
|
||||||
|
|
||||||
return transporter;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export default async function sendMail(message: EmailMessage): Promise<void> {
|
export default async function sendMail(message: EmailMessage): Promise<void> {
|
||||||
try {
|
if (
|
||||||
const transporter = await createTransporter();
|
config.emergency.isEnabled &&
|
||||||
|
config.emergency.mail.isEnabled
|
||||||
|
) {
|
||||||
|
try {
|
||||||
|
const transporter: any = await createTransporter();
|
||||||
|
|
||||||
await transporter.sendMail({
|
await transporter.sendMail({
|
||||||
from: config.emergency.mail.user,
|
from: config.emergency.mail.user,
|
||||||
to: Array.isArray(message.to) ? message.to.join(",") : message.to,
|
to: Array.isArray(message.to) ? message.to.join(",") : message.to,
|
||||||
subject: message.subject,
|
subject: message.subject,
|
||||||
text: message.text,
|
text: message.text,
|
||||||
html: message.html,
|
html: message.html,
|
||||||
});
|
});
|
||||||
console.log("メール送信成功");
|
console.log("メール送信成功");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("メール送信に失敗しました:", error);
|
console.error("メール送信に失敗しました:", error);
|
||||||
throw error;
|
throw error;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "ES2024",
|
"target": "ES2024",
|
||||||
"module": "ESNext",
|
"module": "ESNext",
|
||||||
"moduleResolution": "bundler",
|
"moduleResolution": "node",
|
||||||
"outDir": "./dist",
|
"outDir": "./dist",
|
||||||
"esModuleInterop": true,
|
"esModuleInterop": true,
|
||||||
"allowSyntheticDefaultImports": true,
|
"allowSyntheticDefaultImports": true,
|
||||||
|
|
|
@ -18,8 +18,8 @@ interface timeTypes {
|
||||||
stopTimes: stopsTypes;
|
stopTimes: stopsTypes;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface emergencyMailTypes {
|
interface emergencyMailFullTypes {
|
||||||
function: boolean;
|
isEnabled: true;
|
||||||
host: string;
|
host: string;
|
||||||
port: number;
|
port: number;
|
||||||
user: string;
|
user: string;
|
||||||
|
@ -28,10 +28,18 @@ interface emergencyMailTypes {
|
||||||
to: string | string[];
|
to: string | string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
interface emergencyTypes {
|
interface emergencyMailMinTypes {
|
||||||
function: boolean;
|
isEnabled: false;
|
||||||
mail: emergencyMailTypes;
|
mail: undefined;
|
||||||
report: boolean;
|
}
|
||||||
|
|
||||||
|
interface emergencyFullTypes {
|
||||||
|
isEnabled: true;
|
||||||
|
mail: emergencyMailFullTypes | emergemcyMailMinTypes;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface emergencyMinTypes {
|
||||||
|
isEnabled: false;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface legalTypes {
|
interface legalTypes {
|
||||||
|
@ -39,9 +47,24 @@ interface legalTypes {
|
||||||
privacy: string;
|
privacy: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface PanelFullTypes {
|
||||||
|
isEnabled: true;
|
||||||
|
port: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface PanelMinTypes {
|
||||||
|
isEnabled: false;
|
||||||
|
}
|
||||||
|
|
||||||
interface adminTypes {
|
interface adminTypes {
|
||||||
name: string;
|
name: string;
|
||||||
showMail: string | false;
|
showMail: string | false;
|
||||||
|
panel: PanelFullTypes | PanelMinTypes;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface reportTypes {
|
||||||
|
isEnabled: boolean;
|
||||||
|
message: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface uwuzuTypes {
|
interface uwuzuTypes {
|
||||||
|
@ -55,8 +78,9 @@ export interface configTypes {
|
||||||
earthquake: earthquakeTypes;
|
earthquake: earthquakeTypes;
|
||||||
weather: weatherTypes;
|
weather: weatherTypes;
|
||||||
|
|
||||||
emergency: emergencyTypes;
|
emergency: emergencyFullTypes | emergencyMinTypes;
|
||||||
legal: legalTypes;
|
legal: legalTypes;
|
||||||
admin: adminTypes;
|
admin: adminTypes;
|
||||||
|
report: reportTypes;
|
||||||
uwuzu: uwuzuTypes;
|
uwuzu: uwuzuTypes;
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,3 +56,9 @@ export interface ueuseCreateApi {
|
||||||
export interface followApi {
|
export interface followApi {
|
||||||
userid: string;
|
userid: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface NetworkInterfaceDetails {
|
||||||
|
family: string;
|
||||||
|
internal: boolean;
|
||||||
|
address: string;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue