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

Ensure we never fetch a deleted story

Browse source
This commit is contained in:
Josh Perez 2022-07-29 14:12:47 -04:00 • committed by GitHub
parent 7d2b91368d
commit 76cff75730
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ts/state/ducks/stories.ts
View file

@ -574,7 +574,7 @@ const getSelectedStoryDataForConversationId = (
const { stories } = state.stories; const { stories } = state.stories;
const storiesByConversationId = stories.filter( const storiesByConversationId = stories.filter(
item => item.conversationId === conversationId item => item.conversationId === conversationId && !item.deletedForEveryone
); );
// Find the index of the storyId provided, or if none provided then find the // Find the index of the storyId provided, or if none provided then find the
@ -676,7 +676,9 @@ const viewStory: ViewStoryActionCreatorType = ({
// If all stories from a user are viewed, opening the viewer should take // If all stories from a user are viewed, opening the viewer should take
// you to their oldest story // you to their oldest story
const story = stories.find(item => item.messageId === storyId); const story = stories.find(
item => item.messageId === storyId && !item.deletedForEveryone
);
if (!story) { if (!story) {
return; return;
@ -754,7 +756,8 @@ const viewStory: ViewStoryActionCreatorType = ({
// stories first. But only if we're going "next" // stories first. But only if we're going "next"
if (viewDirection === StoryViewDirectionType.Next) { if (viewDirection === StoryViewDirectionType.Next) {
const unreadStory = stories.find( const unreadStory = stories.find(
item => item.readStatus === ReadStatus.Unread item =>
item.readStatus === ReadStatus.Unread && !item.deletedForEveryone
); );
if (unreadStory) { if (unreadStory) {
const nextSelectedStoryData = getSelectedStoryDataForConversationId( const nextSelectedStoryData = getSelectedStoryDataForConversationId(
@ -992,6 +995,15 @@ export function reducer(
return state; return state;
} }
if (hasBeenDeleted) {
return {
...state,
stories: state.stories.filter(
existingStory => existingStory.messageId !== newStory.messageId
),
};
}
return { return {
...state, ...state,
stories: replaceIndex(state.stories, prevStoryIndex, newStory), stories: replaceIndex(state.stories, prevStoryIndex, newStory),
@ -1119,20 +1131,11 @@ export function reducer(
} }
if (action.type === DOE_STORY) { if (action.type === DOE_STORY) {
const prevStoryIndex = state.stories.findIndex(
existingStory => existingStory.messageId === action.payload
);
if (prevStoryIndex < 0) {
return state;
}
return { return {
...state, ...state,
stories: replaceIndex(state.stories, prevStoryIndex, { stories: state.stories.filter(
...state.stories[prevStoryIndex], existingStory => existingStory.messageId !== action.payload
deletedForEveryone: true, ),
}),
}; };
} }