grammy 1.30.0 → 1.30.1

package/README.md

@@ -10,7 +10,7 @@
 
 <!-- deno-fmt-ignore-start -->
 
-[![Bot API](https://img.shields.io/badge/Bot%20API-7.9-blue?logo=telegram&style=flat&labelColor=000&color=3b82f6)](https://core.telegram.org/bots/api)
+[![Bot API](https://img.shields.io/badge/Bot%20API-7.10-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-)
@@ -142,7 +142,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <table>
   <tbody>
     <tr>
-      <td align="center" valign="top" width="11.11%"><a href="https://github.com/KnorpelSenf"><img src="https://avatars.githubusercontent.com/u/12952387?v=4?s=100" width="100px;" alt="KnorpelSenf"/><br /><sub><b>KnorpelSenf</b></sub></a><br /><a href="#ideas-KnorpelSenf" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/commits?author=KnorpelSenf" title="Code">💻</a> <a href="https://github.com/grammyjs/grammY/commits?author=KnorpelSenf" title="Documentation">📖</a> <a href="#design-KnorpelSenf" title="Design">🎨</a> <a href="#example-KnorpelSenf" title="Examples">💡</a> <a href="https://github.com/grammyjs/grammY/commits?author=KnorpelSenf" title="Tests">⚠️</a> <a href="#plugin-KnorpelSenf" title="Plugin/utility libraries">🔌</a> <a href="#platform-KnorpelSenf" title="Packaging/porting to new platform">📦</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AKnorpelSenf" title="Reviewed Pull Requests">👀</a> <a href="#mentoring-KnorpelSenf" title="Mentoring">🧑‍🏫</a> <a href="#projectManagement-KnorpelSenf" title="Project Management">📆</a> <a href="#infra-KnorpelSenf" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#audio-KnorpelSenf" title="Audio">🔊</a> <a href="#a11y-KnorpelSenf" title="Accessibility">️️️️♿️</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://github.com/KnorpelSenf"><img src="https://avatars.githubusercontent.com/u/12952387?v=4?s=100" width="100px;" alt="KnorpelSenf"/><br /><sub><b>KnorpelSenf</b></sub></a><br /><a href="#ideas-KnorpelSenf" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/commits?author=KnorpelSenf" title="Code">💻</a> <a href="https://github.com/grammyjs/grammY/commits?author=KnorpelSenf" title="Documentation">📖</a> <a href="#design-KnorpelSenf" title="Design">🎨</a> <a href="#example-KnorpelSenf" title="Examples">💡</a> <a href="https://github.com/grammyjs/grammY/commits?author=KnorpelSenf" title="Tests">⚠️</a> <a href="#plugin-KnorpelSenf" title="Plugin/utility libraries">🔌</a> <a href="#platform-KnorpelSenf" title="Packaging/porting to new platform">📦</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AKnorpelSenf" title="Reviewed Pull Requests">👀</a> <a href="#mentoring-KnorpelSenf" title="Mentoring">🧑‍🏫</a> <a href="#projectManagement-KnorpelSenf" title="Project Management">📆</a> <a href="#infra-KnorpelSenf" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#audio-KnorpelSenf" title="Audio">🔊</a> <a href="#a11y-KnorpelSenf" title="Accessibility">️️️️♿️</a> <a href="#talk-KnorpelSenf" title="Talks">📢</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/HeeroML"><img src="https://avatars.githubusercontent.com/u/42873000?v=4?s=100" width="100px;" alt="Heero"/><br /><sub><b>Heero</b></sub></a><br /><a href="#plugin-HeeroML" title="Plugin/utility libraries">🔌</a> <a href="#userTesting-HeeroML" title="User Testing">📓</a> <a href="#example-HeeroML" title="Examples">💡</a> <a href="https://github.com/grammyjs/grammY/commits?author=HeeroML" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AHeeroML" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=HeeroML" title="Code">💻</a> <a href="#ideas-HeeroML" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/wojpawlik"><img src="https://avatars.githubusercontent.com/u/23058303?v=4?s=100" width="100px;" alt="Wojciech Pawlik"/><br /><sub><b>Wojciech Pawlik</b></sub></a><br /><a href="#ideas-wojpawlik" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Awojpawlik" title="Reviewed Pull Requests">👀</a> <a href="#infra-wojpawlik" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#platform-wojpawlik" title="Packaging/porting to new platform">📦</a> <a href="#tool-wojpawlik" title="Tools">🔧</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/MegaITA"><img src="https://avatars.githubusercontent.com/u/32493080?v=4?s=100" width="100px;" alt="Alessandro Bertozzi"/><br /><sub><b>Alessandro Bertozzi</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=MegaITA" title="Documentation">📖</a></td>
@@ -309,6 +309,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/rayz1065"><img src="https://avatars.githubusercontent.com/u/37779815?v=4?s=100" width="100px;" alt="rayz"/><br /><sub><b>rayz</b></sub></a><br /><a href="#question-rayz1065" title="Answering Questions">💬</a> <a href="#ideas-rayz1065" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/commits?author=rayz1065" title="Code">💻</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/z44d"><img src="https://avatars.githubusercontent.com/u/162994967?v=4?s=100" width="100px;" alt="Zaid"/><br /><sub><b>Zaid</b></sub></a><br /><a href="#tool-z44d" title="Tools">🔧</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://github.com/matmilbury"><img src="https://avatars.githubusercontent.com/u/73319876?v=4?s=100" width="100px;" alt="Mat Milbury"/><br /><sub><b>Mat Milbury</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Amatmilbury" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=matmilbury" title="Code">💻</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://lao.sb/"><img src="https://avatars.githubusercontent.com/u/2545261?v=4?s=100" width="100px;" alt="Shibo Lyu"/><br /><sub><b>Shibo Lyu</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=laosb" title="Code">💻</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://nometa.xyz/"><img src="https://avatars.githubusercontent.com/u/68379695?v=4?s=100" width="100px;" alt="Mased"/><br /><sub><b>Mased</b></sub></a><br /><a href="#translation-MasedMSD" title="Translation">🌍</a> <a href="https://github.com/grammyjs/grammY/commits?author=MasedMSD" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://github.com/ExposedCat"><img src="https://avatars.githubusercontent.com/u/44642024?v=4?s=100" width="100px;" alt="Artem Prokop"/><br /><sub><b>Artem Prokop</b></sub></a><br /><a href="#userTesting-ExposedCat" title="User Testing">📓</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://chinoman10.com/"><img src="https://avatars.githubusercontent.com/u/8300763?v=4?s=100" width="100px;" alt="Sérgio Rebelo"/><br /><sub><b>Sérgio Rebelo</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AChinoman10" title="Reviewed Pull Requests">👀</a></td>
     </tr>
   </tbody>
 </table>

package/out/bot.d.ts

@@ -21,11 +21,11 @@ export interface PollingOptions {
     timeout?: number;
     /**
      * A list of the update types you want your bot to receive. For example,
-     * specify [“message”, “edited_channel_post”, “callback_query”] to only
+     * specify ["message", "edited_channel_post", "callback_query"] to only
      * receive updates of these types. See Update for a complete list of
      * available update types. Specify an empty list to receive all update types
-     * except chat_member (default). If not specified, the previous setting will
-     * be used.
+     * except chat_member, message_reaction, and message_reaction_count
+     * (default). If not specified, the previous setting will be used.
      *
      * Please note that this parameter doesn't affect updates created before the
      * call to the getUpdates, so unwanted updates may be received for a short
@@ -43,6 +43,9 @@ export interface PollingOptions {
      * fetched. The bot information `bot.botInfo` will be available when the
      * function is run. For convenience, the callback function receives the
      * value of `bot.botInfo` as an argument.
+     *
+     * When this function is invoked, the bot already signals that it is
+     * running. In other words, `bot.isRunning()` already returns true.
      */
     onStart?: (botInfo: UserFromGetMe) => void | Promise<void>;
 }
@@ -260,6 +263,21 @@ export declare class Bot<C extends Context = Context, A extends Api = Api> exten
      * > for the promise returned by `bot.start()` to resolve.
      */
     stop(): Promise<void>;
+    /**
+     * Returns true if the bot is currently running via built-in long polling,
+     * and false otherwise.
+     *
+     * If this method returns true, it means that `bot.start()` has been called,
+     * and that the bot has neither crashed nor was it stopped via a call to
+     * `bot.stop()`. This also means that you cannot use this method to check if
+     * a webhook server is running, or if grammY runner was started.
+     *
+     * Note that this method will already begin to return true even before the
+     * call to `bot.start()` has completed its initialization phase (and hence
+     * before `bot.isInited()` returns true). By extension, this method
+     * returns true before `onStart` callback of `bot.start()` is invoked.
+     */
+    isRunning(): boolean;
     /**
      * Sets the bots error handler that is used during long polling.
      *

package/out/bot.js

@@ -346,6 +346,23 @@ a known bot info object.");
             debug("Bot is not running!");
         }
     }
+    /**
+     * Returns true if the bot is currently running via built-in long polling,
+     * and false otherwise.
+     *
+     * If this method returns true, it means that `bot.start()` has been called,
+     * and that the bot has neither crashed nor was it stopped via a call to
+     * `bot.stop()`. This also means that you cannot use this method to check if
+     * a webhook server is running, or if grammY runner was started.
+     *
+     * Note that this method will already begin to return true even before the
+     * call to `bot.start()` has completed its initialization phase (and hence
+     * before `bot.isInited()` returns true). By extension, this method
+     * returns true before `onStart` callback of `bot.start()` is invoked.
+     */
+    isRunning() {
+        return this.pollingRunning;
+    }
     /**
      * Sets the bots error handler that is used during long polling.
      *
@@ -370,17 +387,22 @@ a known bot info object.");
         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 = (_b = options === null || options === void 0 ? void 0 : options.allowed_updates) !== null && _b !== void 0 ? _b : []; // reset to default if unspecified
-        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 some traffic by only sending it in the first request
-            allowed_updates = undefined;
+        try {
+            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 some traffic by only sending it in the first request
+                allowed_updates = undefined;
+            }
+        }
+        finally {
+            this.pollingRunning = false;
         }
     }
     /**

package/out/convenience/inline_query.d.ts

@@ -163,7 +163,7 @@ export declare const InlineQueryResultBuilder: {
      * @param options Remaining options
      */
     game(id: string, game_short_name: string, options?: InlineQueryResultOptions<InlineQueryResultGame, "game_short_name">): {
-        reply_markup?: import("@grammyjs/types/markup.js").InlineKeyboardMarkup;
+        reply_markup?: import("@grammyjs/types/markup.js").InlineKeyboardMarkup | undefined;
         type: string;
         id: string;
         game_short_name: string;

package/out/convenience/webhook.js

@@ -12,6 +12,14 @@ const callbackAdapter = (update, callback, header, unauthorized = () => callback
 });
 const adapters = { ...frameworks_js_1.adapters, callback: callbackAdapter };
 function webhookCallback(bot, adapter = platform_node_js_1.defaultAdapter, onTimeout, timeoutMilliseconds, secretToken) {
+    if (bot.isRunning()) {
+        throw new Error("Bot is already running via long polling, the webhook setup won't receive any updates!");
+    }
+    else {
+        bot.start = () => {
+            throw new Error("You already started the bot via webhooks, calling `bot.start()` starts the bot with long polling and this will prevent your webhook setup from receiving any updates!");
+        };
+    }
     const { onTimeout: timeout = "throw", timeoutMilliseconds: ms = 10000, secretToken: token, } = typeof onTimeout === "object"
         ? onTimeout
         : { onTimeout, timeoutMilliseconds, secretToken };

package/out/web.mjs

@@ -3465,6 +3465,9 @@ a known bot info object.");
             debug2("Bot is not running!");
         }
     }
+    isRunning() {
+        return this.pollingRunning;
+    }
     catch(errorHandler) {
         this.errorHandler = errorHandler;
     }
@@ -3472,15 +3475,19 @@ a known bot info object.");
         const limit = options?.limit;
         const timeout = options?.timeout ?? 30;
         let allowed_updates = options?.allowed_updates ?? [];
-        while(this.pollingRunning){
-            const updates = await this.fetchUpdates({
-                limit,
-                timeout,
-                allowed_updates
-            });
-            if (updates === undefined) break;
-            await this.handleUpdates(updates);
-            allowed_updates = undefined;
+        try {
+            while(this.pollingRunning){
+                const updates = await this.fetchUpdates({
+                    limit,
+                    timeout,
+                    allowed_updates
+                });
+                if (updates === undefined) break;
+                await this.handleUpdates(updates);
+                allowed_updates = undefined;
+            }
+        } finally{
+            this.pollingRunning = false;
         }
     }
     async fetchUpdates({ limit, timeout, allowed_updates }) {
@@ -4899,6 +4906,13 @@ const adapters1 = {
     callback: callbackAdapter
 };
 function webhookCallback(bot, adapter = defaultAdapter, onTimeout, timeoutMilliseconds, secretToken) {
+    if (bot.isRunning()) {
+        throw new Error("Bot is already running via long polling, the webhook setup won't receive any updates!");
+    } else {
+        bot.start = ()=>{
+            throw new Error("You already started the bot via webhooks, calling `bot.start()` starts the bot with long polling and this will prevent your webhook setup from receiving any updates!");
+        };
+    }
     const { onTimeout: timeout = "throw", timeoutMilliseconds: ms = 10_000, secretToken: token } = typeof onTimeout === "object" ? onTimeout : {
         onTimeout,
         timeoutMilliseconds,

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "grammy",
     "description": "The Telegram Bot Framework.",
-    "version": "1.30.0",
+    "version": "1.30.1",
     "author": "KnorpelSenf",
     "license": "MIT",
     "engines": {