Merge changes from old repository

nekoplanet#13 Add changelog by @HotoRas
2215de5 by @HotoRas
c645e8f by @HotoRas
nekoplanet#15 노트 수정 기능 부활 (3트) by @HotoRas
nekoplanet#16 Feat: "다른 계정 추가" 버튼 아래에 "새 계정 추가" 버튼이 살아 있어서 지웠습니다 by @HotoRas
nekoplanet#17 Typecheck Fix by @janghoseo
nekoplanet#21 Fix note edit 2 by @HotoRas

Changelog-neko.md

@@ -0,0 +1,19 @@
+## Unreleased
+
+### General
+- Fix: 프론트엔드의 타입 이슈
+- Revert: s3 설정을 설정 파일로 옮김 (취소됨: MisskeyIO#104)
+- Feat: 노트 수정 기능 부활 (Code cherry-picked from cherrypick)
+
+### Client
+- Revert: s3 설정 페이지를 관리 페이지 하위에서 삭제 (취소됨: MisskeyIO#104)
+
+### Backend
+
+### Frontend
+- Feat: "다른 계정 추가" 버튼 아래에 "새 계정 추가" 버튼이 살아 있어서 지웠습니다
+
+### misskey-js
+
+### develop
+- QoL: `misskey-js`의 갱신과 이를 적용한 전체 빌드의 자동화 스크립트 추가

locales/en-US.yml

@@ -657,6 +657,7 @@ tokenRequested: "Grant access to account"
 pluginTokenRequestedDescription: "This plugin will be able to use the permissions set here."
 notificationType: "Notification type"
 edit: "Edit"
+editConfirm: "Edit note? Some remote servers won't properly display the edited content."
 emailServer: "Email server"
 enableEmail: "Enable email distribution"
 emailConfigInfo: "Used to confirm your email during sign-up or if you forget your password"

locales/index.d.ts

@@ -2644,6 +2644,10 @@ export interface Locale extends ILocale {
      * 編集
      */
     "edit": string;
+    /**
+     * ノートを修正しますか？連合するサーバーによっては、修正後のノートが正常に表示されない場合があります。
+     */
+    "editConfirm": string;
     /**
      * メールサーバー
      */

locales/ja-JP.yml

@@ -657,6 +657,7 @@ tokenRequested: "アカウントへのアクセス許可"
 pluginTokenRequestedDescription: "このプラグインはここで設定した権限を行使できるようになります。"
 notificationType: "通知の種類"
 edit: "編集"
+editConfirm: "ノートを修正しますか？連合するサーバーによっては、修正後のノートが正常に表示されない場合があります。"
 emailServer: "メールサーバー"
 enableEmail: "メール配信機能を有効化する"
 emailConfigInfo: "メールアドレスの確認やパスワードリセットの際に使います"

locales/ko-KR.yml

@@ -651,6 +651,7 @@ tokenRequested: "계정 접근 허용"
 pluginTokenRequestedDescription: "이 플러그인은 여기서 설정한 권한을 사용할 수 있게 됩니다."
 notificationType: "알림 유형"
 edit: "편집"
+editConfirm: "노트를 수정하시겠습니까? 연합되는 서버에 따라 수정 후의 노트가 정상적으로 표시되지 않을 수 있습니다."
 emailServer: "메일 서버"
 enableEmail: "이메일 송신 기능 활성화"
 emailConfigInfo: "가입 시 메일 주소 확인이나 비밀번호 초기화 시에 사용합니다."

package.json

@@ -75,4 +75,4 @@
 	"optionalDependencies": {
 		"@tensorflow/tfjs-core": "4.4.0"
 	}
-}
+}

packages/backend/migration/1720853122058-RevRevertNoteEdit.js

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class RevRevertNoteEdit1720853122058 {
+    name = 'RevRevertNoteEdit1720853122058'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`);
+        await queryRunner.query(`ALTER TABLE "note" ADD "updatedAtHistory" TIMESTAMP WITH TIME ZONE ARRAY`);
+        await queryRunner.query(`ALTER TABLE "note" ADD "noteEditHistory" character varying array`)
+    }
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note" DROP COLUMN "updatedAt"`);
+        await queryRunner.query(`ALTER TABLE "note" DROP "updatedAtHistory" TIMESTAMP WITH TIME ZONE ARRAY`);
+        await queryRunner.query(`ALTER TABLE "note" DROP "noteEditHistory"`)
+    }
+
+}

packages/backend/src/config.ts

@@ -129,6 +129,14 @@ export type Config = {
 		index: string;
 		scope?: 'local' | 'global' | string[];
 	} | undefined;
+	skebStatus: {
+		method: string;
+		endpoint: string;
+		headers: { [x: string]: string };
+		parameters: { [x: string]: string };
+		userIdParameterName: string;
+		roleId: string;
+	} | undefined;
 	proxy: string | undefined;
 	proxySmtp: string | undefined;
 	proxyBypassHosts: string[] | undefined;

packages/backend/src/core/CoreModule.ts

@@ -41,6 +41,7 @@ import { MetaService } from './MetaService.js';
 import { MfmService } from './MfmService.js';
 import { ModerationLogService } from './ModerationLogService.js';
 import { NoteCreateService } from './NoteCreateService.js';
+import { NoteUpdateService } from './NoteUpdateService.js';
 import { NoteDeleteService } from './NoteDeleteService.js';
 import { NotePiningService } from './NotePiningService.js';
 import { NoteReadService } from './NoteReadService.js';
@@ -183,6 +184,7 @@ const $MetaService: Provider = { provide: 'MetaService', useExisting: MetaServic
 const $MfmService: Provider = { provide: 'MfmService', useExisting: MfmService };
 const $ModerationLogService: Provider = { provide: 'ModerationLogService', useExisting: ModerationLogService };
 const $NoteCreateService: Provider = { provide: 'NoteCreateService', useExisting: NoteCreateService };
+const $NoteUpdateService: Provider = { provide: 'NoteUpdateService', useExisting: NoteUpdateService };
 const $NoteDeleteService: Provider = { provide: 'NoteDeleteService', useExisting: NoteDeleteService };
 const $NotePiningService: Provider = { provide: 'NotePiningService', useExisting: NotePiningService };
 const $NoteReadService: Provider = { provide: 'NoteReadService', useExisting: NoteReadService };
@@ -331,6 +333,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		MfmService,
 		ModerationLogService,
 		NoteCreateService,
+		NoteUpdateService,
 		NoteDeleteService,
 		NotePiningService,
 		NoteReadService,
@@ -475,6 +478,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$MfmService,
 		$ModerationLogService,
 		$NoteCreateService,
+		$NoteUpdateService,
 		$NoteDeleteService,
 		$NotePiningService,
 		$NoteReadService,
@@ -620,6 +624,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		MfmService,
 		ModerationLogService,
 		NoteCreateService,
+		NoteUpdateService,
 		NoteDeleteService,
 		NotePiningService,
 		NoteReadService,
@@ -763,6 +768,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$MfmService,
 		$ModerationLogService,
 		$NoteCreateService,
+		$NoteUpdateService,
 		$NoteDeleteService,
 		$NotePiningService,
 		$NoteReadService,