diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2020-04-16 00:47:17 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 00:47:17 +0900 |
| commit | fa75b40dfd565c437da99c84fbefed564d4b4eb1 (patch) | |
| tree | 3d2baa3b493e087cdbdc095eb49dcf046f868f37 /src/services/note | |
| parent | 0以下のリアクションは送らないように Resolve #6263 (#6264) (diff) | |
| download | sharkey-fa75b40dfd565c437da99c84fbefed564d4b4eb1.tar.gz sharkey-fa75b40dfd565c437da99c84fbefed564d4b4eb1.tar.bz2 sharkey-fa75b40dfd565c437da99c84fbefed564d4b4eb1.zip | |
リアクションの修正 (#6260)
Diffstat (limited to 'src/services/note')
| -rw-r--r-- | src/services/note/reaction/create.ts | 4 | ||||
| -rw-r--r-- | src/services/note/reaction/delete.ts | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts index 70cb1adf4b..c650b2e103 100644 --- a/src/services/note/reaction/create.ts +++ b/src/services/note/reaction/create.ts @@ -72,13 +72,13 @@ export default async (user: User, note: Note, reaction?: string) => { if (emoji) { emoji = { - name: emoji.host ? `${emoji.name}@${emoji.host}` : `${emoji.name}`, + name: emoji.host ? `${emoji.name}@${emoji.host}` : `${emoji.name}@.`, url: emoji.url } as any; } publishNoteStream(note.id, 'reacted', { - reaction: reaction, + reaction: decodedReaction.reaction, emoji: emoji, userId: user.id }); diff --git a/src/services/note/reaction/delete.ts b/src/services/note/reaction/delete.ts index fd6628c71f..3f7dda7bc3 100644 --- a/src/services/note/reaction/delete.ts +++ b/src/services/note/reaction/delete.ts @@ -7,6 +7,7 @@ import { IdentifiableError } from '../../../misc/identifiable-error'; import { User, IRemoteUser } from '../../../models/entities/user'; import { Note } from '../../../models/entities/note'; import { NoteReactions, Users, Notes } from '../../../models'; +import { decodeReaction } from '../../../misc/reaction-lib'; export default async (user: User, note: Note) => { // if already unreacted @@ -38,7 +39,7 @@ export default async (user: User, note: Note) => { Notes.decrement({ id: note.id }, 'score', 1); publishNoteStream(note.id, 'unreacted', { - reaction: exist.reaction, + reaction: decodeReaction(exist.reaction).reaction, userId: user.id }); |