massive rename and separation merged config into its own "store"

This commit is contained in:
Henry Jameson 2026-03-24 21:42:22 +02:00
commit 4e235562aa
65 changed files with 272 additions and 221 deletions

View file

@ -9,7 +9,7 @@ import Status from '../status/status.vue'
import ThreadTree from '../thread_tree/thread_tree.vue'
import { useInterfaceStore } from 'src/stores/interface'
import { useSyncConfigStore } from 'src/stores/sync_config.js'
import { useMergedConfigStore } from 'src/stores/merged_config.js'
import { library } from '@fortawesome/fontawesome-svg-core'
import {
@ -82,7 +82,7 @@ const conversation = {
// maxDepthInThread = max number of depths that is *visible*
// since our depth starts with 0 and "showing" means "showing children"
// there is a -2 here
const maxDepth = useSyncConfigStore().mergedConfig.maxDepthInThread - 2
const maxDepth = this.mergedConfig.maxDepthInThread - 2
return maxDepth >= 1 ? maxDepth : 1
},
streamingEnabled() {
@ -92,22 +92,22 @@ const conversation = {
)
},
displayStyle() {
return useSyncConfigStore().mergedConfig.conversationDisplay
return this.mergedConfig.conversationDisplay
},
isTreeView() {
return !this.isLinearView
},
treeViewIsSimple() {
return !useSyncConfigStore().mergedConfig.conversationTreeAdvanced
return !this.mergedConfig.conversationTreeAdvanced
},
isLinearView() {
return this.displayStyle === 'linear'
},
shouldFadeAncestors() {
return useSyncConfigStore().mergedConfig.conversationTreeFadeAncestors
return this.mergedConfig.conversationTreeFadeAncestors
},
otherRepliesButtonPosition() {
return useSyncConfigStore().mergedConfig.conversationOtherRepliesButton
return this.mergedConfig.conversationOtherRepliesButton
},
showOtherRepliesButtonBelowStatus() {
return this.otherRepliesButtonPosition === 'below'
@ -393,7 +393,7 @@ const conversation = {
maybeHighlight() {
return this.isExpanded ? this.highlight : null
},
...mapPiniaState(useSyncConfigStore, ['mergedConfig']),
...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
...mapState({
mastoUserSocketStatus: (state) => state.api.mastoUserSocketStatus,
}),