Delete Activity id をランダムにしないように

mei23 · Jan 31, 2020 · 6613528 · 6613528
1 parent 9681319
commit 6613528
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/remote/activitypub/renderer/delete.ts b/src/remote/activitypub/renderer/delete.ts
@@ -1,8 +1,14 @@
 import config from '../../../config';
 import { ILocalUser } from '../../../models/user';
 
-export default (object: any, user: ILocalUser) => ({
-	type: 'Delete',
-	actor: `${config.url}/users/${user._id}`,
-	object
-});
+export default (object: any, user: ILocalUser, id?: string) => {
+	const activity = {
+		type: 'Delete',
+		actor: `${config.url}/users/${user._id}`,
+		object
+	} as any;
+
+	if (id) activity.id = id;
+
+	return activity;
+};
diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts
@@ -103,7 +103,7 @@ export default async function(user: IUser, note: INote, quiet = false) {
 
 			const content = renderActivity(renote
 				? renderUndo(renderAnnounce(renote.uri || `${config.url}/notes/${renote._id}`, note), user)
-				: renderDelete(renderTombstone(`${config.url}/notes/${note._id}`), user));
+				: renderDelete(renderTombstone(`${config.url}/notes/${note._id}`), user, `${config.url}/notes/${note._id}/delete`));
 
 			deliverToFollowers(user, content);
 		}