Autoplay the hidden stories section

signalapp · Sep 22, 2022 · 94ef800 · 94ef800
1 parent 7edb9ed
commit 94ef800
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/ts/components/StoryViewer.tsx b/ts/components/StoryViewer.tsx
@@ -326,6 +326,7 @@ export const StoryViewer = ({
 
   const canFreelyNavigateStories =
     storyViewMode === StoryViewModeType.All ||
+    storyViewMode === StoryViewModeType.Hidden ||
     storyViewMode === StoryViewModeType.Unread;
 
   const canNavigateLeft =

diff --git a/ts/state/ducks/stories.ts b/ts/state/ducks/stories.ts
@@ -814,16 +814,29 @@ const viewUserStories: ViewUserStoriesActionCreatorType = ({
 
     const story = storiesByConversationId[currentIndex];
 
+    const hiddenConversationIds = new Set(
+      getHideStoryConversationIds(getState())
+    );
+
+    let inferredStoryViewMode: StoryViewModeType;
+    if (storyViewMode) {
+      inferredStoryViewMode = storyViewMode;
+    } else if (hiddenConversationIds.has(conversationId)) {
+      inferredStoryViewMode = StoryViewModeType.Hidden;
+    } else if (hasUnread) {
+      inferredStoryViewMode = StoryViewModeType.Unread;
+    } else {
+      inferredStoryViewMode = StoryViewModeType.All;
+    }
+
     dispatch({
       type: VIEW_STORY,
       payload: {
         currentIndex,
         messageId: story.messageId,
         numStories,
         shouldShowDetailsModal,
-        storyViewMode:
-          storyViewMode ||
-          (hasUnread ? StoryViewModeType.Unread : StoryViewModeType.All),
+        storyViewMode: inferredStoryViewMode,
       },
     });
   };
@@ -1008,7 +1021,11 @@ const viewStory: ViewStoryActionCreatorType = (
       }
     }
 
-    const conversationStories = getStories(state).stories;
+    const storiesSelectorState = getStories(state);
+    const conversationStories =
+      storyViewMode === StoryViewModeType.Hidden
+        ? storiesSelectorState.hiddenStories
+        : storiesSelectorState.stories;
     const conversationStoryIndex = conversationStories.findIndex(
       item => item.conversationId === story.conversationId
     );

diff --git a/ts/state/selectors/stories.ts b/ts/state/selectors/stories.ts
@@ -405,7 +405,9 @@ export const getStories = createSelector(
     });
 
     return {
-      hiddenStories: Array.from(hiddenStoriesById.values()),
+      hiddenStories: Array.from(hiddenStoriesById.values()).sort(
+        sortByRecencyAndUnread
+      ),
       myStories: Array.from(myStoriesById.values()).sort(sortMyStories),
       stories: Array.from(storiesById.values()).sort(sortByRecencyAndUnread),
     };

diff --git a/ts/types/Stories.ts b/ts/types/Stories.ts
@@ -116,6 +116,7 @@ export enum StoryViewDirectionType {
 // User = All of a user's stories
 export enum StoryViewModeType {
   All = 'All',
+  Hidden = 'Hidden',
   Single = 'Single',
   Unread = 'Unread',
   User = 'User',