From 9e9ab5cec97f5f37a38ecd4bd1f81381b99ff3c3 Mon Sep 17 00:00:00 2001
From: Eris <femmediscord@gmail.com>
Date: Mon, 14 Jun 2021 19:42:56 +0000
Subject: [PATCH] New option: Hide shoutbox
---
src/App.js | 3 +++
src/App.vue | 2 +-
src/components/settings_modal/tabs/general_tab.js | 1 +
src/components/settings_modal/tabs/general_tab.vue | 5 +++++
src/i18n/en.json | 1 +
src/modules/config.js | 1 +
6 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/App.js b/src/App.js
index fe4c30cb2..8d9ec8c7c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -73,6 +73,9 @@ export default {
this.$store.state.instance.instanceSpecificPanelContent
},
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
+ hideSB () {
+ return this.$store.getters.mergedConfig.hideShoutbox
+ },
isMobileLayout () { return this.$store.state.interface.mobileLayout },
privateMode () { return this.$store.state.instance.private },
sidebarAlign () {
diff --git a/src/App.vue b/src/App.vue
index 6c582c034..39decde9e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -50,7 +50,7 @@
<media-modal />
</div>
<shout-panel
- v-if="currentUser && shout"
+ v-if="currentUser && shout && !hideSB"
:floating="true"
class="floating-shout mobile-hidden"
/>
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 07fccf57c..0e838e599 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -50,6 +50,7 @@ const GeneralTab = {
return this.$store.state.instance.background &&
!this.$store.state.users.currentUser.background_image
},
+ shout () { return this.$store.state.shout.channel.state === 'joined' },
...SharedComputedObject()
}
}
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index e62df2909..764a4c768 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -21,6 +21,11 @@
{{ $t('settings.hide_wallpaper') }}
</BooleanSetting>
</li>
+ <li v-if="shout">
+ <BooleanSetting path="hideShoutbox">
+ {{ $t('settings.hide_shoutbox') }} {{ $t('shoutbox.title') }}
+ </BooleanSetting>
+ </li>
</ul>
</div>
<div class="setting-item">
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 2b253efb2..ca3ee273b 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -351,6 +351,7 @@
"max_thumbnails": "Maximum amount of thumbnails per post",
"hide_isp": "Hide instance-specific panel",
"right_sidebar": "Show sidebar on the right side",
+ "hide_shoutbox": "Hide ",
"hide_wallpaper": "Hide instance wallpaper",
"preload_images": "Preload images",
"use_one_click_nsfw": "Open NSFW attachments with just one click",
diff --git a/src/modules/config.js b/src/modules/config.js
index ad9c8be5c..db9d5ffbb 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -21,6 +21,7 @@ export const defaultState = {
customThemeSource: undefined,
hideISP: false,
hideInstanceWallpaper: false,
+ hideShoutbox: false,
// bad name: actually hides posts of muted USERS
hideMutedPosts: undefined, // instance default
collapseMessageWithSubject: undefined, // instance default
--
GitLab