summaryrefslogtreecommitdiff
path: root/packages/backend/src/services/note
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-01-21 18:47:02 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-01-21 18:47:02 +0900
commiteec7e6500ed7f56a3b545adbb45420b3e1c7b0a9 (patch)
treea2d7fa54272590ce0a54abe51f4106f1134e2716 /packages/backend/src/services/note
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadsharkey-eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9.tar.gz
sharkey-eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9.tar.bz2
sharkey-eec7e6500ed7f56a3b545adbb45420b3e1c7b0a9.zip
enhance: convert svg to png of custom emojis
Diffstat (limited to 'packages/backend/src/services/note')
-rw-r--r--packages/backend/src/services/note/reaction/create.ts14
1 files changed, 5 insertions, 9 deletions
diff --git a/packages/backend/src/services/note/reaction/create.ts b/packages/backend/src/services/note/reaction/create.ts
index e0baa6a096..47f46419dd 100644
--- a/packages/backend/src/services/note/reaction/create.ts
+++ b/packages/backend/src/services/note/reaction/create.ts
@@ -81,19 +81,15 @@ export default async (user: { id: User['id']; host: User['host']; }, note: Note,
name: decodedReaction.name,
host: decodedReaction.host,
},
- select: ['name', 'host', 'url'],
+ select: ['name', 'host', 'originalUrl', 'publicUrl'],
});
- if (emoji) {
- emoji = {
- name: emoji.host ? `${emoji.name}@${emoji.host}` : `${emoji.name}@.`,
- url: emoji.url,
- } as any;
- }
-
publishNoteStream(note.id, 'reacted', {
reaction: decodedReaction.reaction,
- emoji: emoji,
+ emoji: emoji != null ? {
+ name: emoji.host ? `${emoji.name}@${emoji.host}` : `${emoji.name}@.`,
+ url: emoji.publicUrl || emoji.originalUrl, // || emoji.originalUrl してるのは後方互換性のため
+ } : null,
userId: user.id,
});