diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index 6550aa9f47..aaf7527fe1 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -1125,7 +1125,7 @@ notifyNotes: "새 노트 알림 켜기" unnotifyNotes: "새 노트 알림 끄기" authentication: "인증" showRenotes: "리노트 표시" -edited: "수정됨" +edited: "편집됨" notificationRecieveConfig: "알림 설정" mutualFollow: "맞팔로우" showRepliesToOthersInTimeline: "타임라인에 다른 사람에게 보내는 답글을 포함" diff --git a/packages/backend/migration/1695901659683-note-updated-at.js b/packages/backend/migration/1695901659683-note-updated-at.js deleted file mode 100644 index d8a151a1f7..0000000000 --- a/packages/backend/migration/1695901659683-note-updated-at.js +++ /dev/null @@ -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"`); - } -} diff --git a/packages/backend/migration/1696388600237-revert-note-edit.js b/packages/backend/migration/1696388600237-revert-note-edit.js deleted file mode 100644 index 83bc552c35..0000000000 --- a/packages/backend/migration/1696388600237-revert-note-edit.js +++ /dev/null @@ -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`); - } -} diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts index d175f21f2f..429331c83c 100644 --- a/packages/backend/src/core/GlobalEventService.ts +++ b/packages/backend/src/core/GlobalEventService.ts @@ -115,8 +115,10 @@ export interface NoteEventTypes { deletedAt: Date; }; updated: { - cw: string | null; - text: string; + cw?: string | null; + text?: string | null; + visibility?: string; + updatedAt: Date; }; reacted: { reaction: string; diff --git a/packages/backend/src/core/NoteUpdateService.ts b/packages/backend/src/core/NoteUpdateService.ts index ac0132be36..3f95bbd198 100644 --- a/packages/backend/src/core/NoteUpdateService.ts +++ b/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); diff --git a/packages/backend/src/daemons/ServerStatsService.ts b/packages/backend/src/daemons/ServerStatsService.ts index 2e51b2e618..5c79b5cee7 100644 --- a/packages/backend/src/daemons/ServerStatsService.ts +++ b/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) {