fix: add comments to isMessageEmptyExceptReaction and isMessageEmpty

pull/2437/head
Audric Ackermann 3 years ago
parent 4a3d970a35
commit 8649483503

@ -79,34 +79,23 @@ function cleanAttachments(decrypted: SignalService.DataMessage) {
} }
} }
export function isMessageEmpty(message: SignalService.DataMessage) { /**
const { * We separate the isMessageEmpty and the isMessageEmptyExceptReaction, because we
flags, * - sometimes want to drop a message only when it is completely empty,
body, * - and sometimes only when the message is empty but have a reaction
attachments, */
group, function isMessageEmpty(message: SignalService.DataMessage) {
quote, const { reaction } = message;
preview,
openGroupInvitation,
reaction,
} = message;
return ( return isMessageEmptyExceptReaction(message) && isEmpty(reaction);
!flags &&
isEmpty(body) &&
isEmpty(attachments) &&
isEmpty(group) &&
isEmpty(quote) &&
isEmpty(preview) &&
isEmpty(openGroupInvitation) &&
isEmpty(reaction)
);
} }
/** /**
* Incoming sogs messages without reaction must be dropped when they are empty, so we had to separate this function and `isMessageEmpty` * We separate the isMessageEmpty and the isMessageEmptyExceptReaction, because we
* - sometimes want to drop a message only when it is completely empty,
* - and sometimes only when the message is empty but have a reaction
*/ */
export function isMessageEmptyNoReaction(message: SignalService.DataMessage) { export function isMessageEmptyExceptReaction(message: SignalService.DataMessage) {
const { flags, body, attachments, group, quote, preview, openGroupInvitation } = message; const { flags, body, attachments, group, quote, preview, openGroupInvitation } = message;
return ( return (

@ -12,7 +12,7 @@ import { removeMessagePadding } from '../session/crypto/BufferPadding';
import { UserUtils } from '../session/utils'; import { UserUtils } from '../session/utils';
import { perfEnd, perfStart } from '../session/utils/Performance'; import { perfEnd, perfStart } from '../session/utils/Performance';
import { fromBase64ToArray } from '../session/utils/String'; import { fromBase64ToArray } from '../session/utils/String';
import { cleanIncomingDataMessage, isMessageEmptyNoReaction } from './dataMessage'; import { cleanIncomingDataMessage, isMessageEmptyExceptReaction } from './dataMessage';
import { handleMessageJob, toRegularMessage } from './queuedJob'; import { handleMessageJob, toRegularMessage } from './queuedJob';
export const handleOpenGroupV4Message = async ( export const handleOpenGroupV4Message = async (
@ -63,9 +63,11 @@ const handleOpenGroupMessage = async (
return; return;
} }
if (isMessageEmptyNoReaction(idataMessage as SignalService.DataMessage)) { if (isMessageEmptyExceptReaction(idataMessage as SignalService.DataMessage)) {
// empty message, drop it // empty message, drop it
if (!idataMessage.reaction) {
window.log.info('received an empty message for sogs'); window.log.info('received an empty message for sogs');
}
return; return;
} }

Loading…
Cancel
Save