mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2026-05-08 08:58:38 +01:00
Do not accept stories without a name and no deletedAtTimestamp
This commit is contained in:
@@ -1305,12 +1305,14 @@ export async function mergeStoryDistributionListRecord(
|
||||
details.push('adding unknown fields');
|
||||
}
|
||||
|
||||
const deletedAtTimestamp = getTimestampFromLong(
|
||||
storyDistributionListRecord.deletedAtTimestamp
|
||||
);
|
||||
|
||||
const storyDistribution: StoryDistributionWithMembersType = {
|
||||
id: listId,
|
||||
name: String(storyDistributionListRecord.name),
|
||||
deletedAtTimestamp: isMyStories
|
||||
? undefined
|
||||
: getTimestampFromLong(storyDistributionListRecord.deletedAtTimestamp),
|
||||
deletedAtTimestamp: isMyStories ? undefined : deletedAtTimestamp,
|
||||
allowsReplies: Boolean(storyDistributionListRecord.allowsReplies),
|
||||
isBlockList: Boolean(storyDistributionListRecord.isBlockList),
|
||||
members: remoteListMembers,
|
||||
@@ -1352,6 +1354,14 @@ export async function mergeStoryDistributionListRecord(
|
||||
details.push('clearing unknown fields');
|
||||
}
|
||||
|
||||
const isBadRemoteData = !deletedAtTimestamp && !storyDistribution.name;
|
||||
if (isBadRemoteData) {
|
||||
Object.assign(storyDistribution, {
|
||||
name: localStoryDistributionList.name,
|
||||
members: localStoryDistributionList.members,
|
||||
});
|
||||
}
|
||||
|
||||
const { hasConflict, details: conflictDetails } = doRecordsConflict(
|
||||
toStoryDistributionListRecord(storyDistribution),
|
||||
storyDistributionListRecord
|
||||
|
||||
Reference in New Issue
Block a user