From 78382a27eaca6f792110ccd90f17523eb414c74a Mon Sep 17 00:00:00 2001
From: eris <femmediscord@gmail.com>
Date: Mon, 1 Aug 2022 23:03:04 +0000
Subject: [PATCH] Add user options to hide instance favicon and name

---
 src/components/desktop_nav/desktop_nav.js          |  9 +++++++++
 src/components/desktop_nav/desktop_nav.scss        | 11 ++++++-----
 src/components/desktop_nav/desktop_nav.vue         |  3 ++-
 src/components/mobile_nav/mobile_nav.js            |  7 ++++++-
 src/components/mobile_nav/mobile_nav.vue           | 12 ++++++++++--
 src/components/settings_modal/tabs/general_tab.vue | 10 ++++++++++
 src/i18n/en.json                                   |  2 ++
 src/modules/config.js                              |  2 ++
 src/modules/instance.js                            |  3 ++-
 9 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 72b984c2..7df43e6b 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -80,7 +80,16 @@ export default {
           })
     },
     logo () { return this.$store.state.instance.logo },
+    mergedConfig () {
+      return this.$store.getters.mergedConfig
+    },
     sitename () { return this.$store.state.instance.name },
+    hideSiteFavicon () {
+      return this.mergedConfig.hideSiteFavicon
+    },
+    hideSiteName () {
+      return this.mergedConfig.hideSiteName
+    },
     hideSitename () { return this.$store.state.instance.hideSitename },
     logoLeft () { return this.$store.state.instance.logoLeft },
     currentUser () { return this.$store.state.users.currentUser },
diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index 255b4c36..9fed26f3 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -109,6 +109,11 @@
     }
   }
 
+  .svg-inline--fa {
+    color: $fallback--link;
+    color: var(--topBarLink, $fallback--link);
+  }
+
   .nav-icon {
     margin-left: 0.7em;
     width: 2em;
@@ -123,6 +128,7 @@
         font-weight: bolder;
         color: $fallback--text;
         color: var(--selectedMenuText, $fallback--text);
+
         --lightText: var(--selectedMenuLightText, $fallback--lightText);
       }
     }
@@ -130,11 +136,6 @@
     &-logout {
       margin-left: 2em;
     }
-
-    .svg-inline--fa {
-      color: $fallback--link;
-      color: var(--topBarLink, $fallback--link);
-    }
   }
 
   .left {
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 21a0f33b..80bbfe59 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -13,11 +13,12 @@
           active-class="home"
         >
           <img
+            v-if="!hideSiteFavicon"
             class="favicon"
             src="/favicon.png"
           >
           <span
-            v-if="!hideSitename"
+            v-if="!hideSiteName"
             class="site-name"
           >
             {{ sitename }}
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index dad1f6aa..ef973981 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -52,7 +52,12 @@ const MobileNav = {
     unseenNotificationsCount () {
       return this.unseenNotifications.length
     },
-    hideSitename () { return this.$store.state.instance.hideSitename },
+    mergedConfig () {
+      return this.$store.getters.mergedConfig
+    },
+    hideSiteName () {
+      return this.mergedConfig.hideSiteName
+    },
     sitename () { return this.$store.state.instance.name },
     isChat () {
       return this.$route.name === 'chat'
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index c2746abe..483611b7 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -23,8 +23,16 @@
             class="alert-dot"
           />
         </button>
-        <NavigationPins class="pins" />
-      </div> <div class="item right">
+        <router-link
+          v-if="!hideSiteName"
+          class="site-name"
+          :to="{ name: 'root' }"
+          active-class="home"
+        >
+          {{ sitename }}
+        </router-link>
+      </div>
+      <div class="item right">
         <button
           v-if="currentUser"
           class="button-unstyled mobile-nav-button"
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 610c15a9..5d0e4ee6 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -25,6 +25,16 @@
     <div class="setting-item">
       <h2>{{ $t('nav.timeline') }}</h2>
       <ul class="setting-list">
+        <li>
+          <BooleanSetting path="hideSiteFavicon">
+            {{ $t('settings.hide_site_favicon') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="hideSiteName">
+            {{ $t('settings.hide_site_name') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting path="stopGifs">
             {{ $t('settings.stop_gifs') }}
diff --git a/src/i18n/en.json b/src/i18n/en.json
index dd55b6ed..5fa9e43a 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -507,6 +507,8 @@
     "preload_images": "Preload images",
     "use_one_click_nsfw": "Open NSFW attachments with just one click",
     "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
+    "hide_site_favicon": "Hide instance favicon in top panel",
+    "hide_site_name": "Hide instance name in top panel",
     "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
     "hide_filtered_statuses": "Hide all filtered posts",
     "hide_wordfiltered_statuses": "Hide word-filtered statuses",
diff --git a/src/modules/config.js b/src/modules/config.js
index 84ec4efc..b4d510da 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -40,6 +40,8 @@ export const defaultState = {
   muteBotStatuses: undefined, // instance default
   collapseMessageWithSubject: undefined, // instance default
   padEmoji: true,
+  hideSiteFavicon: undefined, // instance default
+  hideSiteName: undefined, // instance default
   swapReacts: true,
   hideAttachments: false,
   hideAttachmentsInConv: false,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 33370c8c..eb90a47e 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -68,7 +68,8 @@ const defaultState = {
   hideWordFilteredPosts: false,
   hidePostStats: false,
   hideBotIndication: false,
-  hideSitename: false,
+  hideSiteFavicon: false,
+  hideSiteName: false,
   hideUserStats: false,
   muteBotStatuses: false,
   modalOnRepeat: false,