From 1472f0b141cdcb4f21c4db0d5ff3d84a5f8ccb93 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 13 Jun 2018 05:11:55 +0900 Subject: Fix #1712 --- src/remote/activitypub/renderer/note.ts | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/remote/activitypub/renderer/note.ts') diff --git a/src/remote/activitypub/renderer/note.ts b/src/remote/activitypub/renderer/note.ts index a05c12b388..39335a7cca 100644 --- a/src/remote/activitypub/renderer/note.ts +++ b/src/remote/activitypub/renderer/note.ts @@ -1,5 +1,6 @@ import renderDocument from './document'; import renderHashtag from './hashtag'; +import renderMention from './mention'; import config from '../../../config'; import DriveFile from '../../../models/drive-file'; import Note, { INote } from '../../../models/note'; @@ -45,6 +46,18 @@ export default async function renderNote(note: INote, dive = true) { const attributedTo = `${config.url}/users/${user._id}`; + const mentions = note.mentionedRemoteUsers && note.mentionedRemoteUsers.length > 0 + ? note.mentionedRemoteUsers.map(x => x.uri) + : []; + + const cc = ['public', 'home', 'followers'].includes(note.visibility) + ? [`${attributedTo}/followers`].concat(mentions) + : []; + + const hashtagTags = (note.tags || []).map(renderHashtag); + const mentionTags = (note.mentionedRemoteUsers || []).map(renderMention); + const tag = hashtagTags.concat(mentionTags) + return { id: `${config.url}/notes/${note._id}`, type: 'Note', @@ -52,9 +65,9 @@ export default async function renderNote(note: INote, dive = true) { content: toHtml(note), published: note.createdAt.toISOString(), to: 'https://www.w3.org/ns/activitystreams#Public', - cc: `${attributedTo}/followers`, + cc, inReplyTo, attachment: (await promisedFiles).map(renderDocument), - tag: (note.tags || []).map(renderHashtag) + tag }; } -- cgit v1.2.3-freya