From 6fc42629c8deeb7b2aac2bf91d0000b858ea676e Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 19 Jul 2022 13:23:36 +0900 Subject: [PATCH 1/9] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69bb5ba89..114481357 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,15 @@ You should also include the user name that made the change. --> +## 12.x.x (unreleased) + +### Improvements +- Client: UIのブラッシュアップ @syuilo + +### Bugfixes +- Client: リアクションピッカーがアプリ内ウィンドウの後ろに表示されてしまう問題を修正 @syuilo +- Client: ユーザー情報の取得の再試行を修正する @xianonn + ## 12.117.0 (2022/07/18) ### Improvements From e35f599b6de7ddcb1c276fdf4979aff58592f05a Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 19 Jul 2022 13:25:23 +0900 Subject: [PATCH 2/9] update vite --- packages/client/package.json | 2 +- packages/client/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/client/package.json b/packages/client/package.json index 31c760489..eaebf69ed 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -73,7 +73,7 @@ "uuid": "8.3.2", "v-debounce": "0.1.2", "vanilla-tilt": "1.7.2", - "vite": "3.0.1", + "vite": "3.0.2", "vue": "3.2.37", "vue-prism-editor": "2.0.0-alpha.2", "vuedraggable": "4.0.1", diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock index 0be2fa310..af3af22fc 100644 --- a/packages/client/yarn.lock +++ b/packages/client/yarn.lock @@ -4222,10 +4222,10 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vite@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.1.tgz#9c30c9662ec24455b8834d0b831c9f3c5a9139ca" - integrity sha512-nefKSglkoEsDpYUkBuT2++L04ktcP8fz8dxLtmZdDdMyhubFSOLFw6BTh/46Fc6tIX/cibs/NVYWNrsqn0k6pQ== +vite@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.2.tgz#2a7b4642c53ae066cf724e7e581d6c1fd24e2c32" + integrity sha512-TAqydxW/w0U5AoL5AsD9DApTvGb2iNbGs3sN4u2VdT1GFkQVUfgUldt+t08TZgi23uIauh1TUOQJALduo9GXqw== dependencies: esbuild "^0.14.47" postcss "^8.4.14" From a3c2dbbfb59cf95f1f3972e0e08dde50a66b7829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Tue, 19 Jul 2022 17:09:21 +0900 Subject: [PATCH 3/9] fix(server): make sure `getFileInfo` doesn't fail if `detectSensitivity` ever fails (#9020) --- packages/backend/src/misc/get-file-info.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/backend/src/misc/get-file-info.ts b/packages/backend/src/misc/get-file-info.ts index 42061fcf8..1c988b248 100644 --- a/packages/backend/src/misc/get-file-info.ts +++ b/packages/backend/src/misc/get-file-info.ts @@ -101,13 +101,17 @@ export async function getFileInfo(path: string, opts: { let porn = false; if (!opts.skipSensitiveDetection) { - [sensitive, porn] = await detectSensitivity( + await detectSensitivity( path, type.mime, opts.sensitiveThreshold ?? 0.5, opts.sensitiveThresholdForPorn ?? 0.75, opts.enableSensitiveMediaDetectionForVideos ?? false, - ); + ).then(value => { + [sensitive, porn] = value; + }, error => { + warnings.push(`detectSensitivity failed: ${error}`); + }); } return { From 7dd381bb5cddde6b83b2d7c1c8639503ff8965dc Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 19 Jul 2022 17:10:21 +0900 Subject: [PATCH 4/9] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 114481357..c8926cb6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ You should also include the user name that made the change. - Client: UIのブラッシュアップ @syuilo ### Bugfixes +- Server: ファイルのアップロードに失敗することがある問題を修正 @acid-chicken - Client: リアクションピッカーがアプリ内ウィンドウの後ろに表示されてしまう問題を修正 @syuilo - Client: ユーザー情報の取得の再試行を修正する @xianonn From 5b8d960b9fdfba46b707d768e9cf321270ae5c05 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 19 Jul 2022 17:13:24 +0900 Subject: [PATCH 5/9] fix(client): tweak mfm-cheat-sheet --- CHANGELOG.md | 3 +- locales/ja-JP.yml | 2 + packages/client/src/pages/mfm-cheat-sheet.vue | 643 +++++++++--------- 3 files changed, 332 insertions(+), 316 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8926cb6d..0c6423149 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,8 @@ You should also include the user name that made the change. ### Bugfixes - Server: ファイルのアップロードに失敗することがある問題を修正 @acid-chicken - Client: リアクションピッカーがアプリ内ウィンドウの後ろに表示されてしまう問題を修正 @syuilo -- Client: ユーザー情報の取得の再試行を修正する @xianonn +- Client: ユーザー情報の取得の再試行を修正 @xianonn +- Client: MFMチートシートの挙動を修正 @syuilo ## 12.117.0 (2022/07/18) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index e071b4bda..0c4a7c723 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1038,6 +1038,8 @@ _mfm: sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。" rotate: "回転" rotateDescription: "指定した角度で回転させます。" + plain: "プレーン" + plainDescription: "内側の構文を全て無効にします。" _instanceTicker: none: "表示しない" diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue index 3315479ab..0b5dae996 100644 --- a/packages/client/src/pages/mfm-cheat-sheet.vue +++ b/packages/client/src/pages/mfm-cheat-sheet.vue @@ -1,301 +1,313 @@ @@ -306,35 +318,36 @@ import { definePageMetadata } from '@/scripts/page-metadata'; import { i18n } from '@/i18n'; import { instance } from '@/instance'; -const preview_mention = '@example'; -const preview_hashtag = '#test'; -const preview_url = 'https://example.com'; -const preview_link = `[${i18n.ts._mfm.dummy}](https://example.com)`; -const preview_emoji = instance.emojis.length ? `:${instance.emojis[0].name}:` : ':emojiname:'; -const preview_bold = `**${i18n.ts._mfm.dummy}**`; -const preview_small = `${i18n.ts._mfm.dummy}`; -const preview_center = `
${i18n.ts._mfm.dummy}
`; -const preview_inlineCode = '`<: "Hello, world!"`'; -const preview_blockCode = '```\n~ (#i, 100) {\n\t<: ? ((i % 15) = 0) "FizzBuzz"\n\t\t.? ((i % 3) = 0) "Fizz"\n\t\t.? ((i % 5) = 0) "Buzz"\n\t\t. i\n}\n```'; -const preview_inlineMath = '\\(x= \\frac{-b\' \\pm \\sqrt{(b\')^2-ac}}{a}\\)'; -const preview_quote = `> ${i18n.ts._mfm.dummy}`; -const preview_search = `${i18n.ts._mfm.dummy} 検索`; -const preview_jelly = '$[jelly 🍮] $[jelly.speed=5s 🍮]'; -const preview_tada = '$[tada 🍮] $[tada.speed=5s 🍮]'; -const preview_jump = '$[jump 🍮] $[jump.speed=5s 🍮]'; -const preview_bounce = '$[bounce 🍮] $[bounce.speed=5s 🍮]'; -const preview_shake = '$[shake 🍮] $[shake.speed=5s 🍮]'; -const preview_twitch = '$[twitch 🍮] $[twitch.speed=5s 🍮]'; -const preview_spin = '$[spin 🍮] $[spin.left 🍮] $[spin.alternate 🍮]\n$[spin.x 🍮] $[spin.x,left 🍮] $[spin.x,alternate 🍮]\n$[spin.y 🍮] $[spin.y,left 🍮] $[spin.y,alternate 🍮]\n\n$[spin.speed=5s 🍮]'; -const preview_flip = `$[flip ${i18n.ts._mfm.dummy}]\n$[flip.v ${i18n.ts._mfm.dummy}]\n$[flip.h,v ${i18n.ts._mfm.dummy}]`; -const preview_font = `$[font.serif ${i18n.ts._mfm.dummy}]\n$[font.monospace ${i18n.ts._mfm.dummy}]\n$[font.cursive ${i18n.ts._mfm.dummy}]\n$[font.fantasy ${i18n.ts._mfm.dummy}]`; -const preview_x2 = '$[x2 🍮]'; -const preview_x3 = '$[x3 🍮]'; -const preview_x4 = '$[x4 🍮]'; -const preview_blur = `$[blur ${i18n.ts._mfm.dummy}]`; -const preview_rainbow = '$[rainbow 🍮] $[rainbow.speed=5s 🍮]'; -const preview_sparkle = '$[sparkle 🍮]'; -const preview_rotate = '$[rotate 🍮]'; +let preview_mention = $ref('@example'); +let preview_hashtag = $ref('#test'); +let preview_url = $ref('https://example.com'); +let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://example.com)`); +let preview_emoji = $ref(instance.emojis.length ? `:${instance.emojis[0].name}:` : ':emojiname:'); +let preview_bold = $ref(`**${i18n.ts._mfm.dummy}**`); +let preview_small = $ref(`${i18n.ts._mfm.dummy}`); +let preview_center = $ref(`
${i18n.ts._mfm.dummy}
`); +let preview_inlineCode = $ref('`<: "Hello, world!"`'); +let preview_blockCode = $ref('```\n~ (#i, 100) {\n\t<: ? ((i % 15) = 0) "FizzBuzz"\n\t\t.? ((i % 3) = 0) "Fizz"\n\t\t.? ((i % 5) = 0) "Buzz"\n\t\t. i\n}\n```'); +let preview_inlineMath = $ref('\\(x= \\frac{-b\' \\pm \\sqrt{(b\')^2-ac}}{a}\\)'); +let preview_quote = $ref(`> ${i18n.ts._mfm.dummy}`); +let preview_search = $ref(`${i18n.ts._mfm.dummy} 検索`); +let preview_jelly = $ref('$[jelly 🍮] $[jelly.speed=5s 🍮]'); +let preview_tada = $ref('$[tada 🍮] $[tada.speed=5s 🍮]'); +let preview_jump = $ref('$[jump 🍮] $[jump.speed=5s 🍮]'); +let preview_bounce = $ref('$[bounce 🍮] $[bounce.speed=5s 🍮]'); +let preview_shake = $ref('$[shake 🍮] $[shake.speed=5s 🍮]'); +let preview_twitch = $ref('$[twitch 🍮] $[twitch.speed=5s 🍮]'); +let preview_spin = $ref('$[spin 🍮] $[spin.left 🍮] $[spin.alternate 🍮]\n$[spin.x 🍮] $[spin.x,left 🍮] $[spin.x,alternate 🍮]\n$[spin.y 🍮] $[spin.y,left 🍮] $[spin.y,alternate 🍮]\n\n$[spin.speed=5s 🍮]'); +let preview_flip = $ref(`$[flip ${i18n.ts._mfm.dummy}]\n$[flip.v ${i18n.ts._mfm.dummy}]\n$[flip.h,v ${i18n.ts._mfm.dummy}]`); +let preview_font = $ref(`$[font.serif ${i18n.ts._mfm.dummy}]\n$[font.monospace ${i18n.ts._mfm.dummy}]\n$[font.cursive ${i18n.ts._mfm.dummy}]\n$[font.fantasy ${i18n.ts._mfm.dummy}]`); +let preview_x2 = $ref('$[x2 🍮]'); +let preview_x3 = $ref('$[x3 🍮]'); +let preview_x4 = $ref('$[x4 🍮]'); +let preview_blur = $ref(`$[blur ${i18n.ts._mfm.dummy}]`); +let preview_rainbow = $ref('$[rainbow 🍮] $[rainbow.speed=5s 🍮]'); +let preview_sparkle = $ref('$[sparkle 🍮]'); +let preview_rotate = $ref('$[rotate 🍮]'); +let preview_plain = $ref('**bold** @mention #hashtag `code` $[x2 🍮]'); definePageMetadata({ title: i18n.ts._mfm.cheatSheet, From 4769cd420b03703078417eaec8b7b7222a264d2d Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 19 Jul 2022 17:21:03 +0900 Subject: [PATCH 6/9] =?UTF-8?q?fix(client):=20=E3=80=8C=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=B9=E3=81=8B=E3=82=89=E3=81=AE?= =?UTF-8?q?=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9B=E3=82=92=E5=8F=97=E3=81=91?= =?UTF-8?q?=E5=8F=96=E3=82=8B=E3=80=8D=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #8474 --- CHANGELOG.md | 1 + packages/client/src/pages/settings/email.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c6423149..c337e13df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ You should also include the user name that made the change. - Client: リアクションピッカーがアプリ内ウィンドウの後ろに表示されてしまう問題を修正 @syuilo - Client: ユーザー情報の取得の再試行を修正 @xianonn - Client: MFMチートシートの挙動を修正 @syuilo +- Client: 「インスタンスからのお知らせを受け取る」の設定を変更できない問題を修正 @syuilo ## 12.117.0 (2022/07/18) diff --git a/packages/client/src/pages/settings/email.vue b/packages/client/src/pages/settings/email.vue index e575af6d6..9d2afd6a6 100644 --- a/packages/client/src/pages/settings/email.vue +++ b/packages/client/src/pages/settings/email.vue @@ -10,7 +10,7 @@ - + {{ $ts.receiveAnnouncementFromInstance }} From c3c74c098d160d94af78bdf029b8f999432adc63 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 19 Jul 2022 17:21:30 +0900 Subject: [PATCH 7/9] New translations ja-JP.yml (Slovak) (#9014) --- locales/sk-SK.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index 2ac0a8566..4fbdc1cb1 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -885,6 +885,7 @@ enableAutoSensitiveDescription: "Ak je zapnuté, príznak NSFW sa na médiách a activeEmailValidationDescription: "Dôkladnejšie overí e-mailovú adresu používateľa tým, že zistí, či ide o vyradenú e-mailovú adresu a či sa s ňou dá skutočne komunikovať. Ak nie je začiarknuté, e-mailová adresa sa kontroluje len ako text." navbar: "Navigačný panel" account: "Účty" +move: "Pohyb" _sensitiveMediaDetection: description: "Strojové učenie sa použije na automatickú detekciu citlivých médií na účely ich moderovania. Mierne sa zvýši zaťaženie servera." sensitivity: "Citlivosť detekcie" @@ -1691,6 +1692,7 @@ _deck: alwaysShowMainColumn: "Vždy zobraziť v hlavnom stĺpci" columnAlign: "Zarovnať stĺpce" addColumn: "Pridať stĺpec" + configureColumn: "Nastavenie stĺpcov" swapLeft: "Vymeniť vľavo" swapRight: "Vymeniť vpravo" swapUp: "Vymeniť hore" From b495f6cffff7a9a41cc72bd11417d7b9d79e0f27 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 19 Jul 2022 17:22:24 +0900 Subject: [PATCH 8/9] 12.117.1 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c337e13df..59c748fb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ You should also include the user name that made the change. --> -## 12.x.x (unreleased) +## 12.117.1 (2022/07/19) ### Improvements - Client: UIのブラッシュアップ @syuilo diff --git a/package.json b/package.json index 2699b7dc9..cabb9f8f9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "12.117.0", + "version": "12.117.1", "codename": "indigo", "repository": { "type": "git", From 17afbc3c46f7bd11351b5775f08356e598d60110 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 19 Jul 2022 21:36:33 +0900 Subject: [PATCH 9/9] enhance(client): suspense Fix #8817 --- CHANGELOG.md | 7 +++++++ packages/client/src/components/global/router-view.vue | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59c748fb6..4fd6ff231 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ You should also include the user name that made the change. --> +## 12.x.x (unreleased) + +### Improvements + +### Bugfixes +- Client: 一度作ったwebhookの設定画面を開こうとするとページがフリーズする @syuilo + ## 12.117.1 (2022/07/19) ### Improvements diff --git a/packages/client/src/components/global/router-view.vue b/packages/client/src/components/global/router-view.vue index fca2371f0..cd1e78019 100644 --- a/packages/client/src/components/global/router-view.vue +++ b/packages/client/src/components/global/router-view.vue @@ -1,6 +1,12 @@