From 0dd3cac8d954050f85aee6aadd50d7256604d7c3 Mon Sep 17 00:00:00 2001 From: zyoshoka <107108195+zyoshoka@users.noreply.github.com> Date: Sat, 11 Nov 2023 16:07:07 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix(frontend):=20=E3=82=A2=E3=82=A4?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=87=E3=82=B3=E3=83=AC=E3=83=BC=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=8C=E8=A6=8B=E5=88=87=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#12239)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(frontend): アイコンデコレーションがナビゲーションバーでクリップされないように * Revert "fix(frontend): アイコンデコレーションがナビゲーションバーでクリップされないように" This reverts commit db246b13d9c5b3a6112b4cf38f605cc8c967639b. * fix: tweak padding of account in navbar * fix: set minimum height of note preview * fix: リアクション一覧でアイコンデコレーションが見切れないように * Update CHANGELOG.md --------- Co-authored-by: syuilo --- CHANGELOG.md | 2 +- packages/frontend/src/components/MkPostForm.vue | 1 + .../src/components/MkReactionsViewer.details.vue | 3 +-- packages/frontend/src/ui/_common_/navbar.vue | 9 ++++----- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e4617d0e67e9..11e5eb87f14a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ - ### Client -- +- Fix: アイコンデコレーションが複数の場所で見切れている問題を修正 ### Server - Fix: トークンのないプラグインをアンインストールするときにエラーが出ないように diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index 512fb892edc4..d163ea248767 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -1072,6 +1072,7 @@ defineExpose({ .preview { padding: 16px 20px 0 20px; + min-height: 75px; max-height: 150px; overflow: auto; } diff --git a/packages/frontend/src/components/MkReactionsViewer.details.vue b/packages/frontend/src/components/MkReactionsViewer.details.vue index 17cd083561ff..1b0d8f74a325 100644 --- a/packages/frontend/src/components/MkReactionsViewer.details.vue +++ b/packages/frontend/src/components/MkReactionsViewer.details.vue @@ -73,7 +73,6 @@ function getReactionName(reaction: string): string { } .users { - contain: content; flex: 1; min-width: 0; margin: -4px 14px 0 10px; @@ -85,7 +84,7 @@ function getReactionName(reaction: string): string { line-height: 24px; padding-top: 4px; white-space: nowrap; - overflow: hidden; + overflow: visible; text-overflow: ellipsis; } diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue index bd554ad8bed6..93d09e95b50b 100644 --- a/packages/frontend/src/ui/_common_/navbar.vue +++ b/packages/frontend/src/ui/_common_/navbar.vue @@ -176,7 +176,7 @@ function more(ev: MouseEvent) { .bottom { position: sticky; bottom: 0; - padding: 20px 0; + padding-top: 20px; background: var(--X14); -webkit-backdrop-filter: var(--blur, blur(8px)); backdrop-filter: var(--blur, blur(8px)); @@ -228,11 +228,10 @@ function more(ev: MouseEvent) { position: relative; display: flex; align-items: center; - padding-left: 30px; + padding: 20px 0 20px 30px; width: 100%; text-align: left; box-sizing: border-box; - margin-top: 16px; overflow: clip; } @@ -363,7 +362,7 @@ function more(ev: MouseEvent) { .bottom { position: sticky; bottom: 0; - padding: 20px 0; + padding-top: 20px; background: var(--X14); -webkit-backdrop-filter: var(--blur, blur(8px)); backdrop-filter: var(--blur, blur(8px)); @@ -374,7 +373,6 @@ function more(ev: MouseEvent) { position: relative; width: 100%; height: 52px; - margin-bottom: 16px; text-align: center; &:before { @@ -411,6 +409,7 @@ function more(ev: MouseEvent) { .account { display: block; text-align: center; + padding: 20px 0; width: 100%; overflow: clip; } From cec02966ad3917fd41950044f3ff24afe233bdd5 Mon Sep 17 00:00:00 2001 From: zyoshoka <107108195+zyoshoka@users.noreply.github.com> Date: Sat, 11 Nov 2023 16:34:46 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix(frontend):=20=E3=80=8C=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=AD=E3=83=BC=E4=B8=AD=E3=81=AE=E4=BA=BA=E5=85=A8?= =?UTF-8?q?=E5=93=A1=E3=81=AE=E8=BF=94=E4=BF=A1=E3=82=92=E5=90=AB=E3=82=81?= =?UTF-8?q?=E3=82=8B/=E5=90=AB=E3=82=81=E3=81=AA=E3=81=84=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B=E3=80=8D=E3=81=AE=E3=83=9C?= =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=82=92=E6=8A=BC=E4=B8=8B=E3=81=97=E3=81=9F?= =?UTF-8?q?=E9=9A=9B=E3=81=AE=E7=A2=BA=E8=AA=8D=E3=81=8C=E6=A9=9F=E8=83=BD?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=20(#12308)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(frontend): 「フォロー中の人全員の返信を含める/含めないようにする」のボタンを押下した際の確認が機能していない問題を修正 * Update CHANGELOG.md --- CHANGELOG.md | 1 + packages/frontend/src/pages/settings/other.vue | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11e5eb87f14a..57415554e7df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ ### Client - Fix: アイコンデコレーションが複数の場所で見切れている問題を修正 +― Fix: 「フォロー中の人全員の返信を含める/含めないようにする」のボタンを押下した際の確認が機能していない問題を修正 ### Server - Fix: トークンのないプラグインをアンインストールするときにエラーが出ないように diff --git a/packages/frontend/src/pages/settings/other.vue b/packages/frontend/src/pages/settings/other.vue index 36666b9c20af..a921e0cea9af 100644 --- a/packages/frontend/src/pages/settings/other.vue +++ b/packages/frontend/src/pages/settings/other.vue @@ -148,12 +148,13 @@ async function reloadAsk() { } async function updateRepliesAll(withReplies: boolean) { - const { canceled } = os.confirm({ + const { canceled } = await os.confirm({ type: 'warning', text: withReplies ? i18n.ts.confirmShowRepliesAll : i18n.ts.confirmHideRepliesAll, }); if (canceled) return; - await os.api('following/update-all', { withReplies }); + + os.api('following/update-all', { withReplies }); } watch([ From e1cc95d3084cefe693a1f7028848d1c8aaceacf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?= <46447427+samunohito@users.noreply.github.com> Date: Mon, 13 Nov 2023 09:27:37 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=81=AE?= =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AE=E3=81=BF=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E6=99=82=E3=81=ABDB=E3=81=B8=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=83=90=E3=83=83=E3=82=AF=E3=81=99=E3=82=8B=E3=81=A8?= =?UTF-8?q?=E3=83=AA=E3=83=8E=E3=83=BC=E3=83=88=E3=82=92=E5=90=AB=E3=82=93?= =?UTF-8?q?=E3=81=A7=E3=81=97=E3=81=BE=E3=81=86=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20(#12321)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ユーザのノートのみ表示時にDBへフォールバックするとリノートを含んでしまうのを修正 * fix CHANGELOG.md --------- Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com> --- CHANGELOG.md | 1 + packages/backend/src/server/api/endpoints/users/notes.ts | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57415554e7df..6f9e540fe322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ ### Server - Fix: トークンのないプラグインをアンインストールするときにエラーが出ないように - Fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないようにされました +- Fix: ユーザタイムラインの「ノート」選択時にリノートが混ざり込んでしまうことがある問題の修正 #12306 ## 2023.11.0 diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts index 343d320f6e50..a43e57292217 100644 --- a/packages/backend/src/server/api/endpoints/users/notes.ts +++ b/packages/backend/src/server/api/endpoints/users/notes.ts @@ -51,7 +51,6 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, sinceDate: { type: 'integer' }, untilDate: { type: 'integer' }, - includeMyRenotes: { type: 'boolean', default: true }, withFiles: { type: 'boolean', default: false }, excludeNsfw: { type: 'boolean', default: false }, }, @@ -169,7 +168,7 @@ export default class extends Endpoint { // eslint- query.andWhere('note.fileIds != \'{}\''); } - if (ps.includeMyRenotes === false) { + if (ps.withRenotes === false) { query.andWhere(new Brackets(qb => { qb.orWhere('note.userId != :userId', { userId: ps.userId }); qb.orWhere('note.renoteId IS NULL'); From c541ced3abc57cee7c242682de58e562779a1ce6 Mon Sep 17 00:00:00 2001 From: Srgr0 <66754887+Srgr0@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:25:52 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E9=9D=9E=E3=83=AD=E3=82=B0=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E6=99=82=E3=81=AB=E3=80=8C=E3=83=A1=E3=83=A2=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=80=8D=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=97?= =?UTF-8?q?=E3=81=AA=E3=81=84=20(#12310)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update home.vue * Update CHANGELOG.md --- CHANGELOG.md | 1 + packages/frontend/src/pages/user/home.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f9e540fe322..87d89e2fc777 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ ### Client - Fix: アイコンデコレーションが複数の場所で見切れている問題を修正 ― Fix: 「フォロー中の人全員の返信を含める/含めないようにする」のボタンを押下した際の確認が機能していない問題を修正 +- Fix: 非ログイン時に「ノートを追加」を表示しないように変更 #12309 ### Server - Fix: トークンのないプラグインをアンインストールするときにエラーが出ないように diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue index 7ff490bf8b6a..2e5dd705d0bc 100644 --- a/packages/frontend/src/pages/user/home.vue +++ b/packages/frontend/src/pages/user/home.vue @@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only -