From fa75b40dfd565c437da99c84fbefed564d4b4eb1 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Thu, 16 Apr 2020 00:47:17 +0900
Subject: リアクションの修正 (#6260)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/note/reaction/create.ts | 4 ++--
 src/services/note/reaction/delete.ts | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/services/note/reaction')

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
 	});
 
-- 
cgit v1.2.3-freya