bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix remote timeline pages

Browse source
This commit is contained in:
Alex Gleason 2023-09-23 20:56:37 -05:00
parent 3b630ed8fb
commit 17bcd68d73
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/features/federation-restrictions/components/instance-restrictions.tsx
View file

@ -8,10 +8,8 @@ import { useInstance } from 'soapbox/hooks';
import type { Map as ImmutableMap } from 'immutable';
const hasRestrictions = (remoteInstance: ImmutableMap<string, any>): boolean => {
return remoteInstance
.get('federation')
.deleteAll(['accept', 'reject_deletes', 'report_removal'])
.reduce((acc: boolean, value: boolean) => acc || value, false);
const { accept, reject_deletes, report_removal, ...federation } = remoteInstance.get('federation');
return !!Object.values(federation).reduce((acc, value) => Boolean(acc || value), false);
};
interface IRestriction {

7
src/features/ui/components/modals/edit-federation-modal.tsx
View file

@ -1,4 +1,3 @@
import { Map as ImmutableMap } from 'immutable';
import React, { useState, useEffect, useCallback } from 'react';
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
@ -31,10 +30,10 @@ const EditFederationModal: React.FC<IEditFederationModal> = ({ host, onClose })
const getRemoteInstance = useCallback(makeGetRemoteInstance(), []);
const remoteInstance = useAppSelector(state => getRemoteInstance(state, host));
const [data, setData] = useState(ImmutableMap<string, any>());
const [data, setData] = useState({} as any);
useEffect(() => {
setData(remoteInstance.get('federation') as any);
setData(remoteInstance.get('federation'));
}, [remoteInstance]);
const handleDataChange = (key: string): React.ChangeEventHandler<HTMLInputElement> => {
@ -69,7 +68,7 @@ const EditFederationModal: React.FC<IEditFederationModal> = ({ host, onClose })
media_nsfw,
media_removal,
reject,
} = data.toJS() as Record<string, boolean>;
} = data;
const fullMediaRemoval = avatar_removal && banner_removal && media_removal;