Merge branch 'develop' into notes-embed

locales/index.d.ts

@@ -2022,6 +2022,7 @@ export interface Locale {
         "metadataContent": string;
         "changeAvatar": string;
         "changeBanner": string;
+        "verifiedLinkDescription": string;
     };
     "_exportOrImport": {
         "allNotes": string;

locales/ja-JP.yml

@@ -1937,6 +1937,7 @@ _profile:
   metadataContent: "内容"
   changeAvatar: "アイコン画像を変更"
   changeBanner: "バナー画像を変更"
+  verifiedLinkDescription: "内容にURLを設定すると、リンク先のWebサイトに自分のプロフィールへのリンクが含まれている場合に所有者確認済みアイコンを表示させることができます。"
 
 _exportOrImport:
   allNotes: "全てのノート"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2023.9.0-beta.9",
+	"version": "2023.9.0-beta.10",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/frontend/package.json

@@ -60,13 +60,13 @@
 		"querystring": "0.2.1",
 		"rollup": "3.29.2",
 		"sanitize-html": "2.11.0",
-		"sass": "1.67.0",
+		"sass": "1.68.0",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
 		"three": "0.156.1",
 		"throttle-debounce": "5.0.0",
 		"tinycolor2": "1.6.0",
-		"tsc-alias": "1.8.7",
+		"tsc-alias": "1.8.8",
 		"tsconfig-paths": "4.2.0",
 		"twemoji-parser": "14.0.0",
 		"typescript": "5.2.2",

packages/frontend/src/pages/settings/profile.vue

@@ -76,6 +76,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</div>
 					</template>
 				</Sortable>
+
+				<MkInfo>{{ i18n.ts._profile.verifiedLinkDescription }}</MkInfo>
 			</div>
 		</MkFolder>
 		<template #caption>{{ i18n.ts._profile.metadataDescription }}</template>
@@ -119,6 +121,7 @@ import { langmap } from '@/scripts/langmap.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { claimAchievement } from '@/scripts/achievements.js';
 import { defaultStore } from '@/store.js';
+import MkInfo from '@/components/MkInfo.vue';
 
 const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
 

pnpm-lock.yaml

@@ -773,8 +773,8 @@ importers:
         specifier: 2.11.0
         version: 2.11.0
       sass:
-        specifier: 1.67.0
+        specifier: 1.68.0
-        version: 1.67.0
+        version: 1.68.0
       strict-event-emitter-types:
         specifier: 2.0.0
         version: 2.0.0
@@ -791,8 +791,8 @@ importers:
         specifier: 1.6.0
         version: 1.6.0
       tsc-alias:
-        specifier: 1.8.7
+        specifier: 1.8.8
-        version: 1.8.7
+        version: 1.8.8
       tsconfig-paths:
         specifier: 4.2.0
         version: 4.2.0
@@ -810,7 +810,7 @@ importers:
         version: 1.8.1
       vite:
         specifier: 4.4.9
-        version: 4.4.9(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0)
+        version: 4.4.9(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0)
       vue:
         specifier: 3.3.4
         version: 3.3.4
@@ -991,7 +991,7 @@ importers:
         version: 1.0.3
       vitest:
         specifier: 0.34.4
-        version: 0.34.4(happy-dom@10.0.3)(sass@1.67.0)(terser@5.20.0)
+        version: 0.34.4(happy-dom@10.0.3)(sass@1.68.0)(terser@5.20.0)
       vitest-fetch-mock:
         specifier: 0.2.2
         version: 0.2.2(vitest@0.34.4)
@@ -4268,7 +4268,7 @@ packages:
       magic-string: 0.27.0
       react-docgen-typescript: 2.2.2(typescript@5.2.2)
       typescript: 5.2.2
-      vite: 4.4.9(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0)
+      vite: 4.4.9(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0)
     dev: true
 
   /@jridgewell/gen-mapping@0.3.2:
@@ -6306,7 +6306,7 @@ packages:
       remark-slug: 6.1.0
       rollup: 3.29.2
       typescript: 5.2.2
-      vite: 4.4.9(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0)
+      vite: 4.4.9(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0)
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -6844,7 +6844,7 @@ packages:
       react: 18.2.0
       react-docgen: 6.0.0-alpha.3
       react-dom: 18.2.0(react@18.2.0)
-      vite: 4.4.9(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0)
+      vite: 4.4.9(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0)
     transitivePeerDependencies:
       - '@preact/preset-vite'
       - encoding
@@ -7009,7 +7009,7 @@ packages:
       magic-string: 0.30.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      vite: 4.4.9(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0)
+      vite: 4.4.9(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0)
       vue-docgen-api: 4.64.1(vue@3.3.4)
     transitivePeerDependencies:
       - '@preact/preset-vite'
@@ -7493,7 +7493,7 @@ packages:
       dom-accessibility-api: 0.5.16
       lodash: 4.17.21
       redent: 3.0.0
-      vitest: 0.34.4(happy-dom@10.0.3)(sass@1.67.0)(terser@5.20.0)
+      vitest: 0.34.4(happy-dom@10.0.3)(sass@1.68.0)(terser@5.20.0)
     dev: true
 
   /@testing-library/user-event@14.4.3(@testing-library/dom@9.2.0):
@@ -8295,7 +8295,7 @@ packages:
       '@babel/plugin-transform-react-jsx-source': 7.19.6(@babel/core@7.22.11)
       magic-string: 0.27.0
       react-refresh: 0.14.0
-      vite: 4.4.9(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0)
+      vite: 4.4.9(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -8307,7 +8307,7 @@ packages:
       vite: ^4.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 4.4.9(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0)
+      vite: 4.4.9(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0)
       vue: 3.3.4
 
   /@vitest/coverage-v8@0.34.4(vitest@0.34.4):
@@ -8326,7 +8326,7 @@ packages:
       std-env: 3.3.3
       test-exclude: 6.0.0
       v8-to-istanbul: 9.1.0
-      vitest: 0.34.4(happy-dom@10.0.3)(sass@1.67.0)(terser@5.20.0)
+      vitest: 0.34.4(happy-dom@10.0.3)(sass@1.68.0)(terser@5.20.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -17385,8 +17385,8 @@ packages:
       postcss: 8.4.30
     dev: false
 
-  /sass@1.67.0:
+  /sass@1.68.0:
-    resolution: {integrity: sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==}
+    resolution: {integrity: sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==}
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
@@ -18600,18 +18600,6 @@ packages:
     resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
     dev: true
 
-  /tsc-alias@1.8.7:
-    resolution: {integrity: sha512-59Q/zUQa3miTf99mLbSqaW0hi1jt4WoG8Uhe5hSZJHQpSoFW9eEwvW7jlKMHXWvT+zrzy3SN9PE/YBhQ+WVydA==}
-    hasBin: true
-    dependencies:
-      chokidar: 3.5.3
-      commander: 9.5.0
-      globby: 11.1.0
-      mylas: 2.1.13
-      normalize-path: 3.0.0
-      plimit-lit: 1.5.0
-    dev: false
-
   /tsc-alias@1.8.8:
     resolution: {integrity: sha512-OYUOd2wl0H858NvABWr/BoSKNERw3N9GTi3rHPK8Iv4O1UyUXIrTTOAZNHsjlVpXFOhpJBVARI1s+rzwLivN3Q==}
     hasBin: true
@@ -19161,7 +19149,7 @@ packages:
       core-util-is: 1.0.2
       extsprintf: 1.3.0
 
-  /vite-node@0.34.4(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0):
+  /vite-node@0.34.4(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0):
     resolution: {integrity: sha512-ho8HtiLc+nsmbwZMw8SlghESEE3KxJNp04F/jPUCLVvaURwt0d+r9LxEqCX5hvrrOQ0GSyxbYr5ZfRYhQ0yVKQ==}
     engines: {node: '>=v14.18.0'}
     hasBin: true
@@ -19171,7 +19159,7 @@ packages:
       mlly: 1.4.0
       pathe: 1.1.1
       picocolors: 1.0.0
-      vite: 4.4.9(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0)
+      vite: 4.4.9(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -19187,7 +19175,7 @@ packages:
     resolution: {integrity: sha512-p4D8CFVhZS412SyQX125qxyzOgIFouwOcvjZWk6bQbNPR1wtaEzFT6jZxAjf1dejlGqa6fqHcuCvQea6EWUkUA==}
     dev: true
 
-  /vite@4.4.9(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0):
+  /vite@4.4.9(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0):
     resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -19219,7 +19207,7 @@ packages:
       esbuild: 0.18.17
       postcss: 8.4.30
       rollup: 3.29.2
-      sass: 1.67.0
+      sass: 1.68.0
       terser: 5.20.0
     optionalDependencies:
       fsevents: 2.3.2
@@ -19231,12 +19219,12 @@ packages:
       vitest: '>=0.16.0'
     dependencies:
       cross-fetch: 3.1.5
-      vitest: 0.34.4(happy-dom@10.0.3)(sass@1.67.0)(terser@5.20.0)
+      vitest: 0.34.4(happy-dom@10.0.3)(sass@1.68.0)(terser@5.20.0)
     transitivePeerDependencies:
       - encoding
     dev: true
 
-  /vitest@0.34.4(happy-dom@10.0.3)(sass@1.67.0)(terser@5.20.0):
+  /vitest@0.34.4(happy-dom@10.0.3)(sass@1.68.0)(terser@5.20.0):
     resolution: {integrity: sha512-SE/laOsB6995QlbSE6BtkpXDeVNLJc1u2LHRG/OpnN4RsRzM3GQm4nm3PQCK5OBtrsUqnhzLdnT7se3aeNGdlw==}
     engines: {node: '>=v14.18.0'}
     hasBin: true
@@ -19289,8 +19277,8 @@ packages:
       strip-literal: 1.0.1
       tinybench: 2.5.0
       tinypool: 0.7.0
-      vite: 4.4.9(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0)
+      vite: 4.4.9(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0)
-      vite-node: 0.34.4(@types/node@20.6.3)(sass@1.67.0)(terser@5.20.0)
+      vite-node: 0.34.4(@types/node@20.6.3)(sass@1.68.0)(terser@5.20.0)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less