retrive old changes

.node-version

@@ -1 +1 @@
-20.16.0
+22.5.1

Changelog-neko.md

@@ -0,0 +1,18 @@
+## Unreleased
+
+### General
+- Fix: 프론트엔드의 타입 이슈
+- Feat: 노트 수정 기능 부활 (Code cherry-picked from cherrypick)
+
+### Client
+
+### Backend
+
+### Frontend
+- Feat: "다른 계정 추가" 버튼 아래에 "새 계정 추가" 버튼이 살아 있어서 지웠습니다
+- Fix (test): 회원가입 관련 테스트 삭제
+
+### misskey-js
+
+### develop
+- QoL: `misskey-js`의 갱신과 이를 적용한 전체 빌드의 자동화 스크립트 추가

chart/files/default.yml

@@ -208,6 +208,9 @@ id: "aidx"
 # Media Proxy
 #mediaProxy: https://example.com/proxy
 
+# Proxy remote files (default: true)
+proxyRemoteFiles: true
+
 # Sign to ActivityPub GET request (default: true)
 signToActivityPubGet: true
 

cypress/e2e/basic.cy.ts

@@ -49,49 +49,6 @@ describe('After setup instance', () => {
 
   it('successfully loads', () => {
     cy.visitHome();
-  });
-
-	it('signup', () => {
-		cy.visitHome();
-
-		cy.intercept('POST', '/api/signup').as('signup');
-
-		cy.get('[data-cy-signup]').click();
-		cy.get('[data-cy-signup-rules-continue]').should('be.disabled');
-		cy.get('[data-cy-signup-rules-notes-agree] [data-cy-switch-toggle]').click();
-		cy.get('[data-cy-modal-dialog-ok]').click();
-		cy.get('[data-cy-signup-rules-continue]').should('not.be.disabled');
-		cy.get('[data-cy-signup-rules-continue]').click();
-
-		cy.get('[data-cy-signup-submit]').should('be.disabled');
-		cy.get('[data-cy-signup-username] input').type('alice');
-		cy.get('[data-cy-signup-submit]').should('be.disabled');
-		cy.get('[data-cy-signup-password] input').type('alice1234');
-		cy.get('[data-cy-signup-submit]').should('be.disabled');
-		cy.get('[data-cy-signup-password-retype] input').type('alice1234');
-		cy.get('[data-cy-signup-submit]').should('not.be.disabled');
-		cy.get('[data-cy-signup-submit]').click();
-
-		cy.wait('@signup');
-  });
-
-  it('signup with duplicated username', () => {
-		cy.registerUser('alice', 'alice1234');
-
-		cy.visitHome();
-
-		// ユーザー名が重複している場合の挙動確認
-		cy.get('[data-cy-signup]').click();
-		cy.get('[data-cy-signup-rules-continue]').should('be.disabled');
-		cy.get('[data-cy-signup-rules-notes-agree] [data-cy-switch-toggle]').click();
-		cy.get('[data-cy-modal-dialog-ok]').click();
-		cy.get('[data-cy-signup-rules-continue]').should('not.be.disabled');
-		cy.get('[data-cy-signup-rules-continue]').click();
-
-		cy.get('[data-cy-signup-username] input').type('alice');
-		cy.get('[data-cy-signup-password] input').type('alice1234');
-		cy.get('[data-cy-signup-password-retype] input').type('alice1234');
-		cy.get('[data-cy-signup-submit]').should('be.disabled');
   });
 });
 

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"
@@ -1263,6 +1264,7 @@ confirmWhenRevealingSensitiveMedia: "Confirm when revealing sensitive media"
 sensitiveMediaRevealConfirm: "This might be a sensitive media. Are you sure to reveal?"
 createdLists: "Created lists"
 createdAntennas: "Created antennas"
+noteUpdatedAt: "Edited: {date} {time}"
 _delivery:
   status: "Delivery status"
   stop: "Suspended"
@@ -1706,6 +1708,7 @@ _role:
     gtlAvailable: "Can view the global timeline"
     ltlAvailable: "Can view the local timeline"
     canPublicNote: "Can send public notes"
+    canEditNote: "Note editing"
     mentionMax: "Maximum number of mentions in a note"
     canInvite: "Can create instance invite codes"
     inviteLimit: "Invite limit"

locales/index.d.ts

