grammy 1.22.4 → 1.23.1

package/README.md

@@ -10,7 +10,7 @@
 
 <!-- deno-fmt-ignore-start -->
 
-[![Bot API](https://img.shields.io/badge/Bot%20API-7.2-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.3-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-)
@@ -288,6 +288,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="11.11%"><a href="https://linktr.ee/joshgillies"><img src="https://avatars.githubusercontent.com/u/319694?v=4?s=100" width="100px;" alt="Josh Gillies"/><br /><sub><b>Josh Gillies</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=joshgillies" title="Code">💻</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://secondthunder.github.io"><img src="https://avatars.githubusercontent.com/u/36604233?v=4?s=100" width="100px;" alt="Uladzislau Hramyka"/><br /><sub><b>Uladzislau Hramyka</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3ASecondThundeR" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="11.11%"><a href="http://gabelluardo.github.io"><img src="https://avatars.githubusercontent.com/u/42920247?v=4?s=100" width="100px;" alt="Gabriele Belluardo"/><br /><sub><b>Gabriele Belluardo</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Agabelluardo" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=gabelluardo" title="Code">💻</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://github.com/dimpurr"><img src="https://avatars.githubusercontent.com/u/5173244?v=4?s=100" width="100px;" alt="Dim Chen"/><br /><sub><b>Dim Chen</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adimpurr" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=dimpurr" title="Code">💻</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="http://www.fwqaq.us"><img src="https://avatars.githubusercontent.com/u/82551626?v=4?s=100" width="100px;" alt="fwqaaq"/><br /><sub><b>fwqaaq</b></sub></a><br /><a href="#ideas-fwqaaq" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/commits?author=fwqaaq" title="Code">💻</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://github.com/janek"><img src="https://avatars.githubusercontent.com/u/2146927?v=4?s=100" width="100px;" alt="Janek Szynal"/><br /><sub><b>Janek Szynal</b></sub></a><br /><a href="#ideas-janek" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://github.com/mordv"><img src="https://avatars.githubusercontent.com/u/32086218?v=4?s=100" width="100px;" alt="Alexander Mordvinov"/><br /><sub><b>Alexander Mordvinov</b></sub></a><br /><a href="#ideas-mordv" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="http://zi.vc/"><img src="https://avatars.githubusercontent.com/u/4239224?v=4?s=100" width="100px;" alt="Ash"/><br /><sub><b>Ash</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Azivc" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://github.com/winstxnhdw"><img src="https://avatars.githubusercontent.com/u/56998716?v=4?s=100" width="100px;" alt="Winston H."/><br /><sub><b>Winston H.</b></sub></a><br /><a href="#ideas-winstxnhdw" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/grammyjs/grammY/commits?author=winstxnhdw" title="Code">💻</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Awinstxnhdw" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=winstxnhdw" title="Tests">⚠️</a></td>
     </tr>
   </tbody>
 </table>

package/out/bot.js

@@ -284,19 +284,24 @@ a known bot info object.");
             debug("Simple long polling already running!");
             return;
         }
-        else {
-            this.pollingRunning = true;
-            this.pollingAbortController = new shim_node_js_1.AbortController();
+        this.pollingRunning = true;
+        this.pollingAbortController = new shim_node_js_1.AbortController();
+        try {
+            setup.push(withRetries(async () => {
+                var _a;
+                await this.api.deleteWebhook({
+                    drop_pending_updates: options === null || options === void 0 ? void 0 : options.drop_pending_updates,
+                }, (_a = this.pollingAbortController) === null || _a === void 0 ? void 0 : _a.signal);
+            }, (_b = this.pollingAbortController) === null || _b === void 0 ? void 0 : _b.signal));
+            await Promise.all(setup);
+            // All async ops of setup complete, run callback
+            await ((_c = options === null || options === void 0 ? void 0 : options.onStart) === null || _c === void 0 ? void 0 : _c.call(options, this.botInfo));
+        }
+        catch (err) {
+            this.pollingRunning = false;
+            this.pollingAbortController = undefined;
+            throw err;
         }
-        setup.push(withRetries(async () => {
-            var _a;
-            await this.api.deleteWebhook({
-                drop_pending_updates: options === null || options === void 0 ? void 0 : options.drop_pending_updates,
-            }, (_a = this.pollingAbortController) === null || _a === void 0 ? void 0 : _a.signal);
-        }, (_b = this.pollingAbortController) === null || _b === void 0 ? void 0 : _b.signal));
-        await Promise.all(setup);
-        // All async ops of setup complete, run callback
-        await ((_c = options === null || options === void 0 ? void 0 : options.onStart) === null || _c === void 0 ? void 0 : _c.call(options, this.botInfo));
         // Bot was stopped during `onStart`
         if (!this.pollingRunning)
             return;
@@ -413,12 +418,8 @@ a known bot info object.");
         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.");
+            // rethrow upon unauthorized or conflict
+            if (error.error_code === 401 || error.error_code === 409) {
                 throw error;
             }
             else if (error.error_code === 429) {

package/out/context.d.ts

@@ -1,7 +1,7 @@
 import { type Api, type Other as OtherApi } from "./core/api.js";
 import { type Methods, type RawApi } from "./core/client.js";
 import { type Filter, type FilterCore, type FilterQuery } from "./filter.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 MessageEntity, type PassportElementError, type ReactionType, type ReactionTypeEmoji, type Update, type User, type UserFromGetMe } from "./types.js";
+import { type Chat, type ChatPermissions, type InlineQueryResult, type InputFile, type InputMedia, type InputMediaAudio, type InputMediaDocument, type InputMediaPhoto, type InputMediaVideo, type InputPollOption, type LabeledPrice, type Message, type MessageEntity, type PassportElementError, type ReactionType, type ReactionTypeEmoji, type Update, type User, type UserFromGetMe } from "./types.js";
 export type MaybeArray<T> = T | T[];
 export type StringWithSuggestions<S extends string> = (string & Record<never, never>) | S;
 type Other<M extends Methods<RawApi>, X extends string = never> = OtherApi<RawApi, M, X>;
@@ -231,6 +231,11 @@ export declare class Context implements RenamedUpdate {
      * this.messageReactionCount?.message_id`.
      */
     get msgId(): number | undefined;
+    /**
+     * Gets the chat identifier from wherever possible. Alias for `this.chat?.id
+     * ?? this.businessConnection?.user_chat_id`.
+     */
+    get chatId(): number | undefined;
     /**
      * Get the inline message identifier from wherever possible. Alias for
      * `(ctx.callbackQuery ?? ctx.chosenInlineResult)?.inline_message_id`.
@@ -606,7 +611,7 @@ export declare class Context implements RenamedUpdate {
      *
      * **Official reference:** https://core.telegram.org/bots/api#sendpoll
      */
-    replyWithPoll(question: string, options: readonly string[], other?: Other<"sendPoll", "chat_id" | "question" | "options">, signal?: AbortSignal): Promise<Message.PollMessage>;
+    replyWithPoll(question: string, options: InputPollOption[], other?: Other<"sendPoll", "chat_id" | "question" | "options">, signal?: AbortSignal): Promise<Message.PollMessage>;
     /**
      * Context-aware alias for `api.sendDice`. Use this method to send an animated emoji that will display a random value. On success, the sent Message is returned.
      *
@@ -929,7 +934,7 @@ export declare class Context implements RenamedUpdate {
      *
      * **Official reference:** https://core.telegram.org/bots/api#getchat
      */
-    getChat(signal?: AbortSignal): Promise<import("@grammyjs/types/manage.js").ChatFromGetChat>;
+    getChat(signal?: AbortSignal): Promise<import("@grammyjs/types/manage.js").ChatFullInfo>;
     /**
      * Context-aware alias for `api.getChatAdministrators`. Use this method to get a list of administrators in a chat, which aren't bots. Returns an Array of ChatMember objects.
      *