Relay GTL patch

jbblily · Jun 7, 2024 · e52b40c · e52b40c
1 parent c542820
commit e52b40c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -297,13 +297,15 @@ export class ApInboxService {
 
 		const relays = await this.relayService.getAcceptedRelays();
 		const fromRelay = !!actor.inbox && relays.map(r => r.inbox).includes(actor.inbox);
+		const targetUri = getApId(activity.object);
 
 		const unlock = await this.appLockService.getApLock(uri);
 
 		try {
 			// 既に同じURIを持つものが登録されていないかチェック
 			const exist = await this.apNoteService.fetchNote(fromRelay ? targetUri : uri);
 			if (exist) {
+				this.logger.info(`Skip existing Note announce (fromRelay: ${fromRelay}, uri:${ fromRelay ? targetUri : uri})`);
 				return;
 			}
 
@@ -329,7 +331,7 @@ export class ApInboxService {
 			}
 
 			if (fromRelay) {
-				const noteObj = await this.noteEntityService.pack(renote);
+				const noteObj = await this.noteEntityService.pack(renote, null, { skipHide: true });
 				this.globalEventService.publishNotesStream(noteObj);
 				return;
 			}