feat: add support for Bot API 6.6

README.md

@@ -10,7 +10,7 @@
 
 <!-- deno-fmt-ignore-start -->
 
-[![Bot API](https://img.shields.io/badge/Bot%20API-6.5-blue?logo=telegram&style=flat&labelColor=000&color=3b82f6)](https://core.telegram.org/bots/api)
+[![Bot API](https://img.shields.io/badge/Bot%20API-6.6-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.jsonc

@@ -17,6 +17,7 @@
         },
         "files": {
             "exclude": [
+                "./deno_cache/",
                 "./node_modules/",
                 "./out/",
                 "./package-lock.json",
@@ -28,6 +29,7 @@
     "lint": {
         "files": {
             "exclude": [
+                "./deno_cache/",
                 "./node_modules/",
                 "./out/",
                 "./package-lock.json",

package.json

@@ -18,7 +18,7 @@
         "contribs": "all-contributors"
     },
     "dependencies": {
-        "@grammyjs/types": "^2.12.1",
+        "@grammyjs/types": "^3.0.1",
         "abort-controller": "^3.0.0",
         "debug": "^4.3.4",
         "node-fetch": "^2.6.9"

src/context.ts

@@ -2143,7 +2143,7 @@ export class Context implements RenamedUpdate {
      * @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 Payments provider token, obtained via BotFather
+     * @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 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

src/platform.deno.ts

@@ -17,7 +17,7 @@ if (isDeno) {
 
 // === Export system-specific operations
 // Turn an AsyncIterable<Uint8Array> into a stream
-export { readableStreamFromIterable as itrToStream } from "https://deno.land/std@0.176.0/streams/mod.ts";
+export { readableStreamFromIterable as itrToStream } from "https://deno.land/std@0.178.0/streams/mod.ts";
 
 // === Base configuration for `fetch` calls
 export const baseFetchConfig = (_apiRoot: string) => ({});

src/platform.web.ts

@@ -3,7 +3,7 @@ export { d as debug };
 
 // === Export system-specific operations
 // Turn an AsyncIterable<Uint8Array> into a stream
-export { readableStreamFromIterable as itrToStream } from "https://deno.land/std@0.176.0/streams/mod.ts";
+export { readableStreamFromIterable as itrToStream } from "https://deno.land/std@0.178.0/streams/mod.ts";
 
 // === Base configuration for `fetch` calls
 export const baseFetchConfig = (_apiRoot: string) => ({});

src/types.deno.ts

@@ -1,13 +1,23 @@
 // === Needed imports
-import { basename } from "https://deno.land/[email protected]/path/mod.ts";
-import { iterateReader } from "https://deno.land/[email protected]/streams/mod.ts";
-import { type InputFileProxy } from "https://esm.sh/@grammyjs/[email protected]";
+import { basename } from "https://deno.land/[email protected]/path/mod.ts";
+import { iterateReader } from "https://deno.land/[email protected]/streams/mod.ts";
 import { debug as d, isDeno, toRaw } from "./platform.deno.ts";
+import {
+    type ApiMethods as ApiMethodsF,
+    type InputMedia as InputMediaF,
+    type InputMediaAnimation as InputMediaAnimationF,
+    type InputMediaAudio as InputMediaAudioF,
+    type InputMediaDocument as InputMediaDocumentF,
+    type InputMediaPhoto as InputMediaPhotoF,
+    type InputMediaVideo as InputMediaVideoF,
+    type InputSticker as InputStickerF,
+    type Opts as OptsF,
+} from "https://deno.land/x/[email protected]/mod.ts";
 
 const debug = d("grammy:warn");
 
 // === Export all API types
-export * from "https://esm.sh/@grammyjs/[email protected]";
+export * from "https://deno.land/x/[email protected]/mod.ts";
 
 /** Something that looks like a URL. */
 interface URLLike {
@@ -118,29 +128,29 @@ function isDenoFile(data: unknown): data is Deno.FsFile {
 }
 
 // === Export InputFile types
-type GrammyTypes = InputFileProxy<InputFile>;
-
 /** Wrapper type to bundle all methods of the Telegram API */
-export type ApiMethods = GrammyTypes["Telegram"];
+export type ApiMethods = ApiMethodsF<InputFile>;
 
 /** Utility type providing the argument type for the given method name or `{}` if the method does not take any parameters */
-export type Opts<M extends keyof GrammyTypes["Telegram"]> =
-    GrammyTypes["Opts"][M];
+export type Opts<M extends keyof ApiMethods> = OptsF<InputFile>[M];
+
+/** This object describes a sticker to be added to a sticker set. */
+export type InputSticker = InputStickerF<InputFile>;
 
 /** This object represents the content of a media message to be sent. It should be one of
 - InputMediaAnimation
 - InputMediaDocument
 - InputMediaAudio
 - InputMediaPhoto
 - InputMediaVideo */
-export type InputMedia = GrammyTypes["InputMedia"];
+export type InputMedia = InputMediaF<InputFile>;
 /** Represents a photo to be sent. */
-export type InputMediaPhoto = GrammyTypes["InputMediaPhoto"];
+export type InputMediaPhoto = InputMediaPhotoF<InputFile>;
 /** Represents a video to be sent. */
-export type InputMediaVideo = GrammyTypes["InputMediaVideo"];
+export type InputMediaVideo = InputMediaVideoF<InputFile>;
 /** Represents an animation file (GIF or H.264/MPEG-4 AVC video without sound) to be sent. */
-export type InputMediaAnimation = GrammyTypes["InputMediaAnimation"];
+export type InputMediaAnimation = InputMediaAnimationF<InputFile>;
 /** Represents an audio file to be treated as music to be sent. */
-export type InputMediaAudio = GrammyTypes["InputMediaAudio"];
+export type InputMediaAudio = InputMediaAudioF<InputFile>;
 /** Represents a general file to be sent. */
-export type InputMediaDocument = GrammyTypes["InputMediaDocument"];
+export type InputMediaDocument = InputMediaDocumentF<InputFile>;

src/types.node.ts

@@ -1,5 +1,15 @@
 // === Needed imports
-import { type InputFileProxy } from "@grammyjs/types";
+import {
+    type ApiMethods as ApiMethodsF,
+    type InputMedia as InputMediaF,
+    type InputMediaAnimation as InputMediaAnimationF,
+    type InputMediaAudio as InputMediaAudioF,
+    type InputMediaDocument as InputMediaDocumentF,
+    type InputMediaPhoto as InputMediaPhotoF,
+    type InputMediaVideo as InputMediaVideoF,
+    type InputSticker as InputStickerF,
+    type Opts as OptsF,
+} from "@grammyjs/types";
 import { createReadStream, type ReadStream } from "fs";
 import fetch from "node-fetch";
 import { basename } from "path";
@@ -110,29 +120,29 @@ async function* fetchFile(url: string | URL): AsyncIterable<Uint8Array> {
 }
 
 // === Export InputFile types
-type GrammyTypes = InputFileProxy<InputFile>;
-
 /** Wrapper type to bundle all methods of the Telegram API */
-export type ApiMethods = GrammyTypes["Telegram"];
+export type ApiMethods = ApiMethodsF<InputFile>;
 
 /** Utility type providing the argument type for the given method name or `{}` if the method does not take any parameters */
-export type Opts<M extends keyof GrammyTypes["Telegram"]> =
-    GrammyTypes["Opts"][M];
+export type Opts<M extends keyof ApiMethods> = OptsF<InputFile>[M];
+
+/** This object describes a sticker to be added to a sticker set. */
+export type InputSticker = InputStickerF<InputFile>;
 
 /** This object represents the content of a media message to be sent. It should be one of
 - InputMediaAnimation
 - InputMediaDocument
 - InputMediaAudio
 - InputMediaPhoto
 - InputMediaVideo */
-export type InputMedia = GrammyTypes["InputMedia"];
+export type InputMedia = InputMediaF<InputFile>;
 /** Represents a photo to be sent. */
-export type InputMediaPhoto = GrammyTypes["InputMediaPhoto"];
+export type InputMediaPhoto = InputMediaPhotoF<InputFile>;
 /** Represents a video to be sent. */
-export type InputMediaVideo = GrammyTypes["InputMediaVideo"];
+export type InputMediaVideo = InputMediaVideoF<InputFile>;
 /** Represents an animation file (GIF or H.264/MPEG-4 AVC video without sound) to be sent. */
-export type InputMediaAnimation = GrammyTypes["InputMediaAnimation"];
+export type InputMediaAnimation = InputMediaAnimationF<InputFile>;
 /** Represents an audio file to be treated as music to be sent. */
-export type InputMediaAudio = GrammyTypes["InputMediaAudio"];
+export type InputMediaAudio = InputMediaAudioF<InputFile>;
 /** Represents a general file to be sent. */
-export type InputMediaDocument = GrammyTypes["InputMediaDocument"];
+export type InputMediaDocument = InputMediaDocumentF<InputFile>;

src/types.web.ts

@@ -1,10 +1,20 @@
 // === Needed imports
-import { basename } from "https://deno.land/[email protected]/path/mod.ts";
-import { type InputFileProxy } from "https://esm.sh/@grammyjs/[email protected]";
+import { basename } from "https://deno.land/[email protected]/path/mod.ts";
+import {
+    type ApiMethods as ApiMethodsF,
+    type InputMedia as InputMediaF,
+    type InputMediaAnimation as InputMediaAnimationF,
+    type InputMediaAudio as InputMediaAudioF,
+    type InputMediaDocument as InputMediaDocumentF,
+    type InputMediaPhoto as InputMediaPhotoF,
+    type InputMediaVideo as InputMediaVideoF,
+    type InputSticker as InputStickerF,
+    type Opts as OptsF,
+} from "https://deno.land/x/[email protected]/mod.ts";
 import { toRaw } from "./platform.deno.ts";
 
 // === Export all API types
-export * from "https://esm.sh/@grammyjs/[email protected]";
+export * from "https://deno.land/x/[email protected]/mod.ts";
 
 /** Something that looks like a URL. */
 interface URLLike {
@@ -90,29 +100,29 @@ async function* fetchFile(url: string | URL): AsyncIterable<Uint8Array> {
 }
 
 // === Export InputFile types
-type GrammyTypes = InputFileProxy<InputFile>;
-
 /** Wrapper type to bundle all methods of the Telegram API */
-export type ApiMethods = GrammyTypes["Telegram"];
+export type ApiMethods = ApiMethodsF<InputFile>;
 
 /** Utility type providing the argument type for the given method name or `{}` if the method does not take any parameters */
-export type Opts<M extends keyof GrammyTypes["Telegram"]> =
-    GrammyTypes["Opts"][M];
+export type Opts<M extends keyof ApiMethods> = OptsF<InputFile>[M];
+
+/** This object describes a sticker to be added to a sticker set. */
+export type InputSticker = InputStickerF<InputFile>;
 
 /** This object represents the content of a media message to be sent. It should be one of
 - InputMediaAnimation
 - InputMediaDocument
 - InputMediaAudio
 - InputMediaPhoto
 - InputMediaVideo */
-export type InputMedia = GrammyTypes["InputMedia"];
+export type InputMedia = InputMediaF<InputFile>;
 /** Represents a photo to be sent. */
-export type InputMediaPhoto = GrammyTypes["InputMediaPhoto"];
+export type InputMediaPhoto = InputMediaPhotoF<InputFile>;
 /** Represents a video to be sent. */
-export type InputMediaVideo = GrammyTypes["InputMediaVideo"];
+export type InputMediaVideo = InputMediaVideoF<InputFile>;
 /** Represents an animation file (GIF or H.264/MPEG-4 AVC video without sound) to be sent. */
-export type InputMediaAnimation = GrammyTypes["InputMediaAnimation"];
+export type InputMediaAnimation = InputMediaAnimationF<InputFile>;
 /** Represents an audio file to be treated as music to be sent. */
-export type InputMediaAudio = GrammyTypes["InputMediaAudio"];
+export type InputMediaAudio = InputMediaAudioF<InputFile>;
 /** Represents a general file to be sent. */
-export type InputMediaDocument = GrammyTypes["InputMediaDocument"];
+export type InputMediaDocument = InputMediaDocumentF<InputFile>;

test/bot.test.ts

@@ -2,7 +2,7 @@ import { Bot } from "../src/bot.ts";
 import {
     assertEquals,
     assertThrows,
-} from "https://deno.land/std@0.176.0/testing/asserts.ts";
+} from "https://deno.land/std@0.178.0/testing/asserts.ts";
 
 function createBot(token: string) {
     return new Bot(token);

test/composer.test.ts

@@ -3,13 +3,13 @@ import { type Context } from "../src/mod.ts";
 import {
     assertEquals,
     assertRejects,
-} from "https://deno.land/std@0.176.0/testing/asserts.ts";
-import { type Spy, spy } from "https://deno.land/std@0.176.0/testing/mock.ts";
+} from "https://deno.land/std@0.178.0/testing/asserts.ts";
+import { type Spy, spy } from "https://deno.land/std@0.178.0/testing/mock.ts";
 import {
     beforeEach,
     describe,
     it,
-} from "https://deno.land/std@0.176.0/testing/bdd.ts";
+} from "https://deno.land/std@0.178.0/testing/bdd.ts";
 
 describe("Composer", () => {
     let composer: Composer<Context>;

test/context.test.ts

@@ -12,8 +12,8 @@ import {
     assertEquals,
     assertFalse,
     assertThrows,
-} from "https://deno.land/std@0.176.0/testing/asserts.ts";
-import { describe, it } from "https://deno.land/std@0.176.0/testing/bdd.ts";
+} from "https://deno.land/std@0.178.0/testing/asserts.ts";
+import { describe, it } from "https://deno.land/std@0.178.0/testing/bdd.ts";
 
 describe("Context", () => {
     const u = { id: 42, first_name: "bot", is_bot: true } as User;

test/convenience/keyboard.test.ts

@@ -1,7 +1,7 @@
 import { InlineKeyboard, Keyboard } from "../../src/convenience/keyboard.ts";
 import { type LoginUrl } from "../../src/types.ts";
-import { assertEquals } from "https://deno.land/std@0.170.0/testing/asserts.ts";
-import { describe, it } from "https://deno.land/std@0.170.0/testing/bdd.ts";
+import { assertEquals } from "https://deno.land/std@0.178.0/testing/asserts.ts";
+import { describe, it } from "https://deno.land/std@0.178.0/testing/bdd.ts";
 
 describe("Keyboard", () => {
     it("should take initial buttons", () => {

test/convenience/session.test.ts

@@ -13,9 +13,9 @@ import {
     assertEquals,
     assertRejects,
     assertThrows,
-} from "https://deno.land/std@0.170.0/testing/asserts.ts";
-import { spy } from "https://deno.land/std@0.170.0/testing/mock.ts";
-import { describe, it } from "https://deno.land/std@0.170.0/testing/bdd.ts";
+} from "https://deno.land/std@0.178.0/testing/asserts.ts";
+import { spy } from "https://deno.land/std@0.178.0/testing/mock.ts";
+import { describe, it } from "https://deno.land/std@0.178.0/testing/bdd.ts";
 
 const TICK_MS = 50;
 const tick = (n = 1) => new Promise((r) => setTimeout(r, n * TICK_MS));

test/core/client.test.ts

@@ -4,14 +4,14 @@ import { type ApiResponse } from "../../src/types.ts";
 import {
     assertEquals,
     assertRejects,
-} from "https://deno.land/std@0.170.0/testing/asserts.ts";
-import { spy, Stub, stub } from "https://deno.land/std@0.170.0/testing/mock.ts";
+} from "https://deno.land/std@0.178.0/testing/asserts.ts";
+import { spy, Stub, stub } from "https://deno.land/std@0.178.0/testing/mock.ts";
 import {
     afterEach,
     beforeEach,
     describe,
     it,
-} from "https://deno.land/std@0.170.0/testing/bdd.ts";
+} from "https://deno.land/std@0.178.0/testing/bdd.ts";
 
 const token = "secret-token";
 

test/core/error.test.ts

@@ -1,6 +1,6 @@
 import { HttpError, toHttpError } from "../../src/core/error.ts";
-import { assertThrows } from "https://deno.land/std@0.170.0/testing/asserts.ts";
-import { describe, it } from "https://deno.land/std@0.170.0/testing/bdd.ts";
+import { assertThrows } from "https://deno.land/std@0.178.0/testing/asserts.ts";
+import { describe, it } from "https://deno.land/std@0.178.0/testing/bdd.ts";
 
 describe("toHttpError", () => {
     it("should throw errors", () => {

test/core/payload.test.ts

@@ -7,12 +7,12 @@ import {
     assert,
     assertEquals,
     assertFalse,
-} from "https://deno.land/std@0.170.0/testing/asserts.ts";
-import { describe, it } from "https://deno.land/std@0.170.0/testing/bdd.ts";
+} from "https://deno.land/std@0.178.0/testing/asserts.ts";
+import { describe, it } from "https://deno.land/std@0.178.0/testing/bdd.ts";
 import {
     readAll,
     readerFromIterable,
-} from "https://deno.land/std@0.170.0/streams/conversion.ts";
+} from "https://deno.land/std@0.178.0/streams/mod.ts";
 
 describe("requiresFormDataUpload", () => {
     it("should ignore primitives", () => {

test/filter.test.ts

@@ -3,8 +3,8 @@ import { type Context } from "../src/mod.ts";
 import {
     assert,
     assertThrows,
-} from "https://deno.land/std@0.176.0/testing/asserts.ts";
-import { describe, it } from "https://deno.land/std@0.176.0/testing/bdd.ts";
+} from "https://deno.land/std@0.178.0/testing/asserts.ts";
+import { describe, it } from "https://deno.land/std@0.178.0/testing/bdd.ts";
 
 describe("matchFilter", () => {
     it("should reject empty filters", () => {