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

Use group name for hidden stories

Browse source
This commit is contained in:
Josh Perez 2022-10-26 18:34:57 -04:00 committed by GitHub
parent 7b9807d464
commit db557104a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ts/components/StoriesPane.tsx
View file

@ -177,17 +177,17 @@ export const StoriesPane = ({
{renderedStories.map(story => ( {renderedStories.map(story => (
<StoryListItem <StoryListItem
conversationId={story.conversationId} conversationId={story.conversationId}
group={story.group}
getPreferredBadge={getPreferredBadge} getPreferredBadge={getPreferredBadge}
hasReplies={story.hasReplies} hasReplies={story.hasReplies}
hasRepliesFromSelf={story.hasRepliesFromSelf} hasRepliesFromSelf={story.hasRepliesFromSelf}
group={story.group}
i18n={i18n} i18n={i18n}
key={story.storyView.timestamp} key={story.storyView.timestamp}
onHideStory={toggleHideStories}
onGoToConversation={conversationId => { onGoToConversation={conversationId => {
showConversation({ conversationId }); showConversation({ conversationId });
toggleStoriesView(); toggleStoriesView();
}} }}
onHideStory={toggleHideStories}
queueStoryDownload={queueStoryDownload} queueStoryDownload={queueStoryDownload}
story={story.storyView} story={story.storyView}
viewUserStories={viewUserStories} viewUserStories={viewUserStories}
@ -210,15 +210,16 @@ export const StoriesPane = ({
hiddenStories.map(story => ( hiddenStories.map(story => (
<StoryListItem <StoryListItem
conversationId={story.conversationId} conversationId={story.conversationId}
key={story.storyView.timestamp}
getPreferredBadge={getPreferredBadge} getPreferredBadge={getPreferredBadge}
group={story.group}
i18n={i18n} i18n={i18n}
isHidden isHidden
onHideStory={toggleHideStories} key={story.storyView.timestamp}
onGoToConversation={conversationId => { onGoToConversation={conversationId => {
showConversation({ conversationId }); showConversation({ conversationId });
toggleStoriesView(); toggleStoriesView();
}} }}
onHideStory={toggleHideStories}
queueStoryDownload={queueStoryDownload} queueStoryDownload={queueStoryDownload}
story={story.storyView} story={story.storyView}
viewUserStories={viewUserStories} viewUserStories={viewUserStories}

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

@ -223,7 +223,6 @@ export function getConversationStory(
story: StoryDataType story: StoryDataType
): ConversationStoryType { ): ConversationStoryType {
const sender = pick(conversationSelector(story.sourceUuid || story.source), [ const sender = pick(conversationSelector(story.sourceUuid || story.source), [
'hideStory',
'id', 'id',
]); ]);
@ -231,6 +230,7 @@ export function getConversationStory(
'acceptedMessageRequest', 'acceptedMessageRequest',
'avatarPath', 'avatarPath',
'color', 'color',
'hideStory',
'id', 'id',
'name', 'name',
'profileName', 'profileName',
@ -251,7 +251,7 @@ export function getConversationStory(
group: conversation.id !== sender.id ? conversation : undefined, group: conversation.id !== sender.id ? conversation : undefined,
hasReplies: story.hasReplies, hasReplies: story.hasReplies,
hasRepliesFromSelf: story.hasRepliesFromSelf, hasRepliesFromSelf: story.hasRepliesFromSelf,
isHidden: Boolean(sender.hideStory), isHidden: Boolean(conversation.hideStory),
storyView, storyView,
}; };
} }