Merge pull request #9 from upstream

src/ai.ts

@@ -16,7 +16,7 @@ import type { User } from '@/misskey/user.js';
 import Stream from '@/stream.js';
 import log from '@/utils/log.js';
 import { sleep } from './utils/sleep.js';
-import pkg from '../package.json' assert { type: 'json' };
+import pkg from '../package.json' with { type: 'json' };
 
 type MentionHook = (msg: Message) => Promise<boolean | HandlerResult>;
 type ContextHook = (key: any, msg: Message, data?: any) => Promise<void | boolean | HandlerResult>;

src/config.ts

@@ -17,7 +17,7 @@ type Config = {
 	memoryDir?: string;
 };
 
-import config from '../config.json' assert { type: 'json' };
+import config from '../config.json' with { type: 'json' };
 
 config.wsUrl ??= config.host.replace('http', 'ws');
 config.apiUrl ??= config.host + '/api';

src/index.ts

@@ -8,7 +8,7 @@ import promiseRetry from 'promise-retry';
 import 藍 from './ai.js';
 import config from './config.js';
 import _log from './utils/log.js';
-import pkg from '../package.json' assert { type: 'json' };
+import pkg from '../package.json' with { type: 'json' };
 
 import CoreModule from './modules/core/index.js';
 import TalkModule from './modules/talk/index.js';

src/modules/check-custom-emojis/index.ts

@@ -43,14 +43,35 @@ export default class extends Module {
 	}
 
 	@bindThis
-	private async post() {
+	private async post(byMentionHook:boolean = false) {
 		this.log('Start to Check CustomEmojis.');
 		const lastEmoji = this.lastEmoji.find({});
 
 		const lastId = lastEmoji.length != 0 ? lastEmoji[0].id : null;
-		const emojisData = await this.checkCumstomEmojis(lastId);
-		if (emojisData.length == 0) {
+		let emojisData:any[] | null = null;
+		try {
+			emojisData = await this.checkCumstomEmojis(lastId);
+		} catch (err: unknown) {
+			this.log('Error By API(admin/emoji/list)');
+			if (err instanceof Error) {
+				this.log(`${err.name}\n${err.message}`);
+			}
+		}
+		if (emojisData === null) {
+			const errMessage = 'read:admin:emoji権限がないため、エラーが発生しました。\nカスタム絵文字管理の権限が付与されているか見直しをお願いします。';
+			this.log(errMessage);
+			await this.ai.post({
+				text: errMessage
+			});
+			return;
+		}
+		else if (emojisData.length == 0) {
 			this.log('No CustomEmojis Added.');
+			if (byMentionHook) {
+				await this.ai.post({
+					text: serifs.checkCustomEmojis.nothing
+				});
+			}
 			return;
 		}
 
@@ -148,7 +169,7 @@ export default class extends Module {
 			this.log('Check CustomEmojis requested');
 		}
 
-		await this.post();
+		await this.post(true);
 
 		return {
 			reaction: 'like'

src/serifs.ts

@@ -385,7 +385,8 @@ export default {
 		post: (server_name, num) => `${server_name}に${num}件の絵文字が追加されました！`,
 		emojiPost: emoji => `:${emoji}:\n(\`${emoji}\`) #AddCustomEmojis`,
 		postOnce: (server_name, num, text) => `${server_name}に${num}件の絵文字が追加されました！\n${text} #AddCustomEmojis`,
-		emojiOnce: emoji => `:${emoji}:(\`${emoji}\`)`
+		emojiOnce: emoji => `:${emoji}:(\`${emoji}\`)`,
+		nothing: '絵文字を確認しましたが、なにも追加されていないみたいです',
 	},
 
 	sleepReport: {