mirror of
https://github.com/iamxvbaba/gramsrv.git
synced 2026-11-19 05:16:55 +03:00
e0fc067ff7
answerPreCheckoutQuery answered 501 and no pre_checkout_query was ever created, so a bot could not refuse an order before the payer was charged. The whole gate was missing, not just the method. The payer is now held in sendStarsForm/sendPaymentForm for at most 10 seconds - Telegram's window - while the bot answers. Approval charges the Stars, refusal cancels them and shows the bot's error_message to the payer, and silence fails the payment. Silence never degrades into charging anyway: a bot that does not answer means a refusal, or the gate would verify nothing. The gate runs before the invoice is marked settled. Settling first would leave a declined invoice flagged as paid, and the retry would then hand back a receipt with no money behind it. An already settled invoice skips the question, so a replayed payment form neither re-asks the bot nor re-charges. Only the bot that owns the order can answer, and a stale query id gets QUERY_ID_INVALID rather than a false ok, since a bot told "ok" for an answer that landed nowhere would assume it approved a payment. answerShippingQuery stays blocked, now as METHOD_NOT_FOUND rather than the old BLOCKED_DURABLE_QUERY_STATE_MISSING marker: a Stars payment has no shipping step, so there is nothing to answer. Also fixes an unrelated test defect that made the suite non-idempotent: the bot invoice store test hardcoded a charge id while its users were unique per run, so the unique charge index collided with every earlier run in a shared database.
69 lines
3.4 KiB
SQL
69 lines
3.4 KiB
SQL
-- ON CONFLICT DO NOTHING is what keeps a replayed question from queueing twice, and
|
|
-- it needs a unique index just like callback_query has. The query id lives inside the
|
|
-- payload, so the index reaches into it.
|
|
CREATE UNIQUE INDEX IF NOT EXISTS bot_api_updates_pre_checkout_unique
|
|
ON public.bot_api_updates (bot_user_id, ((pre_checkout_payload #>> '{id}')::bigint))
|
|
WHERE update_kind = 'pre_checkout_query';
|
|
|
|
-- pre_checkout_query, like callback_query, carries no message: the bot is asked
|
|
-- before any payment exists. The shape constraints below existed to let exactly one
|
|
-- message-less kind through, so they are widened to name both.
|
|
ALTER TABLE public.bot_api_updates
|
|
DROP CONSTRAINT bot_api_updates_kind_check,
|
|
DROP CONSTRAINT bot_api_updates_peer_type_check,
|
|
DROP CONSTRAINT bot_api_updates_peer_id_check,
|
|
DROP CONSTRAINT bot_api_updates_message_id_check,
|
|
DROP CONSTRAINT bot_api_updates_callback_shape_check;
|
|
|
|
ALTER TABLE public.bot_api_updates
|
|
ADD CONSTRAINT bot_api_updates_kind_check CHECK (
|
|
update_kind IN ('message', 'edited_message', 'callback_query', 'pre_checkout_query')
|
|
);
|
|
|
|
ALTER TABLE public.bot_api_updates
|
|
ADD CONSTRAINT bot_api_updates_peer_type_check CHECK (
|
|
peer_type IN ('user', 'channel')
|
|
OR (update_kind IN ('callback_query', 'pre_checkout_query') AND peer_type = '')
|
|
),
|
|
ADD CONSTRAINT bot_api_updates_peer_id_check CHECK (
|
|
peer_id > 0
|
|
OR (update_kind IN ('callback_query', 'pre_checkout_query') AND peer_id = 0)
|
|
),
|
|
ADD CONSTRAINT bot_api_updates_message_id_check CHECK (
|
|
message_id > 0
|
|
OR (update_kind IN ('callback_query', 'pre_checkout_query') AND message_id = 0)
|
|
),
|
|
ADD CONSTRAINT bot_api_updates_callback_shape_check CHECK (
|
|
(update_kind = 'callback_query'
|
|
AND callback_query_id <> 0
|
|
AND callback_user_id > 0
|
|
AND callback_chat_instance <> 0
|
|
AND COALESCE(octet_length(callback_data), 0) <= 64
|
|
AND source_pts = 0
|
|
AND (
|
|
(peer_type IN ('user', 'channel') AND peer_id > 0 AND message_id > 0
|
|
AND callback_inline_dc_id = 0 AND callback_inline_owner_id = 0
|
|
AND callback_inline_message_id = 0 AND callback_inline_access_hash = 0)
|
|
OR
|
|
(peer_type = '' AND peer_id = 0 AND message_id = 0
|
|
AND callback_inline_dc_id > 0 AND callback_inline_owner_id > 0
|
|
AND callback_inline_message_id > 0 AND callback_inline_access_hash <> 0)
|
|
))
|
|
OR
|
|
(update_kind = 'pre_checkout_query'
|
|
AND pre_checkout_payload IS NOT NULL
|
|
AND callback_query_id = 0 AND callback_user_id = 0
|
|
AND callback_chat_instance = 0 AND callback_data IS NULL
|
|
AND callback_inline_dc_id = 0 AND callback_inline_owner_id = 0
|
|
AND callback_inline_message_id = 0 AND callback_inline_access_hash = 0
|
|
AND source_pts = 0
|
|
AND peer_type = '' AND peer_id = 0 AND message_id = 0)
|
|
OR
|
|
(update_kind IN ('message', 'edited_message')
|
|
AND peer_type IN ('user', 'channel') AND peer_id > 0 AND message_id > 0
|
|
AND callback_query_id = 0 AND callback_user_id = 0
|
|
AND callback_chat_instance = 0 AND callback_data IS NULL
|
|
AND callback_inline_dc_id = 0 AND callback_inline_owner_id = 0
|
|
AND callback_inline_message_id = 0 AND callback_inline_access_hash = 0)
|
|
);
|