Merge pull request #688 from update-host

MisskeyIO · Aug 12, 2024 · 23760f5 · 23760f5
2 parents 9fbc039 + 1254333
commit 23760f5
Show file tree

Hide file tree

Showing 104 changed files with 6,068 additions and 5,459 deletions.
diff --git a/.github/workflows/api-misskey-js.yml b/.github/workflows/api-misskey-js.yml
@@ -20,7 +20,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           node-version-file: '.node-version'
           cache: 'pnpm'

diff --git a/.github/workflows/docker-beta.yml b/.github/workflows/docker-beta.yml
@@ -34,7 +34,7 @@ jobs:
         run: |
           echo "FORMATTED_BRANCH_NAME=$(echo ${{ github.ref_name }} | sed -e 's/\//-/g' )" >> $GITHUB_ENV
       - name: Build and Push to GitHub Container Registry
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

diff --git a/.github/workflows/docker-host.yml b/.github/workflows/docker-host.yml
@@ -36,7 +36,7 @@ jobs:
         run: |
           echo "FORMATTED_BRANCH_NAME=$(echo ${{ github.ref_name }} | sed -e 's/\//-/g' )" >> $GITHUB_ENV
       - name: Build and Push to GitHub Container Registry
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

diff --git a/.github/workflows/docker-io.yml b/.github/workflows/docker-io.yml
@@ -36,7 +36,7 @@ jobs:
         run: |
           echo "FORMATTED_BRANCH_NAME=$(echo ${{ github.ref_name }} | sed -e 's/\//-/g' )" >> $GITHUB_ENV
       - name: Build and Push to GitHub Container Registry
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

diff --git a/.github/workflows/dockle.yml b/.github/workflows/dockle.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Build an image from Dockerfile
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: false
@@ -24,10 +24,12 @@ jobs:
           tags: |
             misskey:scan
       - name: Run dockle
-        uses: goodwithtech/dockle-action@main
+        uses: docker://goodwithtech/dockle:v0.4.14
+        env:
+          DOCKLE_OUTPUT_FORMAT: list
+          DOCKLE_EXIT_CODE: 1
+          DOCKLE_EXIT_LEVEL: WARN
+          DOCKLE_IGNORES: CIS-DI-0005,CIS-DI-0010
+          DOCKLE_DEBUG: true
         with:
-          image: 'misskey:scan'
-          format: 'list'
-          exit-code: '1'
-          exit-level: 'warn'
-          ignore: 'CIS-DI-0005,CIS-DI-0010'
+          args: 'misskey:scan'
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -31,7 +31,7 @@ jobs:
     - uses: pnpm/action-setup@v4
       with:
         run_install: false
-    - uses: actions/[email protected].2
+    - uses: actions/[email protected].3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -57,7 +57,7 @@ jobs:
     - uses: pnpm/action-setup@v4
       with:
         run_install: false
-    - uses: actions/[email protected].2
+    - uses: actions/[email protected].3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -82,7 +82,7 @@ jobs:
     - uses: pnpm/action-setup@v4
       with:
         run_install: false
-    - uses: actions/[email protected].2
+    - uses: actions/[email protected].3
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'

diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml
@@ -49,7 +49,7 @@ jobs:
     - name: Install FFmpeg
       uses: FedericoCarboni/setup-ffmpeg@v3
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].2
+      uses: actions/[email protected].3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -99,7 +99,7 @@ jobs:
         with:
           run_install: false
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

diff --git a/.github/workflows/test-frontend.yml b/.github/workflows/test-frontend.yml
@@ -39,7 +39,7 @@ jobs:
       with:
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].2
+      uses: actions/[email protected].3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

diff --git a/.github/workflows/test-misskey-js.yml b/.github/workflows/test-misskey-js.yml
@@ -32,7 +32,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

diff --git a/.github/workflows/test-production.yml b/.github/workflows/test-production.yml
@@ -29,7 +29,7 @@ jobs:
       with:
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].2
+      uses: actions/[email protected].3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

diff --git a/.github/workflows/validate-api-json.yml b/.github/workflows/validate-api-json.yml
@@ -30,7 +30,7 @@ jobs:
       with:
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].2
+      uses: actions/[email protected].3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

diff --git a/locales/en-US.yml b/locales/en-US.yml
@@ -593,6 +593,8 @@ unsetUserAvatar: "Unset avatar"
 unsetUserAvatarConfirm: "Are you sure you want to unset the avatar?"
 unsetUserBanner: "Unset banner"
 unsetUserBannerConfirm: "Are you sure you want to unset the banner?"
+unsetUserMutualLink: "Unset mutual link"
+unsetUserMutualLinkConfirm: "Are you sure you want to unset the mutual link?"
 deleteAllFiles: "Delete all files"
 deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
 removeAllFollowing: "Unfollow all followed users"
