Merge pull request #685 from rel-2024.5.0-io.2

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"

locales/index.d.ts

@@ -2401,11 +2401,11 @@ export interface Locale extends ILocale {
      */
     "unsetUserBannerConfirm": string;
     /**
-     * 相互リンクを解除
+     * 相互リンクを削除
      */
     "unsetUserMutualLink": string;
     /**
-     * 相互リンクを解除しますか？
+     * 相互リンクを削除しますか？
      */
     "unsetUserMutualLinkConfirm": string;
     /**
@@ -5095,14 +5095,6 @@ export interface Locale extends ILocale {
      * 相互リンク
      */
     "mutualLink": string;
-    /**
-     * このユーザーのバナー
-     */
-    "mutualBannerThisUser": string;
-    /**
-     * 最大
-     */
-    "maximum": string;
     "_bubbleGame": {
         /**
          * 遊び方
@@ -8846,10 +8838,6 @@ export interface Locale extends ILocale {
          * リンク先のURL
          */
         "mutualLinksUrl": string;
-        /**
-         * このセクションをプロフィールにピン留め
-         */
-        "mutualLinkPining": string;
         /**
          * 相互リンクを設定すると、あなたのプロフィールにバナーが表示されます。
          */

locales/ja-JP.yml

@@ -1269,8 +1269,6 @@ blockThisUser: "このユーザーをブロックする"
 muteThisUser: "このユーザーをミュートする"
 here: "こちら"
 mutualLink: "相互リンク"
-mutualBannerThisUser: "このユーザーのバナー"
-maximum: "最大"
 
 _bubbleGame:
   howToPlay: "遊び方"
@@ -2325,7 +2323,6 @@ _profile:
   mutualLinksBanner: "相互リンクのバナー"
   mutualLinksDescriptionEdit: "説明"
   mutualLinksUrl: "リンク先のURL"
-  mutualLinkPining: "このセクションをプロフィールにピン留め"
   mutualLinksDescription: "相互リンクを設定すると、あなたのプロフィールにバナーが表示されます。"
   addMutualLink: "相互リンクを追加"
   addMutualLinkSection: "セクションを追加"

locales/ko-KR.yml

@@ -592,6 +592,8 @@ unsetUserAvatar: "아바타 제거"
 unsetUserAvatarConfirm: "아바타를 제거할까요?"
 unsetUserBanner: "배너 제거"
 unsetUserBannerConfirm: "배너를 제거할까요?"
+unsetUserMutualLink: "서로링크 삭제"
+unsetUserMutualLinkConfirm: "서로링크를 삭제할까요?"
 deleteAllFiles: "모든 파일 삭제"
 deleteAllFilesConfirm: "모든 파일을 삭제하시겠습니까?"
 removeAllFollowing: "모든 팔로잉 해제"
@@ -1250,6 +1252,7 @@ useBackupCode: "백업 코드 사용"
 launchApp: "앱 실행"
 useNativeUIForVideoAudioPlayer: "브라우저 UI에서 미디어 재생"
 here: "여기"
+mutualLink: "서로링크"
 _bubbleGame:
   howToPlay: "설명"
   hold: "홀드"
@@ -1324,6 +1327,7 @@ _initialAccountSetting:
   startTutorial: "튜토리얼 시작"
   skipAreYouSure: "초기 설정을 중단하시겠습니까?"
   laterAreYouSure: "초기 설정을 나중에 진행하시겠습니까?"
+  mustBeSetBotOwner: "봇 계정은 반드시 관리자를 지정해야 합니다. 아래에서 관리자 계정을 선택해 주세요."
 _initialTutorial:
   launchTutorial: "튜토리얼 보기"
   title: "튜토리얼"
@@ -1744,6 +1748,9 @@ _role:
     canUseTranslator: "번역 기능의 사용"
     canUseDriveFileInSoundSettings: "사운드 설정에서 드라이브의 파일 사용 가능 여부"
     avatarDecorationLimit: "아바타 장식의 최대 붙임 개수"
+    canUseReaction: "리액션 사용"
+    mutualLinkSectionLimit: "서로링크 섹션의 최대 수"
+    mutualLinkLimit: "섹션 내의 서로링크의 최대 수"
   _condition:
     roleAssignedTo: "수동 역할에 이미 할당됨"
     isLocal: "로컬 사용자"
@@ -2088,6 +2095,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": "조정 기록 수정하기"
@@ -2239,6 +2247,16 @@ _profile:
   changeBanner: "배너 이미지 변경"
   verifiedLinkDescription: "내용에 자신의 프로필로 향하는 링크가 포함된 페이지의 URL을 삽입하면 소유자 인증 마크가 표시됩니다."
   avatarDecorationMax: "최대 {max}개까지 장식을 할 수 있습니다."
+  mutualLinksEdit: "서로링크 편집"
+  mutualLinksBanner: "서로링크 배너"
+  mutualLinksDescriptionEdit: "설명"
+  mutualLinksUrl: "링크 URL"
+  mutualLinksDescription: "서로링크를 설정하면 프로필에 배너가 표시됩니다."
+  addMutualLink: "서로링크 추가"
+  addMutualLinkSection: "섹션 추가"
+  sectionName: "섹션 이름"
+  sectionNameNoneDescription: "섹션 이름이 표시되지 않도록 합니다."
+  sectionNameNone: "섹션 이름을 숨기기"
 _exportOrImport:
   allNotes: "모든 노트"
   favoritedNotes: "즐겨찾기한 노트"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.5.0-io.1a",
+	"version": "2024.5.0-io.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
@@ -21,7 +21,7 @@
 		"build-assets": "node ./scripts/build-assets.mjs",
 		"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 && 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",
+		"build-misskey-js-with-types": "pnpm build-pre && pnpm -r build:tsc && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json && 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",
 		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
 		"start:docker": "pnpm check:connect && cd packages/backend && exec node ./built/boot/entry.js",
 		"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
@@ -46,29 +46,29 @@
 		"cleanall": "pnpm clean-all"
 	},
 	"resolutions": {
-		"@tensorflow/tfjs-core": "4.19.0",
+		"@tensorflow/tfjs-core": "4.20.0",
 		"chokidar": "3.6.0",
-		"esbuild": "0.21.3",
+		"esbuild": "0.23.0",
 		"lodash": "4.17.21",
 		"sharp": "0.33.4"
 	},
 	"dependencies": {
-		"cssnano": "7.0.1",
-		"execa": "9.1.0",
+		"cssnano": "7.0.5",
+		"execa": "9.3.0",
 		"js-yaml": "4.1.0",
-		"postcss": "8.4.38",
-		"terser": "5.31.0",
-		"typescript": "5.4.5"
+		"postcss": "8.4.41",
+		"terser": "5.31.5",
+		"typescript": "5.5.4"
 	},
 	"devDependencies": {
-		"@types/node": "20.12.12",
+		"@types/node": "22.2.0",
 		"@typescript-eslint/eslint-plugin": "7.10.0",
 		"@typescript-eslint/parser": "7.10.0",
 		"cross-env": "7.0.3",
-		"cypress": "13.10.0",
+		"cypress": "13.13.2",
 		"eslint": "8.57.0",
 		"ncp": "2.0.0",
-		"start-server-and-test": "2.0.3"
+		"start-server-and-test": "2.0.5"
 	},
 	"optionalDependencies": {
 		"@tensorflow/tfjs-core": "4.19.0"