bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'get-account-perf' into 'develop'

Browse source 
Fix performance issue with makeGetAccount

See merge request soapbox-pub/soapbox!2582
This commit is contained in:
Alex Gleason 2023-06-29 03:12:36 +00:00
commit 11f100da51
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/soapbox/selectors/index.ts
View file

@ -7,6 +7,7 @@ import {
import { createSelector } from 'reselect';
import { getSettings } from 'soapbox/actions/settings';
import { Entities } from 'soapbox/entity-store/entities';
import { getDomain } from 'soapbox/utils/accounts';
import { validId } from 'soapbox/utils/auth';
import ConfigDB from 'soapbox/utils/config-db';
@ -16,21 +17,20 @@ import { shouldFilter } from 'soapbox/utils/timelines';
import type { ContextType } from 'soapbox/normalizers/filter';
import type { ReducerChat } from 'soapbox/reducers/chats';
import type { RootState } from 'soapbox/store';
import type { Filter as FilterEntity, Notification, Status } from 'soapbox/types/entities';
import type { Account, Filter as FilterEntity, Notification, Status } from 'soapbox/types/entities';
const normalizeId = (id: any): string => typeof id === 'string' ? id : '';
const getAccountBase = (state: RootState, id: string) => state.accounts.get(id);
const getAccountBase = (state: RootState, id: string) => state.entities[Entities.ACCOUNTS]?.store[id] as Account | undefined;
const getAccountRelationship = (state: RootState, id: string) => state.relationships.get(id);
export const makeGetAccount = () => {
return createSelector([
getAccountBase,
getAccountRelationship,
], (base, relationship) => {
if (!base) return null;
base.relationship = base.relationship ?? relationship;
return base;
], (account, relationship) => {
if (!account) return null;
return { ...account, relationship };
});
};