diff --git a/src/modules/reminder/index.ts b/src/modules/reminder/index.ts index 1bc16f9..434e943 100644 --- a/src/modules/reminder/index.ts +++ b/src/modules/reminder/index.ts @@ -143,10 +143,15 @@ export default class extends Module { text: serifs.reminder.notifyWithThing(remind.thing, friend.name) }); } else { - reply = await this.ai.post({ - renoteId: remind.thing == null && remind.quoteId ? remind.quoteId : remind.id, - text: acct(friend.doc.user) + ' ' + serifs.reminder.notify(friend.name) - }); + try { + reply = await this.ai.post({ + renoteId: remind.thing == null && remind.quoteId ? remind.quoteId : remind.id, + text: acct(friend.doc.user) + ' ' + serifs.reminder.notify(friend.name) + }); + } catch (err) { + // TODO: renote対象が消されていたらリマインダー解除 + return; + } } this.subscribeReply(remind.id, remind.isDm, remind.isDm ? remind.userId : reply.id, { diff --git a/src/modules/server/index.ts b/src/modules/server/index.ts index 62be15a..fc9d84c 100644 --- a/src/modules/server/index.ts +++ b/src/modules/server/index.ts @@ -39,7 +39,7 @@ export default class extends Module { private check() { const average = (arr) => arr.reduce((a, b) => a + b) / arr.length; - const cpuPercentages = this.statsLogs.map(s => s && s.cpu_usage * 100 || 0); + const cpuPercentages = this.statsLogs.map(s => s && (s.cpu_usage || s.cpu) * 100 || 0); const cpuPercentage = average(cpuPercentages); if (cpuPercentage >= 70) { this.warn(); diff --git a/src/vocabulary.ts b/src/vocabulary.ts index 083c8e0..1f936c3 100644 --- a/src/vocabulary.ts +++ b/src/vocabulary.ts @@ -470,6 +470,7 @@ export const items = [ 'クラインの壺', 'メビウスの輪', 'オリハルコン', + 'ヘドロ', ]; export const and = [