From a87dd5ddec2e9e6b53e8eb9883277ec582f1bc0a 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: Fri, 21 Jul 2023 10:53:37 +0000 Subject: [PATCH 1/7] fix: response to experimental rIC support on Safari removed due to Google Login bug? --- packages/frontend/src/scripts/idle-render.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/packages/frontend/src/scripts/idle-render.ts b/packages/frontend/src/scripts/idle-render.ts index ccce8b02bf..781b624cdf 100644 --- a/packages/frontend/src/scripts/idle-render.ts +++ b/packages/frontend/src/scripts/idle-render.ts @@ -1,3 +1,20 @@ +const requestIdleCallback: typeof globalThis.requestIdleCallback = globalThis.requestIdleCallback ?? (callback) => { + const start = performance.now(); + const timeoutId = setTimeout(() => { + callback({ + didTimeout: false, // polyfill でタイムアウト発火することはない + timeRemaining() { + const diff = performance.now() - start; + return Math.max(0, 50 - diff); // + }, + }); + }); + return timeoutId; +}; +const cancelIdleCallback: typeof globalThis.cancelIdleCallback = globalThis.cancelIdleCallback ?? (timeoutId) => { + clearTimeout(timeoutId); +}; + class IdlingRenderScheduler { #renderers: Set; #rafId: number; From 40c5699d9392a5dfdf28fe8bb473c8f69b6e924c 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: Fri, 21 Jul 2023 10:56:48 +0000 Subject: [PATCH 2/7] fix: typo --- packages/frontend/src/scripts/idle-render.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/scripts/idle-render.ts b/packages/frontend/src/scripts/idle-render.ts index 781b624cdf..a1470b82e9 100644 --- a/packages/frontend/src/scripts/idle-render.ts +++ b/packages/frontend/src/scripts/idle-render.ts @@ -1,4 +1,4 @@ -const requestIdleCallback: typeof globalThis.requestIdleCallback = globalThis.requestIdleCallback ?? (callback) => { +const requestIdleCallback: typeof globalThis.requestIdleCallback = globalThis.requestIdleCallback ?? ((callback) => { const start = performance.now(); const timeoutId = setTimeout(() => { callback({ @@ -10,10 +10,10 @@ const requestIdleCallback: typeof globalThis.requestIdleCallback = globalThis.re }); }); return timeoutId; -}; -const cancelIdleCallback: typeof globalThis.cancelIdleCallback = globalThis.cancelIdleCallback ?? (timeoutId) => { +}); +const cancelIdleCallback: typeof globalThis.cancelIdleCallback = globalThis.cancelIdleCallback ?? ((timeoutId) => { clearTimeout(timeoutId); -}; +}); class IdlingRenderScheduler { #renderers: Set; From 50de2e76b4ab9bc3eb56d0f05428d33d19c03b84 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: Fri, 21 Jul 2023 11:22:43 +0000 Subject: [PATCH 3/7] test: MkAd play --- packages/frontend/src/components/global/MkAd.stories.impl.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/frontend/src/components/global/MkAd.stories.impl.ts b/packages/frontend/src/components/global/MkAd.stories.impl.ts index 17f9ccbbae..8d15e1f65b 100644 --- a/packages/frontend/src/components/global/MkAd.stories.impl.ts +++ b/packages/frontend/src/components/global/MkAd.stories.impl.ts @@ -28,6 +28,7 @@ const common = { template: '', }; }, + /* FIXME: disabled because it still didn’t pass after applying #11267 async play({ canvasElement, args }) { if (lock) { console.warn('This test is unexpectedly running twice in parallel, fix it!'); @@ -77,6 +78,7 @@ const common = { lock = undefined; } }, + */ args: { prefer: [], specify: { From b8973a6f19a56177011fc4f37b6b87f0d1904695 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 21 Jul 2023 20:26:13 +0900 Subject: [PATCH 4/7] New Crowdin updates (#11336) * New translations ja-JP.yml (Chinese Traditional) * New translations ja-JP.yml (Swedish) --- locales/sv-SE.yml | 3 +++ locales/zh-TW.yml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml index 375f1ed478..07f43afe2e 100644 --- a/locales/sv-SE.yml +++ b/locales/sv-SE.yml @@ -389,10 +389,13 @@ help: "Hjälp" close: "Stäng" invites: "Inbjudan" members: "Medlemmar" +transfer: "Överför" text: "Text" enable: "Aktivera" next: "Nästa" invitations: "Inbjudan" +invitationCode: "Inbjudningskod" +available: "Tillgängligt" weakPassword: "Svagt Lösenord" normalPassword: "Medel Lösenord" strongPassword: "Starkt Lösenord" diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml index 37775dfb10..df4122ef3d 100644 --- a/locales/zh-TW.yml +++ b/locales/zh-TW.yml @@ -1,7 +1,7 @@ --- _lang_: "繁體中文" headlineMisskey: "貼文連繫網絡" -introMisskey: "歡迎！ Misskey是一個開源且去中心化的社群網絡。\n通過「貼文」分享周邊新鮮事，並告訴其他人您的想法！📡\n透過「情感」功能，對大家的貼文表達情感！👍\n一起來探索這個新的世界吧！🚀" +introMisskey: "歡迎！Misskey 是一個開源且去中心化的社群網路服務。\n發佈「貼文」向身邊的人分享您的想法！📡\n利用「反應」表達您對貼文的感覺！👍\n讓我們一起探索新的世界吧！🚀" poweredByMisskeyDescription: "{name}是使用開放原始碼平台Misskey的服務之一（稱為 Misskey 伺服器）。\n" monthAndDay: "{month}月 {day}日" search: "搜尋" From 7097d553e4d6f0e6273abe1710d133fe5194d628 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 21 Jul 2023 20:38:30 +0900 Subject: [PATCH 5/7] 13.14.1 --- CHANGELOG.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 438436f01a..35c01aff07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ --> -## 13.x.x (unreleased) +## 13.14.1 ### General - 招待機能を改善しました diff --git a/package.json b/package.json index 58d153a4f6..6867a7f50c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "13.14.0-beta.7", + "version": "13.14.1", "codename": "nasubi", "repository": { "type": "git", From 4f4f15a6a407067a5ad8a266f4d88002062f010a Mon Sep 17 00:00:00 2001 From: tamaina Date: Mon, 24 Jul 2023 06:05:37 +0000 Subject: [PATCH 6/7] =?UTF-8?q?chore(frontend):=20MkImgWithBlurhash?= =?UTF-8?q?=E3=81=AE=E3=83=87=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=82=92console.log=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/components/MkImgWithBlurhash.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/frontend/src/components/MkImgWithBlurhash.vue b/packages/frontend/src/components/MkImgWithBlurhash.vue index 4e36defb7c..6dcc890cd3 100644 --- a/packages/frontend/src/components/MkImgWithBlurhash.vue +++ b/packages/frontend/src/components/MkImgWithBlurhash.vue @@ -108,8 +108,7 @@ function waitForDecode() { .then(() => { loaded = true; }, error => { - console.error('Error occurred during decoding image', img.value, error); - throw Error(error); + console.log('Error occurred during decoding image', img.value, error); }); } else { loaded = false; From fca6ae9403b51077a41d890cb78518d93b71bf89 Mon Sep 17 00:00:00 2001 From: tamaina Date: Mon, 24 Jul 2023 06:11:30 +0000 Subject: [PATCH 7/7] =?UTF-8?q?enhance(frontend):=20=E3=83=AA=E3=82=B9?= =?UTF-8?q?=E3=83=88TL=E3=81=A7=E3=80=81=E3=83=A6=E3=83=BC=E3=82=B6?= =?UTF-8?q?=E3=83=BC=E3=81=8C=E8=BF=BD=E5=8A=A0=E3=83=BB=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=A6=E3=82=82TL=E3=82=92=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/components/MkTimeline.vue | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue index 2595ebc45d..062d0bd87a 100644 --- a/packages/frontend/src/components/MkTimeline.vue +++ b/packages/frontend/src/components/MkTimeline.vue @@ -38,14 +38,6 @@ const prepend = note => { } }; -const onUserAdded = () => { - tlComponent.pagingComponent?.reload(); -}; - -const onUserRemoved = () => { - tlComponent.pagingComponent?.reload(); -}; - let endpoint; let query; let connection; @@ -125,8 +117,6 @@ if (props.src === 'antenna') { listId: props.list, }); connection.on('note', prepend); - connection.on('userAdded', onUserAdded); - connection.on('userRemoved', onUserRemoved); } else if (props.src === 'channel') { endpoint = 'channels/timeline'; query = {