This commit is contained in:
Henry Jameson 2026-06-05 14:53:33 +03:00
commit 3f2ce5e7ab
5 changed files with 13 additions and 6 deletions

View file

@ -150,7 +150,10 @@ export default {
return this.currentUser.background_image return this.currentUser.background_image
}, },
foreignProfileBackground() { foreignProfileBackground() {
return useMergedConfigStore().mergedConfig.allowForeignUserBackground && useInterfaceStore().foreignProfileBackground return (
useMergedConfigStore().mergedConfig.allowForeignUserBackground &&
useInterfaceStore().foreignProfileBackground
)
}, },
instanceBackground() { instanceBackground() {
return useMergedConfigStore().mergedConfig.hideInstanceWallpaper return useMergedConfigStore().mergedConfig.hideInstanceWallpaper
@ -158,7 +161,11 @@ export default {
: this.instanceBackgroundUrl : this.instanceBackgroundUrl
}, },
background() { background() {
return this.foreignProfileBackground || this.userBackground || this.instanceBackground return (
this.foreignProfileBackground ||
this.userBackground ||
this.instanceBackground
)
}, },
bgStyle() { bgStyle() {
if (this.background) { if (this.background) {

View file

@ -79,7 +79,7 @@
:button="button" :button="button"
:status="status" :status="status"
v-bind="$attrs" v-bind="$attrs"
@emojiPickerShown="e => $emit('emojiPickerShown', e)" @emoji-picker-shown="e => $emit('emojiPickerShown', e)"
/> />
<teleport to="#modal"> <teleport to="#modal">
<MuteConfirm <MuteConfirm

View file

@ -20,7 +20,7 @@
:get-component="getComponent" :get-component="getComponent"
:close="() => { /* no-op */ }" :close="() => { /* no-op */ }"
:do-action="doAction" :do-action="doAction"
@emojiPickerShown="onEmojiPickerShown" @emoji-picker-shown="onEmojiPickerShown"
/> />
<button <button
v-if="showPin && currentUser" v-if="showPin && currentUser"

View file

@ -11,8 +11,8 @@ import Timeline from '../timeline/timeline.vue'
import UserCard from '../user_card/user_card.vue' import UserCard from '../user_card/user_card.vue'
import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceStore } from 'src/stores/instance.js'
import { useInterfaceStore } from 'src/stores/interface.js'
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
import { useInterfaceStore } from 'src/stores/interface.js'
import { useMergedConfigStore } from 'src/stores/merged_config.js' import { useMergedConfigStore } from 'src/stores/merged_config.js'
import { library } from '@fortawesome/fontawesome-svg-core' import { library } from '@fortawesome/fontawesome-svg-core'

View file

@ -141,7 +141,7 @@ export const INSTANCE_DEFAULT_CONFIG_DEFINITIONS = {
default: false, default: false,
}, },
allowForeignUserBackground: { allowForeignUserBackground: {
description: 'Allow other user\'s profiles to override wallpaper', description: "Allow other user's profiles to override wallpaper",
default: true, default: true,
}, },
hideInstanceWallpaper: { hideInstanceWallpaper: {