apnote

1673beta · Sep 10, 2024 · db0a9b7 · db0a9b7
1 parent ca776c6
commit db0a9b7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 26 deletions.
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -354,30 +354,6 @@ export class ApInboxService {
 				throw err;
 			}
 
-			let searchableActivity = activity.searchableBy;
-			let searchable: string[] = [];
-			if (typeof searchableActivity === 'string') {
-				if (searchableActivity.includes('https://www.w3.org/ns/activitystreams#Public')) {
-					searchable = ['public'];
-				} else if (searchableActivity.includes('kmyblue:Limited') || searchableActivity.includes('as:Limited')) {
-					searchable = ['limited'];
-				} else if (searchableActivity.includes('followers')) {
-					searchable = ['followers'];
-				} else {
-					searchable = ['reacted'];
-				}
-			} else if (Array.isArray(searchableActivity)) {
-				if (searchableActivity.some(url => url.includes('https://www.w3.org/ns/activitystreams#Public'))) {
-					searchable = ['public'];
-				} else if (searchableActivity.some(url => url.includes('kmyblue:Limited')) || searchableActivity.some(url => url.includes('as:Limited'))) {
-					searchable = ['limited'];
-				} else if (searchableActivity.some(url => url.includes('followers'))) {
-					searchable = ['followers'];
-				} else {
-					searchable = ['reacted'];
-				}
-			}
-
 			if (!await this.noteEntityService.isVisibleForMe(renote, actor.id)) {
 				return 'skip: invalid actor for this activity';
 			}
@@ -403,7 +379,6 @@ export class ApInboxService {
 				visibility: activityAudience.visibility,
 				visibleUsers: activityAudience.visibleUsers,
 				uri,
-				searchableBy: searchable,
 			});
 		} finally {
 			unlock();

diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -40,6 +40,7 @@ import { ApEventService } from './ApEventService.js';
 import { ApImageService } from './ApImageService.js';
 import type { Resolver } from '../ApResolverService.js';
 import type { IObject, IPost } from '../type.js';
+import search from '@/server/api/endpoints/hashtags/search.js';
 
 @Injectable()
 export class ApNoteService {
@@ -221,6 +222,16 @@ export class ApNoteService {
 
 		let isMessaging = note._misskey_talk && visibility === 'specified';
 
+		let searchableActivity = toArray(note.searchableBy);
+		let searchable: string[] = [];
+		if (searchableActivity.includes('https://www.w3.org/ns/activitystreams#Public')) {
+			searchable = ['public'];
+		} else if (searchableActivity.includes('kmyblue:Limited') || searchableActivity.includes('as:Limited')) {
+			searchable = ['limited'];
+		} else {
+			searchable = [];
+		}
+
 		// 添付ファイル
 		const files: MiDriveFile[] = [];
 
@@ -348,7 +359,7 @@ export class ApNoteService {
 				event,
 				uri: note.id,
 				url: url,
-				searchableBy: note.searchableBy,
+				searchableBy: note.searchableBy ? searchable : ['public'],
 			}, silent);
 		} catch (err: any) {
 			if (err.name !== 'duplicated') {