Merge branch 'setttingssync' into shigusegubu-themes3

This commit is contained in:
Henry Jameson 2026-04-23 12:20:50 +03:00
commit a4928aa35c

View file

@ -1,5 +1,6 @@
import { get } from 'lodash' import { get } from 'lodash'
import { mapState } from 'vuex' import { mapState } from 'pinia'
import { useInstanceStore } from 'src/stores/instance.js'
/** /**
* This is for backwards compatibility. We originally didn't recieve * This is for backwards compatibility. We originally didn't recieve
@ -18,64 +19,65 @@ const toInstanceReasonObject = (instances, info, key) => {
const MRFTransparencyPanel = { const MRFTransparencyPanel = {
computed: { computed: {
...mapState({ ...mapState(useInstanceStore, {
federationPolicy: (state) => get(state, 'instance.federationPolicy'), federationPolicy: (state) => state.federationPolicy,
mrfPolicies: (state) => mrfPolicies: (state) =>
get(state, 'instance.federationPolicy.mrf_policies', []), get(state, 'federationPolicy.mrf_policies', []),
quarantineInstances: (state) => quarantineInstances: (state) =>
console.log(state) ||
toInstanceReasonObject( toInstanceReasonObject(
get(state, 'instance.federationPolicy.quarantined_instances', []), get(state, 'federationPolicy.quarantined_instances', []),
get( get(
state, state,
'instance.federationPolicy.quarantined_instances_info', 'federationPolicy.quarantined_instances_info',
[], [],
), ),
'quarantined_instances', 'quarantined_instances',
), ),
acceptInstances: (state) => acceptInstances: (state) =>
toInstanceReasonObject( toInstanceReasonObject(
get(state, 'instance.federationPolicy.mrf_simple.accept', []), get(state, 'federationPolicy.mrf_simple.accept', []),
get(state, 'instance.federationPolicy.mrf_simple_info', []), get(state, 'federationPolicy.mrf_simple_info', []),
'accept', 'accept',
), ),
rejectInstances: (state) => rejectInstances: (state) =>
toInstanceReasonObject( toInstanceReasonObject(
get(state, 'instance.federationPolicy.mrf_simple.reject', []), get(state, 'federationPolicy.mrf_simple.reject', []),
get(state, 'instance.federationPolicy.mrf_simple_info', []), get(state, 'federationPolicy.mrf_simple_info', []),
'reject', 'reject',
), ),
ftlRemovalInstances: (state) => ftlRemovalInstances: (state) =>
toInstanceReasonObject( toInstanceReasonObject(
get( get(
state, state,
'instance.federationPolicy.mrf_simple.federated_timeline_removal', 'federationPolicy.mrf_simple.federated_timeline_removal',
[], [],
), ),
get(state, 'instance.federationPolicy.mrf_simple_info', []), get(state, 'federationPolicy.mrf_simple_info', []),
'federated_timeline_removal', 'federated_timeline_removal',
), ),
mediaNsfwInstances: (state) => mediaNsfwInstances: (state) =>
toInstanceReasonObject( toInstanceReasonObject(
get(state, 'instance.federationPolicy.mrf_simple.media_nsfw', []), get(state, 'federationPolicy.mrf_simple.media_nsfw', []),
get(state, 'instance.federationPolicy.mrf_simple_info', []), get(state, 'federationPolicy.mrf_simple_info', []),
'media_nsfw', 'media_nsfw',
), ),
mediaRemovalInstances: (state) => mediaRemovalInstances: (state) =>
toInstanceReasonObject( toInstanceReasonObject(
get(state, 'instance.federationPolicy.mrf_simple.media_removal', []), get(state, 'federationPolicy.mrf_simple.media_removal', []),
get(state, 'instance.federationPolicy.mrf_simple_info', []), get(state, 'federationPolicy.mrf_simple_info', []),
'media_removal', 'media_removal',
), ),
keywordsFtlRemoval: (state) => keywordsFtlRemoval: (state) =>
get( get(
state, state,
'instance.federationPolicy.mrf_keyword.federated_timeline_removal', 'federationPolicy.mrf_keyword.federated_timeline_removal',
[], [],
), ),
keywordsReject: (state) => keywordsReject: (state) =>
get(state, 'instance.federationPolicy.mrf_keyword.reject', []), get(state, 'federationPolicy.mrf_keyword.reject', []),
keywordsReplace: (state) => keywordsReplace: (state) =>
get(state, 'instance.federationPolicy.mrf_keyword.replace', []), get(state, 'federationPolicy.mrf_keyword.replace', []),
}), }),
hasInstanceSpecificPolicies() { hasInstanceSpecificPolicies() {
return ( return (