Add extra conditional for more than 1 message in the same chat.

pull/2222/head
warrickct 3 years ago
parent 9bbac225ad
commit 8ba0020a6c

@ -19,6 +19,7 @@ import {
removeMessage as dataRemoveMessage, removeMessage as dataRemoveMessage,
saveMessages, saveMessages,
updateConversation, updateConversation,
getMessagesByConversation,
} from '../../ts/data/data'; } from '../../ts/data/data';
import { toHex } from '../session/utils/String'; import { toHex } from '../session/utils/String';
import { import {
@ -1383,7 +1384,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
let friendRequestText; let friendRequestText;
if (!this.isApproved()) { if (!this.isApproved()) {
window?.log?.info('notification cancelled for unapproved convo', this.idForLogging()); window?.log?.info('notification cancelled for unapproved convo', this.idForLogging());
const showRequestNotification = const hadNoRequestsPrior =
getConversationController() getConversationController()
.getConversations() .getConversations()
.filter(conversation => { .filter(conversation => {
@ -1394,7 +1395,9 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
!conversation.isMe() !conversation.isMe()
); );
}).length === 1; }).length === 1;
if (showRequestNotification) { const isFirstMessageOfConvo =
(await (await getMessagesByConversation(this.id, { messageId: null })).length) === 1;
if (hadNoRequestsPrior && isFirstMessageOfConvo) {
friendRequestText = window.i18n('youHaveANewFriendRequest'); friendRequestText = window.i18n('youHaveANewFriendRequest');
} else { } else {
window?.log?.info( window?.log?.info(

Loading…
Cancel
Save