Skip to content

Commit

Permalink
fix: legacy group invite do not expire
Browse files Browse the repository at this point in the history
  • Loading branch information
Bilb committed Nov 9, 2023
1 parent 8f99e82 commit f10a20a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 0 additions & 4 deletions stylesheets/_modules.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@

.module-contact-name.compact {
display: block;

span::after {
content: '\00a0';
}
}

// Module: Message
Expand Down
4 changes: 3 additions & 1 deletion ts/session/disappearing_messages/legacy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// TODO legacy messages support will be removed in a future release
import { isEmpty } from 'lodash';
import { ConversationModel } from '../../models/conversation';
import { ProtobufUtils, SignalService } from '../../protobuf';
import { ReleasedFeatures } from '../../util/releaseFeature';
Expand Down Expand Up @@ -55,6 +56,7 @@ export function checkShouldDisappearButIsntMessage(
expirationMode === 'off' &&
expirationTimer === 0 &&
convo.getExpirationMode() !== 'off' &&
convo.getExpireTimer() !== 0
convo.getExpireTimer() !== 0 &&
isEmpty(content.dataMessage?.closedGroupControlMessage?.encryptionKeyPair) // group invites do not expire, and have this field set
);
}

0 comments on commit f10a20a

Please sign in to comment.