packages/backend/src/core/NoteEditService.ts

@@ -241,14 +241,6 @@ export class NoteEditService implements OnApplicationShutdown {
 			throw new Error('not the author');
 		}
 
-		// we never want to change the replyId, so fetch the original "parent"
-		if (oldnote.replyId) {
-			data.reply = await this.notesRepository.findOneBy({ id: oldnote.replyId });
-		}
-		else {
-			data.reply = undefined;
-		}
-
 		// チャンネル外にリプライしたら対象のスコープに合わせる
 		// (クライアントサイドでやっても良い処理だと思うけどとりあえずサーバーサイドで)
 		if (data.reply && data.channel && data.reply.channelId !== data.channel.id) {
@@ -443,7 +435,7 @@ export class NoteEditService implements OnApplicationShutdown {
 				id: oldnote.id,
 				updatedAt: data.updatedAt ? data.updatedAt : new Date(),
 				fileIds: data.files ? data.files.map(file => file.id) : [],
-				replyId: oldnote.replyId,
+				replyId: data.reply ? data.reply.id : null,
 				renoteId: data.renote ? data.renote.id : null,
 				channelId: data.channel ? data.channel.id : null,
 				threadId: data.reply

packages/backend/src/core/NoteReadService.ts

@@ -66,11 +66,7 @@ export class NoteReadService implements OnApplicationShutdown {
 			noteUserId: note.userId,
 		};
 
-		/* we may be called from NoteEditService, for a note that's
-			already present in the `note_unread` table: `upsert` makes sure
-			we don't throw a "duplicate key" error, while still updating
-			the other columns if they've changed */
-		await this.noteUnreadsRepository.upsert(unread,['userId', 'noteId']);
+		await this.noteUnreadsRepository.insert(unread);
 
 		// 2秒経っても既読にならなかったら「未読の投稿がありますよ」イベントを発行する
 		setTimeout(2000, 'unread note', { signal: this.#shutdownController.signal }).then(async () => {

packages/frontend/src/components/MkNoteSub.vue

@@ -141,7 +141,7 @@ const replies = ref<Misskey.entities.Note[]>([]);
 const isRenote = (
 	props.note.renote != null &&
 	props.note.text == null &&
-	props.note.fileIds && props.note.fileIds.length === 0 &&
+	props.note.fileIds.length === 0 &&
 	props.note.poll == null
 );
 
@@ -211,7 +211,7 @@ function react(viaKeyboard = false): void {
 		}
 	} else {
 		blur();
-		reactionPicker.show(reactButton.value ?? null, props.note, reaction => {
+		reactionPicker.show(reactButton.value, reaction => {
 			misskeyApi('notes/reactions/create', {
 				noteId: props.note.id,
 				reaction: reaction,

packages/frontend/src/components/SkNoteSub.vue

@@ -155,7 +155,7 @@ const replies = ref<Misskey.entities.Note[]>([]);
 const isRenote = (
 	props.note.renote != null &&
 	props.note.text == null &&
-	props.note.fileIds && props.note.fileIds.length === 0 &&
+	props.note.fileIds.length === 0 &&
 	props.note.poll == null
 );
 
@@ -225,7 +225,7 @@ function react(viaKeyboard = false): void {
 		}
 	} else {
 		blur();
-		reactionPicker.show(reactButton.value ?? null, props.note, reaction => {
+		reactionPicker.show(reactButton.value, reaction => {
 			misskeyApi('notes/reactions/create', {
 				noteId: props.note.id,
 				reaction: reaction,