From 2efb187466e2d242b019c0f5f396f176dff80d07 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Wed, 20 Mar 2019 21:39:02 +0900
Subject: [PATCH] Fix NoteReaction (#4547)

---
 src/models/note-reaction.ts                 | 5 ++---
 src/models/note.ts                          | 4 ++--
 src/server/api/endpoints/notes/reactions.ts | 4 ++--
 src/services/note/reaction/delete.ts        | 6 +++---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/models/note-reaction.ts b/src/models/note-reaction.ts
index 4e449b400..89b752935 100644
--- a/src/models/note-reaction.ts
+++ b/src/models/note-reaction.ts
@@ -2,7 +2,6 @@ import * as mongo from 'mongodb';
 import * as deepcopy from 'deepcopy';
 import db from '../db/mongodb';
 import isObjectId from '../misc/is-objectid';
-import Reaction from './note-reaction';
 import { pack as packUser } from './user';
 
 const NoteReaction = db.get<INoteReaction>('noteReactions');
@@ -30,11 +29,11 @@ export const pack = (
 
 	// Populate the reaction if 'reaction' is ID
 	if (isObjectId(reaction)) {
-		_reaction = await Reaction.findOne({
+		_reaction = await NoteReaction.findOne({
 			_id: reaction
 		});
 	} else if (typeof reaction === 'string') {
-		_reaction = await Reaction.findOne({
+		_reaction = await NoteReaction.findOne({
 			_id: new mongo.ObjectID(reaction)
 		});
 	} else {
diff --git a/src/models/note.ts b/src/models/note.ts
index af45ff966..d4a252631 100644
--- a/src/models/note.ts
+++ b/src/models/note.ts
@@ -7,7 +7,7 @@ import { length } from 'stringz';
 import { IUser, pack as packUser } from './user';
 import { pack as packApp } from './app';
 import PollVote from './poll-vote';
-import Reaction from './note-reaction';
+import NoteReaction from './note-reaction';
 import { packMany as packFileMany, IDriveFile } from './drive-file';
 import Following from './following';
 import Emoji from './emoji';
@@ -357,7 +357,7 @@ export const pack = async (
 		if (meId) {
 			// Fetch my reaction
 			_note.myReaction = (async () => {
-				const reaction = await Reaction
+				const reaction = await NoteReaction
 					.findOne({
 						userId: meId,
 						noteId: id,
diff --git a/src/server/api/endpoints/notes/reactions.ts b/src/server/api/endpoints/notes/reactions.ts
index b28f24249..7d977154f 100644
--- a/src/server/api/endpoints/notes/reactions.ts
+++ b/src/server/api/endpoints/notes/reactions.ts
@@ -1,6 +1,6 @@
 import $ from 'cafy';
 import ID, { transform } from '../../../../misc/cafy-id';
-import Reaction, { pack } from '../../../../models/note-reaction';
+import NoteReaction, { pack } from '../../../../models/note-reaction';
 import define from '../../define';
 import { getNote } from '../../common/getters';
 import { ApiError } from '../../error';
@@ -87,7 +87,7 @@ export default define(meta, async (ps, user) => {
 		};
 	}
 
-	const reactions = await Reaction.find(query, {
+	const reactions = await NoteReaction.find(query, {
 		limit: ps.limit,
 		skip: ps.offset,
 		sort: sort
diff --git a/src/services/note/reaction/delete.ts b/src/services/note/reaction/delete.ts
index 9735d4ec0..695534db6 100644
--- a/src/services/note/reaction/delete.ts
+++ b/src/services/note/reaction/delete.ts
@@ -1,6 +1,6 @@
 import { IUser, isLocalUser, isRemoteUser } from '../../../models/user';
 import Note, { INote } from '../../../models/note';
-import Reaction from '../../../models/note-reaction';
+import NoteReaction from '../../../models/note-reaction';
 import { publishNoteStream } from '../../stream';
 import renderLike from '../../../remote/activitypub/renderer/like';
 import renderUndo from '../../../remote/activitypub/renderer/undo';
@@ -10,7 +10,7 @@ import { IdentifiableError } from '../../../misc/identifiable-error';
 
 export default async (user: IUser, note: INote) => {
 	// if already unreacted
-	const exist = await Reaction.findOne({
+	const exist = await NoteReaction.findOne({
 		noteId: note._id,
 		userId: user._id,
 		deletedAt: { $exists: false }
@@ -21,7 +21,7 @@ export default async (user: IUser, note: INote) => {
 	}
 
 	// Delete reaction
-	await Reaction.remove({
+	await NoteReaction.remove({
 		_id: exist._id
 	});