Fix missing merged contents

locales/ko-KR.yml

@@ -1125,7 +1125,7 @@ notifyNotes: "새 노트 알림 켜기"
 unnotifyNotes: "새 노트 알림 끄기"
 authentication: "인증"
 showRenotes: "리노트 표시"
-edited: "수정됨"
+edited: "편집됨"
 notificationRecieveConfig: "알림 설정"
 mutualFollow: "맞팔로우"
 showRepliesToOthersInTimeline: "타임라인에 다른 사람에게 보내는 답글을 포함"

packages/backend/migration/1695901659683-note-updated-at.js

@@ -1,11 +0,0 @@
-export class NoteUpdatedAt1695901659683 {
-    name = 'NoteUpdatedAt1695901659683'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "updatedAt"`);
-    }
-}

packages/backend/migration/1696388600237-revert-note-edit.js

@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and other misskey contributors
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export class RevertNoteEdit1696388600237 {
-    name = 'RevertNoteEdit1696388600237'
-
-    async up(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "updatedAt"`);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`ALTER TABLE "note" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`);
-    }
-}

packages/backend/src/core/GlobalEventService.ts

@@ -115,8 +115,10 @@ export interface NoteEventTypes {
 		deletedAt: Date;
 	};
 	updated: {
-		cw: string | null;
+		cw?: string | null;
-		text: string;
+		text?: string | null;
+		visibility?: string;
+		updatedAt: Date;
 	};
 	reacted: {
 		reaction: string;

packages/backend/src/core/NoteUpdateService.ts

@@ -62,7 +62,7 @@ export class NoteUpdateService implements OnApplicationShutdown {
 	) {}
 
 	@bindThis
-	public async update(user: { id: MiUser['id']; uri: MiUser['uri']; host: MiUser['host']; username: MiUser['username']; isBot: MiUser['isBot']; createdAt: MiUser['createdAt']; }, note: MiNote, data: Option, silent = false) {
+	public async update(user: { id: MiUser['id']; uri: MiUser['uri']; host: MiUser['host']; username: MiUser['username']; isBot: MiUser['isBot']; }, note: MiNote, data: Option, silent = false) {
 		this.globalEventService.publishNoteStream(note.id, 'updated', data);
 
 		if (data.visibility !== undefined) {
@@ -111,7 +111,6 @@ export class NoteUpdateService implements OnApplicationShutdown {
 		host: MiUser['host'];
 		username: MiUser['username'];
 		isBot: MiUser['isBot'];
-		createdAt: MiUser['createdAt'];
 	}, silent: boolean) {
 		if (!silent) {
 			if (this.userEntityService.isLocalUser(user)) this.activeUsersChart.write(user);

packages/backend/src/daemons/ServerStatsService.ts

@@ -11,7 +11,7 @@ import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { MetaService } from '@/core/MetaService.js';
-import { StreamMessages } from '@/server/api/stream/types.js';
+import type { GlobalEvents } from '@/core/GlobalEventService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
 const ev = new Xev();
@@ -39,7 +39,7 @@ export class ServerStatsService implements OnApplicationShutdown {
 		const obj = JSON.parse(data);
 
 		if (obj.channel === 'internal') {
-			const { type, body } = obj.message as StreamMessages['internal']['payload'];
+			const { type, body } = obj.message as GlobalEvents['internal']['payload'];
 			switch (type) {
 				case 'metaUpdated': {
 					if (body.enableServerMachineStats === true) {