Fix issues with story thread when processing a sync message.

fork-5.53.8
Greyson Parrelli 2022-10-05 11:52:57 -04:00 zatwierdzone przez GitHub
rodzic ee00e931eb
commit ad1801108d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 5 dodań i 1 usunięć

Wyświetl plik

@ -1641,6 +1641,10 @@ public final class MessageContentProcessor {
Recipient threadRecipient = Objects.requireNonNull(SignalDatabase.threads().getRecipientForThreadId(story.getThreadId()));
boolean groupStory = threadRecipient.isActiveGroup();
if (!groupStory) {
threadRecipient = senderRecipient;
}
handlePossibleExpirationUpdate(content, message, threadRecipient.getGroupId(), senderRecipient, threadRecipient, receivedTime);
if (message.getGroupContext().isPresent() ) {
@ -1935,7 +1939,7 @@ public final class MessageContentProcessor {
}
quoteModel = new QuoteModel(storyContext.getSentTimestamp(), storyAuthorRecipient, quoteBody, false, story.getSlideDeck().asAttachments(), Collections.emptyList(), QuoteModel.Type.NORMAL);
expiresInMillis = TimeUnit.SECONDS.toMillis(message.getExpirationStartTimestamp());
expiresInMillis = TimeUnit.SECONDS.toMillis(message.getDataMessage().get().getExpiresInSeconds());
} else {
warn(envelopeTimestamp, "Story has replies disabled. Dropping reply.");
return -1L;