grammy 1.41.0 → 1.41.1

package/out/convenience/inline_query.d.ts

@@ -4,6 +4,7 @@ type OptionalKeys<T> = {
     [K in keyof T]-?: undefined extends T[K] ? K : never;
 };
 type OptionalFields<T> = Pick<T, OptionalKeys<T>[keyof T]>;
+type PartialKeys<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 /**
  * Holds a number of helper methods for building `InlineQueryResult*` objects.
  *
@@ -256,7 +257,7 @@ export declare const InlineQueryResultBuilder: {
      * @param photo_url A valid URL of the photo. Photo must be in JPEG format. Photo size must not exceed 5MB
      * @param options Remaining options
      */
-    photo(id: string, photo_url: string | URL, options?: InlineQueryResultOptions<InlineQueryResultPhoto, "photo_url">): InlineQueryResultPhoto & {
+    photo(id: string, photo_url: string | URL, options?: InlineQueryResultOptions<PartialKeys<InlineQueryResultPhoto, "thumbnail_url">, "photo_url">): InlineQueryResultPhoto & {
         text(message_text: string, options?: OptionalFields<InputTextMessageContent>): InlineQueryResultPhoto;
         location(latitude: number, longitude: number, options?: OptionalFields<InputLocationMessageContent>): InlineQueryResultPhoto;
         venue(title: string, latitude: number, longitude: number, address: string, options: OptionalFields<InputVenueMessageContent>): InlineQueryResultPhoto;

package/out/convenience/inline_query.js

@@ -301,17 +301,15 @@ exports.InlineQueryResultBuilder = {
      * @param photo_url A valid URL of the photo. Photo must be in JPEG format. Photo size must not exceed 5MB
      * @param options Remaining options
      */
-    photo(id, photo_url, options = {
-        thumbnail_url: typeof photo_url === "string"
+    photo(id, photo_url, options = {}) {
+        const photoUrl = typeof photo_url === "string"
             ? photo_url
-            : photo_url.href,
-    }) {
+            : photo_url.href;
         return inputMessage({
             type: "photo",
             id,
-            photo_url: typeof photo_url === "string"
-                ? photo_url
-                : photo_url.href,
+            photo_url: photoUrl,
+            thumbnail_url: photoUrl,
             ...options,
         });
     },

package/out/core/client.js

@@ -45,14 +45,17 @@ class ApiClient {
                 : (0, payload_js_1.createJsonPayload)(payload);
             const sig = controller.signal;
             const options = { ...opts.baseFetchConfig, signal: sig, ...config };
-            // Perform fetch call, and handle networking errors
-            const successPromise = this.fetch(url instanceof URL ? url.href : url, options).catch((0, error_js_1.toHttpError)(method, opts.sensitiveLogs));
+            // Perform fetch call
+            const successPromise = this.fetch(url, options)
+                .then((res) => res.json());
             // Those are the three possible outcomes of the fetch call:
             const operations = [successPromise, streamErr.promise, timeout.promise];
             // Wait for result
             try {
-                const res = await Promise.race(operations);
-                return await res.json();
+                return await Promise.race(operations);
+            }
+            catch (error) {
+                throw (0, error_js_1.toHttpError)(method, opts.sensitiveLogs, error);
             }
             finally {
                 if (timeout.handle !== undefined)

package/out/core/error.d.ts

@@ -50,4 +50,4 @@ export declare class HttpError extends Error {
     /** The thrown error object. */
     error: unknown);
 }
-export declare function toHttpError(method: string, sensitiveLogs: boolean): (err: unknown) => never;
+export declare function toHttpError(method: string, sensitiveLogs: boolean, err: unknown): HttpError;

package/out/core/error.js

@@ -70,18 +70,14 @@ class HttpError extends Error {
 }
 exports.HttpError = HttpError;
 function isTelegramError(err) {
-    return (typeof err === "object" &&
-        err !== null &&
-        "status" in err &&
-        "statusText" in err);
+    return (typeof err === "object" && err !== null &&
+        "status" in err && "statusText" in err);
 }
-function toHttpError(method, sensitiveLogs) {
-    return (err) => {
-        let msg = `Network request for '${method}' failed!`;
-        if (isTelegramError(err))
-            msg += ` (${err.status}: ${err.statusText})`;
-        if (sensitiveLogs && err instanceof Error)
-            msg += ` ${err.message}`;
-        throw new HttpError(msg, err);
-    };
+function toHttpError(method, sensitiveLogs, err) {
+    let msg = `Network request for '${method}' failed!`;
+    if (isTelegramError(err))
+        msg += ` (${err.status}: ${err.statusText})`;
+    if (sensitiveLogs && err instanceof Error)
+        msg += ` ${err.message}`;
+    return new HttpError(msg, err);
 }

package/out/web.mjs

@@ -2306,13 +2306,11 @@ class HttpError extends Error {
 function isTelegramError(err) {
     return typeof err === "object" && err !== null && "status" in err && "statusText" in err;
 }
-function toHttpError(method, sensitiveLogs) {
-    return (err)=>{
-        let msg = `Network request for '${method}' failed!`;
-        if (isTelegramError(err)) msg += ` (${err.status}: ${err.statusText})`;
-        if (sensitiveLogs && err instanceof Error) msg += ` ${err.message}`;
-        throw new HttpError(msg, err);
-    };
+function toHttpError(method, sensitiveLogs, err) {
+    let msg = `Network request for '${method}' failed!`;
+    if (isTelegramError(err)) msg += ` (${err.status}: ${err.statusText})`;
+    if (sensitiveLogs && err instanceof Error) msg += ` ${err.message}`;
+    return new HttpError(msg, err);
 }
 function checkWindows() {
     const global = globalThis;
@@ -2631,15 +2629,16 @@ class ApiClient {
                 signal: sig,
                 ...config
             };
-            const successPromise = this.fetch(url instanceof URL ? url.href : url, options).catch(toHttpError(method, opts.sensitiveLogs));
+            const successPromise = this.fetch(url, options).then((res)=>res.json());
             const operations = [
                 successPromise,
                 streamErr.promise,
                 timeout.promise
             ];
             try {
-                const res = await Promise.race(operations);
-                return await res.json();
+                return await Promise.race(operations);
+            } catch (error) {
+                throw toHttpError(method, opts.sensitiveLogs, error);
             } finally{
                 if (timeout.handle !== undefined) clearTimeout(timeout.handle);
             }
@@ -4467,13 +4466,13 @@ const InlineQueryResultBuilder = {
             ...options
         });
     },
-    photo (id, photo_url, options = {
-        thumbnail_url: typeof photo_url === "string" ? photo_url : photo_url.href
-    }) {
+    photo (id, photo_url, options = {}) {
+        const photoUrl = typeof photo_url === "string" ? photo_url : photo_url.href;
         return inputMessage({
             type: "photo",
             id,
-            photo_url: typeof photo_url === "string" ? photo_url : photo_url.href,
+            photo_url: photoUrl,
+            thumbnail_url: photoUrl,
             ...options
         });
     },

package/package.json

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