Story replies: Require referenced story only for groups
This commit is contained in:
parent
29eb07c159
commit
d87684a03c
1 changed files with 7 additions and 18 deletions
|
@ -1963,8 +1963,11 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
|
|||
return sendState.isAllowedToReplyToStory !== false;
|
||||
});
|
||||
|
||||
if (storyContext && !storyQuote) {
|
||||
if (!isDirectConversation(conversation.attributes)) {
|
||||
if (
|
||||
storyContext &&
|
||||
!storyQuote &&
|
||||
!isDirectConversation(conversation.attributes)
|
||||
) {
|
||||
log.warn(
|
||||
`${idLog}: Received ${storyContextLogId} message in group but no matching story. Dropping.`
|
||||
);
|
||||
|
@ -1973,20 +1976,6 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
|
|||
return;
|
||||
}
|
||||
|
||||
if (storyQuotes.length === 0) {
|
||||
log.warn(
|
||||
`${idLog}: Received ${storyContextLogId} message but no matching story. We'll try processing this message again later.`
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
log.warn(
|
||||
`${idLog}: Received ${storyContextLogId} message in 1:1 conversation but no matching story. Dropping.`
|
||||
);
|
||||
confirm();
|
||||
return;
|
||||
}
|
||||
|
||||
if (storyQuote) {
|
||||
const storyDistributionListId = storyQuote.get(
|
||||
'storyDistributionListId'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue