From 70a06e30d52cfacdfdc4122f9c1a9e09c4bc7e1d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Mon, 10 Apr 2023 10:03:53 +0900
Subject: [PATCH] =?UTF-8?q?fix(backend):=20=E3=82=A2=E3=83=B3=E3=83=86?=
 =?UTF-8?q?=E3=83=8A=E3=81=AE=E3=83=8E=E3=83=BC=E3=83=88=E3=80=81=E3=83=81?=
 =?UTF-8?q?=E3=83=A3=E3=83=B3=E3=83=8D=E3=83=AB=E3=81=AE=E3=83=8E=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=E3=80=81=E9=80=9A=E7=9F=A5=E3=81=8C=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E3=81=AB=E4=BD=9C=E6=88=90=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #10482
---
 CHANGELOG.md                                     | 11 +++++++++++
 packages/backend/src/core/AntennaService.ts      |  2 +-
 packages/backend/src/core/NoteCreateService.ts   |  2 +-
 packages/backend/src/core/NotificationService.ts |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e6fa2cf4..114bdc4d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,17 @@
 
 -->
 
+## 13.x.x (unreleased)
+
+### General
+-
+
+### Client
+-
+
+### Server
+- アンテナのノート、チャンネルのノート、通知が正常に作成できないことがある問題を修正
+
 ## 13.11.1
 
 ### General
diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
index 47ebd4c74..02e0b455f 100644
--- a/packages/backend/src/core/AntennaService.ts
+++ b/packages/backend/src/core/AntennaService.ts
@@ -95,7 +95,7 @@ export class AntennaService implements OnApplicationShutdown {
 		this.redisClient.xadd(
 			`antennaTimeline:${antenna.id}`,
 			'MAXLEN', '~', '200',
-			`${this.idService.parse(note.id).date.getTime()}-*`,
+			'*',
 			'note', note.id);
 		
 		this.globalEventService.publishAntennaStream(antenna.id, 'note', note);
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 5c4d13f17..fb7ee7080 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -329,7 +329,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			this.redisClient.xadd(
 				`channelTimeline:${data.channel.id}`,
 				'MAXLEN', '~', '1000',
-				`${this.idService.parse(note.id).date.getTime()}-*`,
+				'*',
 				'note', note.id);
 		}
 
diff --git a/packages/backend/src/core/NotificationService.ts b/packages/backend/src/core/NotificationService.ts
index c44dddea4..c7dac061b 100644
--- a/packages/backend/src/core/NotificationService.ts
+++ b/packages/backend/src/core/NotificationService.ts
@@ -99,7 +99,7 @@ export class NotificationService implements OnApplicationShutdown {
 		const redisIdPromise = this.redisClient.xadd(
 			`notificationTimeline:${notifieeId}`,
 			'MAXLEN', '~', '300',
-			`${this.idService.parse(notification.id).date.getTime()}-*`,
+			'*',
 			'data', JSON.stringify(notification));
 
 		const packed = await this.notificationEntityService.pack(notification, notifieeId, {});