normalizeStatus: refactor baseStatus

app/soapbox/normalizers/status.js

@@ -3,12 +3,16 @@ import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import { accountToMention } from 'soapbox/utils/accounts';
 
 // Some backends can return null, or omit these required fields
-const setRequiredFields = status => {
+const baseStatus = ImmutableMap({
-  return status.merge({
+  emojis: ImmutableList(),
-    emojis: status.get('emojis') || ImmutableList(),
+  spoiler_text: '',
-    spoiler_text: status.get('spoiler_text') || '',
+  mentions: ImmutableList(),
-    mentions: status.get('mentions') || ImmutableList(),
 });
+
+const mergeDefined = (oldVal, newVal) => oldVal === undefined ? newVal : oldVal;
+
+const setRequiredFields = status => {
+  return status.mergeDeepWith(mergeDefined, baseStatus);
 };
 
 // Ensure attachments have required fields