pass 2
This commit is contained in:
parent
6124d9c04c
commit
2e53707324
20 changed files with 115 additions and 99 deletions
|
|
@ -61,8 +61,8 @@ const ExtraNotifications = {
|
|||
return useInterfaceStore().openSettingsModalTab('notifications')
|
||||
},
|
||||
dismissConfigurationTip() {
|
||||
return useSyncConfigStore().setPreference({
|
||||
path: 'simple.showExtraNotificationsTip',
|
||||
return useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'showExtraNotificationsTip',
|
||||
value: false,
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -84,8 +84,8 @@ const NavPanel = {
|
|||
this.editMode = !this.editMode
|
||||
},
|
||||
toggleCollapse() {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.collapseNav',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'collapseNav',
|
||||
value: !this.collapsed,
|
||||
})
|
||||
useSyncConfigStore().pushSyncConfig()
|
||||
|
|
|
|||
|
|
@ -124,8 +124,8 @@ export default {
|
|||
},
|
||||
methods: {
|
||||
toggleNotificationFilter(type) {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.notificationVisibility',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'notificationVisibility',
|
||||
value: {
|
||||
...this.filters,
|
||||
[type]: !this.filters[type],
|
||||
|
|
|
|||
|
|
@ -819,8 +819,8 @@ const PostStatusForm = {
|
|||
}
|
||||
},
|
||||
dismissScopeNotice() {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.hideScopeNotice',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'hideScopeNotice',
|
||||
value: true,
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ const QuickFilterSettings = {
|
|||
},
|
||||
methods: {
|
||||
setReplyVisibility(visibility) {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.replyVisibility',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'replyVisibility',
|
||||
value: visibility,
|
||||
})
|
||||
this.$store.dispatch('queueFlushAll')
|
||||
|
|
@ -87,9 +87,9 @@ const QuickFilterSettings = {
|
|||
},
|
||||
set() {
|
||||
const value = !this.hideMedia
|
||||
useSyncConfigStore().setPreference({ path: 'simple.hideAttachments', value })
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.hideAttachmentsInConv',
|
||||
useSyncConfigStore().setSimplePrefAndSave({ path: 'hideAttachments', value })
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'hideAttachmentsInConv',
|
||||
value,
|
||||
})
|
||||
},
|
||||
|
|
@ -100,8 +100,8 @@ const QuickFilterSettings = {
|
|||
},
|
||||
set() {
|
||||
const value = !this.hideMutedPosts
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.hideFilteredStatuses',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'hideFilteredStatuses',
|
||||
value,
|
||||
})
|
||||
},
|
||||
|
|
@ -112,7 +112,7 @@ const QuickFilterSettings = {
|
|||
},
|
||||
set() {
|
||||
const value = !this.muteBotStatuses
|
||||
useSyncConfigStore().setPreference({ path: 'simple.muteBotStatuses', value })
|
||||
useSyncConfigStore().setSimplePrefAndSave({ path: 'muteBotStatuses', value })
|
||||
},
|
||||
},
|
||||
muteSensitiveStatuses: {
|
||||
|
|
@ -121,8 +121,8 @@ const QuickFilterSettings = {
|
|||
},
|
||||
set() {
|
||||
const value = !this.muteSensitiveStatuses
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.muteSensitiveStatuses',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'muteSensitiveStatuses',
|
||||
value,
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ const QuickViewSettings = {
|
|||
return this.mergedConfig.conversationDisplay
|
||||
},
|
||||
set(value) {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.conversationDisplay',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'conversationDisplay',
|
||||
value,
|
||||
})
|
||||
},
|
||||
|
|
@ -54,7 +54,7 @@ const QuickViewSettings = {
|
|||
},
|
||||
set() {
|
||||
const value = !this.autoUpdate
|
||||
useSyncConfigStore().setPreference({ path: 'simple.streaming', value })
|
||||
useSyncConfigStore().setSimplePrefAndSave({ path: 'streaming', value })
|
||||
},
|
||||
},
|
||||
collapseWithSubjects: {
|
||||
|
|
@ -63,8 +63,8 @@ const QuickViewSettings = {
|
|||
},
|
||||
set() {
|
||||
const value = !this.collapseWithSubjects
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.collapseMessageWithSubject',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'collapseMessageWithSubject',
|
||||
value,
|
||||
})
|
||||
},
|
||||
|
|
@ -75,8 +75,8 @@ const QuickViewSettings = {
|
|||
},
|
||||
set() {
|
||||
const value = !this.showUserAvatars
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.mentionLinkShowAvatar',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'mentionLinkShowAvatar',
|
||||
value,
|
||||
})
|
||||
},
|
||||
|
|
@ -87,8 +87,8 @@ const QuickViewSettings = {
|
|||
},
|
||||
set() {
|
||||
const value = !this.muteBotStatuses
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.muteBotStatuses',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'muteBotStatuses',
|
||||
value,
|
||||
})
|
||||
},
|
||||
|
|
@ -99,8 +99,8 @@ const QuickViewSettings = {
|
|||
},
|
||||
set() {
|
||||
const value = !this.muteSensitiveStatuses
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.muteSensitiveStatuses',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'muteSensitiveStatuses',
|
||||
value,
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ export default {
|
|||
const writePath = `simple.${readPath}`
|
||||
|
||||
if (!this.timedApplyMode) {
|
||||
useSyncConfigStore().setPreference({ path: writePath, value })
|
||||
useSyncConfigStore().setSimplePrefAndSave({ path: writePath, value })
|
||||
useSyncConfigStore().pushSyncConfig()
|
||||
} else {
|
||||
if (useInterfaceStore().temporaryChangesTimeoutId !== null) {
|
||||
|
|
|
|||
|
|
@ -195,8 +195,8 @@ const SettingsModal = {
|
|||
return useSyncConfigStore().mergedConfig.expertLevel > 0
|
||||
},
|
||||
set(value) {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.expertLevel',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'expertLevel',
|
||||
value: value ? 1 : 0,
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ const ClutterTab = {
|
|||
if (value !== 'ask' && value !== 'forever') {
|
||||
realValue = '14d'
|
||||
}
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.onMuteDefaultAction',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'onMuteDefaultAction',
|
||||
value: realValue,
|
||||
})
|
||||
},
|
||||
|
|
@ -72,8 +72,8 @@ const ClutterTab = {
|
|||
if (value !== 'ask' && value !== 'forever') {
|
||||
realValue = '14d'
|
||||
}
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.onBlockDefaultAction',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'onBlockDefaultAction',
|
||||
value: realValue,
|
||||
})
|
||||
},
|
||||
|
|
@ -90,8 +90,8 @@ const ClutterTab = {
|
|||
},
|
||||
methods: {
|
||||
...mapActions(useSyncConfigStore, [
|
||||
'setPreference',
|
||||
'unsetPreference',
|
||||
'setSimplePrefAndSave',
|
||||
'unsetSimplePrefAndSave',
|
||||
'pushSyncConfig',
|
||||
]),
|
||||
getDatetimeLocal(timestamp) {
|
||||
|
|
@ -138,7 +138,7 @@ const ClutterTab = {
|
|||
|
||||
filter.order = this.muteFilters.length + 2
|
||||
this.muteFiltersDraftObject[newId] = filter
|
||||
this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter })
|
||||
this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
|
||||
this.pushSyncConfig()
|
||||
},
|
||||
exportFilter(id) {
|
||||
|
|
@ -154,18 +154,18 @@ const ClutterTab = {
|
|||
const newId = uuidv4()
|
||||
|
||||
this.muteFiltersDraftObject[newId] = filter
|
||||
this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter })
|
||||
this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
|
||||
this.pushSyncConfig()
|
||||
},
|
||||
deleteFilter(id) {
|
||||
delete this.muteFiltersDraftObject[id]
|
||||
this.unsetPreference({ path: 'simple.muteFilters.' + id, value: null })
|
||||
this.unsetSimplePrefAndSave({ path: 'muteFilters.' + id, value: null })
|
||||
this.pushSyncConfig()
|
||||
},
|
||||
purgeExpiredFilters() {
|
||||
this.muteFiltersExpired.forEach(([id]) => {
|
||||
delete this.muteFiltersDraftObject[id]
|
||||
this.unsetPreference({ path: 'simple.muteFilters.' + id, value: null })
|
||||
this.unsetSimplePrefAndSave({ path: 'muteFilters.' + id, value: null })
|
||||
})
|
||||
this.pushSyncConfig()
|
||||
},
|
||||
|
|
@ -189,8 +189,8 @@ const ClutterTab = {
|
|||
this.muteFiltersDraftDirty[id] = true
|
||||
},
|
||||
saveFilter(id) {
|
||||
this.setPreference({
|
||||
path: 'simple.muteFilters.' + id,
|
||||
this.setSimplePrefAndSave({
|
||||
path: 'muteFilters.' + id,
|
||||
value: this.muteFiltersDraftObject[id],
|
||||
})
|
||||
this.pushSyncConfig()
|
||||
|
|
|
|||
|
|
@ -120,8 +120,8 @@ const ComposingTab = {
|
|||
return useSyncConfigStore().mergedConfig.interfaceLanguage
|
||||
},
|
||||
set: function (val) {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.interfaceLanguage',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'interfaceLanguage',
|
||||
value: val,
|
||||
})
|
||||
},
|
||||
|
|
@ -172,8 +172,8 @@ const ComposingTab = {
|
|||
})
|
||||
},
|
||||
updateFont(key, value) {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.theme3hacks',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'theme3hacks',
|
||||
value: {
|
||||
...this.mergedConfig.theme3hacks,
|
||||
fonts: {
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@ const FilteringTab = {
|
|||
label: this.$t(`user_card.mute_block_${mode}`),
|
||||
})),
|
||||
muteFiltersDraftObject: cloneDeep(
|
||||
useSyncConfigStore().prefsStorage.simple.muteFilters,
|
||||
this.prefsStorage.simple.muteFilters,
|
||||
),
|
||||
muteFiltersDraftDirty: Object.fromEntries(
|
||||
Object.entries(
|
||||
useSyncConfigStore().prefsStorage.simple.muteFilters,
|
||||
this.prefsStorage.simple.muteFilters,
|
||||
).map(([k]) => [k, false]),
|
||||
),
|
||||
exportedFilter: null,
|
||||
|
|
@ -112,7 +112,7 @@ const FilteringTab = {
|
|||
if (value !== 'ask' && value !== 'forever') {
|
||||
realValue = '14d'
|
||||
}
|
||||
useSyncConfigStore().setPreference({
|
||||
this.setPreference({
|
||||
path: 'simple.onMuteDefaultAction',
|
||||
value: realValue,
|
||||
})
|
||||
|
|
@ -132,7 +132,7 @@ const FilteringTab = {
|
|||
if (value !== 'ask' && value !== 'forever') {
|
||||
realValue = '14d'
|
||||
}
|
||||
useSyncConfigStore().setPreference({
|
||||
this.setPreference({
|
||||
path: 'simple.onBlockDefaultAction',
|
||||
value: realValue,
|
||||
})
|
||||
|
|
@ -151,7 +151,9 @@ const FilteringTab = {
|
|||
methods: {
|
||||
...mapActions(useSyncConfigStore, [
|
||||
'setPreference',
|
||||
'setPrefAndSave',
|
||||
'unsetPreference',
|
||||
'unsetPrefAndSave',
|
||||
'pushSyncConfig',
|
||||
]),
|
||||
getDatetimeLocal(timestamp) {
|
||||
|
|
@ -198,8 +200,7 @@ const FilteringTab = {
|
|||
|
||||
filter.order = this.muteFilters.length + 2
|
||||
this.muteFiltersDraftObject[newId] = filter
|
||||
this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter })
|
||||
this.pushSyncConfig()
|
||||
this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
|
||||
},
|
||||
exportFilter(id) {
|
||||
this.exportedFilter = { ...this.muteFiltersDraftObject[id] }
|
||||
|
|
@ -214,13 +215,11 @@ const FilteringTab = {
|
|||
const newId = uuidv4()
|
||||
|
||||
this.muteFiltersDraftObject[newId] = filter
|
||||
this.setPreference({ path: 'simple.muteFilters.' + newId, value: filter })
|
||||
this.pushSyncConfig()
|
||||
this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
|
||||
},
|
||||
deleteFilter(id) {
|
||||
delete this.muteFiltersDraftObject[id]
|
||||
this.unsetPreference({ path: 'simple.muteFilters.' + id, value: null })
|
||||
this.pushSyncConfig()
|
||||
this.unsetSimplePrefAndSave({ path: 'muteFilters.' + id, value: null })
|
||||
},
|
||||
purgeExpiredFilters() {
|
||||
this.muteFiltersExpired.forEach(([id]) => {
|
||||
|
|
@ -249,11 +248,10 @@ const FilteringTab = {
|
|||
this.muteFiltersDraftDirty[id] = true
|
||||
},
|
||||
saveFilter(id) {
|
||||
this.setPreference({
|
||||
path: 'simple.muteFilters.' + id,
|
||||
this.setPrefAndSave({
|
||||
path: 'muteFilters.' + id,
|
||||
value: this.muteFiltersDraftObject[id],
|
||||
})
|
||||
this.pushSyncConfig()
|
||||
this.muteFiltersDraftDirty[id] = false
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@ const GeneralTab = {
|
|||
return useSyncConfigStore().mergedConfig.interfaceLanguage
|
||||
},
|
||||
set: function (val) {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.interfaceLanguage',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'interfaceLanguage',
|
||||
value: val,
|
||||
})
|
||||
},
|
||||
|
|
@ -69,8 +69,8 @@ const GeneralTab = {
|
|||
})
|
||||
},
|
||||
updateFont(key, value) {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.theme3hacks',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'theme3hacks',
|
||||
value: {
|
||||
...this.mergedConfig.theme3hacks,
|
||||
fonts: {
|
||||
|
|
|
|||
|
|
@ -67,8 +67,8 @@ const GeneralTab = {
|
|||
},
|
||||
methods: {
|
||||
updateFont(key, value) {
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.theme3hacks',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'theme3hacks',
|
||||
value: {
|
||||
...this.mergedConfig.theme3hacks,
|
||||
fonts: {
|
||||
|
|
|
|||
|
|
@ -57,8 +57,8 @@ const UpdateNotification = {
|
|||
flag: 'updateCounter',
|
||||
value: CURRENT_UPDATE_COUNTER,
|
||||
})
|
||||
useSyncConfigStore().setPreference({
|
||||
path: 'simple.dontShowUpdateNotifs',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'dontShowUpdateNotifs',
|
||||
value: true,
|
||||
})
|
||||
useSyncConfigStore().pushSyncConfig()
|
||||
|
|
|
|||
|
|
@ -84,16 +84,16 @@ const UserTimedFilterModal = {
|
|||
if (this.isMute) {
|
||||
this.$store.dispatch('muteUser', this.requestBody)
|
||||
if (this.dontAskAgain) {
|
||||
this.$store.dispatch('setOption', {
|
||||
name: 'onMuteDefaultAction',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'onMuteDefaultAction',
|
||||
value: this.expiryString,
|
||||
})
|
||||
}
|
||||
} else {
|
||||
this.$store.dispatch('blockUser', this.requestBody)
|
||||
if (this.dontAskAgain) {
|
||||
this.$store.dispatch('setOption', {
|
||||
name: 'onBlockDefaultAction',
|
||||
useSyncConfigStore().setSimplePrefAndSave({
|
||||
path: 'onBlockDefaultAction',
|
||||
value: this.expiryString,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue