mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes getStoryView selector

Browse source
This commit is contained in:
Josh Perez 2022-07-07 17:59:08 -04:00 committed by GitHub
parent 4a15df5904
commit 664181cf9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stylesheets/components/MyStories.scss
View file

@ -7,6 +7,7 @@
&__title {
@include font-body-1-bold;
color: $color-gray-05;
margin: 24px 0 8px 0;
}
}
@ -18,6 +19,7 @@
&__details {
@include font-body-1-bold;
color: $color-gray-05;
display: flex;
flex-direction: column;
flex: 1;

75
ts/state/selectors/stories.ts
View file

@ -113,13 +113,51 @@ export function getStoryView(
const { attachment, timestamp } = pick(story, ['attachment', 'timestamp']);
const { sendStateByConversationId } = story;
let sendState: Array<StorySendStateType> | undefined;
let views: number | undefined;
if (sendStateByConversationId) {
const innerSendState: Array<StorySendStateType> = [];
let innerViews = 0;
Object.keys(sendStateByConversationId).forEach(recipientId => {
const recipient = conversationSelector(recipientId);
const recipientSendState = sendStateByConversationId[recipient.id];
if (recipientSendState.status === SendStatus.Viewed) {
innerViews += 1;
}
innerSendState.push({
...recipientSendState,
recipient: pick(recipient, [
'acceptedMessageRequest',
'avatarPath',
'color',
'id',
'isMe',
'name',
'profileName',
'sharedGroupNames',
'title',
]),
});
});
sendState = innerSendState;
views = innerViews;
}
return {
attachment,
canReply: canReply(story, undefined, conversationSelector),
isUnread: story.readStatus === ReadStatus.Unread,
messageId: story.messageId,
sender,
sendState,
timestamp,
views,
};
}
@ -260,47 +298,12 @@ export const getStories = createSelector(
const storyView = getStoryView(conversationSelector, story);
const sendState: Array<StorySendStateType> = [];
const { sendStateByConversationId } = story;
let views = 0;
Object.keys(story.sendStateByConversationId).forEach(recipientId => {
const recipient = conversationSelector(recipientId);
const recipientSendState = sendStateByConversationId[recipient.id];
if (recipientSendState.status === SendStatus.Viewed) {
views += 1;
}
sendState.push({
...recipientSendState,
recipient: pick(recipient, [
'acceptedMessageRequest',
'avatarPath',
'color',
'id',
'isMe',
'name',
'profileName',
'sharedGroupNames',
'title',
]),
});
});
const existingMyStory = myStoriesById.get(list.id) || { stories: [] };
myStoriesById.set(list.id, {
distributionId: list.id,
distributionName: list.name,
stories: [
...existingMyStory.stories,
{
...storyView,
sendState,
views,
},
],
stories: [...existingMyStory.stories, storyView],
});
return;