Merge branch 'ts-reducers' into 'develop'

Typescript: reducers/accounts.ts, reducers/statuses.ts

See merge request soapbox-pub/soapbox-fe!1115

app/soapbox/normalizers/account.ts

@@ -13,7 +13,6 @@ import {
 
 import emojify from 'soapbox/features/emoji/emoji';
 import { normalizeEmoji } from 'soapbox/normalizers/emoji';
-import { IAccount } from 'soapbox/types';
 import { acctFull } from 'soapbox/utils/accounts';
 import { unescapeHTML } from 'soapbox/utils/html';
 import { mergeDefined, makeEmojiMap } from 'soapbox/utils/normalizers';
@@ -200,7 +199,7 @@ const normalizeFqn = (account: ImmutableMap<string, any>) => {
   return account.set('fqn', acctFull(account));
 };
 
-export const normalizeAccount = (account: Record<string, any>): IAccount => {
+export const normalizeAccount = (account: Record<string, any>) => {
   return AccountRecord(
     ImmutableMap(fromJS(account)).withMutations(account => {
       normalizePleromaLegacyFields(account);

app/soapbox/normalizers/status.ts

@@ -15,7 +15,6 @@ import { normalizeCard } from 'soapbox/normalizers/card';
 import { normalizeEmoji } from 'soapbox/normalizers/emoji';
 import { normalizeMention } from 'soapbox/normalizers/mention';
 import { normalizePoll } from 'soapbox/normalizers/poll';
-import { IStatus } from 'soapbox/types';
 
 // https://docs.joinmastodon.org/entities/status/
 export const StatusRecord = ImmutableRecord({
@@ -136,7 +135,7 @@ const fixQuote = (status: ImmutableMap<string, any>) => {
   });
 };
 
-export const normalizeStatus = (status: Record<string, any>): IStatus => {
+export const normalizeStatus = (status: Record<string, any>) => {
   return StatusRecord(
     ImmutableMap(fromJS(status)).withMutations(status => {
       normalizeAttachments(status);

app/soapbox/reducers/accounts.ts

@@ -3,6 +3,7 @@ import {
   List as ImmutableList,
   fromJS,
 } from 'immutable';
+import { AnyAction } from 'redux';
 
 import {
   ADMIN_USERS_FETCH_SUCCESS,
@@ -37,20 +38,27 @@ import {
   ACCOUNT_FETCH_FAIL_FOR_USERNAME_LOOKUP,
 } from '../actions/importer';
 
-const initialState = ImmutableMap();
+type AccountRecord = ReturnType<typeof normalizeAccount>;
+type AccountMap = ImmutableMap<string, any>;
+type APIEntity = Record<string, any>;
+type APIEntities = Array<APIEntity>;
 
-const minifyAccount = account => {
+type State = ImmutableMap<string | number, AccountRecord>;
+
+const initialState: State = ImmutableMap();
+
+const minifyAccount = (account: AccountRecord): AccountRecord => {
   return account.mergeWith((o, n) => n || o, {
     moved: account.getIn(['moved', 'id']),
   });
 };
 
-const fixAccount = (state, account) => {
+const fixAccount = (state: State, account: APIEntity) => {
   const normalized = minifyAccount(normalizeAccount(account));
   return state.set(account.id, normalized);
 };
 
-const normalizeAccounts = (state, accounts) => {
+const normalizeAccounts = (state: State, accounts: ImmutableList<AccountMap>) => {
   accounts.forEach(account => {
     state = fixAccount(state, account);
   });
@@ -58,33 +66,44 @@ const normalizeAccounts = (state, accounts) => {
   return state;
 };
 
-const importAccountFromChat = (state, chat) => fixAccount(state, chat.account);
+const importAccountFromChat = (
+  state: State,
+  chat: APIEntity,
+): State => fixAccount(state, chat.account);
 
-const importAccountsFromChats = (state, chats) =>
+const importAccountsFromChats = (state: State, chats: APIEntities): State =>
   state.withMutations(mutable =>
     chats.forEach(chat => importAccountFromChat(mutable, chat)));
 
-const addTags = (state, accountIds, tags) => {
+const addTags = (
+  state: State,
+  accountIds: Array<string>,
+  tags: Array<string>,
+): State => {
   return state.withMutations(state => {
     accountIds.forEach(id => {
-      state.updateIn([id, 'pleroma', 'tags'], ImmutableList(), v =>
+      state.updateIn([id, 'pleroma', 'tags'], ImmutableList(), (v: ImmutableList<string>) =>
         v.toOrderedSet().union(tags).toList(),
       );
     });
   });
 };
 
-const removeTags = (state, accountIds, tags) => {
+const removeTags = (
+  state: State,
+  accountIds: Array<string>,
+  tags: Array<string>,
+): State => {
   return state.withMutations(state => {
     accountIds.forEach(id => {
-      state.updateIn([id, 'pleroma', 'tags'], ImmutableList(), v =>
+      state.updateIn([id, 'pleroma', 'tags'], ImmutableList(), (v: ImmutableList<string>) =>
         v.toOrderedSet().subtract(tags).toList(),
       );
     });
   });
 };
 
-const setActive = (state, accountIds, active) => {
+const setActive = (state: State, accountIds: Array<string>, active: boolean): State => {
   return state.withMutations(state => {
     accountIds.forEach(id => {
       state.setIn([id, 'pleroma', 'is_active'], active);
@@ -92,12 +111,16 @@ const setActive = (state, accountIds, active) => {
   });
 };
 
-const permissionGroupFields = {
+const permissionGroupFields: Record<string, string> = {
   admin: 'is_admin',
   moderator: 'is_moderator',
 };
 
-const addPermission = (state, accountIds, permissionGroup) => {
+const addPermission = (
+  state: State,
+  accountIds: Array<string>,
+  permissionGroup: string,
+): State => {
   const field = permissionGroupFields[permissionGroup];
   if (!field) return state;
 
@@ -108,7 +131,11 @@ const addPermission = (state, accountIds, permissionGroup) => {
   });
 };
 
-const removePermission = (state, accountIds, permissionGroup) => {
+const removePermission = (
+  state: State,
+  accountIds: Array<string>,
+  permissionGroup: string,
+): State => {
   const field = permissionGroupFields[permissionGroup];
   if (!field) return state;
 
@@ -119,7 +146,7 @@ const removePermission = (state, accountIds, permissionGroup) => {
   });
 };
 
-const buildAccount = adminUser => normalizeAccount({
+const buildAccount = (adminUser: ImmutableMap<string, any>): AccountRecord => normalizeAccount({
   id: adminUser.get('id'),
   username: adminUser.get('nickname').split('@')[0],
   acct: adminUser.get('nickname'),
@@ -144,7 +171,10 @@ const buildAccount = adminUser => normalizeAccount({
   should_refetch: true,
 });
 
-const mergeAdminUser = (account, adminUser) => {
+const mergeAdminUser = (
+  account: AccountRecord,
+  adminUser: ImmutableMap<string, any>,
+) => {
   return account.withMutations(account => {
     account.set('display_name', adminUser.get('display_name'));
     account.set('avatar', adminUser.get('avatar'));
@@ -157,7 +187,7 @@ const mergeAdminUser = (account, adminUser) => {
   });
 };
 
-const importAdminUser = (state, adminUser) => {
+const importAdminUser = (state: State, adminUser: ImmutableMap<string, any>): State => {
   const id = adminUser.get('id');
   const account = state.get(id);
 
@@ -168,15 +198,15 @@ const importAdminUser = (state, adminUser) => {
   }
 };
 
-const importAdminUsers = (state, adminUsers) => {
+const importAdminUsers = (state: State, adminUsers: Array<Record<string, any>>): State => {
-  return state.withMutations(state => {
+  return state.withMutations((state: State) => {
     fromJS(adminUsers).forEach(adminUser => {
-      importAdminUser(state, adminUser);
+      importAdminUser(state, ImmutableMap(adminUser));
     });
   });
 };
 
-const setSuggested = (state, accountIds, isSuggested) => {
+const setSuggested = (state: State, accountIds: Array<string>, isSuggested: boolean): State => {
   return state.withMutations(state => {
     accountIds.forEach(id => {
       state.setIn([id, 'pleroma', 'is_suggested'], isSuggested);
@@ -184,16 +214,14 @@ const setSuggested = (state, accountIds, isSuggested) => {
   });
 };
 
-export default function accounts(state = initialState, action) {
+export default function accounts(state: State = initialState, action: AnyAction): State {
   switch(action.type) {
   case ACCOUNT_IMPORT:
     return fixAccount(state, action.account);
   case ACCOUNTS_IMPORT:
     return normalizeAccounts(state, action.accounts);
   case ACCOUNT_FETCH_FAIL_FOR_USERNAME_LOOKUP:
-    return state.set(-1, ImmutableMap({
+    return state.set(-1, normalizeAccount({ username: action.username }));
-      username: action.username,
-    }));
   case CHATS_FETCH_SUCCESS:
   case CHATS_EXPAND_SUCCESS:
     return importAccountsFromChats(state, action.chats);

app/soapbox/reducers/statuses.ts

@@ -1,10 +1,11 @@
 import escapeTextContentForBrowser from 'escape-html';
-import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { AnyAction } from 'redux';
 
 import emojify from 'soapbox/features/emoji/emoji';
-import { normalizeStatus } from 'soapbox/normalizers/status';
+import { normalizeStatus } from 'soapbox/normalizers';
 import { simulateEmojiReact, simulateUnEmojiReact } from 'soapbox/utils/emoji_reacts';
-import { stripCompatibilityFeatures } from 'soapbox/utils/html';
+import { stripCompatibilityFeatures, unescapeHTML } from 'soapbox/utils/html';
 import { makeEmojiMap } from 'soapbox/utils/normalizers';
 
 import {
@@ -33,7 +34,13 @@ import { TIMELINE_DELETE } from '../actions/timelines';
 
 const domParser = new DOMParser();
 
-const minifyStatus = status => {
+type StatusRecord = ReturnType<typeof normalizeStatus>;
+type APIEntity = Record<string, any>;
+type APIEntities = Array<APIEntity>;
+
+type State = ImmutableMap<string, StatusRecord>;
+
+const minifyStatus = (status: StatusRecord): StatusRecord => {
   return status.mergeWith((o, n) => n || o, {
     account: status.getIn(['account', 'id']),
     reblog: status.getIn(['reblog', 'id']),
@@ -42,48 +49,69 @@ const minifyStatus = status => {
   });
 };
 
+// Gets titles of poll options from status
+const getPollOptionTitles = (status: StatusRecord): Array<string> => {
+  return status.poll?.options.map(({ title }: { title: string }) => title);
+};
+
+// Creates search text from the status
+const buildSearchContent = (status: StatusRecord): string => {
+  const pollOptionTitles = getPollOptionTitles(status);
+
+  const fields = ImmutableList([
+    status.spoiler_text,
+    status.content,
+  ]).concat(pollOptionTitles);
+
+  return unescapeHTML(fields.join('\n\n'));
+};
+
 // Only calculate these values when status first encountered
 // Otherwise keep the ones already in the reducer
-export const calculateStatus = (status, oldStatus, expandSpoilers = false) => {
+const calculateStatus = (
+  status: StatusRecord,
+  oldStatus: StatusRecord,
+  expandSpoilers: boolean = false,
+): StatusRecord => {
   if (oldStatus) {
     return status.merge({
-      search_index: oldStatus.get('search_index'),
+      search_index: oldStatus.search_index,
-      contentHtml: oldStatus.get('contentHtml'),
+      contentHtml: oldStatus.contentHtml,
-      spoilerHtml: oldStatus.get('spoilerHtml'),
+      spoilerHtml: oldStatus.spoilerHtml,
-      hidden: oldStatus.get('hidden'),
+      hidden: oldStatus.hidden,
     });
   } else {
-    const spoilerText   = status.get('spoiler_text') || '';
+    const spoilerText   = status.spoiler_text;
-    const searchContent = (ImmutableList([spoilerText, status.get('content')]).concat(status.getIn(['poll', 'options'], ImmutableList()).map(option => option.get('title')))).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
+    const searchContent = buildSearchContent(status);
-    const emojiMap      = makeEmojiMap(status.get('emojis'));
+    const emojiMap      = makeEmojiMap(status.emojis);
 
     return status.merge({
       search_index: domParser.parseFromString(searchContent, 'text/html').documentElement.textContent,
-      contentHtml: stripCompatibilityFeatures(emojify(status.get('content'), emojiMap)),
+      contentHtml: stripCompatibilityFeatures(emojify(status.content, emojiMap)),
       spoilerHtml: emojify(escapeTextContentForBrowser(spoilerText), emojiMap),
-      hidden: expandSpoilers ? false : spoilerText.length > 0 || status.get('sensitive'),
+      hidden: expandSpoilers ? false : spoilerText.length > 0 || status.sensitive,
     });
   }
 };
 
 // Check whether a status is a quote by secondary characteristics
-const isQuote = status => {
+const isQuote = (status: StatusRecord) => {
-  return Boolean(status.get('quote_id') || status.getIn(['pleroma', 'quote_url']));
+  return Boolean(status.getIn(['pleroma', 'quote_url']));
 };
 
 // Preserve quote if an existing status already has it
-const fixQuote = (status, oldStatus) => {
+const fixQuote = (status: StatusRecord, oldStatus: StatusRecord): StatusRecord => {
-  if (oldStatus && !status.get('quote') && isQuote(status)) {
+  if (oldStatus && !status.quote && isQuote(status)) {
     return status
-      .set('quote', oldStatus.get('quote'))
+      .set('quote', oldStatus.quote)
       .updateIn(['pleroma', 'quote_visible'], visible => visible || oldStatus.getIn(['pleroma', 'quote_visible']));
   } else {
     return status;
   }
 };
 
-const fixStatus = (state, status, expandSpoilers) => {
+const fixStatus = (state: State, status: APIEntity, expandSpoilers: boolean): StatusRecord => {
-  const oldStatus = state.get(status.get('id'));
+  const oldStatus: StatusRecord = state.get(status.id);
 
   return normalizeStatus(status).withMutations(status => {
     fixQuote(status, oldStatus);
@@ -92,13 +120,13 @@ const fixStatus = (state, status, expandSpoilers) => {
   });
 };
 
-const importStatus = (state, status, expandSpoilers) =>
+const importStatus = (state: State, status: APIEntity, expandSpoilers: boolean): State =>
-  state.set(status.id, fixStatus(state, fromJS(status), expandSpoilers));
+  state.set(status.id, fixStatus(state, status, expandSpoilers));
 
-const importStatuses = (state, statuses, expandSpoilers) =>
+const importStatuses = (state: State, statuses: APIEntities, expandSpoilers: boolean): State =>
   state.withMutations(mutable => statuses.forEach(status => importStatus(mutable, status, expandSpoilers)));
 
-const deleteStatus = (state, id, references) => {
+const deleteStatus = (state: State, id: string, references: Array<string>) => {
   references.forEach(ref => {
     state = deleteStatus(state, ref[0], []);
   });
@@ -106,25 +134,25 @@ const deleteStatus = (state, id, references) => {
   return state.delete(id);
 };
 
-const importPendingStatus = (state, { in_reply_to_id }) => {
+const importPendingStatus = (state: State, { in_reply_to_id }: APIEntity) => {
   if (in_reply_to_id) {
-    return state.updateIn([in_reply_to_id, 'replies_count'], 0, count => count + 1);
+    return state.updateIn([in_reply_to_id, 'replies_count'], 0, (count: number) => count + 1);
   } else {
     return state;
   }
 };
 
-const deletePendingStatus = (state, { in_reply_to_id }) => {
+const deletePendingStatus = (state: State, { in_reply_to_id }: APIEntity) => {
   if (in_reply_to_id) {
-    return state.updateIn([in_reply_to_id, 'replies_count'], 0, count => Math.max(0, count - 1));
+    return state.updateIn([in_reply_to_id, 'replies_count'], 0, (count: number) => Math.max(0, count - 1));
   } else {
     return state;
   }
 };
 
-const initialState = ImmutableMap();
+const initialState: State = ImmutableMap();
 
-export default function statuses(state = initialState, action) {
+export default function statuses(state = initialState, action: AnyAction): State {
   switch(action.type) {
   case STATUS_IMPORT:
     return importStatus(state, action.status, action.expandSpoilers);
@@ -172,7 +200,7 @@ export default function statuses(state = initialState, action) {
     return state.setIn([action.id, 'muted'], false);
   case STATUS_REVEAL:
     return state.withMutations(map => {
-      action.ids.forEach(id => {
+      action.ids.forEach((id: string) => {
         if (!(state.get(id) === undefined)) {
           map.setIn([id, 'hidden'], false);
         }
@@ -180,7 +208,7 @@ export default function statuses(state = initialState, action) {
     });
   case STATUS_HIDE:
     return state.withMutations(map => {
-      action.ids.forEach(id => {
+      action.ids.forEach((id: string) => {
         if (!(state.get(id) === undefined)) {
           map.setIn([id, 'hidden'], true);
         }