From 022d915199a3b75877dd3759e3cd2bf0d53af3e4 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Thu, 27 Jul 2023 11:48:13 +0200 Subject: [PATCH] Message: Fix false flagging as scheduled (#3670) --- src/api/gramjs/apiBuilders/messages.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/api/gramjs/apiBuilders/messages.ts b/src/api/gramjs/apiBuilders/messages.ts index c185df4cf..ec4dcafc1 100644 --- a/src/api/gramjs/apiBuilders/messages.ts +++ b/src/api/gramjs/apiBuilders/messages.ts @@ -62,12 +62,13 @@ import { addPhotoToLocalDb, resolveMessageApiChatId, serializeBytes } from '../h import { buildApiPeerId, getApiChatIdFromMtpPeer, isPeerUser } from './peers'; import { buildApiCallDiscardReason } from './calls'; import { getEmojiOnlyCountForMessage } from '../../../global/helpers/getEmojiOnlyCountForMessage'; -import { getServerTimeOffset } from '../../../util/serverTime'; +import { getServerTime, getServerTimeOffset } from '../../../util/serverTime'; const LOCAL_MESSAGES_LIMIT = 1e6; // 1M const LOCAL_MEDIA_UPLOADING_TEMP_ID = 'temp'; const INPUT_WAVEFORM_LENGTH = 63; +const MIN_SCHEDULED_PERIOD = 10; let localMessageCounter = 0; function getNextLocalMessageId(lastMessageId = 0) { @@ -176,7 +177,7 @@ export function buildApiMessageWithChatId( if (action) { content.action = action; } - const isScheduled = mtpMessage.date > (Math.round(Date.now() / 1000) + getServerTimeOffset()); + const isScheduled = mtpMessage.date > getServerTime() + MIN_SCHEDULED_PERIOD; const isInvoiceMedia = mtpMessage.media instanceof GramJs.MessageMediaInvoice && Boolean(mtpMessage.media.extendedMedia);