Revert "fix(backend): renoteのリモートで表示のときに正しいページに飛ぶように"

This reverts commit 251ddcf.
4ster1sk · Dec 27, 2024 · 19702a5 · 19702a5
1 parent 29514fa
commit 19702a5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -29,7 +29,7 @@ import type { MiRemoteUser } from '@/models/User.js';
 import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { AbuseReportService } from '@/core/AbuseReportService.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
-import { getApHrefNullable, getApId, getApIds, getApType, getApUrl, isAccept, isActor, isAdd, isAnnounce, isBlock, isCollection, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isMove, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost } from './type.js';
+import { getApHrefNullable, getApId, getApIds, getApType, isAccept, isActor, isAdd, isAnnounce, isBlock, isCollection, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isMove, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost } from './type.js';
 import { ApNoteService } from './models/ApNoteService.js';
 import { ApLoggerService } from './ApLoggerService.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
@@ -280,9 +280,8 @@ export class ApInboxService {
 	@bindThis
 	private async announce(actor: MiRemoteUser, activity: IAnnounce, resolver?: Resolver): Promise<string | void> {
 		const uri = getApId(activity);
-		const url = getApUrl(activity);
 
-		this.logger.info(`Announce: ${uri} / ${url}`);
+		this.logger.info(`Announce: ${uri}`);
 
 		// eslint-disable-next-line no-param-reassign
 		resolver ??= this.apResolverService.createResolver();
@@ -304,7 +303,6 @@ export class ApInboxService {
 	@bindThis
 	private async announceNote(actor: MiRemoteUser, activity: IAnnounce, target: IPost, resolver?: Resolver): Promise<string | void> {
 		const uri = getApId(activity);
-		const url = getApUrl(activity);
 
 		if (actor.isSuspended) {
 			return;
@@ -357,7 +355,6 @@ export class ApInboxService {
 				visibility: activityAudience.visibility,
 				visibleUsers: activityAudience.visibleUsers,
 				uri,
-				url: url,
 			});
 		} finally {
 			unlock();

diff --git a/packages/backend/src/core/activitypub/type.ts b/packages/backend/src/core/activitypub/type.ts
@@ -62,12 +62,6 @@ export function getApId(value: string | IObject): string {
 	throw new Error('cannot detemine id');
 }
 
-export function getApUrl(value: string | IActivity): string | null {
-	if (typeof value === 'string') return value;
-	if (typeof value.object === 'string') return value.object;
-	return null;
-}
-
 /**
  * Get ActivityStreams Object type
  *