From 64f4231283bfe6bb6b2a56e60a0b7fd99027cdbe Mon Sep 17 00:00:00 2001 From: tamaina Date: Fri, 11 Feb 2022 23:26:51 +0900 Subject: [PATCH 01/11] =?UTF-8?q?=E3=82=BD=E3=83=95=E3=83=88=E3=83=9F?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=83=88=E3=81=A7=E3=81=99=E3=81=B9=E3=81=A6?= =?UTF-8?q?=E3=81=8C=E3=83=9E=E3=83=83=E3=83=81=E3=81=97=E3=81=A6=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=86=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#8307?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ソフトミュートですべてがマッチしてしまうのを修正 * Clean up * Update packages/client/src/scripts/check-word-mute.ts Co-authored-by: syuilo * fix Co-authored-by: syuilo --- packages/client/src/scripts/check-word-mute.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/client/src/scripts/check-word-mute.ts b/packages/client/src/scripts/check-word-mute.ts index 74e258186..fa74c0993 100644 --- a/packages/client/src/scripts/check-word-mute.ts +++ b/packages/client/src/scripts/check-word-mute.ts @@ -7,7 +7,11 @@ export function checkWordMute(note: Record, me: Record const matched = mutedWords.some(filter => { if (Array.isArray(filter)) { - return filter.every(keyword => note.text!.includes(keyword)); + // Clean up + const filteredFilter = filter.filter(keyword => keyword !== ''); + if (filteredFilter.length === 0) return false; + + return filteredFilter.every(keyword => note.text!.includes(keyword)); } else { // represents RegExp const regexp = filter.match(/^\/(.+)\/(.*)$/); From 7df8cd2b5d515527a4e6588bfd38997619e1df36 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Feb 2022 14:43:21 +0900 Subject: [PATCH 02/11] fix(client): tweak ui #8311 --- packages/client/src/init.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts index b7fc8b1d1..113324d49 100644 --- a/packages/client/src/init.ts +++ b/packages/client/src/init.ts @@ -95,8 +95,7 @@ window.addEventListener('resize', () => { if (['smartphone', 'tablet'].includes(deviceKind)) { const viewport = document.getElementsByName('viewport').item(0); viewport.setAttribute('content', - `${viewport.getAttribute('content')},minimum-scale=1,maximum-scale=1,user-scalable=no`); - document.head.appendChild(viewport); + `${viewport.getAttribute('content')}, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover`); } //#region Set lang attr From fd3ce321c58dfb625fe9a3aa14da9157129c7b87 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Feb 2022 14:48:01 +0900 Subject: [PATCH 03/11] =?UTF-8?q?fix(client):=20=E3=83=95=E3=83=83?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=81=A7=E3=82=BB=E3=83=BC=E3=83=95=E3=82=A8?= =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=82=92=E8=80=83=E6=85=AE=E3=81=99=E3=82=8B?= =?UTF-8?q?=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/client/src/ui/universal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index b0dfc5aad..e30ba1195 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -340,7 +340,7 @@ const wallpaper = localStorage.getItem('wallpaper') != null; z-index: 1000; bottom: 0; left: 0; - padding: 16px; + padding: 16px 16px calc(env(safe-area-inset-bottom, 0px) + 16px) 16px; display: flex; width: 100%; box-sizing: border-box; From 720d5db041e52baa57177331eea3490d75c6b75c Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Feb 2022 16:52:01 +0900 Subject: [PATCH 04/11] :art: --- packages/client/src/scripts/theme.ts | 2 ++ packages/client/src/themes/d-cherry.json5 | 20 ++++++++++++++++++++ packages/client/src/themes/l-cherry.json5 | 21 +++++++++++++++++++++ packages/client/src/ui/universal.vue | 1 + 4 files changed, 44 insertions(+) create mode 100644 packages/client/src/themes/d-cherry.json5 create mode 100644 packages/client/src/themes/l-cherry.json5 diff --git a/packages/client/src/scripts/theme.ts b/packages/client/src/scripts/theme.ts index 85c087331..2001b135c 100644 --- a/packages/client/src/scripts/theme.ts +++ b/packages/client/src/scripts/theme.ts @@ -20,6 +20,7 @@ export const builtinThemes = [ require('@/themes/l-apricot.json5'), require('@/themes/l-rainy.json5'), require('@/themes/l-vivid.json5'), + require('@/themes/l-cherry.json5'), require('@/themes/l-sushi.json5'), require('@/themes/d-dark.json5'), @@ -27,6 +28,7 @@ export const builtinThemes = [ require('@/themes/d-astro.json5'), require('@/themes/d-future.json5'), require('@/themes/d-botanical.json5'), + require('@/themes/d-cherry.json5'), require('@/themes/d-pumpkin.json5'), require('@/themes/d-black.json5'), ] as Theme[]; diff --git a/packages/client/src/themes/d-cherry.json5 b/packages/client/src/themes/d-cherry.json5 new file mode 100644 index 000000000..a7e1ad1c8 --- /dev/null +++ b/packages/client/src/themes/d-cherry.json5 @@ -0,0 +1,20 @@ +{ + id: '679b3b87-a4e9-4789-8696-b56c15cc33b0', + + name: 'Mi Cherry Dark', + author: 'syuilo', + + base: 'dark', + + props: { + accent: 'rgb(255, 89, 117)', + bg: 'rgb(28, 28, 37)', + fg: 'rgb(236, 239, 244)', + panel: 'rgb(35, 35, 47)', + renote: '@accent', + link: '@accent', + mention: '@accent', + hashtag: '@accent', + divider: 'rgb(63, 63, 80)', + }, +} diff --git a/packages/client/src/themes/l-cherry.json5 b/packages/client/src/themes/l-cherry.json5 new file mode 100644 index 000000000..5ad240241 --- /dev/null +++ b/packages/client/src/themes/l-cherry.json5 @@ -0,0 +1,21 @@ +{ + id: 'ac168876-f737-4074-a3fc-a370c732ef48', + + name: 'Mi Cherry Light', + author: 'syuilo', + + base: 'light', + + props: { + accent: 'rgb(219, 96, 114)', + bg: 'rgb(254, 248, 249)', + fg: 'rgb(152, 13, 26)', + panel: 'rgb(255, 255, 255)', + renote: '@accent', + link: 'rgb(156, 187, 5)', + mention: '@accent', + hashtag: '@accent', + divider: 'rgba(134, 51, 51, 0.1)', + inputBorderHover: 'rgb(238, 221, 222)', + }, +} diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index e30ba1195..a2041b2e3 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -347,6 +347,7 @@ const wallpaper = localStorage.getItem('wallpaper') != null; -webkit-backdrop-filter: var(--blur, blur(32px)); backdrop-filter: var(--blur, blur(32px)); background-color: var(--header); + border-top: solid 0.5px var(--divider); > .button { position: relative; From f6e40a9092d0b72a70151b63b0a504260d97d9b4 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Feb 2022 16:53:25 +0900 Subject: [PATCH 05/11] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bed70f918..eb475ba61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,15 @@ You should also include the user name that made the change. --> +## 12.x.x (unreleased) + +### Improvements +- クライアント: テーマを追加 @syuilo + +### Bugfixes +- クライアント: デバイスのスクリーンのセーフエリアを考慮するように @syuilo +- クライアント: ソフトミュートですべてがマッチしてしまう場合があるのを修正 @tamaina + ## 12.106.3 (2022/02/11) ### Improvements From e7d6bd19eb012582f59cdb3355a751d421563f91 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Feb 2022 17:00:09 +0900 Subject: [PATCH 06/11] :art: --- packages/client/src/ui/deck.vue | 2 +- packages/client/src/ui/universal.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue index 9accc34a8..e4571d409 100644 --- a/packages/client/src/ui/deck.vue +++ b/packages/client/src/ui/deck.vue @@ -276,7 +276,7 @@ export default defineComponent({ } > * { - font-size: 22px; + font-size: 20px; } &:disabled { diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index a2041b2e3..000fec9b4 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -393,7 +393,7 @@ const wallpaper = localStorage.getItem('wallpaper') != null; } > * { - font-size: 22px; + font-size: 20px; } &:disabled { From 1c6ab5447d591f4f6e876b59f6e104fcf30869a3 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Feb 2022 17:28:33 +0900 Subject: [PATCH 07/11] =?UTF-8?q?fix(client):=20=E4=B8=80=E9=83=A8?= =?UTF-8?q?=E7=92=B0=E5=A2=83=E3=81=A7=E3=82=B5=E3=82=A4=E3=83=89=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E6=8A=95=E7=A8=BF=E3=83=9C=E3=82=BF=E3=83=B3?= =?UTF-8?q?=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E5=95=8F=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 --- CHANGELOG.md | 3 ++- packages/client/src/ui/_common_/sidebar.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb475ba61..4469a1496 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,9 @@ You should also include the user name that made the change. - クライアント: テーマを追加 @syuilo ### Bugfixes -- クライアント: デバイスのスクリーンのセーフエリアを考慮するように @syuilo - クライアント: ソフトミュートですべてがマッチしてしまう場合があるのを修正 @tamaina +- クライアント: デバイスのスクリーンのセーフエリアを考慮するように @syuilo +- クライアント: 一部環境でサイドバーの投稿ボタンが表示されない問題を修正 @syuilo ## 12.106.3 (2022/02/11) diff --git a/packages/client/src/ui/_common_/sidebar.vue b/packages/client/src/ui/_common_/sidebar.vue index 94baacbee..f33d8f899 100644 --- a/packages/client/src/ui/_common_/sidebar.vue +++ b/packages/client/src/ui/_common_/sidebar.vue @@ -305,7 +305,7 @@ export default defineComponent({ &.post:before { width: calc(100% - 28px); - height: min-content; + height: auto; aspect-ratio: 1/1; border-radius: 100%; } From 642a51a558550d801688a9a16cd640451c05288e Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 12 Feb 2022 17:29:15 +0900 Subject: [PATCH 08/11] =?UTF-8?q?fix(client):=20nextTick=E3=81=AE=E4=B8=AD?= =?UTF-8?q?=E3=81=A7onUnmounted=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=82=82=E5=8A=B9=E3=81=8B=E3=81=AA=E3=81=84=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E6=80=A7=E3=81=8C=E3=81=82=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/components/ui/tooltip.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/client/src/components/ui/tooltip.vue b/packages/client/src/components/ui/tooltip.vue index 3ccd1b731..ee1909554 100644 --- a/packages/client/src/components/ui/tooltip.vue +++ b/packages/client/src/components/ui/tooltip.vue @@ -180,12 +180,12 @@ const setPosition = () => { el.value.style.top = top + 'px'; }; +let loopHandler; + onMounted(() => { nextTick(() => { setPosition(); - let loopHandler; - const loop = () => { loopHandler = window.requestAnimationFrame(() => { setPosition(); @@ -194,12 +194,12 @@ onMounted(() => { }; loop(); - - onUnmounted(() => { - window.cancelAnimationFrame(loopHandler); - }); }); }); + +onUnmounted(() => { + window.cancelAnimationFrame(loopHandler); +});