grammy 1.8.1 → 1.9.0

package/README.md

@@ -10,10 +10,10 @@ _<h2 align="center"> [:mag: Documentation](https://grammy.dev) | [:page_with_cur
 
 <!-- deno-fmt-ignore-start -->
 
-[![Bot API](https://img.shields.io/badge/Bot%20API-6.0-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-54-orange.svg?style=flat-square)](#contributors-)
-<!-- ALL-CONTRIBUTORS-BADGE:END -->
+[![Bot API](https://img.shields.io/badge/Bot%20API-6.1-blue?logo=telegram&style=flat&labelColor=000&color=3b82f6)](https://core.telegram.org/bots/api)
+[![Deno](https://shield.deno.dev/x/grammy)](https://deno.land/x/grammy)
+[![npm](https://img.shields.io/npm/v/grammy?logo=npm&style=flat&labelColor=000&color=3b82f6)](https://www.npmjs.org/package/grammy)
+[![All Contributors](https://img.shields.io/github/all-contributors/grammyjs/grammy?style=flat&labelColor=000&color=3b82f6)](#contributors-)
 
 <!-- deno-fmt-ignore-end -->
 
@@ -140,11 +140,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://edjopato.de/"><img src="https://avatars.githubusercontent.com/u/7953011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>EdJoPaTo</b></sub></a><br /><a href="#plugin-EdJoPaTo" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/grammyjs/grammY/commits?author=EdJoPaTo" title="Documentation">📖</a> <a href="#ideas-EdJoPaTo" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AEdJoPaTo" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/issues?q=author%3AEdJoPaTo" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=EdJoPaTo" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Amir-Zouerami"><img src="https://avatars.githubusercontent.com/u/53701884?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Amir Zouerami</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Amir-Zouerami" title="Documentation">📖</a> <a href="#plugin-Amir-Zouerami" title="Plugin/utility libraries">🔌</a> <a href="#example-Amir-Zouerami" title="Examples">💡</a></td>
-    <td align="center"><a href="https://github.com/roj1512"><img src="https://avatars.githubusercontent.com/u/49933115?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roj</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=roj1512" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Aroj1512" title="Reviewed Pull Requests">👀</a> <a href="#infra-roj1512" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#translation-roj1512" title="Translation">🌍</a> <a href="https://github.com/grammyjs/grammY/commits?author=roj1512" title="Code">💻</a> <a href="#ideas-roj1512" title="Ideas, Planning, & Feedback">🤔</a> <a href="#mentoring-roj1512" title="Mentoring">🧑‍🏫</a></td>
+    <td align="center"><a href="https://github.com/roj1512"><img src="https://avatars.githubusercontent.com/u/49933115?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roj</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=roj1512" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Aroj1512" title="Reviewed Pull Requests">👀</a> <a href="#infra-roj1512" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#translation-roj1512" title="Translation">🌍</a> <a href="https://github.com/grammyjs/grammY/commits?author=roj1512" title="Code">💻</a> <a href="#ideas-roj1512" title="Ideas, Planning, & Feedback">🤔</a> <a href="#mentoring-roj1512" title="Mentoring">🧑‍🏫</a> <a href="#example-roj1512" title="Examples">💡</a></td>
     <td align="center"><a href="https://github.com/jokasimr"><img src="https://avatars.githubusercontent.com/u/20954731?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jokasimr</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Ajokasimr" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/CikiMomogi"><img src="https://avatars.githubusercontent.com/u/74030149?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ciki Momogi</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=CikiMomogi" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/AndreoliBR"><img src="https://avatars.githubusercontent.com/u/15970011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>AndreoliBR</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AAndreoliBR" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://github.com/Loskir"><img src="https://avatars.githubusercontent.com/u/21295738?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kirill Loskutov</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Loskir" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/issues?q=author%3ALoskir" title="Bug reports">🐛</a> <a href="#ideas-Loskir" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/Loskir"><img src="https://avatars.githubusercontent.com/u/21295738?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kirill Loskutov</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Loskir" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/issues?q=author%3ALoskir" title="Bug reports">🐛</a> <a href="#ideas-Loskir" title="Ideas, Planning, & Feedback">🤔</a> <a href="#design-Loskir" title="Design">🎨</a> <a href="#question-Loskir" title="Answering Questions">💬</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3ALoskir" title="Reviewed Pull Requests">👀</a></td>
   </tr>
   <tr>
     <td align="center"><a href="https://lungers.com/"><img src="https://avatars.githubusercontent.com/u/32808683?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrew Lane</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3AAndrewLaneX" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AAndrewLaneX" title="Reviewed Pull Requests">👀</a></td>
@@ -177,19 +177,19 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/taotie111"><img src="https://avatars.githubusercontent.com/u/44166322?v=4?s=100" width="100px;" alt=""/><br /><sub><b>taotie111</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=taotie111" title="Documentation">📖</a> <a href="#translation-taotie111" title="Translation">🌍</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/merlin-brandes-42328717a/"><img src="https://avatars.githubusercontent.com/u/14237330?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Merlin</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=FatalMerlin" title="Documentation">📖</a></td>
     <td align="center"><a href="https://darve.sh"><img src="https://avatars.githubusercontent.com/u/22394081?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Darvesh</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adarvesh" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=darvesh" title="Code">💻</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adarvesh" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="http://telegram.me/dcdunkan"><img src="https://avatars.githubusercontent.com/u/70066170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dcdunkan</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adcdunkan" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=dcdunkan" title="Code">💻</a> <a href="#plugin-dcdunkan" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adcdunkan" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=dcdunkan" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://telegram.me/dcdunkan"><img src="https://avatars.githubusercontent.com/u/70066170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dcdunkan</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adcdunkan" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=dcdunkan" title="Code">💻</a> <a href="#plugin-dcdunkan" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adcdunkan" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=dcdunkan" title="Documentation">📖</a> <a href="#ideas-dcdunkan" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-dcdunkan" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
     <td align="center"><a href="https://xuann.wang/"><img src="https://avatars.githubusercontent.com/u/44045911?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kid</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=kidonng" title="Documentation">📖</a> <a href="#translation-kidonng" title="Translation">🌍</a></td>
     <td align="center"><a href="http://slava.fomin.io/"><img src="https://avatars.githubusercontent.com/u/1702725?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Slava Fomin II</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Aslavafomin" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=slavafomin" title="Documentation">📖</a></td>
     <td align="center"><a href="https://kikobeats.com/"><img src="https://avatars.githubusercontent.com/u/2096101?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kiko Beats</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Kikobeats" title="Documentation">📖</a></td>
   </tr>
   <tr>
     <td align="center"><a href="http://///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////kraftwerk28.pp.ua"><img src="https://avatars.githubusercontent.com/u/31807671?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vsevolod</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=kraftwerk28" title="Code">💻</a> <a href="#ideas-kraftwerk28" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Akraftwerk28" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://github.com/habemuscode"><img src="https://avatars.githubusercontent.com/u/34692207?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Habemuscode</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Ahabemuscode" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=habemuscode" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/habemuscode"><img src="https://avatars.githubusercontent.com/u/34692207?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Habemuscode</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Ahabemuscode" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=habemuscode" title="Documentation">📖</a> <a href="#translation-habemuscode" title="Translation">🌍</a></td>
     <td align="center"><a href="https://borodutch.com/"><img src="https://avatars.githubusercontent.com/u/3192028?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Nikita Kolmogorov</b></sub></a><br /><a href="#plugin-backmeupplz" title="Plugin/utility libraries">🔌</a></td>
     <td align="center"><a href="http://glukki.ru"><img src="https://avatars.githubusercontent.com/u/140462?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Vitaliy Meshchaninov</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Aglukki" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=glukki" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/dilyanpalauzov"><img src="https://avatars.githubusercontent.com/u/4992947?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Дилян Палаузов</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adilyanpalauzov" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=dilyanpalauzov" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/lmx-Hexagram"><img src="https://avatars.githubusercontent.com/u/52130356?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lmx-Hexagram</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=lmx-Hexagram" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/IlyaSemenov"><img src="https://avatars.githubusercontent.com/u/128121?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ilya Semenov</b></sub></a><br /><a href="#ideas-IlyaSemenov" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AIlyaSemenov" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/IlyaSemenov"><img src="https://avatars.githubusercontent.com/u/128121?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ilya Semenov</b></sub></a><br /><a href="#ideas-IlyaSemenov" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AIlyaSemenov" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=IlyaSemenov" title="Code">💻</a></td>
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/abdollahzadehAli"><img src="https://avatars.githubusercontent.com/u/96317431?v=4?s=100" width="100px;" alt=""/><br /><sub><b>abdollahzadehAli</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=abdollahzadehAli" title="Documentation">📖</a> <a href="#example-abdollahzadehAli" title="Examples">💡</a></td>
@@ -197,6 +197,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/Scrip7"><img src="https://avatars.githubusercontent.com/u/37535505?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hesoyam</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Scrip7" title="Documentation">📖</a></td>
     <td align="center"><a href="http://yrz.am"><img src="https://avatars.githubusercontent.com/u/96742416?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yrzam</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Ayrzam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/drmikecrowe"><img src="https://avatars.githubusercontent.com/u/90312?v=4?s=100" width="100px;" alt=""/><br /><sub><b>drmikecrowe</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adrmikecrowe" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://rys.pw"><img src="https://avatars.githubusercontent.com/u/1641362?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=C0rn3j" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://pavelpolyakov.com/"><img src="https://avatars.githubusercontent.com/u/839290?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel</b></sub></a><br /><a href="#example-PavelPolyakov" title="Examples">💡</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://youtube.com/thorwebdev"><img src="https://avatars.githubusercontent.com/u/5748289?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thor 雷神 Schaeff</b></sub></a><br /><a href="#example-thorwebdev" title="Examples">💡</a></td>
+    <td align="center"><a href="https://github.com/x066it"><img src="https://avatars.githubusercontent.com/u/75589380?v=4?s=100" width="100px;" alt=""/><br /><sub><b>x066it</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Ax066it" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Ax066it" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/kolay-v"><img src="https://avatars.githubusercontent.com/u/49853802?v=4?s=100" width="100px;" alt=""/><br /><sub><b>kolay</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Akolay-v" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://enepom.com/"><img src="https://avatars.githubusercontent.com/u/2511553?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Evgeny Nepomnyashchiy</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Apizzaeater" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/anantakrishna"><img src="https://avatars.githubusercontent.com/u/6065071?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ananta Krsna dasa</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=anantakrishna" title="Documentation">📖</a></td>
   </tr>
 </table>
 

package/out/composer.d.ts

@@ -1,5 +1,6 @@
-import { type Context } from "./context.js";
+import { type AliasProps, type Context } from "./context.js";
 import { type Filter, type FilterQuery } from "./filter.js";
+import { type Chat } from "./platform.node.js";
 declare type MaybePromise<T> = T | Promise<T>;
 declare type MaybeArray<T> = T | T[];
 declare type StringWithSuggestions<S extends string> = (string & {}) | S;
@@ -212,7 +213,7 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * @param trigger The text to look for
      * @param middleware The middleware to register
      */
-    hears(trigger: MaybeArray<string | RegExp>, ...middleware: Array<Middleware<HearsContext<C>>>): Composer<HearsContext<C>>;
+    hears(trigger: MaybeArray<string | RegExp>, ...middleware: Array<HearsMiddleware<C>>): Composer<HearsContext<C>>;
     /**
      * Registers some middleware that will only be executed when a certain
      * command is found.
@@ -268,7 +269,39 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * @param command The command to look for
      * @param middleware The middleware to register
      */
-    command<S extends string>(command: MaybeArray<StringWithSuggestions<S | "start" | "help" | "settings">>, ...middleware: Array<Middleware<CommandContext<C>>>): Composer<CommandContext<C>>;
+    command<S extends string>(command: MaybeArray<StringWithSuggestions<S | "start" | "help" | "settings">>, ...middleware: Array<CommandMiddleware<C>>): Composer<CommandContext<C>>;
+    /**
+     * Registers some middleware for certain chat types only. For example, you
+     * can use this method to only receive updates from private chats. The four
+     * chat types are `"channel"`, `"supergroup"`, `"group"`, and `"private"`.
+     * This is especially useful when combined with other filtering logic. For
+     * example, this is how can you respond to `/start` commands only from
+     * private chats:
+     * ```ts
+     * bot.chatType("private").command("start", ctx => { ... })
+     * ```
+     *
+     * Naturally, you can also use this method on its own.
+     * ```ts
+     * // Private chats only
+     * bot.chatType("private", ctx => { ... });
+     * // Channels only
+     * bot.chatType("channel", ctx => { ... });
+     * ```
+     *
+     * You can pass an array of chat types if you want your middleware to run
+     * for any of several provided chat types.
+     * ```ts
+     * // Groups and supergroups only
+     * bot.chatType(["group", "supergroup"], ctx => { ... });
+     * ```
+     * [Remember](https://grammy.dev/guide/context.html#shortcuts) also that you
+     * can access the chat type via `ctx.chat.type`.
+     *
+     * @param chatType The chat type
+     * @param middleware The middleware to register
+     */
+    chatType<T extends Chat["type"]>(chatType: MaybeArray<T>, ...middleware: Array<Middleware<ChatTypeContext<C, T>>>): Composer<ChatTypeContext<C, T>>;
     /**
      * Registers some middleware for callback queries, i.e. the updates that
      * Telegram delivers to your bot when a user clicks an inline button (that
@@ -309,7 +342,7 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * @param trigger The string to look for in the payload
      * @param middleware The middleware to register
      */
-    callbackQuery(trigger: MaybeArray<string | RegExp>, ...middleware: Array<Middleware<Filter<C, "callback_query:data">>>): Composer<Filter<C, "callback_query:data">>;
+    callbackQuery(trigger: MaybeArray<string | RegExp>, ...middleware: Array<CallbackQueryMiddleware<C>>): Composer<CallbackQueryContext<C>>;
     /**
      * Registers some middleware for game queries, i.e. the updates that
      * Telegram delivers to your bot when a user clicks an inline button for the
@@ -328,7 +361,7 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * @param trigger The string to look for in the payload
      * @param middleware The middleware to register
      */
-    gameQuery(trigger: MaybeArray<string | RegExp>, ...middleware: Array<Middleware<Filter<C, "callback_query:game_short_name">>>): Composer<Filter<C, "callback_query:game_short_name">>;
+    gameQuery(trigger: MaybeArray<string | RegExp>, ...middleware: Array<GameQueryMiddleware<C>>): Composer<GameQueryContext<C>>;
     /**
      * Registers middleware for inline queries. Telegram sends an inline query
      * to your bot whenever a user types “@your_bot_name ...” into a text field
@@ -351,7 +384,7 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * @param trigger The inline query text to match
      * @param middleware The middleware to register
      */
-    inlineQuery(trigger: MaybeArray<string | RegExp>, ...middleware: Array<Middleware<Filter<C, "inline_query">>>): Composer<Filter<C, "inline_query">>;
+    inlineQuery(trigger: MaybeArray<string | RegExp>, ...middleware: Array<InlineQueryMiddleware<C>>): Composer<InlineQueryContext<C>>;
     /**
      * > This is an advanced method of grammY.
      *
@@ -553,10 +586,27 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      */
     errorBoundary(errorHandler: (error: BotError<C>, next: NextFunction) => MaybePromise<unknown>, ...middleware: Array<Middleware<C>>): Composer<C>;
 }
-declare type HearsContext<C extends Context> = Filter<C & {
-    match: string | RegExpMatchArray;
+export declare type HearsContext<C extends Context> = Filter<Omit<C, "match"> & {
+    match: Extract<C["match"], string | RegExpMatchArray>;
 }, ":text" | ":caption">;
-declare type CommandContext<C extends Context> = Filter<C & {
-    match: string;
+export declare type CommandContext<C extends Context> = Filter<Omit<C, "match"> & {
+    match: Extract<C["match"], string>;
 }, ":entities:bot_command">;
+export declare type CallbackQueryContext<C extends Context> = Filter<C, "callback_query:data">;
+export declare type GameQueryContext<C extends Context> = Filter<C, "callback_query:game_short_name">;
+export declare type InlineQueryContext<C extends Context> = Filter<C, "inline_query">;
+export declare type ChatTypeContext<C extends Context, T extends Chat["type"]> = C & Record<"update", ChatTypeUpdate<T>> & ChatType<T> & ChatTypeRecord<"msg", T> & AliasProps<ChatTypeUpdate<T>>;
+declare type ChatTypeUpdate<T extends Chat["type"]> = ChatTypeRecord<"message" | "edited_message" | "channel_post" | "edited_channel_post" | "my_chat_member" | "chat_member" | "chat_join_request", T> & Partial<Record<"callback_query", ChatTypeRecord<"message", T>>>;
+declare type ChatTypeRecord<K extends string, T extends Chat["type"]> = Partial<Record<K, ChatType<T>>>;
+interface ChatType<T extends Chat["type"]> {
+    chat: {
+        type: T;
+    };
+}
+export declare type HearsMiddleware<C extends Context> = Middleware<HearsContext<C>>;
+export declare type CommandMiddleware<C extends Context> = Middleware<CommandContext<C>>;
+export declare type CallbackQueryMiddleware<C extends Context> = Middleware<CallbackQueryContext<C>>;
+export declare type GameQueryMiddleware<C extends Context> = Middleware<GameQueryContext<C>>;
+export declare type InlineQueryMiddleware<C extends Context> = Middleware<InlineQueryContext<C>>;
+export declare type ChatTypeMiddleware<C extends Context, T extends Chat["type"]> = Middleware<ChatTypeContext<C, T>>;
 export {};

package/out/composer.js

@@ -317,6 +317,41 @@ class Composer {
             });
         }, ...middleware);
     }
+    /**
+     * Registers some middleware for certain chat types only. For example, you
+     * can use this method to only receive updates from private chats. The four
+     * chat types are `"channel"`, `"supergroup"`, `"group"`, and `"private"`.
+     * This is especially useful when combined with other filtering logic. For
+     * example, this is how can you respond to `/start` commands only from
+     * private chats:
+     * ```ts
+     * bot.chatType("private").command("start", ctx => { ... })
+     * ```
+     *
+     * Naturally, you can also use this method on its own.
+     * ```ts
+     * // Private chats only
+     * bot.chatType("private", ctx => { ... });
+     * // Channels only
+     * bot.chatType("channel", ctx => { ... });
+     * ```
+     *
+     * You can pass an array of chat types if you want your middleware to run
+     * for any of several provided chat types.
+     * ```ts
+     * // Groups and supergroups only
+     * bot.chatType(["group", "supergroup"], ctx => { ... });
+     * ```
+     * [Remember](https://grammy.dev/guide/context.html#shortcuts) also that you
+     * can access the chat type via `ctx.chat.type`.
+     *
+     * @param chatType The chat type
+     * @param middleware The middleware to register
+     */
+    chatType(chatType, ...middleware) {
+        const set = new Set(toArray(chatType));
+        return this.filter((ctx) => { var _a; return ((_a = ctx.chat) === null || _a === void 0 ? void 0 : _a.type) !== undefined && set.has(ctx.chat.type); }, ...middleware);
+    }
     /**
      * Registers some middleware for callback queries, i.e. the updates that
      * Telegram delivers to your bot when a user clicks an inline button (that
@@ -618,7 +653,7 @@ class Composer {
     }
 }
 exports.Composer = Composer;
-// === Util functions and types
+// === Util functions
 function triggerFn(trigger) {
     return toArray(trigger).map((t) => typeof t === "string"
         ? (txt) => (txt === t ? t : null)

package/out/context.d.ts

@@ -4,7 +4,7 @@ import { type Chat, type ChatPermissions, type InlineQueryResult, type InputFile
 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> = {
-    [key in string & keyof U as SnakeToCamelCase<key>]: U[key];
+    [K in string & keyof U as SnakeToCamelCase<K>]: U[K];
 };
 declare type RenamedUpdate = AliasProps<Omit<Update, "update_id">>;
 /**
@@ -106,14 +106,14 @@ export declare class Context implements RenamedUpdate {
     /** Alias for `ctx.update.chat_join_request` */
     get chatJoinRequest(): import("@grammyjs/types/manage").ChatJoinRequest | undefined;
     /**
-     * Get message object from whereever possible. Alias for `ctx.message ??
+     * Get message object from wherever possible. Alias for `ctx.message ??
      * ctx.editedMessage ?? ctx.callbackQuery?.message ?? ctx.channelPost ??
      * ctx.editedChannelPost`
      */
     get msg(): Message | undefined;
     /**
-     * Get chat object from whereever possible. Alias for `(this.msg ??
-     * this.myChatMember ?? this.chatMember ?? this.chatJoinRequest)?.chat`
+     * Get chat object from wherever possible. Alias for `(ctx.msg ??
+     * ctx.myChatMember ?? ctx.chatMember ?? ctx.chatJoinRequest)?.chat`
      */
     get chat(): Chat | undefined;
     /**
@@ -122,14 +122,14 @@ export declare class Context implements RenamedUpdate {
      */
     get senderChat(): Chat | undefined;
     /**
-     * Get message author from whereever possible. Alias for
+     * Get message author from wherever possible. Alias for
      * `(ctx.callbackQuery?? ctx.inlineQuery ?? ctx.shippingQuery ??
      * ctx.preCheckoutQuery ?? ctx.chosenInlineResult ?? ctx.msg ??
-     * this.myChatMember ?? this.chatMember ?? this.chatJoinRequest)?.from`
+     * ctx.myChatMember ?? ctx.chatMember ?? ctx.chatJoinRequest)?.from`
      */
     get from(): User | undefined;
     /**
-     * Get inline message ID from whereever possible. Alias for
+     * Get inline message ID from wherever possible. Alias for
      * `(ctx.callbackQuery ?? ctx.chosenInlineResult)?.inline_message_id`
      */
     get inlineMessageId(): string | undefined;

package/out/context.js

@@ -116,7 +116,7 @@ class Context {
     }
     // AGGREGATION SHORTCUTS
     /**
-     * Get message object from whereever possible. Alias for `ctx.message ??
+     * Get message object from wherever possible. Alias for `ctx.message ??
      * ctx.editedMessage ?? ctx.callbackQuery?.message ?? ctx.channelPost ??
      * ctx.editedChannelPost`
      */
@@ -126,8 +126,8 @@ class Context {
         return ((_e = (_d = (_b = (_a = this.message) !== null && _a !== void 0 ? _a : this.editedMessage) !== null && _b !== void 0 ? _b : (_c = this.callbackQuery) === null || _c === void 0 ? void 0 : _c.message) !== null && _d !== void 0 ? _d : this.channelPost) !== null && _e !== void 0 ? _e : this.editedChannelPost);
     }
     /**
-     * Get chat object from whereever possible. Alias for `(this.msg ??
-     * this.myChatMember ?? this.chatMember ?? this.chatJoinRequest)?.chat`
+     * Get chat object from wherever possible. Alias for `(ctx.msg ??
+     * ctx.myChatMember ?? ctx.chatMember ?? ctx.chatJoinRequest)?.chat`
      */
     get chat() {
         var _a, _b, _c, _d;
@@ -143,10 +143,10 @@ class Context {
         return (_a = this.msg) === null || _a === void 0 ? void 0 : _a.sender_chat;
     }
     /**
-     * Get message author from whereever possible. Alias for
+     * Get message author from wherever possible. Alias for
      * `(ctx.callbackQuery?? ctx.inlineQuery ?? ctx.shippingQuery ??
      * ctx.preCheckoutQuery ?? ctx.chosenInlineResult ?? ctx.msg ??
-     * this.myChatMember ?? this.chatMember ?? this.chatJoinRequest)?.from`
+     * ctx.myChatMember ?? ctx.chatMember ?? ctx.chatJoinRequest)?.from`
      */
     get from() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
@@ -154,7 +154,7 @@ class Context {
         return (_j = ((_h = (_g = (_f = (_e = (_d = (_c = (_b = (_a = this.callbackQuery) !== null && _a !== void 0 ? _a : this.inlineQuery) !== null && _b !== void 0 ? _b : this.shippingQuery) !== null && _c !== void 0 ? _c : this.preCheckoutQuery) !== null && _d !== void 0 ? _d : this.chosenInlineResult) !== null && _e !== void 0 ? _e : this.msg) !== null && _f !== void 0 ? _f : this.myChatMember) !== null && _g !== void 0 ? _g : this.chatMember) !== null && _h !== void 0 ? _h : this.chatJoinRequest)) === null || _j === void 0 ? void 0 : _j.from;
     }
     /**
-     * Get inline message ID from whereever possible. Alias for
+     * Get inline message ID from wherever possible. Alias for
      * `(ctx.callbackQuery ?? ctx.chosenInlineResult)?.inline_message_id`
      */
     get inlineMessageId() {

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

@@ -3,38 +3,52 @@ import { type IncomingMessage, type ServerResponse } from "http";
 export declare const adapters: {
     http: (req: IncomingMessage, res: ServerResponse) => {
         update: Promise<any>;
+        header: string;
         end: () => ServerResponse;
         respond: (json: string) => ServerResponse;
+        unauthorized: () => ServerResponse;
     };
     https: (req: IncomingMessage, res: ServerResponse) => {
         update: Promise<any>;
+        header: string;
         end: () => ServerResponse;
         respond: (json: string) => ServerResponse;
+        unauthorized: () => ServerResponse;
     };
     express: (req: any, res: any) => {
         update: Promise<any>;
+        header: any;
         end: () => any;
         respond: (json: string) => void;
+        unauthorized: () => void;
     };
     koa: (ctx: any) => {
         update: Promise<any>;
+        header: any;
         end: () => void;
         respond: (json: string) => void;
+        unauthorized: () => void;
     };
     fastify: (req: any, reply: any) => {
         update: Promise<any>;
+        header: any;
         end: () => any;
         respond: (json: string) => any;
+        unauthorized: () => any;
     };
     worktop: (req: any, res: any) => {
         update: Promise<any>;
+        header: any;
         end: () => any;
         respond: (json: string) => any;
+        unauthorized: () => any;
     };
     "aws-lambda": (event: any, _context: any, callback: any) => {
         update: any;
+        header: any;
         end: () => any;
         respond: (json: string) => any;
+        unauthorized: () => any;
     };
 };
 export declare const defaultAdapter = "express";

package/out/convenience/frameworks.node.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultAdapter = exports.adapters = void 0;
+const SECRET_HEADER = "X-Telegram-Bot-Api-Secret-Token";
 /** Node.js native 'http' and 'https' modules */
 const http = (req, res) => ({
     update: new Promise((resolve, reject) => {
@@ -10,21 +11,28 @@ const http = (req, res) => ({
             resolve(JSON.parse(raw));
         }).once("error", reject);
     }),
+    header: String(req.headers[SECRET_HEADER.toLowerCase()]),
     end: () => res.end(),
     respond: (json) => res.writeHead(200, { "Content-Type": "application/json" }).end(json),
+    unauthorized: () => res.writeHead(401).end("secret token is wrong"),
 });
 /** express web framework */
 const express = (req, res) => ({
     update: Promise.resolve(req.body),
+    header: req.header(SECRET_HEADER),
     end: () => res.end(),
     respond: (json) => {
         res.set("Content-Type", "application/json");
         res.send(json);
     },
+    unauthorized: () => {
+        res.send(401, "secret token is wrong");
+    },
 });
 /** koa web framework */
 const koa = (ctx) => ({
     update: Promise.resolve(ctx.request.body),
+    header: ctx.get(SECRET_HEADER),
     end: () => {
         ctx.body = "";
     },
@@ -32,24 +40,33 @@ const koa = (ctx) => ({
         ctx.set("Content-Type", "application/json");
         ctx.response.body = json;
     },
+    unauthorized: () => {
+        ctx.status = 401;
+    },
 });
 /** fastify web framework */
 const fastify = (req, reply) => ({
     update: Promise.resolve(req.body),
+    header: req.headers[SECRET_HEADER],
     end: () => reply.status(200).send(),
     respond: (json) => reply.send(json),
+    unauthorized: () => reply.code(401).send("secret token is wrong"),
 });
 /** worktop CloudFlare workers framework */
 const worktop = (req, res) => ({
     update: Promise.resolve(req.body.json()),
+    header: req.headers.get(SECRET_HEADER),
     end: () => res.end(),
     respond: (json) => res.send(200, json),
+    unauthorized: () => res.send(401, "secret token is wrong"),
 });
 /** AWS lambda serverless functions */
 const awsLambda = (event, _context, callback) => ({
     update: JSON.parse(event.body),
+    header: event.headers[SECRET_HEADER],
     end: () => callback(null, { statusCode: 200 }),
     respond: (json) => callback(null, { statusCode: 200, body: json }),
+    unauthorized: () => callback(null, { statusCode: 401 }),
 });
 // please open a PR if you want to add another
 exports.adapters = {

package/out/convenience/keyboard.d.ts

@@ -178,8 +178,8 @@ export declare class InlineKeyboard {
     webApp(text: string, url: string): this;
     /**
      * Adds a new login button. This can be used as a replacement for the
-     * Telegram Login Widget. You must specify an HTTP URL used to automatically
-     * authorize the user.
+     * Telegram Login Widget. You must specify an HTTPS URL used to
+     * automatically authorize the user.
      *
      * @param text The text to display
      * @param loginUrl The login URL as string or `LoginUrl` object

package/out/convenience/keyboard.js

@@ -217,8 +217,8 @@ class InlineKeyboard {
     }
     /**
      * Adds a new login button. This can be used as a replacement for the
-     * Telegram Login Widget. You must specify an HTTP URL used to automatically
-     * authorize the user.
+     * Telegram Login Widget. You must specify an HTTPS URL used to
+     * automatically authorize the user.
      *
      * @param text The text to display
      * @param loginUrl The login URL as string or `LoginUrl` object

package/out/convenience/session.js

@@ -62,6 +62,7 @@ function session(options = {}) {
             ? undefined
             : (_a = (await storage.read(key))) !== null && _a !== void 0 ? _a : (_b = options.initial) === null || _b === void 0 ? void 0 : _b.call(options);
         Object.defineProperty(ctx, "session", {
+            enumerable: true,
             get() {
                 if (key === undefined) {
                     const msg = undef("access", getSessionKey);
@@ -153,6 +154,7 @@ function lazySession(options = {}) {
             return value;
         }
         Object.defineProperty(ctx, "session", {
+            enumerable: true,
             get() {
                 if (wrote)
                     return value;

package/out/convenience/webhook.d.ts

@@ -6,42 +6,52 @@ declare const adapters: {
     callback: FrameworkAdapter;
     http: (req: import("http").IncomingMessage, res: import("http").ServerResponse) => {
         update: Promise<any>;
+        header: string;
         end: () => import("http").ServerResponse;
         respond: (json: string) => import("http").ServerResponse;
+        unauthorized: () => import("http").ServerResponse;
     };
     https: (req: import("http").IncomingMessage, res: import("http").ServerResponse) => {
         update: Promise<any>;
+        header: string;
         end: () => import("http").ServerResponse;
         respond: (json: string) => import("http").ServerResponse;
+        unauthorized: () => import("http").ServerResponse;
     };
     express: (req: any, res: any) => {
         update: Promise<any>;
+        header: any;
         end: () => any;
         respond: (json: string) => void;
+        unauthorized: () => void;
     };
     koa: (ctx: any) => {
         update: Promise<any>;
+        header: any;
         end: () => void;
         respond: (json: string) => void;
+        unauthorized: () => void;
     };
     fastify: (req: any, reply: any) => {
         update: Promise<any>;
+        header: any;
         end: () => any;
         respond: (json: string) => any;
+        unauthorized: () => any;
     };
     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.
-         */
+        header: any;
         end: () => any;
         respond: (json: string) => any;
+        unauthorized: () => any;
     };
     "aws-lambda": (event: any, _context: any, callback: any) => {
         update: any;
+        header: any;
         end: () => any;
         respond: (json: string) => any;
+        unauthorized: () => any;
     };
 };
 /**
@@ -59,6 +69,11 @@ interface ReqResHandler {
      * body
      */
     update: Promise<Update>;
+    /**
+     * X-Telegram-Bot-Api-Secret-Token header of the request, or undefined if
+     * not present
+     */
+    header?: string;
     /**
      * Ends the request immediately without body, called after every request
      * unless a webhook reply was performed
@@ -68,7 +83,12 @@ interface ReqResHandler {
      * Sends the specified JSON as a payload in the body, used for webhook
      * replies
      */
-    respond: (json: string) => unknown;
+    respond: (json: string) => unknown | Promise<unknown>;
+    /**
+     * Responds that the request is unauthorized due to mismatching
+     * X-Telegram-Bot-Api-Secret-Token headers
+     */
+    unauthorized: () => unknown | Promise<unknown>;
     /**
      * Some frameworks (e.g. Deno's std/http `listenAndServe`) assume that
      * handler returns something
@@ -80,6 +100,14 @@ interface ReqResHandler {
  * request. The handler will be used to integrate with the compatible framework.
  */
 export declare type FrameworkAdapter = (...args: any[]) => ReqResHandler;
+export interface WebhookOptions {
+    /** An optional strategy to handle timeouts (default: 'throw') */
+    onTimeout?: "throw" | "return" | ((...args: any[]) => unknown);
+    /** An optional number of timeout milliseconds (default: 10_000) */
+    timeoutMilliseconds?: number;
+    /** An optional string to compare to X-Telegram-Bot-Api-Secret-Token */
+    secretToken?: string;
+}
 /**
  * Creates a callback function that you can pass to a web framework (such as
  * express) if you want to run your bot via webhooks. Use it like this:
@@ -99,5 +127,6 @@ export declare type FrameworkAdapter = (...args: any[]) => ReqResHandler;
  * @param onTimeout An optional strategy to handle timeouts (default: 'throw')
  * @param timeoutMilliseconds An optional number of timeout milliseconds (default: 10_000)
  */
-export declare function webhookCallback<C extends Context = Context>(bot: Bot<C>, adapter?: SupportedFrameworks | FrameworkAdapter, onTimeout?: "throw" | "return" | ((...args: any[]) => unknown), timeoutMilliseconds?: number): (...args: any[]) => Promise<any>;
+export declare function webhookCallback<C extends Context = Context>(bot: Bot<C>, adapter?: SupportedFrameworks | FrameworkAdapter, onTimeout?: WebhookOptions["onTimeout"], timeoutMilliseconds?: WebhookOptions["timeoutMilliseconds"], secretToken?: WebhookOptions["secretToken"]): (...args: any[]) => any;
+export declare function webhookCallback<C extends Context = Context>(bot: Bot<C>, adapter?: SupportedFrameworks | FrameworkAdapter, webhookOptions?: WebhookOptions): (...args: any[]) => any;
 export {};

package/out/convenience/webhook.js

@@ -4,31 +4,17 @@ exports.webhookCallback = void 0;
 const platform_node_js_1 = require("../platform.node.js");
 const frameworks_node_js_1 = require("./frameworks.node.js");
 const debugErr = (0, platform_node_js_1.debug)("grammy:error");
-const callbackAdapter = (update, callback) => ({
+const callbackAdapter = (update, callback, header, unauthorized = () => callback('"unauthorized"')) => ({
     update: Promise.resolve(update),
     respond: callback,
+    header,
+    unauthorized,
 });
 const adapters = { ...frameworks_node_js_1.adapters, callback: callbackAdapter };
-/**
- * Creates a callback function that you can pass to a web framework (such as
- * express) if you want to run your bot via webhooks. Use it like this:
- * ```ts
- * const app = express() // or whatever you're using
- * const bot = new Bot('<token>')
- *
- * app.use(webhookCallback(bot, 'express'))
- * ```
- *
- * Confer the grammY
- * [documentation](https://grammy.dev/guide/deployment-types.html) to read more
- * about how to run your bot with webhooks.
- *
- * @param bot The bot for which to create a callback
- * @param adapter An optional string identifying the framework (default: 'express')
- * @param onTimeout An optional strategy to handle timeouts (default: 'throw')
- * @param timeoutMilliseconds An optional number of timeout milliseconds (default: 10_000)
- */
-function webhookCallback(bot, adapter = frameworks_node_js_1.defaultAdapter, onTimeout = "throw", timeoutMilliseconds = 10000) {
+function webhookCallback(bot, adapter = frameworks_node_js_1.defaultAdapter, onTimeout = "throw", timeoutMilliseconds = 10000, secretToken) {
+    const { onTimeout: timeout = "throw", timeoutMilliseconds: ms = 10000, secretToken: token, } = typeof onTimeout === "object"
+        ? onTimeout
+        : { onTimeout, timeoutMilliseconds, secretToken };
     let initialized = false;
     const server = typeof adapter === "string"
         ? adapters[adapter]
@@ -39,7 +25,13 @@ function webhookCallback(bot, adapter = frameworks_node_js_1.defaultAdapter, onT
             await bot.init();
             initialized = true;
         }
-        const { update, respond, end, handlerReturn } = server(...args);
+        const { update, respond, unauthorized, end, handlerReturn, header } = server(...args);
+        if (header !== token) {
+            await unauthorized();
+            // TODO: investigate deno bug that happens when this console logging is removed
+            console.log(handlerReturn);
+            return handlerReturn;
+        }
         let usedWebhookReply = false;
         const webhookReplyEnvelope = {
             async send(json) {
@@ -47,11 +39,9 @@ function webhookCallback(bot, adapter = frameworks_node_js_1.defaultAdapter, onT
                 await respond(json);
             },
         };
-        await timeoutIfNecessary(bot.handleUpdate(await update, webhookReplyEnvelope), typeof onTimeout === "function"
-            ? () => onTimeout(...args)
-            : onTimeout, timeoutMilliseconds);
-        if (end !== undefined && !usedWebhookReply)
-            end();
+        await timeoutIfNecessary(bot.handleUpdate(await update, webhookReplyEnvelope), typeof timeout === "function" ? () => timeout(...args) : timeout, ms);
+        if (!usedWebhookReply)
+            end === null || end === void 0 ? void 0 : end();
         return handlerReturn;
     };
 }

package/out/core/api.d.ts

@@ -73,16 +73,16 @@ export declare class Api<R extends RawApi = RawApi> {
      */
     getUpdates(other?: Other<R, "getUpdates">, signal?: AbortSignal): Promise<import("@grammyjs/types/update").Update[]>;
     /**
-     * Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized Update. In case of an unsuccessful request, we will give up after a reasonable amount of attempts. Returns True on success.
+     * Use this method to specify a URL and receive incoming updates via an outgoing webhook. Whenever there is an update for the bot, we will send an HTTPS POST request to the specified URL, containing a JSON-serialized Update. In case of an unsuccessful request, we will give up after a reasonable amount of attempts. Returns True on success.
      *
-     * If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the URL, e.g. https://www.example.com/<token>. Since nobody else knows your bot's token, you can be pretty sure it's us.
+     * If you'd like to make sure that the webhook was set by you, you can specify secret data in the parameter secret_token. If specified, the request will contain a header “X-Telegram-Bot-Api-Secret-Token” with the secret token as content.
      *
      * Notes
      * 1. You will not be able to receive updates using getUpdates for as long as an outgoing webhook is set up.
      * 2. To use a self-signed certificate, you need to upload your public key certificate using certificate parameter. Please upload as InputFile, sending a String will not work.
      * 3. Ports currently supported for Webhooks: 443, 80, 88, 8443.
      *
-     * NEW! If you're having any trouble setting up webhooks, please check out this amazing guide to Webhooks.
+     * If you're having any trouble setting up webhooks, please check out this amazing guide to webhooks.
      *
      * @param url HTTPS url to send updates to. Use an empty string to remove webhook integration
      * @param other Optional remaining parameters, confer the official reference below
@@ -1004,6 +1004,21 @@ export declare class Api<R extends RawApi = RawApi> {
      * **Official reference:** https://core.telegram.org/bots/api#sendinvoice
      */
     sendInvoice(chat_id: number | string, title: string, description: string, payload: string, provider_token: string, currency: string, prices: readonly LabeledPrice[], other?: Other<R, "sendInvoice", "chat_id" | "title" | "description" | "payload" | "provider_token" | "currency" | "prices">, signal?: AbortSignal): Promise<import("@grammyjs/types/message").Message.InvoiceMessage>;
+    /**
+     * Use this method to create a link for an invoice. Returns the created invoice link as String on success.
+     *
+     * @param title Product name, 1-32 characters
+     * @param description Product description, 1-255 characters
+     * @param payload Bot-defined invoice payload, 1-128 bytes. This will not be displayed to the user, use for your internal processes.
+     * @param provider_token Payment provider token, obtained via BotFather
+     * @param currency Three-letter ISO 4217 currency code, see more on currencies
+     * @param prices Price breakdown, a JSON-serialized list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.)
+     * @param other Optional remaining parameters, confer the official reference below
+     * @param signal Optional `AbortSignal` to cancel the request
+     *
+     * **Official reference:** https://core.telegram.org/bots/api#createinvoicelink
+     */
+    createInvoiceLink(title: string, description: string, payload: string, provider_token: string, currency: string, prices: LabeledPrice[], other?: Other<R, "createInvoiceLink", "title" | "description" | "payload" | "provider_token" | "currency" | "prices">, signal?: AbortSignal): Promise<string>;
     /**
      * If you sent an invoice requesting a shipping address and the parameter is_flexible was specified, the Bot API will send an Update with a shipping_query field to the bot. Use this method to reply to shipping queries. On success, True is returned.
      *

package/out/core/api.js

@@ -44,16 +44,16 @@ class Api {
         return this.raw.getUpdates({ ...other }, signal);
     }
     /**
-     * Use this method to specify a url and receive incoming updates via an outgoing webhook. Whenever there is an update for the bot, we will send an HTTPS POST request to the specified url, containing a JSON-serialized Update. In case of an unsuccessful request, we will give up after a reasonable amount of attempts. Returns True on success.
+     * Use this method to specify a URL and receive incoming updates via an outgoing webhook. Whenever there is an update for the bot, we will send an HTTPS POST request to the specified URL, containing a JSON-serialized Update. In case of an unsuccessful request, we will give up after a reasonable amount of attempts. Returns True on success.
      *
-     * If you'd like to make sure that the Webhook request comes from Telegram, we recommend using a secret path in the URL, e.g. https://www.example.com/<token>. Since nobody else knows your bot's token, you can be pretty sure it's us.
+     * If you'd like to make sure that the webhook was set by you, you can specify secret data in the parameter secret_token. If specified, the request will contain a header “X-Telegram-Bot-Api-Secret-Token” with the secret token as content.
      *
      * Notes
      * 1. You will not be able to receive updates using getUpdates for as long as an outgoing webhook is set up.
      * 2. To use a self-signed certificate, you need to upload your public key certificate using certificate parameter. Please upload as InputFile, sending a String will not work.
      * 3. Ports currently supported for Webhooks: 443, 80, 88, 8443.
      *
-     * NEW! If you're having any trouble setting up webhooks, please check out this amazing guide to Webhooks.
+     * If you're having any trouble setting up webhooks, please check out this amazing guide to webhooks.
      *
      * @param url HTTPS url to send updates to. Use an empty string to remove webhook integration
      * @param other Optional remaining parameters, confer the official reference below
@@ -1160,6 +1160,31 @@ class Api {
             ...other,
         }, signal);
     }
+    /**
+     * Use this method to create a link for an invoice. Returns the created invoice link as String on success.
+     *
+     * @param title Product name, 1-32 characters
+     * @param description Product description, 1-255 characters
+     * @param payload Bot-defined invoice payload, 1-128 bytes. This will not be displayed to the user, use for your internal processes.
+     * @param provider_token Payment provider token, obtained via BotFather
+     * @param currency Three-letter ISO 4217 currency code, see more on currencies
+     * @param prices Price breakdown, a JSON-serialized list of components (e.g. product price, tax, discount, delivery cost, delivery tax, bonus, etc.)
+     * @param other Optional remaining parameters, confer the official reference below
+     * @param signal Optional `AbortSignal` to cancel the request
+     *
+     * **Official reference:** https://core.telegram.org/bots/api#createinvoicelink
+     */
+    createInvoiceLink(title, description, payload, provider_token, currency, prices, other, signal) {
+        return this.raw.createInvoiceLink({
+            title,
+            description,
+            payload,
+            provider_token,
+            currency,
+            prices,
+            ...other,
+        }, signal);
+    }
     /**
      * If you sent an invoice requesting a shipping address and the parameter is_flexible was specified, the Bot API will send an Update with a shipping_query field to the bot. Use this method to reply to shipping queries. On success, True is returned.
      *

package/out/core/client.d.ts

@@ -23,8 +23,7 @@ export interface WebhookReplyEnvelope {
  * Type of a function that can perform an API call. Used for Transformers.
  */
 export declare type ApiCallFn<R extends RawApi = RawApi> = <M extends Methods<R>>(method: M, payload: Payload<M, R>, signal?: AbortSignal) => Promise<ApiResponse<ApiCallResult<M, R>>>;
-declare type ApiCallResult<M extends Methods<R>, R extends RawApi> = R[M] extends (...args: unknown[]) => unknown ? Await<ReturnType<R[M]>> : never;
-declare type Await<T> = T extends PromiseLike<infer V> ? V : T;
+declare type ApiCallResult<M extends Methods<R>, R extends RawApi> = R[M] extends (...args: unknown[]) => unknown ? Awaited<ReturnType<R[M]>> : never;
 /**
  * API call transformers are functions that can access and modify the method and
  * payload of an API call on the fly. This can be useful if you want to

package/out/core/payload.js

@@ -11,7 +11,7 @@ const platform_node_js_1 = require("../platform.node.js");
  * @param payload The payload to analyse
  */
 function requiresFormDataUpload(payload) {
-    return (typeof payload === "object" &&
+    return payload instanceof platform_node_js_1.InputFile || (typeof payload === "object" &&
         payload !== null &&
         Object.values(payload).some((v) => Array.isArray(v)
             ? v.some(requiresFormDataUpload)
@@ -164,7 +164,7 @@ or newline (\\n) characters! Filename for property '${origin}' was:
 ${filename}
 """`);
     }
-    yield enc.encode(`content-disposition:form-data;name="${id}";filename=${filename}\r\n\r\n`);
+    yield enc.encode(`content-disposition:form-data;name="${id}";filename=${filename}\r\ncontent-type:application/octet-stream\r\n\r\n`);
     const data = await input[platform_node_js_1.toRaw]();
     if (data instanceof Uint8Array)
         yield data;

package/out/filter.d.ts

@@ -30,10 +30,14 @@ declare const UPDATE_KEYS: {
         readonly new_chat_members: {
             readonly me: {};
             readonly is_bot: {};
+            readonly is_premium: {};
+            readonly added_to_attachment_menu: {};
         };
         readonly left_chat_member: {
             readonly me: {};
             readonly is_bot: {};
+            readonly is_premium: {};
+            readonly added_to_attachment_menu: {};
         };
         readonly group_chat_created: {};
         readonly supergroup_chat_created: {};
@@ -113,10 +117,14 @@ declare const UPDATE_KEYS: {
         readonly new_chat_members: {
             readonly me: {};
             readonly is_bot: {};
+            readonly is_premium: {};
+            readonly added_to_attachment_menu: {};
         };
         readonly left_chat_member: {
             readonly me: {};
             readonly is_bot: {};
+            readonly is_premium: {};
+            readonly added_to_attachment_menu: {};
         };
         readonly group_chat_created: {};
         readonly supergroup_chat_created: {};
@@ -344,12 +352,16 @@ declare const UPDATE_KEYS: {
         readonly from: {
             readonly me: {};
             readonly is_bot: {};
+            readonly is_premium: {};
+            readonly added_to_attachment_menu: {};
         };
     };
     readonly chat_member: {
         readonly from: {
             readonly me: {};
             readonly is_bot: {};
+            readonly is_premium: {};
+            readonly added_to_attachment_menu: {};
         };
     };
     readonly chat_join_request: {};

package/out/filter.js

@@ -212,6 +212,8 @@ const ENTITY_KEYS = {
 const USER_KEYS = {
     me: {},
     is_bot: {},
+    is_premium: {},
+    added_to_attachment_menu: {},
 };
 // L2
 const EDITABLE_MESSAGE_KEYS = {

package/out/mod.d.ts

@@ -4,7 +4,7 @@ export { Context } from "./context.js";
 export * from "./convenience/keyboard.js";
 export * from "./convenience/session.js";
 export * from "./convenience/webhook.js";
-export { Composer, type Middleware, type MiddlewareFn, type MiddlewareObj, type NextFunction, } from "./composer.js";
+export { type CallbackQueryContext, type CallbackQueryMiddleware, type ChatTypeContext, type ChatTypeMiddleware, type CommandContext, type CommandMiddleware, Composer, type GameQueryContext, type GameQueryMiddleware, type HearsContext, type HearsMiddleware, type InlineQueryContext, type InlineQueryMiddleware, 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, type ApiClientOptions, type RawApi, type TransformableApi, type Transformer, type WebhookReplyEnvelope, } from "./core/client.js";

package/out/platform.node.d.ts

@@ -22,7 +22,7 @@ export declare function baseFetchConfig(apiRoot: string): {
 /** Something that looks like a URL. */
 interface URLLike {
     /**
-     * Identifier of the resouce. Must be in a format that can be parsed by the
+     * Identifier of the resource. Must be in a format that can be parsed by the
      * URL constructor.
      */
     url: string;

package/out/types.d.ts

@@ -0,0 +1 @@
+export * from "./types.node.js";

package/out/types.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./types.node.js"), exports);

package/out/types.node.d.ts

@@ -0,0 +1,64 @@
+/// <reference types="node" />
+import { type InputFileProxy } from "@grammyjs/types";
+import { toRaw } from "./platform.node";
+import { URL } from "url";
+import { type ReadStream } from "fs";
+export * from "@grammyjs/types";
+/** Something that looks like a URL. */
+interface URLLike {
+    /**
+     * Identifier of the resouce. Must be in a format that can be parsed by the
+     * URL constructor.
+     */
+    url: string;
+}
+/**
+ * An `InputFile` wraps a number of different sources for [sending
+ * files](https://grammy.dev/guide/files.html#uploading-your-own-file).
+ *
+ * It corresponds to the `InputFile` type in the [Telegram Bot API
+ * Reference](https://core.telegram.org/bots/api#inputfile).
+ */
+export declare class InputFile {
+    private consumed;
+    private readonly fileData;
+    /**
+     * Optional name of the constructed `InputFile` instance.
+     *
+     * Check out the
+     * [documenation](https://grammy.dev/guide/files.html#uploading-your-own-file)
+     * on sending files with `InputFile`.
+     */
+    readonly filename?: string;
+    /**
+     * Constructs an `InputFile` that can be used in the API to send files.
+     *
+     * @param file A path to a local file or a `Buffer` or a `fs.ReadStream` that specifies the file data
+     * @param filename Optional name of the file
+     */
+    constructor(file: string | URL | URLLike | Uint8Array | ReadStream | Iterable<Uint8Array> | AsyncIterable<Uint8Array>, filename?: string);
+    private guessFilename;
+    [toRaw](): Uint8Array | Iterable<Uint8Array> | AsyncIterable<Uint8Array>;
+}
+declare type GrammyTypes = InputFileProxy<InputFile>;
+/** Wrapper type to bundle all methods of the Telegram API */
+export declare type ApiMethods = GrammyTypes["Telegram"];
+/** Utility type providing the argument type for the given method name or `{}` if the method does not take any parameters */
+export declare type Opts<M extends keyof GrammyTypes["Telegram"]> = GrammyTypes["Opts"][M];
+/** This object represents the content of a media message to be sent. It should be one of
+- InputMediaAnimation
+- InputMediaDocument
+- InputMediaAudio
+- InputMediaPhoto
+- InputMediaVideo */
+export declare type InputMedia = GrammyTypes["InputMedia"];
+/** Represents a photo to be sent. */
+export declare type InputMediaPhoto = GrammyTypes["InputMediaPhoto"];
+/** Represents a video to be sent. */
+export declare type InputMediaVideo = GrammyTypes["InputMediaVideo"];
+/** Represents an animation file (GIF or H.264/MPEG-4 AVC video without sound) to be sent. */
+export declare type InputMediaAnimation = GrammyTypes["InputMediaAnimation"];
+/** Represents an audio file to be treated as music to be sent. */
+export declare type InputMediaAudio = GrammyTypes["InputMediaAudio"];
+/** Represents a general file to be sent. */
+export declare type InputMediaDocument = GrammyTypes["InputMediaDocument"];

package/out/types.node.js

@@ -0,0 +1,93 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InputFile = void 0;
+const platform_node_1 = require("./platform.node");
+const path_1 = require("path");
+const node_fetch_1 = require("node-fetch");
+const url_1 = require("url");
+const fs_1 = require("fs");
+const debug = (0, platform_node_1.debug)("grammy:warn");
+__exportStar(require("@grammyjs/types"), exports);
+// === InputFile handling and File augmenting
+/**
+ * An `InputFile` wraps a number of different sources for [sending
+ * files](https://grammy.dev/guide/files.html#uploading-your-own-file).
+ *
+ * It corresponds to the `InputFile` type in the [Telegram Bot API
+ * Reference](https://core.telegram.org/bots/api#inputfile).
+ */
+class InputFile {
+    /**
+     * Constructs an `InputFile` that can be used in the API to send files.
+     *
+     * @param file A path to a local file or a `Buffer` or a `fs.ReadStream` that specifies the file data
+     * @param filename Optional name of the file
+     */
+    constructor(file, filename) {
+        this.consumed = false;
+        this.fileData = file;
+        filename !== null && filename !== void 0 ? filename : (filename = this.guessFilename(file));
+        this.filename = filename;
+        if (typeof file === "string" &&
+            (file.startsWith("http:") || file.startsWith("https:"))) {
+            debug(`InputFile received the local file path '${file}' that looks like a URL. Is this a mistake?`);
+        }
+    }
+    guessFilename(file) {
+        if (typeof file === "string")
+            return (0, path_1.basename)(file);
+        if (typeof file !== "object")
+            return undefined;
+        if ("url" in file)
+            return (0, path_1.basename)(file.url);
+        if (!(file instanceof url_1.URL))
+            return undefined;
+        return (0, path_1.basename)(file.pathname) || (0, path_1.basename)(file.hostname);
+    }
+    [platform_node_1.toRaw]() {
+        if (this.consumed) {
+            throw new Error("Cannot reuse InputFile data source!");
+        }
+        const data = this.fileData;
+        // Handle local files
+        if (typeof data === "string")
+            return (0, fs_1.createReadStream)(data);
+        // Handle URLs and URLLike objects
+        if (data instanceof url_1.URL) {
+            return data.protocol === "file" // node-fetch does not support file URLs
+                ? (0, fs_1.createReadStream)(data.pathname)
+                : fetchFile(data);
+        }
+        if ("url" in data)
+            return fetchFile(data.url);
+        // Mark streams and iterators as consumed
+        if (!(data instanceof Uint8Array))
+            this.consumed = true;
+        // Return buffers and byte streams as-is
+        return data;
+    }
+}
+exports.InputFile = InputFile;
+async function* fetchFile(url) {
+    const { body } = await (0, node_fetch_1.default)(url);
+    for await (const chunk of body) {
+        if (typeof chunk === "string") {
+            throw new Error(`Could not transfer file, received string data instead of bytes from '${url}'`);
+        }
+        yield chunk;
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "grammy",
     "description": "The Telegram Bot Framework.",
-    "version": "1.8.1",
+    "version": "1.9.0",
     "author": "KnorpelSenf",
     "license": "MIT",
     "engines": {
@@ -14,16 +14,11 @@
     },
     "scripts": {
         "prepare": "npm run backport",
-        "cache": "deno cache src/mod.ts",
-        "lint": "deno lint --config deno.json",
-        "fmt": "deno fmt --config deno.json",
-        "test": "deno test ./test/",
-        "bundle": "cd bundling && ./bundle-all.sh",
         "backport": "deno2node tsconfig.json",
         "contribs": "all-contributors"
     },
     "dependencies": {
-        "@grammyjs/types": "^2.7.0",
+        "@grammyjs/types": "^2.8.0",
         "abort-controller": "^3.0.0",
         "debug": "^4.3.4",
         "node-fetch": "^2.6.7"
@@ -31,7 +26,7 @@
     "devDependencies": {
         "@types/debug": "^4.1.7",
         "@types/node": "^12.20.50",
-        "@types/node-fetch": "^2.6.1",
+        "@types/node-fetch": "^2.6.2",
         "all-contributors-cli": "^6.20.0",
         "deno2node": "^1.3.0"
     },