fix lint and add changelog entry
This commit is contained in:
parent
ef0cba713d
commit
304655d448
5 changed files with 13 additions and 12 deletions
1
changelog.d/reply-quote-config.fix
Normal file
1
changelog.d/reply-quote-config.fix
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
Fix reply form crash when quote-reply settings are unavailable
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import { get } from 'lodash'
|
import { get } from 'lodash'
|
||||||
import { mapState } from 'pinia'
|
import { mapState } from 'pinia'
|
||||||
|
|
||||||
import { useInstanceStore } from 'src/stores/instance.js'
|
import { useInstanceStore } from 'src/stores/instance.js'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -21,16 +22,11 @@ const MRFTransparencyPanel = {
|
||||||
computed: {
|
computed: {
|
||||||
...mapState(useInstanceStore, {
|
...mapState(useInstanceStore, {
|
||||||
federationPolicy: (state) => state.federationPolicy,
|
federationPolicy: (state) => state.federationPolicy,
|
||||||
mrfPolicies: (state) =>
|
mrfPolicies: (state) => get(state, 'federationPolicy.mrf_policies', []),
|
||||||
get(state, 'federationPolicy.mrf_policies', []),
|
|
||||||
quarantineInstances: (state) =>
|
quarantineInstances: (state) =>
|
||||||
toInstanceReasonObject(
|
toInstanceReasonObject(
|
||||||
get(state, 'federationPolicy.quarantined_instances', []),
|
get(state, 'federationPolicy.quarantined_instances', []),
|
||||||
get(
|
get(state, 'federationPolicy.quarantined_instances_info', []),
|
||||||
state,
|
|
||||||
'federationPolicy.quarantined_instances_info',
|
|
||||||
[],
|
|
||||||
),
|
|
||||||
'quarantined_instances',
|
'quarantined_instances',
|
||||||
),
|
),
|
||||||
acceptInstances: (state) =>
|
acceptInstances: (state) =>
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,10 @@ export const maybeShowNotification = (
|
||||||
|
|
||||||
if (notification.seen) return
|
if (notification.seen) return
|
||||||
if (!visibleTypes(notificationVisibility).includes(notification.type)) return
|
if (!visibleTypes(notificationVisibility).includes(notification.type)) return
|
||||||
if (notification.type === 'mention' && isMutedNotification(muteFilters, notification))
|
if (
|
||||||
|
notification.type === 'mention' &&
|
||||||
|
isMutedNotification(muteFilters, notification)
|
||||||
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
const notificationObject = prepareNotificationObject(
|
const notificationObject = prepareNotificationObject(
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ import {
|
||||||
uniqWith,
|
uniqWith,
|
||||||
unset,
|
unset,
|
||||||
} from 'lodash'
|
} from 'lodash'
|
||||||
import { v4 as uuidv4 } from 'uuid'
|
|
||||||
import { defineStore } from 'pinia'
|
import { defineStore } from 'pinia'
|
||||||
|
import { v4 as uuidv4 } from 'uuid'
|
||||||
import { toRaw } from 'vue'
|
import { toRaw } from 'vue'
|
||||||
|
|
||||||
import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js'
|
import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js'
|
||||||
|
|
@ -684,8 +684,6 @@ export const useSyncConfigStore = defineStore('sync_config', {
|
||||||
`Already migrated Values: ${[...migratedEntries].join() || '[none]'}`,
|
`Already migrated Values: ${[...migratedEntries].join() || '[none]'}`,
|
||||||
)
|
)
|
||||||
|
|
||||||
const { configMigration } = useSyncConfigStore().flagStorage
|
|
||||||
|
|
||||||
Object.entries(oldDefaultConfigSync).forEach(([key, value]) => {
|
Object.entries(oldDefaultConfigSync).forEach(([key, value]) => {
|
||||||
const oldValue = config[key]
|
const oldValue = config[key]
|
||||||
const defaultValue = value
|
const defaultValue = value
|
||||||
|
|
|
||||||
|
|
@ -292,7 +292,10 @@ export const useUserHighlightStore = defineStore('user_highlight', {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
storage.setItem('vuex-lz', { ...vuexState, config: { ...config, highlight } })
|
storage.setItem('vuex-lz', {
|
||||||
|
...vuexState,
|
||||||
|
config: { ...config, highlight },
|
||||||
|
})
|
||||||
|
|
||||||
if (recent === null) {
|
if (recent === null) {
|
||||||
console.debug(
|
console.debug(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue