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

Fixed all connections count and renamed MY_STORIES_ID and EditMyStoriesPrivacyModal

Browse source
This commit is contained in:
Alvaro 2022-11-10 08:51:39 -07:00 • committed by GitHub
parent be6e988a95
commit 45069673ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 86 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ import type {
StoriesStateType,
AddStoryData,
} from '../ducks/stories';
import { HasStories, MY_STORIES_ID } from '../../types/Stories';
import { HasStories, MY_STORY_ID } from '../../types/Stories';
import { ReadStatus } from '../../messages/MessageReadStatus';
import { SendStatus } from '../../messages/MessageSendState';
import { canReply } from './message';
@ -102,11 +102,11 @@ function sortByRecencyAndUnread(
}
function sortMyStories(storyA: MyStoryType, storyB: MyStoryType): number {
if (storyA.id === MY_STORIES_ID) {
if (storyA.id === MY_STORY_ID) {
return -1;
}
if (storyB.id === MY_STORIES_ID) {
if (storyB.id === MY_STORY_ID) {
return 1;
}
@ -382,8 +382,8 @@ export const getStories = createSelector(
if (story.storyDistributionListId) {
const list =
story.storyDistributionListId === MY_STORIES_ID
? { id: MY_STORIES_ID, name: MY_STORIES_ID }
story.storyDistributionListId === MY_STORY_ID
? { id: MY_STORY_ID, name: MY_STORY_ID }
: distributionListSelector(
story.storyDistributionListId.toLowerCase()
);
@ -528,8 +528,8 @@ export const getStoryByIdSelector = createSelector(
| undefined;
if (story.storyDistributionListId) {
distributionList =
story.storyDistributionListId === MY_STORIES_ID
? { id: MY_STORIES_ID, name: MY_STORIES_ID }
story.storyDistributionListId === MY_STORY_ID
? { id: MY_STORY_ID, name: MY_STORY_ID }
: distributionListSelector(
story.storyDistributionListId.toLowerCase()
);

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

@ -7,14 +7,14 @@ import type { StateType } from '../reducer';
import type { StoryDistributionListDataType } from '../ducks/storyDistributionLists';
import type { StoryDistributionListWithMembersDataType } from '../../types/Stories';
import { getConversationSelector } from './conversations';
import { MY_STORIES_ID } from '../../types/Stories';
import { MY_STORY_ID } from '../../types/Stories';
export const getDistributionLists = (
state: StateType
): Array<StoryDistributionListDataType> =>
state.storyDistributionLists.distributionLists
.filter(list => !list.deletedAtTimestamp)
.sort(list => (list.id === MY_STORIES_ID ? -1 : 1));
.sort(list => (list.id === MY_STORY_ID ? -1 : 1));
export const getDistributionListSelector = createSelector(
getDistributionLists,