Skip to content

Commit

Permalink
Merge 4b74625 into e60b62c
Browse files Browse the repository at this point in the history
  • Loading branch information
AB261 committed Feb 16, 2019
2 parents e60b62c + 4b74625 commit 797f9ed
Showing 1 changed file with 28 additions and 20 deletions.
48 changes: 28 additions & 20 deletions src/unread/unreadSelectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,39 +46,47 @@ export const getUnreadByStream = createSelector(
}, ({}: { [number]: number })),
);

export const getUnreadStreamTotal = createSelector(getUnreadByStream, unreadByStream =>
Object.values(unreadByStream).reduce((total, x) => +x + total, 0),
export const getUnreadStreamTotal: Selector<number> = createSelector(
getUnreadByStream,
unreadByStream => Object.values(unreadByStream).reduce((total, x) => +x + total, 0),
);

export const getUnreadByPms = createSelector(getUnreadPms, unreadPms =>
unreadPms.reduce((totals, pm) => {
totals[pm.sender_id] = totals[pm.sender_id] || 0 + pm.unread_message_ids.length;
return totals;
}, ({}: { [number]: number })),
export const getUnreadByPms = createSelector(
getUnreadPms,
unreadPms =>
unreadPms.reduce((totals, pm) => {
totals[pm.sender_id] = totals[pm.sender_id] || 0 + pm.unread_message_ids.length;
return totals;
}, ({}: { [number]: number })),
);

export const getUnreadPmsTotal = createSelector(getUnreadPms, unreadPms =>
unreadPms.reduce((total, pm) => total + pm.unread_message_ids.length, 0),
export const getUnreadPmsTotal: Selector<number> = createSelector(
getUnreadPms,
unreadPms => unreadPms.reduce((total, pm) => total + pm.unread_message_ids.length, 0),
);

export const getUnreadByHuddles = createSelector(getUnreadHuddles, unreadHuddles =>
unreadHuddles.reduce((totals, huddle) => {
totals[huddle.user_ids_string] =
totals[huddle.user_ids_string] || 0 + huddle.unread_message_ids.length;
return totals;
}, ({}: { [string]: number })),
export const getUnreadByHuddles = createSelector(
getUnreadHuddles,
unreadHuddles =>
unreadHuddles.reduce((totals, huddle) => {
totals[huddle.user_ids_string] =
totals[huddle.user_ids_string] || 0 + huddle.unread_message_ids.length;
return totals;
}, ({}: { [string]: number })),
);

export const getUnreadHuddlesTotal = createSelector(getUnreadHuddles, unreadHuddles =>
unreadHuddles.reduce((total, huddle) => total + huddle.unread_message_ids.length, 0),
export const getUnreadHuddlesTotal: Selector<number> = createSelector(
getUnreadHuddles,
unreadHuddles =>
unreadHuddles.reduce((total, huddle) => total + huddle.unread_message_ids.length, 0),
);

export const getUnreadMentionsTotal = createSelector(
export const getUnreadMentionsTotal: Selector<number> = createSelector(
getUnreadMentions,
unreadMentions => unreadMentions.length,
);

export const getUnreadTotal = createSelector(
export const getUnreadTotal: Selector<number> = createSelector(
getUnreadStreamTotal,
getUnreadPmsTotal,
getUnreadHuddlesTotal,
Expand Down Expand Up @@ -149,7 +157,7 @@ export const getUnreadStreamsAndTopicsSansMuted = createSelector(
.filter(stream => !stream.isMuted && stream.data.length > 0),
);

export const getUnreadPrivateMessagesCount = createSelector(
export const getUnreadPrivateMessagesCount: Selector<number> = createSelector(
getPrivateMessages,
getReadFlags,
(privateMessages, readFlags) => countUnread(privateMessages.map(msg => msg.id), readFlags),
Expand Down

0 comments on commit 797f9ed

Please sign in to comment.