summaryrefslogtreecommitdiff
path: root/src/remote
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-03-21 04:50:44 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-03-21 04:50:44 +0900
commit7bebea087cc35b95c4065c1dd9f554a8ec002771 (patch)
treeb8aea8cff25858cb9061eeeca11df83464cb42f9 /src/remote
parentFix NoteReaction (#4547) (diff)
downloadsharkey-7bebea087cc35b95c4065c1dd9f554a8ec002771.tar.gz
sharkey-7bebea087cc35b95c4065c1dd9f554a8ec002771.tar.bz2
sharkey-7bebea087cc35b95c4065c1dd9f554a8ec002771.zip
Fix #4546 (#4548)
* Refactor download * emoji type
Diffstat (limited to 'src/remote')
-rw-r--r--src/remote/activitypub/renderer/emoji.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/remote/activitypub/renderer/emoji.ts b/src/remote/activitypub/renderer/emoji.ts
index b18337d274..1a05b4e89e 100644
--- a/src/remote/activitypub/renderer/emoji.ts
+++ b/src/remote/activitypub/renderer/emoji.ts
@@ -8,7 +8,7 @@ export default (emoji: IEmoji) => ({
updated: emoji.updatedAt != null ? emoji.updatedAt.toISOString() : new Date().toISOString,
icon: {
type: 'Image',
- mediaType: 'image/png', //Mei-TODO
+ mediaType: emoji.type || 'image/png',
url: emoji.url
}
});