Skip to content

fix(send): auto-forward message_thread_id under Threaded Mode + callback ctx #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adriangalilea wants to merge 2 commits into
base: main
Choose a base branch
from
+30 −28
Open

fix(send): auto-forward message_thread_id under Threaded Mode + callback ctx #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c81e211
fix(send): forward message_thread_id without is_topic_message guard
adriangalilea May 10, 2026
ba710b9
feat(callback-query): expose threadId getter
adriangalilea May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/contexts/callback-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ class CallbackQueryContext<Bot extends BotLike> extends Context<Bot> {
return this.message?.chat?.id;
}

/**
* Identifier of the thread the originating message belongs to, or
* `undefined` if it's not in a thread. Exposed so the `SendMixin`
* auto-forwards `message_thread_id` on follow-up `send`/`reply`
* calls from within a callback handler — keeping replies in the
* same thread as the tapped button.
*/
get threadId() {
return this.message?.threadId;
}

/** Checks if the query has `queryPayload` property */
hasQueryPayload(): this is Require<this, "queryPayload"> {
return this.payload.data !== undefined;
Expand Down
47 changes: 19 additions & 28 deletions src/contexts/mixins/send.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ interface SendMixinMetadata {
get businessConnectionId(): string | undefined;
get senderId(): number | undefined;
get threadId(): number | undefined;
isTopicMessage: () => boolean;
}

/** This object represents a mixin which can invoke `chatId`/`senderId`-dependent methods */
Expand All @@ -28,7 +27,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendMessage({
Expand All @@ -50,7 +49,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendPhoto({
Expand All @@ -76,7 +75,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendLivePhoto({
Expand All @@ -102,7 +101,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendDocument({
Expand All @@ -124,7 +123,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendAudio({
Expand All @@ -146,7 +145,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendVideo({
Expand All @@ -171,7 +170,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendAnimation({
Expand All @@ -196,7 +195,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendVideoNote({
Expand All @@ -218,7 +217,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendVoice({
Expand All @@ -244,7 +243,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendLocation({
Expand Down Expand Up @@ -279,7 +278,7 @@ class SendMixin<Bot extends BotLike> {
async sendVenue(params: Optional<TelegramParams.SendVenueParams, "chat_id">) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendVenue({
Expand All @@ -299,7 +298,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendContact({
Expand All @@ -317,7 +316,7 @@ class SendMixin<Bot extends BotLike> {
async sendPoll(params: Optional<TelegramParams.SendPollParams, "chat_id">) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendPoll({
Expand Down Expand Up @@ -361,7 +360,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendSticker({
Expand Down Expand Up @@ -413,7 +412,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

return this.bot.api.sendChatAction({
Expand All @@ -430,7 +429,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendDice({
Expand Down Expand Up @@ -480,7 +479,7 @@ class SendMixin<Bot extends BotLike> {
) {
if (this.businessConnectionId && !params.business_connection_id)
params.business_connection_id = this.businessConnectionId;
if (this.threadId && this.isTopicMessage?.() && !params.message_thread_id)
if (this.threadId && !params.message_thread_id)
params.message_thread_id = this.threadId;

const response = await this.bot.api.sendMediaGroup({
Expand Down Expand Up @@ -601,11 +600,7 @@ class SendMixin<Bot extends BotLike> {
const baseDraftParams: Record<string, unknown> = {
...options.draftParams,
};
if (
this.threadId &&
this.isTopicMessage?.() &&
!baseDraftParams.message_thread_id
) {
if (this.threadId && !baseDraftParams.message_thread_id) {
baseDraftParams.message_thread_id = this.threadId;
}

Expand All @@ -619,11 +614,7 @@ class SendMixin<Bot extends BotLike> {
) {
baseMessageParams.business_connection_id = this.businessConnectionId;
}
if (
this.threadId &&
this.isTopicMessage?.() &&
!baseMessageParams.message_thread_id
) {
if (this.threadId && !baseMessageParams.message_thread_id) {
baseMessageParams.message_thread_id = this.threadId;
}

Expand Down