From b07659f4743aff896608ae0d2a47478227cfd573 Mon Sep 17 00:00:00 2001
From: CoolElectronics <me@coolelectronics.me>
Date: Mon, 10 Jun 2024 23:15:39 -0400
Subject: [PATCH] fix favicon sorta

---
 src/boot/after_store.js                    | 17 ++++++++++++++---
 src/components/desktop_nav/desktop_nav.js  |  3 +++
 src/components/desktop_nav/desktop_nav.vue |  2 +-
 src/modules/instance.js                    |  4 ++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 29d08cf2..2ca0f4a4 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -67,6 +67,17 @@ const resolveLanguage = (instanceLanguages) => {
 
 const getInstanceConfig = async ({ store }) => {
   try {
+    const metares = await fetch('/api/meta', { method: "POST", body: JSON.stringify({}), headers:{ "content-type":"application/json" } });
+    if (metares.ok) {
+      const data = await metares.json();
+
+
+      console.log(data)
+      store.dispatch('setInstanceOption', { name: 'iconUrl', value: data.iconUrl });
+    } else {
+      throw (metares)
+    }
+
     const res = await preloadFetch('/api/v1/instance')
     if (res.ok) {
       const data = await res.json()
@@ -98,7 +109,7 @@ const getBackendProvidedConfig = async ({ store }) => {
     //const res = await window.fetch('/api/pleroma/frontend_configurations')
     if (true) {
       //const data = await res.json()
-      const data = {"masto_fe":{"showInstanceSpecificPanel":true},"pleroma_fe":{"alwaysShowSubjectInput":true,"background":"/images/city.jpg","collapseMessageWithSubject":true,"conversationDisplay":"linear","disableChat":false,"greentext":false,"hideFilteredStatuses":true,"hideMutedPosts":true,"hidePostStats":false,"hideSitename":false,"hideUserStats":false,"loginMethod":"token","logo":"/static/logo.svg","logoMargin":".1em","logoMask":true,"noAttachmentLinks":false,"nsfwCensorImage":"","postContentType":"text/plain","redirectRootLogin":"/main/friends","redirectRootNoLogin":"/main/public","renderMisskeyMarkdown":true,"scopeCopy":true,"showFeaturesPanel":true,"showInstanceSpecificPanel":false,"sidebarRight":false,"subjectLineBehavior":"email","theme":"pleroma-dark","webPushNotifications":false}}
+      const data = { "masto_fe": { "showInstanceSpecificPanel": true }, "pleroma_fe": { "alwaysShowSubjectInput": true, "background": "/images/city.jpg", "collapseMessageWithSubject": true, "conversationDisplay": "linear", "disableChat": false, "greentext": false, "hideFilteredStatuses": true, "hideMutedPosts": true, "hidePostStats": false, "hideSitename": false, "hideUserStats": false, "loginMethod": "token", "logo": "/static/logo.svg", "logoMargin": ".1em", "logoMask": true, "noAttachmentLinks": false, "nsfwCensorImage": "", "postContentType": "text/plain", "redirectRootLogin": "/main/friends", "redirectRootNoLogin": "/main/public", "renderMisskeyMarkdown": true, "scopeCopy": true, "showFeaturesPanel": true, "showInstanceSpecificPanel": false, "sidebarRight": false, "subjectLineBehavior": "email", "theme": "pleroma-dark", "webPushNotifications": false } }
       return data.pleroma_fe
     } else {
       throw (res)
@@ -293,7 +304,7 @@ const getNodeInfo = async ({ store }) => {
       // store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(configuration.media_attachments.image_size_limit) })
       // store.dispatch('setInstanceOption', { name: 'fieldsLimits', value: metadata.fieldsLimits })
 
-      store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: ["admin","instance.actor","instance.relay"] })
+      store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: ["admin", "instance.actor", "instance.relay"] })
       store.dispatch('setInstanceOption', { name: 'postFormats', value: ["text/x.misskeymarkdown"] })
 
       //const suggestions = metadata.suggestions
@@ -320,7 +331,7 @@ const getNodeInfo = async ({ store }) => {
       // })
 
       // store.dispatch('setInstanceOption', { name: 'federationPolicy', value: federation })
-      store.dispatch('setInstanceOption', { name: 'localBubbleInstances', value: [ ] })
+      store.dispatch('setInstanceOption', { name: 'localBubbleInstances', value: [] })
       // store.dispatch('setInstanceOption', {
       //   name: 'federating',
       //   value: typeof federation.enabled === 'undefined'
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index d7538f5b..690b5113 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -75,6 +75,9 @@ export default {
         'background-color': this.enableMask ? '' : 'transparent'
       }
     },
+    instanceFavicon(){ 
+      return this.$store.state.instance.iconUrl
+    },
     logoBgStyle () {
       return Object.assign({
         'margin': `${this.$store.state.instance.logoMargin} 0`,
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index aa5edd40..dc7b02dd 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -18,7 +18,7 @@
           <img
             v-if="!hideSiteFavicon"
             class="favicon"
-            src="/favicon.png"
+            :src="instanceFavicon"
           >
           <span
             v-if="!hideSiteName"
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 03c83e68..d82331c3 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -13,6 +13,10 @@ const defaultState = {
   textlimit: 5000,
   themeData: undefined,
   vapidPublicKey: undefined,
+  
+
+  // sharkey
+  iconUrl: undefined,
 
   // Stuff from static/config.json
   alwaysShowSubjectInput: true,