5 files changed, 15 insertions, 13 deletions
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 563eaac758..7c7e8d9a08 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -247,7 +247,7 @@ export default async (user: User, data: Option, silent = false) => new Promise<N
 		for (const u of us) {
 			checkWordMute(note, { id: u.userId }, u.mutedWords).then(shouldMute => {
 				if (shouldMute) {
-					MutedNotes.save({
+					MutedNotes.insert({
 						id: genId(),
 						userId: u.userId,
 						noteId: note.id,
diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts
index bfcaaa09be..b4ce03ab60 100644
--- a/src/services/note/polls/vote.ts
+++ b/src/services/note/polls/vote.ts
@@ -29,7 +29,7 @@ export default async function(user: User, note: Note, choice: number) {
 	}
 
 	// Create vote
-	await PollVotes.save({
+	await PollVotes.insert({
 		id: genId(),
 		createdAt: new Date(),
 		noteId: note.id,
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts
index 6c0a852f34..897c816de8 100644
--- a/src/services/note/reaction/create.ts
+++ b/src/services/note/reaction/create.ts
@@ -18,17 +18,17 @@ export default async (user: User, note: Note, reaction?: string) => {
 	// TODO: cache
 	reaction = await toDbReaction(reaction, user.host);
 
-	let record: NoteReaction;
+	let record: NoteReaction = {
+		id: genId(),
+		createdAt: new Date(),
+		noteId: note.id,
+		userId: user.id,
+		reaction
+	};
 
 	// Create reaction
 	try {
-		record = await NoteReactions.save({
-			id: genId(),
-			createdAt: new Date(),
-			noteId: note.id,
-			userId: user.id,
-			reaction
-		});
+		await NoteReactions.insert(record);
 	} catch (e) {
 		if (isDuplicateKeyValueError(e)) {
 			record = await NoteReactions.findOneOrFail({
diff --git a/src/services/note/unread.ts b/src/services/note/unread.ts
index 6fd9ee2cfe..8e6fb4abe8 100644
--- a/src/services/note/unread.ts
+++ b/src/services/note/unread.ts
@@ -17,7 +17,7 @@ export default async function(userId: User['id'], note: Note, params: {
 	if (mute.map(m => m.muteeId).includes(note.userId)) return;
 	//#endregion
 
-	const unread = await NoteUnreads.save({
+	const unread = {
 		id: genId(),
 		noteId: note.id,
 		userId: userId,
@@ -25,7 +25,9 @@ export default async function(userId: User['id'], note: Note, params: {
 		isMentioned: params.isMentioned,
 		noteChannelId: note.channelId,
 		noteUserId: note.userId,
-	});
+	};
+
+	await NoteUnreads.insert(unread);
 
 	// 2秒経っても既読にならなかったら「未読の投稿がありますよ」イベントを発行する
 	setTimeout(async () => {
diff --git a/src/services/note/watch.ts b/src/services/note/watch.ts
index d3c9553696..966b7f0054 100644
--- a/src/services/note/watch.ts
+++ b/src/services/note/watch.ts
@@ -10,7 +10,7 @@ export default async (me: User['id'], note: Note) => {
 		return;
 	}
 
-	await NoteWatchings.save({
+	await NoteWatchings.insert({
 		id: genId(),
 		createdAt: new Date(),
 		noteId: note.id,