From 0177023ead75594c603e41f9c1f355e7f4b18369 Mon Sep 17 00:00:00 2001 From: mei23 Date: Sun, 2 Sep 2018 02:57:34 +0900 Subject: [PATCH] Use Tombstone for Delete --- src/remote/activitypub/renderer/tombstone.ts | 4 ++++ src/services/note/delete.ts | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 src/remote/activitypub/renderer/tombstone.ts diff --git a/src/remote/activitypub/renderer/tombstone.ts b/src/remote/activitypub/renderer/tombstone.ts new file mode 100644 index 000000000..553406b93 --- /dev/null +++ b/src/remote/activitypub/renderer/tombstone.ts @@ -0,0 +1,4 @@ +export default (id: string) => ({ + id, + type: 'Tombstone' +}); diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts index d0e2b12b4..dea306fee 100644 --- a/src/services/note/delete.ts +++ b/src/services/note/delete.ts @@ -5,8 +5,9 @@ import renderDelete from '../../remote/activitypub/renderer/delete'; import pack from '../../remote/activitypub/renderer'; import { deliver } from '../../queue'; import Following from '../../models/following'; -import renderNote from '../../remote/activitypub/renderer/note'; +import renderTombstone from '../../remote/activitypub/renderer/tombstone'; import { updateNoteStats } from '../update-chart'; +import config from '../../config'; /** * 投稿を削除します。 @@ -32,7 +33,7 @@ export default async function(user: IUser, note: INote) { //#region ローカルの投稿なら削除アクティビティを配送 if (isLocalUser(user)) { - const content = pack(renderDelete(await renderNote(note), user)); + const content = pack(renderDelete(renderTombstone(`${config.url}/notes/${note._id}`), user)); const followings = await Following.find({ followeeId: user._id,