From 5f5c4fc44fdec3acbdf9b1d650e4da7fe6b8bb0c Mon Sep 17 00:00:00 2001 From: woxtu Date: Thu, 20 Jul 2023 06:53:35 +0900 Subject: [PATCH 01/34] Remove unused dependencies (#11327) --- packages/backend/package.json | 6 -- pnpm-lock.yaml | 104 ---------------------------------- 2 files changed, 110 deletions(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index 564bbf85dc..52d6ec57d7 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -79,7 +79,6 @@ "ajv": "8.12.0", "archiver": "5.3.1", "async-mutex": "^0.4.0", - "autwh": "0.1.0", "bcryptjs": "2.4.3", "blurhash": "2.0.5", "bullmq": "4.4.0", @@ -93,7 +92,6 @@ "content-disposition": "0.5.4", "date-fns": "2.30.0", "deep-email-validator": "0.1.21", - "escape-regexp": "0.0.1", "fastify": "4.20.0", "feed": "4.2.2", "file-type": "18.5.0", @@ -139,7 +137,6 @@ "rename": "1.0.4", "rss-parser": "3.13.0", "rxjs": "7.8.1", - "s-age": "1.1.2", "sanitize-html": "2.11.0", "semver": "7.5.4", "sharp": "0.32.3", @@ -172,7 +169,6 @@ "@types/cbor": "6.0.0", "@types/color-convert": "2.0.0", "@types/content-disposition": "0.5.5", - "@types/escape-regexp": "0.0.1", "@types/fluent-ffmpeg": "2.1.21", "@types/jest": "29.5.3", "@types/js-yaml": "4.0.5", @@ -191,7 +187,6 @@ "@types/qrcode": "1.5.1", "@types/random-seed": "0.3.3", "@types/ratelimiter": "3.4.4", - "@types/redis": "4.0.11", "@types/rename": "1.0.4", "@types/sanitize-html": "2.9.0", "@types/semver": "7.5.0", @@ -202,7 +197,6 @@ "@types/unzipper": "0.10.6", "@types/vary": "1.1.0", "@types/web-push": "3.3.2", - "@types/websocket": "1.0.5", "@types/ws": "8.5.5", "@typescript-eslint/eslint-plugin": "5.61.0", "@typescript-eslint/parser": "5.61.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9286e29b96..e260bc2eaf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -143,9 +143,6 @@ importers: async-mutex: specifier: ^0.4.0 version: 0.4.0 - autwh: - specifier: 0.1.0 - version: 0.1.0 bcryptjs: specifier: 2.4.3 version: 2.4.3 @@ -185,9 +182,6 @@ importers: deep-email-validator: specifier: 0.1.21 version: 0.1.21 - escape-regexp: - specifier: 0.0.1 - version: 0.0.1 fastify: specifier: 4.20.0 version: 4.20.0 @@ -323,9 +317,6 @@ importers: rxjs: specifier: 7.8.1 version: 7.8.1 - s-age: - specifier: 1.1.2 - version: 1.1.2 sanitize-html: specifier: 2.11.0 version: 2.11.0 @@ -499,9 +490,6 @@ importers: '@types/content-disposition': specifier: 0.5.5 version: 0.5.5 - '@types/escape-regexp': - specifier: 0.0.1 - version: 0.0.1 '@types/fluent-ffmpeg': specifier: 2.1.21 version: 2.1.21 @@ -556,9 +544,6 @@ importers: '@types/ratelimiter': specifier: 3.4.4 version: 3.4.4 - '@types/redis': - specifier: 4.0.11 - version: 4.0.11 '@types/rename': specifier: 1.0.4 version: 1.0.4 @@ -589,9 +574,6 @@ importers: '@types/web-push': specifier: 3.3.2 version: 3.3.2 - '@types/websocket': - specifier: 1.0.5 - version: 1.0.5 '@types/ws': specifier: 8.5.5 version: 8.5.5 @@ -4615,55 +4597,6 @@ packages: requiresBuild: true optional: true - /@redis/bloom@1.1.0(@redis/client@1.4.2): - resolution: {integrity: sha512-9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ==} - peerDependencies: - '@redis/client': ^1.0.0 - dependencies: - '@redis/client': 1.4.2 - dev: true - - /@redis/client@1.4.2: - resolution: {integrity: sha512-oUdEjE0I7JS5AyaAjkD3aOXn9NhO7XKyPyXEyrgFDu++VrVBHUPnV6dgEya9TcMuj5nIJRuCzCm8ZP+c9zCHPw==} - engines: {node: '>=14'} - dependencies: - cluster-key-slot: 1.1.1 - generic-pool: 3.9.0 - yallist: 4.0.0 - dev: true - - /@redis/graph@1.1.0(@redis/client@1.4.2): - resolution: {integrity: sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==} - peerDependencies: - '@redis/client': ^1.0.0 - dependencies: - '@redis/client': 1.4.2 - dev: true - - /@redis/json@1.0.4(@redis/client@1.4.2): - resolution: {integrity: sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==} - peerDependencies: - '@redis/client': ^1.0.0 - dependencies: - '@redis/client': 1.4.2 - dev: true - - /@redis/search@1.1.0(@redis/client@1.4.2): - resolution: {integrity: sha512-NyFZEVnxIJEybpy+YskjgOJRNsfTYqaPbK/Buv6W2kmFNaRk85JiqjJZA5QkRmWvGbyQYwoO5QfDi2wHskKrQQ==} - peerDependencies: - '@redis/client': ^1.0.0 - dependencies: - '@redis/client': 1.4.2 - dev: true - - /@redis/time-series@1.0.4(@redis/client@1.4.2): - resolution: {integrity: sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==} - peerDependencies: - '@redis/client': ^1.0.0 - dependencies: - '@redis/client': 1.4.2 - dev: true - /@rollup/plugin-alias@5.0.0(rollup@3.26.3): resolution: {integrity: sha512-l9hY5chSCjuFRPsnRm16twWBiSApl2uYFLsepQYwtBuAxNMQ/1dJqADld40P0Jkqm65GRTLy/AC6hnpVebtLsA==} engines: {node: '>=14.0.0'} @@ -7311,12 +7244,6 @@ packages: '@types/node': 20.4.2 dev: true - /@types/redis@4.0.11: - resolution: {integrity: sha512-bI+gth8La8Wg/QCR1+V1fhrL9+LZUSWfcqpOj2Kc80ZQ4ffbdL173vQd5wovmoV9i071FU9oP2g6etLuEwb6Rg==} - dependencies: - redis: 4.5.1 - dev: true - /@types/rename@1.0.4: resolution: {integrity: sha512-eV81+6bVv2mdCBahkMefjEUwAjKDAP3AuyhqWCWRxcRaeVdUeHUBaoq2zSz+5HNHF2jzTajMcfLvJsy4K3cbwA==} dev: true @@ -8532,12 +8459,6 @@ packages: resolution: {integrity: sha512-f86EjiUKE6Xvczc4ioP1JBlWG7FKrE13qe/DxBCpe8GCipCq2nFw73aO8QEBKHfSbYGDN5eB9jXWKen7tspDqQ==} dev: false - /autwh@0.1.0: - resolution: {integrity: sha512-IkGZ4kjVlZMkEmDiVtZpGG3lDGHPqsMBIh4IpQKN7idYOJ5EGedqKPO+ychNqh8zrJEEqYsN0NcBkcmoE2uFAw==} - dependencies: - oauth: 0.9.15 - dev: false - /available-typed-arrays@1.0.5: resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} engines: {node: '>= 0.4'} @@ -9587,11 +9508,6 @@ packages: readable-stream: 2.3.7 dev: false - /cluster-key-slot@1.1.1: - resolution: {integrity: sha512-rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw==} - engines: {node: '>=0.10.0'} - dev: true - /cluster-key-slot@1.1.2: resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==} engines: {node: '>=0.10.0'} @@ -12007,11 +11923,6 @@ packages: wide-align: 1.1.5 dev: false - /generic-pool@3.9.0: - resolution: {integrity: sha512-hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==} - engines: {node: '>= 4'} - dev: true - /gensync@1.0.0-beta.2: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} @@ -15604,10 +15515,6 @@ packages: resolution: {integrity: sha512-1orQ9MT1vHFGQxhuy7E/0gECD3fd2fCC+PIX+/jgmU/gI3EpRocXtmtvxCO5x3WZ443FLTLFWNDjl5MPJf9u+Q==} dev: false - /oauth@0.9.15: - resolution: {integrity: sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==} - dev: false - /object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} @@ -17410,17 +17317,6 @@ packages: redis-errors: 1.2.0 dev: false - /redis@4.5.1: - resolution: {integrity: sha512-oxXSoIqMJCQVBTfxP6BNTCtDMyh9G6Vi5wjdPdV/sRKkufyZslDqCScSGcOr6XGR/reAWZefz7E4leM31RgdBA==} - dependencies: - '@redis/bloom': 1.1.0(@redis/client@1.4.2) - '@redis/client': 1.4.2 - '@redis/graph': 1.1.0(@redis/client@1.4.2) - '@redis/json': 1.0.4(@redis/client@1.4.2) - '@redis/search': 1.1.0(@redis/client@1.4.2) - '@redis/time-series': 1.0.4(@redis/client@1.4.2) - dev: true - /reduce-css-calc@1.3.0: resolution: {integrity: sha512-0dVfwYVOlf/LBA2ec4OwQ6p3X9mYxn/wOl2xTcLwjnPYrkgEfPx3VI4eGCH3rQLlPISG5v9I9bkZosKsNRTRKA==} dependencies: From 5e53b41f2d2d9914c1b6d9ff7f93bc88bbeffe41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A5=E9=AB=98=20=E5=87=8C?= <39184410+ryohidaka@users.noreply.github.com> Date: Thu, 20 Jul 2023 08:11:16 +0900 Subject: [PATCH 02/34] =?UTF-8?q?fix(frontend):=20=E3=83=A6=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E3=83=BC=E5=90=8D=E3=81=8C=E9=95=B7=E3=81=84=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=81=AB=E3=80=81=E3=83=95=E3=82=A9=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=9C=E3=82=BF=E3=83=B3=E3=82=92=E6=8A=98=E3=82=8A=E8=BF=94?= =?UTF-8?q?=E3=81=97=E3=81=A6=E8=A1=A8=E7=A4=BA=E3=81=95=E3=81=9B=E3=82=8B?= =?UTF-8?q?=20(#11326)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/pages/gallery/post.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue index dfa6c0bac0..39b2c2c90b 100644 --- a/packages/frontend/src/pages/gallery/post.vue +++ b/packages/frontend/src/pages/gallery/post.vue @@ -236,6 +236,7 @@ definePageMetadata(computed(() => post ? { border-top: solid 0.5px var(--divider); display: flex; align-items: center; + flex-wrap: wrap; > .avatar { width: 52px; From 1e40088d9821948053e331f95218a063f71fb1e7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 20 Jul 2023 10:18:40 +0900 Subject: [PATCH 03/34] enhance(frontend): tweak MkSignupDialog.rules.vue --- locales/index.d.ts | 3 + locales/ja-JP.yml | 5 +- .../src/components/MkSignupDialog.rules.vue | 56 +++++++++++++++++-- 3 files changed, 58 insertions(+), 6 deletions(-) diff --git a/locales/index.d.ts b/locales/index.d.ts index 66b24890f4..db7e3e9575 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -1094,6 +1094,9 @@ export interface Locale { "unused": string; "used": string; "expired": string; + "doYouAgree": string; + "beSureToReadThisAsItIsImportant": string; + "iHaveReadXCarefullyAndAgree": string; "_initialAccountSetting": { "accountCreated": string; "letsStartAccountSetup": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 5f728e0e84..b2fa9c337e 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1042,7 +1042,7 @@ vertical: "縦" horizontal: "横" position: "位置" serverRules: "サーバールール" -pleaseConfirmBelowBeforeSignup: "このサーバーに登録する前に、以下を確認してください。" +pleaseConfirmBelowBeforeSignup: "このサーバーに登録するには、以下の内容を確認し同意する必要があります。" pleaseAgreeAllToContinue: "続けるには、全ての「同意する」にチェックが入っている必要があります。" continue: "続ける" preservedUsernames: "予約ユーザー名" @@ -1091,6 +1091,9 @@ usedAt: "使用日時" unused: "未使用" used: "使用済み" expired: "期限切れ" +doYouAgree: "同意しますか？" +beSureToReadThisAsItIsImportant: "重要ですので必ずお読みください。" +iHaveReadXCarefullyAndAgree: "「{x}」の内容をよく読み、同意します。" _initialAccountSetting: accountCreated: "アカウントの作成が完了しました！" diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue index b6ffba6cc7..de5195ab4f 100644 --- a/packages/frontend/src/components/MkSignupDialog.rules.vue +++ b/packages/frontend/src/components/MkSignupDialog.rules.vue @@ -9,7 +9,10 @@ {{ i18n.ts.invitationRequiredToRegister }} -
{{ i18n.ts.pleaseConfirmBelowBeforeSignup }}
+
+
{{ i18n.ts.pleaseConfirmBelowBeforeSignup }}
+
{{ i18n.ts.beSureToReadThisAsItIsImportant }}
+
@@ -19,7 +22,7 @@
    • - {{ i18n.ts.agree }} + {{ i18n.ts.agree }}     @@ -28,7 +31,7 @@ {{ i18n.ts.termsOfService }} - {{ i18n.ts.agree }} + {{ i18n.ts.agree }} @@ -37,7 +40,7 @@ {{ i18n.ts.basicNotesBeforeCreateAccount }} - {{ i18n.ts.agree }} + {{ i18n.ts.agree }}
    {{ i18n.ts.pleaseAgreeAllToContinue }}
    @@ -52,13 +55,14 @@