Improve legacy store types

app/soapbox/reducers/index.ts

@@ -75,29 +75,57 @@ import type { AnyAction, Reducer } from 'redux';
 import type { EntityStore } from 'soapbox/entity-store/types';
 import type { Account } from 'soapbox/schemas';
 
-interface LegacyImmutable<T> {
+interface LegacyMap {
-  get(key: any): (T & LegacyImmutable<T>) | undefined
+  get(key: any): unknown
   getIn(keyPath: any[]): unknown
-  find(predicate: (value: T & LegacyImmutable<T>, key: string) => boolean): T & LegacyImmutable<T> | undefined
   toJS(): any
 }
 
-function immutableize<T, S extends Record<string, T | undefined>>(state: S): S & LegacyImmutable<T> {
+interface LegacyStore<T> extends LegacyMap {
+  get(key: any): T & LegacyMap | undefined
+  getIn(keyPath: any[]): unknown
+  find(predicate: (value: T & LegacyMap, key: string) => boolean): T & LegacyMap | undefined
+  filter(predicate: (value: T & LegacyMap, key: string) => boolean): (T & LegacyMap)[]
+}
+
+function immutableizeEntity<T extends Record<any, any>>(entity: T): T & LegacyMap {
+  return {
+    ...entity,
+
+    get(key: any): unknown {
+      return entity[key];
+    },
+
+    getIn(keyPath: any[]): unknown {
+      return lodashGet(entity, keyPath);
+    },
+
+    toJS() {
+      return entity;
+    },
+  };
+}
+
+function immutableizeStore<T, S extends Record<string, T | undefined>>(state: S): S & LegacyStore<T> {
   return {
     ...state,
 
-    get(id: any): T & LegacyImmutable<T> | undefined {
+    get(id: any): T & LegacyMap | undefined {
       const entity = state[id];
-      return entity ? immutableize(entity) : undefined;
+      return entity ? immutableizeEntity(entity) : undefined;
     },
 
     getIn(keyPath: any[]): unknown {
       return lodashGet(state, keyPath);
     },
 
-    find(predicate: (value: T & LegacyImmutable<T>, key: string) => boolean): T & LegacyImmutable<T> | undefined {
+    find(predicate: (value: T & LegacyMap, key: string) => boolean): T & LegacyMap | undefined {
-      const result = Object.entries(state).find(([key, value]) => value && predicate(immutableize(value), key))?.[1];
+      const result = Object.entries(state).find(([key, value]) => value && predicate(immutableizeEntity(value), key))?.[1];
-      return result ? immutableize(result) : undefined;
+      return result ? immutableizeEntity(result) : undefined;
+    },
+
+    filter(predicate: (value: T & LegacyMap, key: string) => boolean): (T & LegacyMap)[] {
+      return Object.entries(state).filter(([key, value]) => value && predicate(immutableizeEntity(value), key)).map(([key, value]) => immutableizeEntity(value!));
     },
 
     toJS() {
@@ -211,7 +239,7 @@ type InferState<R> = R extends Reducer<infer S> ? S : never;
 
 const accountsSelector = createSelector(
   (state: InferState<typeof appReducer>) => state.entities[Entities.ACCOUNTS]?.store as EntityStore<Account> || {},
-  (accounts) => immutableize<Account, EntityStore<Account>>(accounts),
+  (accounts) => immutableizeStore<Account, EntityStore<Account>>(accounts),
 );
 
 const extendedRootReducer = (state: InferState<typeof appReducer>, action: AnyAction) => {

app/soapbox/selectors/index.ts

@@ -45,17 +45,18 @@ export const makeGetAccount = () => {
   ], (base, counters, relationship, moved, meta, admin, patron) => {
     if (!base) return null;
 
-    return base.withMutations(map => {
+    return base;
-      if (counters) map.merge(counters);
+    // return base.withMutations(map => {
-      if (meta) {
+    //   if (counters) map.merge(counters);
-        map.merge(meta);
+    //   if (meta) {
-        map.set('pleroma', meta.pleroma.merge(base.get('pleroma', ImmutableMap()))); // Lol, thanks Pleroma
+    //     map.merge(meta);
-      }
+    //     map.set('pleroma', meta.pleroma.merge(base.get('pleroma') || ImmutableMap())); // Lol, thanks Pleroma
-      if (relationship) map.set('relationship', relationship);
+    //   }
-      map.set('moved', moved || null);
+    //   if (relationship) map.set('relationship', relationship);
-      map.set('patron', patron || null);
+    //   map.set('moved', moved || null);
-      map.setIn(['pleroma', 'admin'], admin);
+    //   map.set('patron', patron || null);
-    });
+    //   map.setIn(['pleroma', 'admin'], admin);
+    // });
   });
 };
 
@@ -70,7 +71,7 @@ const findAccountsByUsername = (state: RootState, username: string) => {
 export const findAccountByUsername = (state: RootState, username: string) => {
   const accounts = findAccountsByUsername(state, username);
 
-  if (accounts.size > 1) {
+  if (accounts.length > 1) {
     const me = state.me;
     const meURL = state.accounts.get(me)?.url || '';
 
@@ -85,7 +86,7 @@ export const findAccountByUsername = (state: RootState, username: string) => {
       }
     });
   } else {
-    return accounts.first();
+    return accounts[0];
   }
 };
 
@@ -355,7 +356,7 @@ const getSimplePolicy = createSelector([
 });
 
 const getRemoteInstanceFavicon = (state: RootState, host: string) => (
-  (state.accounts.find(account => getDomain(account) === host, null) || ImmutableMap())
+  (state.accounts.find(account => getDomain(account) === host) || ImmutableMap())
     .getIn(['pleroma', 'favicon'])
 );