fix: not checking for renotes during packing of note

Closes #108
transfem-org · Oct 22, 2023 · 6d29022 · 6d29022
1 parent d49099b
commit 6d29022
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -110,16 +110,29 @@ export class NoteEntityService implements OnModuleInit {
 			} else if (packedNote.mentions && packedNote.mentions.some(id => meId === id)) {
 				// 自分へのメンション
 				hide = false;
+			} else if (packedNote.renote && (meId === packedNote.renote.userId)) {
+				hide = false;
 			} else {
-				// フォロワーかどうか
-				const isFollowing = await this.followingsRepository.exist({
-					where: {
-						followeeId: packedNote.userId,
-						followerId: meId,
-					},
-				});
+				if (packedNote.renote) {
+					const isFollowing = await this.followingsRepository.exist({
+						where: {
+							followeeId: packedNote.renote.userId,
+							followerId: meId,
+						},
+					});
+
+					hide = !isFollowing;
+				} else {
+					// フォロワーかどうか
+					const isFollowing = await this.followingsRepository.exist({
+						where: {
+							followeeId: packedNote.userId,
+							followerId: meId,
+						},
+					});
 
-				hide = !isFollowing;
+					hide = !isFollowing;
+				}
 			}
 		}