summaryrefslogtreecommitdiff
path: root/src/server/activitypub
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2018-09-09 02:59:14 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-09-09 02:59:14 +0900
commitea4e2da58d09a664d79f51fa1b6b9d0592839dbf (patch)
treed7ca52a47c0dbddfd22a3877b13ad1809c2fe647 /src/server/activitypub
parentMerge branch 'master' into develop (diff)
downloadsharkey-ea4e2da58d09a664d79f51fa1b6b9d0592839dbf.tar.gz
sharkey-ea4e2da58d09a664d79f51fa1b6b9d0592839dbf.tar.bz2
sharkey-ea4e2da58d09a664d79f51fa1b6b9d0592839dbf.zip
Fix AP Announce detection (#2672)
Diffstat (limited to 'src/server/activitypub')
-rw-r--r--src/server/activitypub/outbox.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts
index 9a4c881774..1d062f61a1 100644
--- a/src/server/activitypub/outbox.ts
+++ b/src/server/activitypub/outbox.ts
@@ -105,7 +105,7 @@ export default async (ctx: Router.IRouterContext) => {
* @param note Note
*/
export async function packActivity(note: INote): Promise<object> {
- if (note.renoteId && note.text == null) {
+ if (note.renoteId && note.text == null && note.poll == null && (note.fileIds == null || note.fileIds.length == 0)) {
const renote = await Note.findOne(note.renoteId);
return renderAnnounce(renote.uri ? renote.uri : `${config.url}/notes/${renote._id}`, note);
}