-
(%i18n:@hidden%)
+
(%i18n:@private%)
+
(%i18n:@deleted%)
%fa:reply%
RP:
diff --git a/src/client/app/mobile/views/components/sub-note-content.vue b/src/client/app/mobile/views/components/sub-note-content.vue
index 023dec70d..4ad90b97d 100644
--- a/src/client/app/mobile/views/components/sub-note-content.vue
+++ b/src/client/app/mobile/views/components/sub-note-content.vue
@@ -1,13 +1,14 @@
-
(%i18n:@hidden%)
+
(%i18n:@private%)
+
(%i18n:@deleted%)
%fa:reply%
RP: ...
- ({{ note.media.length }}個のメディア)
+ ({{ '%i18n:@media-count%'.replace('{}', note.media.length) }})
diff --git a/src/remote/activitypub/kernel/delete/note.ts b/src/remote/activitypub/kernel/delete/note.ts
index b2868f69a..1951982f6 100644
--- a/src/remote/activitypub/kernel/delete/note.ts
+++ b/src/remote/activitypub/kernel/delete/note.ts
@@ -2,6 +2,7 @@ import * as debug from 'debug';
import Note from '../../../../models/note';
import { IRemoteUser } from '../../../../models/user';
+import deleteNode from '../../../../services/note/delete';
const log = debug('misskey:activitypub');
@@ -18,12 +19,5 @@ export default async function(actor: IRemoteUser, uri: string): Promise {
throw new Error('投稿を削除しようとしているユーザーは投稿の作成者ではありません');
}
- Note.update({ _id: note._id }, {
- $set: {
- deletedAt: new Date(),
- text: null,
- mediaIds: [],
- poll: null
- }
- });
+ await deleteNode(actor, note);
}
diff --git a/src/remote/activitypub/renderer/delete.ts b/src/remote/activitypub/renderer/delete.ts
new file mode 100644
index 000000000..d15cb447e
--- /dev/null
+++ b/src/remote/activitypub/renderer/delete.ts
@@ -0,0 +1,4 @@
+export default object => ({
+ type: 'Delete',
+ object
+});
diff --git a/src/renderers/get-note-summary.ts b/src/renderers/get-note-summary.ts
index 643e2d09b..ec7c74cf9 100644
--- a/src/renderers/get-note-summary.ts
+++ b/src/renderers/get-note-summary.ts
@@ -3,6 +3,10 @@
* @param {*} note (packされた)投稿
*/
const summarize = (note: any): string => {
+ if (note.deletedAt) {
+ return '(削除された投稿)';
+ }
+
if (note.isHidden) {
return '(非公開の投稿)';
}
diff --git a/src/server/api/endpoints.ts b/src/server/api/endpoints.ts
index 892da3540..908d9574a 100644
--- a/src/server/api/endpoints.ts
+++ b/src/server/api/endpoints.ts
@@ -494,6 +494,11 @@ const endpoints: Endpoint[] = [
},
kind: 'note-write'
},
+ {
+ name: 'notes/delete',
+ withCredential: true,
+ kind: 'note-write'
+ },
{
name: 'notes/renotes'
},
diff --git a/src/server/api/endpoints/notes/delete.ts b/src/server/api/endpoints/notes/delete.ts
new file mode 100644
index 000000000..9bbb1541d
--- /dev/null
+++ b/src/server/api/endpoints/notes/delete.ts
@@ -0,0 +1,26 @@
+import $ from 'cafy'; import ID from '../../../../cafy-id';
+import Note from '../../../../models/note';
+import deleteNote from '../../../../services/note/delete';
+
+/**
+ * Delete a note
+ */
+module.exports = (params, user) => new Promise(async (res, rej) => {
+ // Get 'noteId' parameter
+ const [noteId, noteIdErr] = $.type(ID).get(params.noteId);
+ if (noteIdErr) return rej('invalid noteId param');
+
+ // Fetch note
+ const note = await Note.findOne({
+ _id: noteId,
+ userId: user._id
+ });
+
+ if (note === null) {
+ return rej('note not found');
+ }
+
+ await deleteNote(user, note);
+
+ res();
+});
diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts
new file mode 100644
index 000000000..793f0090b
--- /dev/null
+++ b/src/services/note/delete.ts
@@ -0,0 +1,44 @@
+import Note, { INote } from '../../models/note';
+import { IUser, isLocalUser } from '../../models/user';
+import { publishNoteStream } from '../../publishers/stream';
+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';
+
+/**
+ * 投稿を削除します。
+ * @param user 投稿者
+ * @param note 投稿
+ */
+export default async function(user: IUser, note: INote) {
+ await Note.update({
+ _id: note._id,
+ userId: user._id
+ }, {
+ $set: {
+ deletedAt: new Date(),
+ text: null,
+ mediaIds: [],
+ poll: null
+ }
+ });
+
+ publishNoteStream(note._id, 'deleted');
+
+ //#region ローカルの投稿なら削除アクティビティを配送
+ if (isLocalUser(user)) {
+ const content = pack(renderDelete(await renderNote(note)));
+
+ const followings = await Following.find({
+ followeeId: user._id,
+ '_follower.host': { $ne: null }
+ });
+
+ followings.forEach(following => {
+ deliver(user, content, following._follower.inbox);
+ });
+ }
+ //#endregion
+}