grammy 1.6.2 → 1.7.0

package/README.md

@@ -10,7 +10,7 @@ _<h2 align="center"> [:mag: Documentation](https://grammy.dev) | [:page_with_cur
 
 <!-- deno-fmt-ignore-start -->
 
-[![Bot API](https://img.shields.io/badge/Bot%20API-5.6-blue?logo=telegram&style=flat-square)](https://core.telegram.org/bots/api)
+[![Bot API](https://img.shields.io/badge/Bot%20API-5.7-blue?logo=telegram&style=flat-square)](https://core.telegram.org/bots/api)
 [![npm](https://img.shields.io/npm/v/grammy?logo=npm&style=flat-square)](https://www.npmjs.org/package/grammy) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 [![All Contributors](https://img.shields.io/badge/all_contributors-50-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

package/out/bot.d.ts

@@ -1,8 +1,8 @@
 import { BotError, Composer } from "./composer.js";
 import { Context } from "./context.js";
 import { Api } from "./core/api.js";
-import { ApiClientOptions, WebhookReplyEnvelope } from "./core/client.js";
-import { Update, UserFromGetMe } from "./platform.node.js";
+import { type ApiClientOptions, type WebhookReplyEnvelope } from "./core/client.js";
+import { type Update, type UserFromGetMe } from "./platform.node.js";
 /**
  * Options that can be specified when running the bot via simple long polling.
  */
@@ -169,6 +169,14 @@ export declare class Bot<C extends Context = Context, A extends Api = Api> exten
      * manually.
      */
     init(): Promise<void>;
+    /**
+     * Internal. Do not call. Handles an update batch sequentially by supplying
+     * it one-by-one to the middleware. Handles middleware errors and stores the
+     * last update identifier that was being tried to handle.
+     *
+     * @param updates An array of updates to handle
+     */
+    private handleUpdates;
     /**
      * This is an internal method that you probably will not ever need to call.
      * It is used whenever a new update arrives from the Telegram servers that
@@ -249,4 +257,23 @@ export declare class Bot<C extends Context = Context, A extends Api = Api> exten
      * @param errorHandler A function that handles potential middleware errors
      */
     catch(errorHandler: ErrorHandler<C>): void;
+    /**
+     * Internal. Do not call. Enters a loop that will perform long polling until
+     * the bot is stopped.
+     */
+    private loop;
+    /**
+     * Internal. Do not call. Reliably fetches an update batch via `getUpdates`.
+     * Handles all known errors. Returns `undefined` if the bot is stopped and
+     * the call gets cancelled.
+     *
+     * @param options Polling options
+     * @returns An array of updates, or `undefined` if the bot is stopped.
+     */
+    private fetchUpdates;
+    /**
+     * Internal. Do not call. Handles an error that occurred during long
+     * polling.
+     */
+    private handlePollingError;
 }

package/out/bot.js

@@ -185,6 +185,32 @@ class Bot extends composer_js_1.Composer {
         }
         debug(`I am ${this.me.username}!`);
     }
+    /**
+     * Internal. Do not call. Handles an update batch sequentially by supplying
+     * it one-by-one to the middleware. Handles middleware errors and stores the
+     * last update identifier that was being tried to handle.
+     *
+     * @param updates An array of updates to handle
+     */
+    async handleUpdates(updates) {
+        // handle updates sequentially (!)
+        for (const update of updates) {
+            this.lastTriedUpdateId = update.update_id;
+            try {
+                await this.handleUpdate(update);
+            }
+            catch (err) {
+                // should always be true
+                if (err instanceof composer_js_1.BotError) {
+                    await this.errorHandler(err);
+                }
+                else {
+                    console.error("FATAL: grammY unable to handle:", err);
+                    throw err;
+                }
+            }
+        }
+    }
     /**
      * This is an internal method that you probably will not ever need to call.
      * It is used whenever a new update arrives from the Telegram servers that
@@ -256,7 +282,7 @@ a known bot info object.");
      * @param options Options to use for simple long polling
      */
     async start(options) {
-        var _a, _b;
+        var _a;
         // Perform setup
         if (!this.isInited())
             await withRetries(() => this.init());
@@ -283,76 +309,8 @@ you can circumvent this protection against memory leaks.`);
         };
         // Start polling
         debug("Starting simple long polling");
-        this.pollingRunning = true;
-        this.pollingAbortController = new shim_node_js_1.AbortController();
-        const limit = options === null || options === void 0 ? void 0 : options.limit;
-        const timeout = (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : 30; // seconds
-        let allowed_updates = options === null || options === void 0 ? void 0 : options.allowed_updates;
-        try {
-            (_b = options === null || options === void 0 ? void 0 : options.onStart) === null || _b === void 0 ? void 0 : _b.call(options, this.botInfo);
-        }
-        catch (error) {
-            this.pollingRunning = false;
-            this.pollingAbortController = undefined;
-            throw error;
-        }
-        const handleErr = async (error) => {
-            if (!this.pollingRunning)
-                throw error;
-            else if (error instanceof error_js_1.GrammyError) {
-                debugErr(error.message);
-                if (error.error_code === 401) {
-                    debugErr("Make sure you are using the bot token you obtained from @BotFather (https://t.me/BotFather).");
-                    throw error;
-                }
-                else if (error.error_code === 409) {
-                    debugErr("Consider revoking the bot token if you believe that no other instance is running.");
-                    throw error;
-                }
-            }
-            else
-                debugErr(error);
-            debugErr("Call to getUpdates failed, retrying in 3 seconds ...");
-            await new Promise((r) => setTimeout(r, 3000));
-        };
-        while (this.pollingRunning) {
-            // fetch updates
-            const offset = this.lastTriedUpdateId + 1;
-            let updates = undefined;
-            do {
-                try {
-                    updates = await this.api.getUpdates({ offset, limit, timeout, allowed_updates }, this.pollingAbortController.signal);
-                }
-                catch (error) {
-                    if (this.pollingRunning)
-                        await handleErr(error);
-                    else
-                        debug("Pending getUpdates request cancelled");
-                }
-            } while (updates === undefined && this.pollingRunning);
-            if (updates === undefined)
-                break;
-            // handle them sequentially (!)
-            for (const update of updates) {
-                this.lastTriedUpdateId = update.update_id;
-                try {
-                    await this.handleUpdate(update);
-                }
-                catch (err) {
-                    // should always be true
-                    if (err instanceof composer_js_1.BotError) {
-                        await this.errorHandler(err);
-                    }
-                    else {
-                        console.error("FATAL: grammY unable to handle:", err);
-                        throw err;
-                    }
-                }
-            }
-            // Telegram uses the last setting if `allowed_updates` is omitted so
-            // we can save same traffic by only sending it in the first request
-            allowed_updates = undefined;
-        }
+        (_a = options === null || options === void 0 ? void 0 : options.onStart) === null || _a === void 0 ? void 0 : _a.call(options, this.botInfo);
+        await this.loop(options);
         debug("Middleware is done running");
     }
     /**
@@ -402,8 +360,90 @@ you can circumvent this protection against memory leaks.`);
     catch(errorHandler) {
         this.errorHandler = errorHandler;
     }
+    /**
+     * Internal. Do not call. Enters a loop that will perform long polling until
+     * the bot is stopped.
+     */
+    async loop(options) {
+        var _a;
+        this.pollingRunning = true;
+        this.pollingAbortController = new shim_node_js_1.AbortController();
+        const limit = options === null || options === void 0 ? void 0 : options.limit;
+        const timeout = (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : 30; // seconds
+        let allowed_updates = options === null || options === void 0 ? void 0 : options.allowed_updates;
+        while (this.pollingRunning) {
+            // fetch updates
+            const updates = await this.fetchUpdates({ limit, timeout, allowed_updates });
+            // check if polling stopped
+            if (updates === undefined)
+                break;
+            // handle updates
+            await this.handleUpdates(updates);
+            // Telegram uses the last setting if `allowed_updates` is omitted so
+            // we can save same traffic by only sending it in the first request
+            allowed_updates = undefined;
+        }
+    }
+    /**
+     * Internal. Do not call. Reliably fetches an update batch via `getUpdates`.
+     * Handles all known errors. Returns `undefined` if the bot is stopped and
+     * the call gets cancelled.
+     *
+     * @param options Polling options
+     * @returns An array of updates, or `undefined` if the bot is stopped.
+     */
+    async fetchUpdates({ limit, timeout, allowed_updates }) {
+        var _a;
+        const offset = this.lastTriedUpdateId + 1;
+        let updates = undefined;
+        do {
+            try {
+                updates = await this.api.getUpdates({ offset, limit, timeout, allowed_updates }, (_a = this.pollingAbortController) === null || _a === void 0 ? void 0 : _a.signal);
+            }
+            catch (error) {
+                await this.handlePollingError(error);
+            }
+        } while (updates === undefined && this.pollingRunning);
+        return updates;
+    }
+    /**
+     * Internal. Do not call. Handles an error that occurred during long
+     * polling.
+     */
+    async handlePollingError(error) {
+        var _a;
+        if (!this.pollingRunning) {
+            debug("Pending getUpdates request cancelled");
+            return;
+        }
+        let sleepSeconds = 3;
+        if (error instanceof error_js_1.GrammyError) {
+            debugErr(error.message);
+            if (error.error_code === 401) {
+                debugErr("Make sure you are using the bot token you obtained from @BotFather (https://t.me/BotFather).");
+                throw error;
+            }
+            else if (error.error_code === 409) {
+                debugErr("Consider revoking the bot token if you believe that no other instance is running.");
+                throw error;
+            }
+            else if (error.error_code === 429) {
+                debugErr("Bot API server is closing.");
+                sleepSeconds = (_a = error.parameters.retry_after) !== null && _a !== void 0 ? _a : sleepSeconds;
+            }
+        }
+        else
+            debugErr(error);
+        debugErr(`Call to getUpdates failed, retrying in ${sleepSeconds} seconds ...`);
+        await sleep(sleepSeconds);
+    }
 }
 exports.Bot = Bot;
+/**
+ * Performs a network call task, retrying upon known errors until success.
+ *
+ * @param task Async task to perform
+ */
 async function withRetries(task) {
     let success = false;
     while (!success) {
@@ -420,9 +460,8 @@ async function withRetries(task) {
                     continue;
                 if (error.error_code === 429) {
                     const retryAfter = error.parameters.retry_after;
-                    if (retryAfter !== undefined) {
-                        await new Promise((resolve) => setTimeout(resolve, 1000 * retryAfter));
-                    }
+                    if (retryAfter !== undefined)
+                        await sleep(retryAfter);
                     continue;
                 }
             }
@@ -430,4 +469,10 @@ async function withRetries(task) {
         }
     }
 }
+/**
+ * Returns a new promise that resolves after the specified number of seconds.
+ */
+function sleep(seconds) {
+    return new Promise((r) => setTimeout(r, 1000 * seconds));
+}
 const shim_node_js_1 = require("./shim.node.js");

package/out/composer.d.ts

@@ -1,5 +1,5 @@
-import { Context } from "./context.js";
-import { Filter, FilterQuery } from "./filter.js";
+import { type Context } from "./context.js";
+import { type Filter, type FilterQuery } from "./filter.js";
 declare type MaybePromise<T> = T | Promise<T>;
 declare type MaybeArray<T> = T | T[];
 declare type StringWithSuggestions<S extends string> = (string & {}) | S;

package/out/context.d.ts

@@ -1,6 +1,6 @@
-import { Api, Other as OtherApi } from "./core/api.js";
-import { Methods, RawApi } from "./core/client.js";
-import { Chat, ChatPermissions, InlineQueryResult, InputFile, InputMedia, InputMediaAudio, InputMediaDocument, InputMediaPhoto, InputMediaVideo, LabeledPrice, Message, PassportElementError, Update, User, UserFromGetMe } from "./platform.node.js";
+import { type Api, type Other as OtherApi } from "./core/api.js";
+import { type Methods, type RawApi } from "./core/client.js";
+import { type Chat, type ChatPermissions, type InlineQueryResult, type InputFile, type InputMedia, type InputMediaAudio, type InputMediaDocument, type InputMediaPhoto, type InputMediaVideo, type LabeledPrice, type Message, type PassportElementError, type Update, type User, type UserFromGetMe } from "./platform.node.js";
 declare type Other<M extends Methods<RawApi>, X extends string = never> = OtherApi<RawApi, M, X>;
 declare type SnakeToCamelCase<S extends string> = S extends `${infer L}_${infer R}` ? `${L}${Capitalize<SnakeToCamelCase<R>>}` : S;
 export declare type AliasProps<U> = {
@@ -735,7 +735,7 @@ export declare class Context implements RenamedUpdate {
      */
     deleteMessage(signal?: AbortSignal): Promise<true>;
     /**
-     * Context-aware alias for `api.sendSticker`. Use this method to send static .WEBP or animated .TGS stickers. On success, the sent Message is returned.
+     * Context-aware alias for `api.sendSticker`. Use this method to send static .WEBP, animated .TGS, or video .WEBM stickers. On success, the sent Message is returned.
      *
      * @param sticker Sticker to send. Pass a file_id as String to send a file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a .WEBP file from the Internet, or upload a new one using multipart/form-data.
      * @param other Optional remaining parameters, confer the official reference below

package/out/context.js

@@ -940,7 +940,7 @@ class Context {
         return this.api.deleteMessage(orThrow(this.chat, "deleteMessage").id, orThrow(this.msg, "deleteMessage").message_id, signal);
     }
     /**
-     * Context-aware alias for `api.sendSticker`. Use this method to send static .WEBP or animated .TGS stickers. On success, the sent Message is returned.
+     * Context-aware alias for `api.sendSticker`. Use this method to send static .WEBP, animated .TGS, or video .WEBM stickers. On success, the sent Message is returned.
      *
      * @param sticker Sticker to send. Pass a file_id as String to send a file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a .WEBP file from the Internet, or upload a new one using multipart/form-data.
      * @param other Optional remaining parameters, confer the official reference below

package/out/convenience/frameworks.node.d.ts

@@ -1,14 +1,15 @@
-import type { IncomingMessage, ServerResponse } from "http";
+/// <reference types="node" />
+import { type IncomingMessage, type ServerResponse } from "http";
 export declare const adapters: {
     http: (req: IncomingMessage, res: ServerResponse) => {
         update: Promise<any>;
-        end: () => void;
-        respond: (json: string) => void;
+        end: () => ServerResponse;
+        respond: (json: string) => ServerResponse;
     };
     https: (req: IncomingMessage, res: ServerResponse) => {
         update: Promise<any>;
-        end: () => void;
-        respond: (json: string) => void;
+        end: () => ServerResponse;
+        respond: (json: string) => ServerResponse;
     };
     express: (req: any, res: any) => {
         update: Promise<any>;

package/out/convenience/keyboard.d.ts

@@ -1,4 +1,4 @@
-import { InlineKeyboardButton, KeyboardButton, LoginUrl } from "../platform.node.js";
+import { type InlineKeyboardButton, type KeyboardButton, type LoginUrl } from "../platform.node.js";
 /**
  * Use this class to simplify building a custom keyboard (something like this:
  * https://core.telegram.org/bots#keyboards).

package/out/convenience/session.d.ts

@@ -1,5 +1,5 @@
-import { Context } from "../context.js";
-import { MiddlewareFn } from "../composer.js";
+import { type Context } from "../context.js";
+import { type MiddlewareFn } from "../composer.js";
 declare type MaybePromise<T> = Promise<T> | T;
 /**
  * A session flavor is a context flavor that holds session data under

package/out/convenience/webhook.d.ts

@@ -1,18 +1,18 @@
 /// <reference types="node" />
-import { Bot } from "../bot.js";
-import { Update } from "../platform.node.js";
-import { Context } from "../context.js";
+import { type Bot } from "../bot.js";
+import { type Update } from "../platform.node.js";
+import { type Context } from "../context.js";
 declare const adapters: {
     callback: FrameworkAdapter;
     http: (req: import("http").IncomingMessage, res: import("http").ServerResponse) => {
         update: Promise<any>;
-        end: () => void;
-        respond: (json: string) => void;
+        end: () => import("http").ServerResponse;
+        respond: (json: string) => import("http").ServerResponse;
     };
     https: (req: import("http").IncomingMessage, res: import("http").ServerResponse) => {
         update: Promise<any>;
-        end: () => void;
-        respond: (json: string) => void;
+        end: () => import("http").ServerResponse;
+        respond: (json: string) => import("http").ServerResponse;
     };
     express: (req: any, res: any) => {
         update: Promise<any>;
@@ -31,6 +31,10 @@ declare const adapters: {
     };
     worktop: (req: any, res: any) => {
         update: Promise<any>;
+        /**
+         * Middleware for a web framework. Creates a request-response handler for a
+         * request. The handler will be used to integrate with the compatible framework.
+         */
         end: () => any;
         respond: (json: string) => any;
     };

package/out/core/api.d.ts

@@ -1,5 +1,5 @@
-import { BotCommand, ChatPermissions, InlineQueryResult, InputFile, InputMedia, InputMediaAudio, InputMediaDocument, InputMediaPhoto, InputMediaVideo, LabeledPrice, PassportElementError } from "../platform.node.js";
-import { ApiClientOptions, Methods, Payload, RawApi, Transformer, TransformerConsumer, WebhookReplyEnvelope } from "./client.js";
+import { type BotCommand, type ChatPermissions, type InlineQueryResult, type InputFile, type InputMedia, type InputMediaAudio, type InputMediaDocument, type InputMediaPhoto, type InputMediaVideo, type LabeledPrice, type PassportElementError } from "../platform.node.js";
+import { type ApiClientOptions, type Methods, type Payload, type RawApi, type Transformer, type TransformerConsumer, type WebhookReplyEnvelope } from "./client.js";
 declare type AlwaysOmittedInOther = "chat_id";
 /**
  * Helper type to derive remaining properties of a given API method call M,
@@ -589,7 +589,7 @@ export declare class Api<R extends RawApi = RawApi> {
      *
      * **Official reference:** https://core.telegram.org/bots/api#setchatdescription
      */
-    setChatDescription(chat_id: number | string, description: string | undefined, signal?: AbortSignal): Promise<true>;
+    setChatDescription(chat_id: number | string, description?: string, signal?: AbortSignal): Promise<true>;
     /**
      * Use this method to add a message to the list of pinned messages in a chat. If the chat is not a private chat, the bot must be an administrator in the chat for this to work and must have the 'can_pin_messages' administrator right in a supergroup or 'can_edit_messages' administrator right in a channel. Returns True on success.
      *
@@ -845,7 +845,7 @@ export declare class Api<R extends RawApi = RawApi> {
      */
     deleteMessage(chat_id: number | string, message_id: number, signal?: AbortSignal): Promise<true>;
     /**
-     * Use this method to send static .WEBP or animated .TGS stickers. On success, the sent Message is returned.
+     * Use this method to send static .WEBP, animated .TGS, or video .WEBM stickers. On success, the sent Message is returned.
      *
      * @param chat_id Unique identifier for the target chat or username of the target channel (in the format @channelusername)
      * @param sticker Sticker to send. Pass a file_id as String to send a file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a .WEBP file from the Internet, or upload a new one using multipart/form-data.
@@ -875,7 +875,7 @@ export declare class Api<R extends RawApi = RawApi> {
      */
     uploadStickerFile(user_id: number, png_sticker: InputFile, signal?: AbortSignal): Promise<import("@grammyjs/types/manage").File>;
     /**
-     * Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields png_sticker or tgs_sticker. Returns True on success.
+     * Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields png_sticker, tgs_sticker, or webm_sticker. Returns True on success.
      *
      * @param user_id User identifier of created sticker set owner
      * @param name Short name of sticker set, to be used in t.me/addstickers/ URLs (e.g., animals). Can contain only english letters, digits and underscores. Must begin with a letter, can't contain consecutive underscores and must end in “_by_<bot username>”. <bot_username> is case insensitive. 1-64 characters.
@@ -888,7 +888,7 @@ export declare class Api<R extends RawApi = RawApi> {
      */
     createNewStickerSet(user_id: number, name: string, title: string, emojis: string, other?: Other<R, "createNewStickerSet", "user_id" | "name" | "title" | "emojis">, signal?: AbortSignal): Promise<true>;
     /**
-     * Use this method to add a new sticker to a set created by the bot. You must use exactly one of the fields png_sticker or tgs_sticker. Animated stickers can be added to animated sticker sets and only to them. Animated sticker sets can have up to 50 stickers. Static sticker sets can have up to 120 stickers. Returns True on success.
+     * Use this method to add a new sticker to a set created by the bot. You must use exactly one of the fields png_sticker, tgs_sticker, or webm_sticker. Animated stickers can be added to animated sticker sets and only to them. Animated sticker sets can have up to 50 stickers. Static sticker sets can have up to 120 stickers. Returns True on success.
      *
      * @param user_id User identifier of sticker set owner
      * @param name Sticker set name
@@ -919,16 +919,16 @@ export declare class Api<R extends RawApi = RawApi> {
      */
     deleteStickerFromSet(sticker: string, signal?: AbortSignal): Promise<true>;
     /**
-     * Use this method to set the thumbnail of a sticker set. Animated thumbnails can be set for animated sticker sets only. Returns True on success.
+     * Use this method to set the thumbnail of a sticker set. Animated thumbnails can be set for animated sticker sets only. Video thumbnails can be set only for video sticker sets only. Returns True on success.
      *
      * @param name Sticker set name
      * @param user_id User identifier of the sticker set owner
-     * @param thumb A PNG image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, or a TGS animation with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/animated_stickers#technical-requirements for animated sticker technical requirements. Pass a file_id as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data.. Animated sticker set thumbnail can't be uploaded via HTTP URL.
+     * @param thumb A PNG image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, or a TGS animation with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/stickers#animated-sticker-requirements for animated sticker technical requirements, or a WEBM video with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/stickers#video-sticker-requirements for video sticker technical requirements. Pass a file_id as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. More info on Sending Files ». Animated sticker set thumbnails can't be uploaded via HTTP URL.
      * @param signal Optional `AbortSignal` to cancel the request
      *
      * **Official reference:** https://core.telegram.org/bots/api#setstickersetthumb
      */
-    setStickerSetThumb(name: string, user_id: number, thumb: InputFile | string, signal?: AbortSignal): Promise<true>;
+    setStickerSetThumb(name: string, user_id: number, thumb?: InputFile | string, signal?: AbortSignal): Promise<true>;
     /**
      * Use this method to send answers to an inline query. On success, True is returned.
      * No more than 50 results per query are allowed.

package/out/core/api.js

@@ -987,7 +987,7 @@ class Api {
         return this.raw.deleteMessage({ chat_id, message_id }, signal);
     }
     /**
-     * Use this method to send static .WEBP or animated .TGS stickers. On success, the sent Message is returned.
+     * Use this method to send static .WEBP, animated .TGS, or video .WEBM stickers. On success, the sent Message is returned.
      *
      * @param chat_id Unique identifier for the target chat or username of the target channel (in the format @channelusername)
      * @param sticker Sticker to send. Pass a file_id as String to send a file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a .WEBP file from the Internet, or upload a new one using multipart/form-data.
@@ -1023,7 +1023,7 @@ class Api {
         return this.raw.uploadStickerFile({ user_id, png_sticker }, signal);
     }
     /**
-     * Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields png_sticker or tgs_sticker. Returns True on success.
+     * Use this method to create a new sticker set owned by a user. The bot will be able to edit the sticker set thus created. You must use exactly one of the fields png_sticker, tgs_sticker, or webm_sticker. Returns True on success.
      *
      * @param user_id User identifier of created sticker set owner
      * @param name Short name of sticker set, to be used in t.me/addstickers/ URLs (e.g., animals). Can contain only english letters, digits and underscores. Must begin with a letter, can't contain consecutive underscores and must end in “_by_<bot username>”. <bot_username> is case insensitive. 1-64 characters.
@@ -1038,7 +1038,7 @@ class Api {
         return this.raw.createNewStickerSet({ user_id, name, title, emojis, ...other }, signal);
     }
     /**
-     * Use this method to add a new sticker to a set created by the bot. You must use exactly one of the fields png_sticker or tgs_sticker. Animated stickers can be added to animated sticker sets and only to them. Animated sticker sets can have up to 50 stickers. Static sticker sets can have up to 120 stickers. Returns True on success.
+     * Use this method to add a new sticker to a set created by the bot. You must use exactly one of the fields png_sticker, tgs_sticker, or webm_sticker. Animated stickers can be added to animated sticker sets and only to them. Animated sticker sets can have up to 50 stickers. Static sticker sets can have up to 120 stickers. Returns True on success.
      *
      * @param user_id User identifier of sticker set owner
      * @param name Sticker set name
@@ -1075,11 +1075,11 @@ class Api {
         return this.raw.deleteStickerFromSet({ sticker }, signal);
     }
     /**
-     * Use this method to set the thumbnail of a sticker set. Animated thumbnails can be set for animated sticker sets only. Returns True on success.
+     * Use this method to set the thumbnail of a sticker set. Animated thumbnails can be set for animated sticker sets only. Video thumbnails can be set only for video sticker sets only. Returns True on success.
      *
      * @param name Sticker set name
      * @param user_id User identifier of the sticker set owner
-     * @param thumb A PNG image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, or a TGS animation with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/animated_stickers#technical-requirements for animated sticker technical requirements. Pass a file_id as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data.. Animated sticker set thumbnail can't be uploaded via HTTP URL.
+     * @param thumb A PNG image with the thumbnail, must be up to 128 kilobytes in size and have width and height exactly 100px, or a TGS animation with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/stickers#animated-sticker-requirements for animated sticker technical requirements, or a WEBM video with the thumbnail up to 32 kilobytes in size; see https://core.telegram.org/stickers#video-sticker-requirements for video sticker technical requirements. Pass a file_id as a String to send a file that already exists on the Telegram servers, pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data. More info on Sending Files ». Animated sticker set thumbnails can't be uploaded via HTTP URL.
      * @param signal Optional `AbortSignal` to cancel the request
      *
      * **Official reference:** https://core.telegram.org/bots/api#setstickersetthumb

package/out/core/client.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node-fetch" />
-import { ApiResponse, Opts, Telegram } from "../platform.node.js";
+import { type ApiResponse, type Opts, type Telegram } from "../platform.node.js";
 export declare type Methods<R extends RawApi> = string & keyof R;
 /**
  * Represents the raw Telegram Bot API with all methods specified 1:1 as

package/out/core/error.d.ts

@@ -1,4 +1,4 @@
-import { ApiError, ResponseParameters } from "../platform.node.js";
+import { type ApiError, type ResponseParameters } from "../platform.node.js";
 /**
  * This class represents errors that are thrown by grammY because the Telegram
  * Bot API responded with an error.

package/out/filter.d.ts

@@ -1,5 +1,5 @@
-import { AliasProps, Context } from "./context.js";
-import { Update } from "./platform.node.js";
+import { type AliasProps, type Context } from "./context.js";
+import { type Update } from "./platform.node.js";
 declare type FilterFunction<C extends Context, D extends C> = (ctx: C) => ctx is D;
 /**
  * > This is an advanced function of grammY.
@@ -352,11 +352,11 @@ declare const UPDATE_KEYS: {
 };
 declare type KeyOf<T> = string & keyof T;
 declare type S = typeof UPDATE_KEYS;
-declare type L1 = KeyOf<S>;
-declare type L2<K extends L1 = L1> = K extends unknown ? `${K}:${KeyOf<S[K]>}` : never;
-declare type L3<K0 extends L1 = L1> = K0 extends unknown ? L3_<K0> : never;
-declare type L3_<K0 extends L1, K1 extends KeyOf<S[K0]> = KeyOf<S[K0]>> = K1 extends unknown ? `${K0}:${K1}:${KeyOf<S[K0][K1]>}` : never;
-declare type L123 = L1 | L2 | L3;
+declare type L1S = KeyOf<S>;
+declare type L2S<L1 extends L1S = L1S> = L1 extends unknown ? `${L1}:${KeyOf<S[L1]>}` : never;
+declare type L3S<L1 extends L1S = L1S> = L1 extends unknown ? L3S_<L1> : never;
+declare type L3S_<L1 extends L1S, L2 extends KeyOf<S[L1]> = KeyOf<S[L1]>> = L2 extends unknown ? `${L1}:${L2}:${KeyOf<S[L1][L2]>}` : never;
+declare type L123 = L1S | L2S | L3S;
 declare type InjectShortcuts<Q extends L123 = L123> = Q extends `${infer R}:${infer S}:${infer T}` ? `${CollapseL1<R, L1Shortcuts>}:${CollapseL2<S, L2Shortcuts>}:${T}` : Q extends `${infer R}:${infer S}` ? `${CollapseL1<R, L1Shortcuts>}:${CollapseL2<S>}` : CollapseL1<Q>;
 declare type CollapseL1<Q extends string, L extends L1Shortcuts = Exclude<L1Shortcuts, "">> = Q | (L extends string ? Q extends typeof L1_SHORTCUTS[L][number] ? L : never : never);
 declare type CollapseL2<Q extends string, L extends L2Shortcuts = Exclude<L2Shortcuts, "">> = Q | (L extends string ? Q extends typeof L2_SHORTCUTS[L][number] ? L : never : never);
@@ -388,14 +388,17 @@ declare type NotUndefined = string | number | boolean | SomeObject;
  * Given a FilterQuery, returns an object that, when intersected with an Update,
  * marks those properties as required that are guaranteed to exist.
  */
-declare type RunQuery<Q extends string> = L1Combinations<Q, L1Parts<Q>>;
-declare type L1Combinations<Q extends string, L1 extends string> = Combine<L1Fields<Q, L1>, L1>;
-declare type L1Fields<Q extends string, L1 extends string> = L1 extends unknown ? Record<L1, L2Combinations<L2Parts<Q, L1>>> : never;
-declare type L2Combinations<L2 extends string> = [L2] extends [never] ? NotUndefined : Combine<L2Fields<L2>, L2>;
-declare type L2Fields<L2 extends string> = L2 extends unknown ? Record<L2 | Twins<L2>, NotUndefined> : never;
+declare type RunQuery<Q extends string> = L1Discriminator<Q, L1Parts<Q>>;
+declare type L1Parts<Q extends string> = Q extends `${infer L1}:${string}` ? L1 : Q;
+declare type L2Parts<Q extends string, L1 extends string> = Q extends `${L1}:${infer L2}:${string}` ? L2 : Q extends `${L1}:${infer L2}` ? L2 : never;
+declare type L1Discriminator<Q extends string, L1 extends string> = Combine<L1Fragment<Q, L1>, L1>;
+declare type L1Fragment<Q extends string, L1 extends string> = L1 extends unknown ? Record<L1, L2Discriminator<L1, L2Parts<Q, L1>>> : never;
+declare type L2Discriminator<L1 extends string, L2 extends string> = [L2] extends [
+    never
+] ? L2ShallowFragment<L1> : Combine<L2Fragment<L1, L2>, L2>;
+declare type L2Fragment<L1 extends string, L2 extends string> = L2 extends unknown ? Record<L2 | AddTwins<L1, L2>, NotUndefined> : never;
+declare type L2ShallowFragment<L1 extends string> = Record<AddTwins<L1, never>, NotUndefined>;
 declare type Combine<U, K extends string> = U extends unknown ? U & Partial<Record<Exclude<K, keyof U>, undefined>> : never;
-declare type L1Parts<Q extends string> = Q extends `${infer U}:${string}` ? U : Q;
-declare type L2Parts<Q extends string, P extends string> = Q extends `${P}:${infer U}:${string}` ? U : Q extends `${P}:${infer U}` ? U : never;
 /**
  * This type infers which properties will be present on the given context object
  * provided it matches the given filter query. If the filter query is a union
@@ -411,6 +414,7 @@ declare type FilteredContext<C extends Context, U extends Update> = C & Record<"
 interface Shortcuts<U extends Update> {
     msg: [U["callback_query"]] extends [SomeObject] ? U["callback_query"]["message"] : [U["message"]] extends [SomeObject] ? U["message"] : [U["edited_message"]] extends [SomeObject] ? U["edited_message"] : [U["channel_post"]] extends [SomeObject] ? U["channel_post"] : [U["edited_channel_post"]] extends [SomeObject] ? U["edited_channel_post"] : undefined;
     chat: [U["callback_query"]] extends [SomeObject] ? NonNullable<U["callback_query"]["message"]>["chat"] | undefined : [Shortcuts<U>["msg"]] extends [SomeObject] ? Shortcuts<U>["msg"]["chat"] : [U["my_chat_member"]] extends [SomeObject] ? U["my_chat_member"]["chat"] : [U["chat_member"]] extends [SomeObject] ? U["chat_member"]["chat"] : [U["chat_join_request"]] extends [SomeObject] ? U["chat_join_request"]["chat"] : undefined;
+    senderChat: [Shortcuts<U>["msg"]] extends [SomeObject] ? Shortcuts<U>["msg"]["sender_chat"] : undefined;
     from: [U["callback_query"]] extends [SomeObject] ? U["callback_query"]["from"] : [U["inline_query"]] extends [SomeObject] ? U["inline_query"]["from"] : [U["shipping_query"]] extends [SomeObject] ? U["shipping_query"]["from"] : [U["pre_checkout_query"]] extends [SomeObject] ? U["pre_checkout_query"]["from"] : [U["chosen_inline_result"]] extends [SomeObject] ? U["chosen_inline_result"]["from"] : [U["message"]] extends [SomeObject] ? NonNullable<U["message"]["from"]> : [U["edited_message"]] extends [SomeObject] ? NonNullable<U["edited_message"]["from"]> : [U["my_chat_member"]] extends [SomeObject] ? U["my_chat_member"]["from"] : [U["chat_member"]] extends [SomeObject] ? U["chat_member"]["from"] : [U["chat_join_request"]] extends [SomeObject] ? U["chat_join_request"]["from"] : undefined;
 }
 declare const L1_SHORTCUTS: {
@@ -425,16 +429,29 @@ declare const L2_SHORTCUTS: {
 };
 declare type L1Shortcuts = KeyOf<typeof L1_SHORTCUTS>;
 declare type L2Shortcuts = KeyOf<typeof L2_SHORTCUTS>;
-declare type ExpandShortcuts<Q extends string> = Q extends `${infer R}:${infer S}:${infer T}` ? `${ExpandL1<R>}:${ExpandL2<S>}:${T}` : Q extends `${infer R}:${infer S}` ? `${ExpandL1<R>}:${ExpandL2<S>}` : ExpandL1<Q>;
+declare type ExpandShortcuts<Q extends string> = Q extends `${infer L1}:${infer L2}:${infer L3}` ? `${ExpandL1<L1>}:${ExpandL2<L2>}:${L3}` : Q extends `${infer L1}:${infer L2}` ? `${ExpandL1<L1>}:${ExpandL2<L2>}` : ExpandL1<Q>;
 declare type ExpandL1<S extends string> = S extends L1Shortcuts ? typeof L1_SHORTCUTS[S][number] : S;
 declare type ExpandL2<S extends string> = S extends L2Shortcuts ? typeof L2_SHORTCUTS[S][number] : S;
-declare type Twins<V extends string> = V extends KeyOf<Equivalents> ? Equivalents[V] : V;
-declare type Equivalents = {
+declare type AddTwins<L1 extends string, L2 extends string> = TwinsFromL1<L1, L2> | TwinsFromL2<L1, L2>;
+declare type TwinsFromL1<L1 extends string, L2 extends string> = L1 extends KeyOf<L1Equivalents> ? L1Equivalents[L1] : L2;
+declare type L1Equivalents = {
+    message: "from";
+    edited_message: "from" | "edit_date";
+    channel_post: "sender_chat";
+    edited_channel_post: "sender_chat" | "edit_date";
+};
+declare type TwinsFromL2<L1 extends string, L2 extends string> = L1 extends KeyOf<L2Equivalents> ? L2 extends KeyOf<L2Equivalents[L1]> ? L2Equivalents[L1][L2] : L2 : L2;
+declare type L2Equivalents = {
+    message: MessageEquivalents;
+    edited_message: MessageEquivalents;
+    channel_post: MessageEquivalents;
+    edited_channel_post: MessageEquivalents;
+};
+declare type MessageEquivalents = {
     animation: "document";
-    entities: TextMessages;
+    entities: "text";
     caption: CaptionMessages;
     caption_entities: CaptionMessages;
 };
-declare type TextMessages = "text";
 declare type CaptionMessages = "animation" | "audio" | "document" | "photo" | "video" | "voice";
 export {};

package/out/mod.d.ts

@@ -1,14 +1,11 @@
-export { Bot, BotError } from "./bot.js";
-export type { BotConfig, ErrorHandler, PollingOptions } from "./bot.js";
+export { Bot, type BotConfig, BotError, type ErrorHandler, type PollingOptions, } from "./bot.js";
 export { InputFile } from "./platform.node.js";
 export { Context } from "./context.js";
 export * from "./convenience/keyboard.js";
 export * from "./convenience/session.js";
 export * from "./convenience/webhook.js";
-export { Composer } from "./composer.js";
-export type { Middleware, MiddlewareFn, MiddlewareObj, NextFunction, } from "./composer.js";
-export { matchFilter } from "./filter.js";
-export type { Filter, FilterQuery } from "./filter.js";
+export { Composer, type Middleware, type MiddlewareFn, type MiddlewareObj, type NextFunction, } from "./composer.js";
+export { type Filter, type FilterQuery, matchFilter } from "./filter.js";
 export { Api } from "./core/api.js";
-export type { ApiCallFn, ApiClientOptions, RawApi, TransformableApi, Transformer, WebhookReplyEnvelope, } from "./core/client.js";
+export { type ApiCallFn, type ApiClientOptions, type RawApi, type TransformableApi, type Transformer, type WebhookReplyEnvelope, } from "./core/client.js";
 export { GrammyError, HttpError } from "./core/error.js";

package/out/platform.node.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
-import { InputFileProxy } from "@grammyjs/types";
+import { type InputFileProxy } from "@grammyjs/types";
 import { Agent as HttpAgent } from "http";
 import { Agent as HttpsAgent } from "https";
 import { Readable } from "stream";
-import type { ReadStream } from "fs";
+import { type ReadStream } from "fs";
 import { URL } from "url";
 export * from "@grammyjs/types";
 import { debug as d } from "debug";

package/out/shim.node.d.ts

@@ -1,2 +1,2 @@
-export { AbortController, AbortSignal } from "abort-controller";
+export { AbortController, type AbortSignal } from "abort-controller";
 export { default as fetch } from "node-fetch";

package/out/shim.node.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetch = exports.AbortSignal = exports.AbortController = void 0;
+exports.fetch = exports.AbortController = void 0;
 var abort_controller_1 = require("abort-controller");
 Object.defineProperty(exports, "AbortController", { enumerable: true, get: function () { return abort_controller_1.AbortController; } });
-Object.defineProperty(exports, "AbortSignal", { enumerable: true, get: function () { return abort_controller_1.AbortSignal; } });
 var node_fetch_1 = require("node-fetch");
 Object.defineProperty(exports, "fetch", { enumerable: true, get: function () { return node_fetch_1.default; } });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "grammy",
     "description": "The Telegram Bot Framework.",
-    "version": "1.6.2",
+    "version": "1.7.0",
     "author": "KnorpelSenf",
     "license": "MIT",
     "engines": {
@@ -23,7 +23,7 @@
         "contribs": "all-contributors"
     },
     "dependencies": {
-        "@grammyjs/types": "^2.5.1",
+        "@grammyjs/types": "^2.6.0",
         "abort-controller": "^3.0.0",
         "debug": "^4.3.3",
         "node-fetch": "^2.6.5"