From 49c19be3f98d3be101076faa60e819bbdb4768f2 Mon Sep 17 00:00:00 2001 From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com> Date: Sat, 17 Feb 2024 19:40:13 +0900 Subject: [PATCH 1/4] feat: add guideline link --- packages/frontend/src/components/MkVisitorDashboard.vue | 8 +++++++- packages/frontend/src/ui/_common_/common.ts | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue index be80baa774f3..856f6f9fec4a 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -120,7 +120,13 @@ function showMenu(ev) { action: () => { window.open(instance.privacyPolicyUrl!, '_blank', 'noopener'); }, - } : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : { type: 'divider' }, { + } : undefined, { + text: 'NSFWガイドライン', + icon: 'ti ti-notebook', + action: () => { + window.open('https://kinel.notion.site/NSFW-39a3f0c8708e4e2594594a1c88099fe3', '_blank', 'noopener'); + }, + }, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : { type: 'divider' }, { text: i18n.ts.help, icon: 'ti ti-help-circle', action: () => { diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts index 9b510a629241..a874a53757f0 100644 --- a/packages/frontend/src/ui/_common_/common.ts +++ b/packages/frontend/src/ui/_common_/common.ts @@ -97,7 +97,13 @@ export function openInstanceMenu(ev: MouseEvent) { action: () => { window.open(instance.privacyPolicyUrl, '_blank', 'noopener'); }, - } : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : { type: 'divider' }, { + } : undefined, { + text: 'NSFWガイドライン', + icon: 'ti ti-notebook', + action: () => { + window.open('https://kinel.notion.site/NSFW-39a3f0c8708e4e2594594a1c88099fe3', '_blank', 'noopener'); + }, + }, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : { type: 'divider' }, { text: i18n.ts.help, icon: 'ti ti-help-circle', action: () => { From bd6cbd747b84655e2ffccd2e97a15a6401acc22f Mon Sep 17 00:00:00 2001 From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com> Date: Sat, 17 Feb 2024 10:57:54 +0000 Subject: [PATCH 2/4] docs: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fdd1f0b67f47..920a5a88cfcc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ### Client - センシティブチャンネルのNoteの畳まれ方がソフトミュートと同様になりました。 +- NSFWガイドラインへのリンクをメニューに追加しました。 ## 2024.2.0 From 2fdf5f643d2ec04a343404716875c9148e64823f Mon Sep 17 00:00:00 2001 From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com> Date: Sat, 17 Feb 2024 20:09:42 +0900 Subject: [PATCH 3/4] chore: always show divider --- packages/frontend/src/components/MkVisitorDashboard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue index 856f6f9fec4a..63f3be498437 100644 --- a/packages/frontend/src/components/MkVisitorDashboard.vue +++ b/packages/frontend/src/components/MkVisitorDashboard.vue @@ -126,7 +126,7 @@ function showMenu(ev) { action: () => { window.open('https://kinel.notion.site/NSFW-39a3f0c8708e4e2594594a1c88099fe3', '_blank', 'noopener'); }, - }, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : { type: 'divider' }, { + }, { type: 'divider' }, { text: i18n.ts.help, icon: 'ti ti-help-circle', action: () => { From e9ec3af1644a9e17c95f7a2ca019c736048b7ffc Mon Sep 17 00:00:00 2001 From: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com> Date: Sat, 17 Feb 2024 20:10:08 +0900 Subject: [PATCH 4/4] chore: always show divider --- packages/frontend/src/ui/_common_/common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts index a874a53757f0..d7507b04c481 100644 --- a/packages/frontend/src/ui/_common_/common.ts +++ b/packages/frontend/src/ui/_common_/common.ts @@ -103,7 +103,7 @@ export function openInstanceMenu(ev: MouseEvent) { action: () => { window.open('https://kinel.notion.site/NSFW-39a3f0c8708e4e2594594a1c88099fe3', '_blank', 'noopener'); }, - }, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : { type: 'divider' }, { + }, { type: 'divider' }, { text: i18n.ts.help, icon: 'ti ti-help-circle', action: () => {