Merge branch 'instance-migration' into shigusegubu-themes3

This commit is contained in:
Henry Jameson 2026-01-29 21:15:30 +02:00
commit 4ea48dafb9
4 changed files with 9 additions and 13 deletions

View file

@ -83,7 +83,7 @@ export default {
window.addEventListener('resize', this.updateMobileState) window.addEventListener('resize', this.updateMobileState)
this.scrollParent.addEventListener('scroll', this.updateScrollState) this.scrollParent.addEventListener('scroll', this.updateScrollState)
if (useInterfaceStore().themeApplied) { if (this.themeApplied) {
this.setThemeBodyClass() this.setThemeBodyClass()
this.removeSplash() this.removeSplash()
} }

View file

@ -24,9 +24,6 @@ const ClutterTab = {
HelpIndicator, HelpIndicator,
}, },
computed: { computed: {
instanceSpecificPanelPresent() {
return useInstanceStore().showInstanceSpecificPanel
},
...SharedComputedObject(), ...SharedComputedObject(),
...mapState(useServerSideStorageStore, { ...mapState(useServerSideStorageStore, {
muteFilters: (store) => muteFilters: (store) =>

View file

@ -91,9 +91,6 @@ const FilteringTab = {
HelpIndicator, HelpIndicator,
}, },
computed: { computed: {
instanceSpecificPanelPresent() {
return useInstanceStore().instanceIdentity.showInstanceSpecificPanel
},
...SharedComputedObject(), ...SharedComputedObject(),
...mapState(useServerSideStorageStore, { ...mapState(useServerSideStorageStore, {
muteFilters: (store) => muteFilters: (store) =>

View file

@ -1,3 +1,5 @@
import { mapState } from 'pinia'
import BooleanSetting from '../helpers/boolean_setting.vue' import BooleanSetting from '../helpers/boolean_setting.vue'
import ChoiceSetting from '../helpers/choice_setting.vue' import ChoiceSetting from '../helpers/choice_setting.vue'
import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue' import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
@ -31,12 +33,12 @@ const GeneralTab = {
ProfileSettingIndicator, ProfileSettingIndicator,
}, },
computed: { computed: {
postFormats() { ...mapState(useInstanceStore, {
return useInstanceStore().featureSet.postFormats || [] postFormats: (store) => store.featureSet.postFormats || [],
}, instanceSpecificPanelPresent: (store) =>
instanceShoutboxPresent() { store.instanceIdentity.instanceSpecificPanelPresent,
return useInstanceStore().featureSet.shoutAvailable instanceShoutboxPresent: (store) => store.featureSet.shoutAvailable,
}, }),
columns() { columns() {
const mode = this.$store.getters.mergedConfig.thirdColumnMode const mode = this.$store.getters.mergedConfig.thirdColumnMode