@@ -2644,6 +2644,10 @@ export interface Locale extends ILocale {
      * 編集
      */
     "edit": string;
+    /**
+     * ノートを修正しますか？連合するサーバーによっては、修正後のノートが正常に表示されない場合があります。
+     */
+    "editConfirm": string;
     /**
      * メールサーバー
      */
@@ -5068,6 +5072,10 @@ export interface Locale extends ILocale {
      * 作成したアンテナ
      */
     "createdAntennas": string;
+    /**
+     * 編集済み: {date} {time}
+     */
+    "noteUpdatedAt": ParameterizedString<"date" | "time">;
     "_delivery": {
         /**
          * 配信状態
@@ -6642,6 +6650,10 @@ export interface Locale extends ILocale {
              * パブリック投稿の許可
              */
             "canPublicNote": string;
+            /**
+             * ノートの編集
+             */
+            "canEditNote": string;
             /**
              * ノート内の最大メンション数
              */

locales/ja-JP.yml

@@ -657,6 +657,7 @@ tokenRequested: "アカウントへのアクセス許可"
 pluginTokenRequestedDescription: "このプラグインはここで設定した権限を行使できるようになります。"
 notificationType: "通知の種類"
 edit: "編集"
+editConfirm: "ノートを修正しますか？連合するサーバーによっては、修正後のノートが正常に表示されない場合があります。"
 emailServer: "メールサーバー"
 enableEmail: "メール配信機能を有効化する"
 emailConfigInfo: "メールアドレスの確認やパスワードリセットの際に使います"
@@ -1263,6 +1264,7 @@ confirmWhenRevealingSensitiveMedia: "センシティブなメディアを表示
 sensitiveMediaRevealConfirm: "センシティブなメディアです。表示しますか？"
 createdLists: "作成したリスト"
 createdAntennas: "作成したアンテナ"
+noteUpdatedAt: "編集済み: {date} {time}"
 
 _delivery:
   status: "配信状態"
@@ -1717,6 +1719,7 @@ _role:
     gtlAvailable: "グローバルタイムラインの閲覧"
     ltlAvailable: "ローカルタイムラインの閲覧"
     canPublicNote: "パブリック投稿の許可"
+    canEditNote: "ノートの編集"
     mentionMax: "ノート内の最大メンション数"
     canInvite: "サーバー招待コードの発行"
     inviteLimit: "招待コードの作成可能数"

locales/ko-KR.yml

@@ -651,6 +651,7 @@ tokenRequested: "계정 접근 허용"
 pluginTokenRequestedDescription: "이 플러그인은 여기서 설정한 권한을 사용할 수 있게 됩니다."
 notificationType: "알림 유형"
 edit: "편집"
+editConfirm: "노트를 수정하시겠습니까? 연합되는 서버에 따라 수정 후의 노트가 정상적으로 표시되지 않을 수 있습니다."
 emailServer: "메일 서버"
 enableEmail: "이메일 송신 기능 활성화"
 emailConfigInfo: "가입 시 메일 주소 확인이나 비밀번호 초기화 시에 사용합니다."
@@ -1249,6 +1250,7 @@ alwaysConfirmFollow: "팔로우일 때 항상 확인하기"
 inquiry: "문의하기"
 tryAgain: "다시 시도해 주세요."
 confirmWhenRevealingSensitiveMedia: "민감한 미디어를 열 때 두 번 확인"
+noteUpdatedAt: "편집됨: {date} {time}"
 _delivery:
   status: "전송 상태"
   stop: "정지됨"
@@ -1692,6 +1694,7 @@ _role:
     gtlAvailable: "글로벌 타임라인 보이기"
     ltlAvailable: "로컬 타임라인 보이기"
     canPublicNote: "공개 노트 허용"
+    canEditNote: "노트 편집 허용"
     mentionMax: "노트에 넣을 수 있는 멘션 수"
     canInvite: "서버 초대 코드 발행"
     inviteLimit: "초대 한도"

package.json

@@ -22,6 +22,13 @@
 		"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
 		"build-storybook": "pnpm --filter frontend build-storybook",
 		"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json --no-build && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
+		"update-misskey-js-and-build": "pnpm build-misskey-js-with-types && pnpm -r build && pnpm build-assets",
+		"update-mjs": "pnpm update-misskey-js-and-build",
+
+		"backend:build": "pnpm build-pre && pnpm --filter backend build",
+		"frontend:build": "pnpm build-pre && pnpm build-storybook && pnpm --filter frontend build && pnpm build-assets",
+		"misskey-js:build": "pnpm build-misskey-js-with-types",
+
 		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
 		"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
 		"init": "pnpm migrate",
@@ -67,12 +74,12 @@
 		"@typescript-eslint/parser": "7.17.0",
 		"cross-env": "7.0.3",
 		"cypress": "13.13.1",
-		"eslint": "9.8.0",
+		"eslint": "8.57.0",
 		"globals": "15.8.0",
 		"ncp": "2.0.0",
 		"start-server-and-test": "2.0.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" IF NOT EXIST "updatedAt" ADD "updatedAt" TIMESTAMP WITH TIME ZONE`);
+        await queryRunner.query(`ALTER TABLE "note" IF NOT EXIST "updatedAtHistory" ADD "updatedAtHistory" TIMESTAMP WITH TIME ZONE ARRAY`);
+        await queryRunner.query(`ALTER TABLE "note" IF NOT EXIST "noteEditHistory" ADD "noteEditHistory" character varying array`)
+    }
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note" IF EXISTS "updatedAt" DROP COLUMN "updatedAt"`);
+        await queryRunner.query(`ALTER TABLE "note" IF EXISTS "updatedAt" DROP "updatedAtHistory"`);
+        await queryRunner.query(`ALTER TABLE "note" IF EXISTS "updatedAt" DROP "noteEditHistory"`)
+    }
+
+}

packages/backend/migration/1723585019082-noteCreatedAtMissing.js

@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+// 1723585019082-noteCreatedAtMissing.js
+export class NoteCreatedAtMissing1723585019082 {
+    name = 'NoteCreatedAtMissing1723585019082'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note" IF NOT EXIST "createdAt" ADD "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()`);
+    }
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "note" IF EXISTS "createdAt" DROP COLUMN "createdAt"`);
+    }
+
+}

packages/backend/migration/1724072711475-NoteEdit.js

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