From 79dfb9abc4a74106e992190f7f91d3d198329496 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 22 Jan 2022 23:19:14 +0900
Subject: [PATCH 1/3] Update vocabulary.ts

---
 src/vocabulary.ts | 1 +
 1 file changed, 1 insertion(+)

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 = [

From 89a2f5b93683331bb50121fb45347c0b2d79b7d2 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue, 8 Feb 2022 13:05:10 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=80=E8=BF=91=E3=82=B5=E3=83=BC?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E7=9B=A3=E8=A6=96=E3=81=8C=E5=8B=95=E3=81=8B?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#88)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/server/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();

From bf7e1ec77eb733209b114826631a35d024fc4c84 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 10 Feb 2022 19:01:48 +0900
Subject: [PATCH 3/3] fix #86

---
 src/modules/reminder/index.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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, {