Merge remote-tracking branch 'origin/develop' into optimize

This commit is contained in:
Henry Jameson 2026-06-08 00:03:17 +03:00
commit 3bf558089f
11 changed files with 39 additions and 5 deletions

View file

@ -158,13 +158,23 @@ export default {
userBackground() {
return this.currentUser.background_image
},
foreignProfileBackground() {
return (
useMergedConfigStore().mergedConfig.allowForeignUserBackground &&
useInterfaceStore().foreignProfileBackground
)
},
instanceBackground() {
return useMergedConfigStore().mergedConfig.hideInstanceWallpaper
? null
: this.instanceBackgroundUrl
},
background() {
return this.userBackground || this.instanceBackground
return (
this.foreignProfileBackground ||
this.userBackground ||
this.instanceBackground
)
},
bgStyle() {
if (this.background) {