ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Composer: Fix problem with scheduled messages (#4136)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-12-28 14:38:16 +01:00
parent d4c16517f0
commit 6a8e685561
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/common/Composer.tsx
View File

@ -941,6 +941,8 @@ const Composer: FC<OwnProps & StateProps> = ({
if (currentAttachments.length) { if (currentAttachments.length) {
sendAttachments({ sendAttachments({
attachments: currentAttachments, attachments: currentAttachments,
scheduledAt,
isSilent,
}); });
return; return;
} }
@ -1350,9 +1352,8 @@ const Composer: FC<OwnProps & StateProps> = ({
if (!currentMessageList) { if (!currentMessageList) {
return; return;
} }
requestCalendar((scheduledAt) => { requestCalendar((scheduledAt) => {
handleMessageSchedule({}, scheduledAt, currentMessageList!); handleMessageSchedule({}, scheduledAt, currentMessageList);
}); });
break; break;
default: default:
@ -1460,10 +1461,16 @@ const Composer: FC<OwnProps & StateProps> = ({
sendSilent({ sendCompressed, sendGrouped }); sendSilent({ sendCompressed, sendGrouped });
}); });
const onSend = mainButtonState === MainButtonState.Edit const onSend = useMemo(() => {
? handleEditComplete switch (mainButtonState) {
: mainButtonState === MainButtonState.Schedule ? handleSendScheduled case MainButtonState.Edit:
: handleSend; return handleEditComplete;
case MainButtonState.Schedule:
return handleSendScheduled;
default:
return handleSend;
}
}, [mainButtonState, handleEditComplete]);
const withBotCommands = isChatWithBot && botMenuButton?.type === 'commands' && !editingMessage const withBotCommands = isChatWithBot && botMenuButton?.type === 'commands' && !editingMessage
&& botCommands !== false && !activeVoiceRecording; && botCommands !== false && !activeVoiceRecording;