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

Simplify getAccountGallery selector, also fix getGroupGallery

Browse source
This commit is contained in:
Alex Gleason 2023-06-23 11:45:12 -05:00
parent 1f653b1065
commit 2657c8f946
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -208,10 +208,8 @@ export const makeGetNotification = () => {
export const getAccountGallery = createSelector([ export const getAccountGallery = createSelector([
(state: RootState, id: string) => state.timelines.get(`account:${id}:media`)?.items || ImmutableOrderedSet<string>(), (state: RootState, id: string) => state.timelines.get(`account:${id}:media`)?.items || ImmutableOrderedSet<string>(),
(state: RootState) => state.statuses, (state: RootState) => state.statuses,
(state: RootState) => state.accounts, ], (statusIds, statuses) => {
], (statusIds, statuses, accounts) => {
return statusIds.reduce((medias: ImmutableList<any>, statusId: string) => { return statusIds.reduce((medias: ImmutableList<any>, statusId: string) => {
const status = statuses.get(statusId); const status = statuses.get(statusId);
if (!status) return medias; if (!status) return medias;
@ -225,19 +223,14 @@ export const getAccountGallery = createSelector([
export const getGroupGallery = createSelector([ export const getGroupGallery = createSelector([
(state: RootState, id: string) => state.timelines.get(`group:${id}:media`)?.items || ImmutableOrderedSet<string>(), (state: RootState, id: string) => state.timelines.get(`group:${id}:media`)?.items || ImmutableOrderedSet<string>(),
(state: RootState) => state.statuses, (state: RootState) => state.statuses,
(state: RootState) => state.accounts, ], (statusIds, statuses) => {
], (statusIds, statuses, accounts) => {
return statusIds.reduce((medias: ImmutableList<any>, statusId: string) => { return statusIds.reduce((medias: ImmutableList<any>, statusId: string) => {
const status = statuses.get(statusId); const status = statuses.get(statusId);
if (!status) return medias; if (!status) return medias;
if (status.reblog) return medias; if (status.reblog) return medias;
if (typeof status.account !== 'string') return medias;
const account = accounts.get(status.account);
return medias.concat( return medias.concat(
status.media_attachments.map(media => media.merge({ status, account }))); status.media_attachments.map(media => media.merge({ status, account: status.account })));
}, ImmutableList()); }, ImmutableList());
}); });