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

Paid Messages: Remove timer (#5850)

Browse Source
This commit is contained in:
Alexander Zinchuk 2025-04-23 18:59:23 +02:00
parent 92d9f0736c
commit 3087fb85cc
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/global/actions/api/bots.ts
View File

@ -14,7 +14,7 @@ import {
} from '../../../api/types'; } from '../../../api/types';
import { ManagementProgress } from '../../../types'; import { ManagementProgress } from '../../../types';
import { BOT_FATHER_USERNAME, GENERAL_REFETCH_INTERVAL, PAID_SEND_DELAY } from '../../../config'; import { BOT_FATHER_USERNAME, GENERAL_REFETCH_INTERVAL } from '../../../config';
import { copyTextToClipboard } from '../../../util/clipboard'; import { copyTextToClipboard } from '../../../util/clipboard';
import { getUsernameFromDeepLink } from '../../../util/deepLinkParser'; import { getUsernameFromDeepLink } from '../../../util/deepLinkParser';
import { getCurrentTabId } from '../../../util/establishMultitabRole'; import { getCurrentTabId } from '../../../util/establishMultitabRole';
@ -438,6 +438,9 @@ addActionHandler('sendInlineBotResult', async (global, actions, payload): Promis
return; return;
} }
// eslint-disable-next-line eslint-multitab-tt/no-getactions-in-actions
actions.sendInlineBotApiResult({ ...params });
// eslint-disable-next-line eslint-multitab-tt/no-getactions-in-actions // eslint-disable-next-line eslint-multitab-tt/no-getactions-in-actions
actions.showNotification({ actions.showNotification({
localId: queryId, localId: queryId,
@ -445,14 +448,7 @@ addActionHandler('sendInlineBotResult', async (global, actions, payload): Promis
message: { message: {
key: 'MessageSentPaidToastText', variables: { amount: formatStarsAsText(getTranslationFn(), starsForOneMessage) }, key: 'MessageSentPaidToastText', variables: { amount: formatStarsAsText(getTranslationFn(), starsForOneMessage) },
}, },
actionText: { key: 'ButtonUndo' },
dismissAction: {
action: 'sendInlineBotApiResult',
payload: params,
},
duration: PAID_SEND_DELAY,
shouldShowTimer: true,
disableClickDismiss: true,
icon: 'star', icon: 'star',
shouldUseCustomIcon: true, shouldUseCustomIcon: true,
type: 'paidMessage', type: 'paidMessage',

19
src/global/actions/api/messages.ts
View File

@ -29,7 +29,7 @@ import {
MAX_MEDIA_FILES_FOR_ALBUM, MAX_MEDIA_FILES_FOR_ALBUM,
MESSAGE_ID_REQUIRED_ERROR, MESSAGE_ID_REQUIRED_ERROR,
MESSAGE_LIST_SLICE, MESSAGE_LIST_SLICE,
PAID_SEND_DELAY, RE_TELEGRAM_LINK, RE_TELEGRAM_LINK,
SERVICE_NOTIFICATIONS_USER_ID, SERVICE_NOTIFICATIONS_USER_ID,
SUPPORTED_AUDIO_CONTENT_TYPES, SUPPORTED_AUDIO_CONTENT_TYPES,
SUPPORTED_PHOTO_CONTENT_TYPES, SUPPORTED_PHOTO_CONTENT_TYPES,
@ -1713,6 +1713,9 @@ async function sendMessagesWithNotification<T extends GlobalState>(
options: { pluralValue: messagesCount }, options: { pluralValue: messagesCount },
}; };
// eslint-disable-next-line eslint-multitab-tt/no-getactions-in-actions
getActions().sendMessages({ sendParams });
// eslint-disable-next-line eslint-multitab-tt/no-getactions-in-actions // eslint-disable-next-line eslint-multitab-tt/no-getactions-in-actions
getActions().showNotification({ getActions().showNotification({
localId: getMessageKey(firstMessage), localId: getMessageKey(firstMessage),
@ -1721,20 +1724,6 @@ async function sendMessagesWithNotification<T extends GlobalState>(
key: 'MessageSentPaidToastText', key: 'MessageSentPaidToastText',
variables: { amount: formatStarsAsText(getTranslationFn(), starsForOneMessage * messagesCount) }, variables: { amount: formatStarsAsText(getTranslationFn(), starsForOneMessage * messagesCount) },
}, },
actionText: { key: 'ButtonUndo' },
action: {
action: 'deleteMessages',
payload: { messageList: firstSendParam.messageList, messageIds: messageIdsForUndo, shouldDeleteForAll: true },
},
dismissAction: {
action: 'sendMessages',
payload: {
sendParams,
},
},
duration: PAID_SEND_DELAY,
shouldShowTimer: true,
disableClickDismiss: true,
icon: 'star', icon: 'star',
shouldUseCustomIcon: true, shouldUseCustomIcon: true,
type: 'paidMessage', type: 'paidMessage',