fix favicon sorta

This commit is contained in:
CoolElectronics 2024-06-10 23:15:39 -04:00
parent 958dfaa960
commit b07659f474
No known key found for this signature in database
GPG key ID: F63593D168636C50
4 changed files with 22 additions and 4 deletions

View file

@ -67,6 +67,17 @@ const resolveLanguage = (instanceLanguages) => {
const getInstanceConfig = async ({ store }) => { const getInstanceConfig = async ({ store }) => {
try { 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') const res = await preloadFetch('/api/v1/instance')
if (res.ok) { if (res.ok) {
const data = await res.json() const data = await res.json()
@ -98,7 +109,7 @@ const getBackendProvidedConfig = async ({ store }) => {
//const res = await window.fetch('/api/pleroma/frontend_configurations') //const res = await window.fetch('/api/pleroma/frontend_configurations')
if (true) { if (true) {
//const data = await res.json() //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 return data.pleroma_fe
} else { } else {
throw (res) 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: 'bannerlimit', value: parseInt(configuration.media_attachments.image_size_limit) })
// store.dispatch('setInstanceOption', { name: 'fieldsLimits', value: metadata.fieldsLimits }) // 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"] }) store.dispatch('setInstanceOption', { name: 'postFormats', value: ["text/x.misskeymarkdown"] })
//const suggestions = metadata.suggestions //const suggestions = metadata.suggestions
@ -320,7 +331,7 @@ const getNodeInfo = async ({ store }) => {
// }) // })
// store.dispatch('setInstanceOption', { name: 'federationPolicy', value: federation }) // store.dispatch('setInstanceOption', { name: 'federationPolicy', value: federation })
store.dispatch('setInstanceOption', { name: 'localBubbleInstances', value: [ ] }) store.dispatch('setInstanceOption', { name: 'localBubbleInstances', value: [] })
// store.dispatch('setInstanceOption', { // store.dispatch('setInstanceOption', {
// name: 'federating', // name: 'federating',
// value: typeof federation.enabled === 'undefined' // value: typeof federation.enabled === 'undefined'

View file

@ -75,6 +75,9 @@ export default {
'background-color': this.enableMask ? '' : 'transparent' 'background-color': this.enableMask ? '' : 'transparent'
} }
}, },
instanceFavicon(){
return this.$store.state.instance.iconUrl
},
logoBgStyle () { logoBgStyle () {
return Object.assign({ return Object.assign({
'margin': `${this.$store.state.instance.logoMargin} 0`, 'margin': `${this.$store.state.instance.logoMargin} 0`,

View file

@ -18,7 +18,7 @@
<img <img
v-if="!hideSiteFavicon" v-if="!hideSiteFavicon"
class="favicon" class="favicon"
src="/favicon.png" :src="instanceFavicon"
> >
<span <span
v-if="!hideSiteName" v-if="!hideSiteName"

View file

@ -14,6 +14,10 @@ const defaultState = {
themeData: undefined, themeData: undefined,
vapidPublicKey: undefined, vapidPublicKey: undefined,
// sharkey
iconUrl: undefined,
// Stuff from static/config.json // Stuff from static/config.json
alwaysShowSubjectInput: true, alwaysShowSubjectInput: true,
defaultAvatar: '/images/avi.png', defaultAvatar: '/images/avi.png',