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

Pleroma relationship fixes

Browse source
This commit is contained in:
Alex Gleason 2020-08-02 21:45:42 -05:00
parent ccec8698fc
commit 7fe70a64b5
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/soapbox/reducers/relationships.js
View file

@ -22,6 +22,7 @@ import {
DOMAIN_UNBLOCK_SUCCESS, DOMAIN_UNBLOCK_SUCCESS,
} from '../actions/domain_blocks'; } from '../actions/domain_blocks';
import { Map as ImmutableMap, fromJS } from 'immutable'; import { Map as ImmutableMap, fromJS } from 'immutable';
import { get } from 'lodash';
const normalizeRelationship = (state, relationship) => state.set(relationship.id, fromJS(relationship)); const normalizeRelationship = (state, relationship) => state.set(relationship.id, fromJS(relationship));
@ -42,8 +43,10 @@ const setDomainBlocking = (state, accounts, blocking) => {
}; };
const importPleromaAccount = (state, account) => { const importPleromaAccount = (state, account) => {
if (!account.pleroma) return state; const relationship = get(account, ['pleroma', 'relationship'], {});
return normalizeRelationship(state, account.pleroma.relationship); if (relationship.id && relationship !== {})
return normalizeRelationship(state, relationship);
return state;
}; };
const importPleromaAccounts = (state, accounts) => { const importPleromaAccounts = (state, accounts) => {