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

Normalizer: normalize required account & status fields

This commit is contained in:
Alex Gleason 2022-02-07 11:50:05 -06:00
parent 8d65c60638
commit 69712baa02
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/soapbox/actions/importer/normalizer.js
View File

@ -15,6 +15,11 @@ const makeEmojiMap = record => record.emojis.reduce((obj, emoji) => {
export function normalizeAccount(account) { export function normalizeAccount(account) {
account = { ...account }; account = { ...account };
// Some backends can return null, or omit these required fields
if (!account.emojis) account.emojis = [];
if (!account.display_name) account.display_name = '';
if (!account.note) account.note = '';
const emojiMap = makeEmojiMap(account); const emojiMap = makeEmojiMap(account);
const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name; const displayName = account.display_name.trim().length === 0 ? account.username : account.display_name;
@ -41,6 +46,10 @@ export function normalizeAccount(account) {
export function normalizeStatus(status, normalOldStatus, expandSpoilers) { export function normalizeStatus(status, normalOldStatus, expandSpoilers) {
const normalStatus = { ...status }; const normalStatus = { ...status };
// Some backends can return null, or omit these required fields
if (!normalStatus.emojis) normalStatus.emojis = [];
if (!normalStatus.spoiler_text) normalStatus.spoiler_text = '';
// Copy the pleroma object too, so we can modify our copy // Copy the pleroma object too, so we can modify our copy
if (status.pleroma) { if (status.pleroma) {
normalStatus.pleroma = { ...status.pleroma }; normalStatus.pleroma = { ...status.pleroma };