summaryrefslogtreecommitdiff
path: root/src/services
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/services
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/services')
-rw-r--r--src/services/note/create.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index c08836c94b..ceb2ab2e2d 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -239,7 +239,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
});
async function renderActivity(data: Option, note: INote) {
- const content = data.renote && data.text == null
+ const content = data.renote && data.text == null && data.poll == null && (data.files == null || data.files.length == 0)
? renderAnnounce(data.renote.uri ? data.renote.uri : `${config.url}/notes/${data.renote._id}`, note)
: renderCreate(await renderNote(note, false), note);