moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pleroma-location' into 'develop' 

Normalize Pleroma account location

See merge request soapbox-pub/soapbox-fe!1097
This commit is contained in:
Alex Gleason 2022-03-14 22:13:01 +00:00
parent ac55adfcb3 40b5761460
commit 6a6a7b614d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/soapbox/normalizers/account.ts
View File

@ -132,11 +132,12 @@ const normalizeVerified = (account: ImmutableMap<string, any>) => {
}); });
}; };
// Normalize Fedibird/Truth Social location // Normalize Fedibird/Truth Social/Pleroma location
const normalizeLocation = (account: ImmutableMap<string, any>) => { const normalizeLocation = (account: ImmutableMap<string, any>) => {
return account.update('location', location => { return account.update('location', location => {
return [ return [
location, location,
account.getIn(['pleroma', 'location']),
account.getIn(['other_settings', 'location']), account.getIn(['other_settings', 'location']),
].find(Boolean); ].find(Boolean);
}); });