@@ -1257,6 +1259,7 @@ noDescription: "There is not the explanation"
 alwaysConfirmFollow: "Always confirm when following"
 inquiry: "Contact"
 here: "here"
+mutualLink: "Mutual Link"
 _bubbleGame:
   howToPlay: "How to play"
   hold: "Hold"
@@ -1331,6 +1334,7 @@ _initialAccountSetting:
   startTutorial: "Start Tutorial"
   skipAreYouSure: "Really skip profile setup?"
   laterAreYouSure: "Really do profile setup later?"
+  mustBeSetBotOwner: "The bot account must have an administrator specified. Please select an administrator account from below."
 _initialTutorial:
   launchTutorial: "Start Tutorial"
   title: "Tutorial"
@@ -1754,6 +1758,9 @@ _role:
     canUseTranslator: "Can use Translator"
     avatarDecorationLimit: "Maximum number of avatar decorations that can be applied"
     canUseDriveFileInSoundSettings: "Can use Drive File in Sound Settings"
+    canUseReaction: "Can use reactions"
+    mutualLinkSectionLimit: "Maximum number of mutual link sections"
+    mutualLinkLimit: "Maximum number of mutual links in a section"
   _condition:
     roleAssignedTo: "Assigned to manual roles"
     isLocal: "Local user"
@@ -2104,6 +2111,7 @@ _permissions:
   "write:admin:suspend-user": "Suspend user"
   "write:admin:unset-user-avatar": "Remove user avatar"
   "write:admin:unset-user-banner": "Remove user banner"
+  "write:admin:unset-user-mutual-link": "Remove user mutual link"
   "write:admin:unsuspend-user": "Unsuspend user"
   "write:admin:meta": "Manage instance metadata"
   "write:admin:user-note": "Manage moderation note"
@@ -2255,6 +2263,16 @@ _profile:
   changeBanner: "Change banner"
   verifiedLinkDescription: "By entering an URL that contains a link to your profile here, an ownership verification icon can be displayed next to the field."
   avatarDecorationMax: "You can add up to {max} decorations."
+  mutualLinksEdit: "Edit mutual links"
+  mutualLinksBanner: "Banner of mutual links"
+  mutualLinksDescriptionEdit: "Description"
+  mutualLinksUrl: "URL of the link"
+  mutualLinksDescription: "Mutual links are displayed as banners on your profile."
+  addMutualLink: "Add mutual link"
+  addMutualLinkSection: "Add section"
+  sectionName: "Section name"
+  sectionNameNoneDescription: "Do not display the section name"
+  sectionNameNone: "Hide section name"
 _exportOrImport:
   allNotes: "All notes"
   favoritedNotes: "Favorite notes"

diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -2400,6 +2400,14 @@ export interface Locale extends ILocale {
      * バナーを解除しますか？
      */
     "unsetUserBannerConfirm": string;
+    /**
+     * 相互リンクを削除
+     */
+    "unsetUserMutualLink": string;
+    /**
+     * 相互リンクを削除しますか？
+     */
+    "unsetUserMutualLinkConfirm": string;
     /**
      * すべてのファイルを削除
      */
@@ -5083,6 +5091,10 @@ export interface Locale extends ILocale {
      * こちら
      */
     "here": string;
+    /**
+     * 相互リンク
+     */
+    "mutualLink": string;
     "_bubbleGame": {
         /**
          * 遊び方
@@ -5347,6 +5359,10 @@ export interface Locale extends ILocale {
          * 初期設定をあとでやり直しますか？
          */
         "laterAreYouSure": string;
+        /**
+         * Botアカウントは管理者を必ず記載する必要があります。以下から管理者のアカウントを選択してください。
+         */
+        "mustBeSetBotOwner": string;
     };
     "_initialTutorial": {
         /**
@@ -6852,10 +6868,22 @@ export interface Locale extends ILocale {
              * サウンド設定でドライブのファイルを利用
              */
             "canUseDriveFileInSoundSettings": string;
+            /**
+             * リアクションの利用
+             */
+            "canUseReaction": string;
             /**
              * アイコンデコレーションの最大取付個数
              */
             "avatarDecorationLimit": string;
+            /**
+             * 相互リンクのセクションの最大数
+             */
+            "mutualLinkSectionLimit": string;
+            /**
+             * セクション内の相互リンクの最大数
+             */
+            "mutualLinkLimit": string;
         };
         "_condition": {
             /**
@@ -8204,6 +8232,10 @@ export interface Locale extends ILocale {
          * ユーザーのバーナーを削除する
          */
         "write:admin:unset-user-banner": string;
+        /**
+         * ユーザーの相互リンクを削除する
+         */
+        "write:admin:unset-user-mutual-link": string;
         /**
          * ユーザーの凍結を解除する
          */
@@ -8790,6 +8822,46 @@ export interface Locale extends ILocale {
          * 最大{max}つまでデコレーションを付けられます。
          */
         "avatarDecorationMax": ParameterizedString<"max">;
+        /**
+         * 相互リンクを編集
+         */
+        "mutualLinksEdit": string;
+        /**
+         * 相互リンクのバナー
+         */
+        "mutualLinksBanner": string;
+        /**
+         * 説明
+         */
+        "mutualLinksDescriptionEdit": string;
+        /**
+         * リンク先のURL
+         */
+        "mutualLinksUrl": string;
+        /**
+         * 相互リンクを設定すると、あなたのプロフィールにバナーが表示されます。
+         */
+        "mutualLinksDescription": string;
+        /**
+         * 相互リンクを追加
+         */
+        "addMutualLink": string;
+        /**
+         * セクションを追加
+         */
+        "addMutualLinkSection": string;
+        /**
+         * セクション名
+         */
+        "sectionName": string;
+        /**
+         * セクション名を表示しないようにする
+         */
+        "sectionNameNoneDescription": string;
+        /**
+         * セクション名を表示しない
+         */
+        "sectionNameNone": string;
     };
     "_exportOrImport": {
         /**

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -596,6 +596,8 @@ unsetUserAvatar: "アイコンを解除"
 unsetUserAvatarConfirm: "アイコンを解除しますか？"
 unsetUserBanner: "バナーを解除"
 unsetUserBannerConfirm: "バナーを解除しますか？"
+unsetUserMutualLink: "相互リンクを削除"
+unsetUserMutualLinkConfirm: "相互リンクを削除しますか？"
 deleteAllFiles: "すべてのファイルを削除"
 deleteAllFilesConfirm: "すべてのファイルを削除しますか？"
 removeAllFollowing: "フォローを全解除"
@@ -1266,6 +1268,7 @@ reportComplete: "通報完了"
 blockThisUser: "このユーザーをブロックする"
 muteThisUser: "このユーザーをミュートする"
 here: "こちら"
+mutualLink: "相互リンク"
 
 _bubbleGame:
   howToPlay: "遊び方"
@@ -1339,6 +1342,7 @@ _initialAccountSetting:
   startTutorial: "チュートリアルを開始"
   skipAreYouSure: "初期設定をスキップしますか？"
   laterAreYouSure: "初期設定をあとでやり直しますか？"
+  mustBeSetBotOwner: "Botアカウントは管理者を必ず記載する必要があります。以下から管理者のアカウントを選択してください。"
 
 _initialTutorial:
   launchTutorial: "チュートリアルを見る"
@@ -1768,7 +1772,10 @@ _role:
     canSearchNotes: "ノート検索の利用"
     canUseTranslator: "翻訳機能の利用"
     canUseDriveFileInSoundSettings: "サウンド設定でドライブのファイルを利用"
+    canUseReaction: "リアクションの利用"
     avatarDecorationLimit: "アイコンデコレーションの最大取付個数"
+    mutualLinkSectionLimit: "相互リンクのセクションの最大数"
+    mutualLinkLimit: "セクション内の相互リンクの最大数"
   _condition:
     roleAssignedTo: "マニュアルロールにアサイン済み"
     isLocal: "ローカルユーザー"
@@ -2150,6 +2157,7 @@ _permissions:
   "write:admin:suspend-user": "ユーザーを凍結する"
   "write:admin:unset-user-avatar": "ユーザーのアバターを削除する"
   "write:admin:unset-user-banner": "ユーザーのバーナーを削除する"
+  "write:admin:unset-user-mutual-link": "ユーザーの相互リンクを削除する"
   "write:admin:unsuspend-user": "ユーザーの凍結を解除する"
   "write:admin:meta": "インスタンスのメタデータを操作する"
   "write:admin:user-note": "モデレーションノートを操作する"
@@ -2311,6 +2319,16 @@ _profile:
   changeBanner: "バナー画像を変更"
   verifiedLinkDescription: "内容にURLを設定すると、リンク先のWebサイトに自分のプロフィールへのリンクが含まれている場合に所有者確認済みアイコンを表示させることができます。"
   avatarDecorationMax: "最大{max}つまでデコレーションを付けられます。"
+  mutualLinksEdit: "相互リンクを編集"
+  mutualLinksBanner: "相互リンクのバナー"
+  mutualLinksDescriptionEdit: "説明"
+  mutualLinksUrl: "リンク先のURL"
+  mutualLinksDescription: "相互リンクを設定すると、あなたのプロフィールにバナーが表示されます。"
+  addMutualLink: "相互リンクを追加"
+  addMutualLinkSection: "セクションを追加"
+  sectionName: "セクション名"
+  sectionNameNoneDescription: "セクション名を表示しないようにする"
+  sectionNameNone: "セクション名を表示しない"
 
 _exportOrImport:
   allNotes: "全てのノート"