grammy 1.38.1 → 1.38.3

package/README.md

@@ -323,13 +323,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/ikelax"><img src="https://avatars.githubusercontent.com/u/163678144?v=4?s=100" width="100px;" alt="ikelax"/><br /><sub><b>ikelax</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=ikelax" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="11.11%"><a href="http://zeokku.com"><img src="https://avatars.githubusercontent.com/u/22231294?v=4?s=100" width="100px;" alt="Lutymane"/><br /><sub><b>Lutymane</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Lutymane" title="Code">💻</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://thadaw.com"><img src="https://avatars.githubusercontent.com/u/3647850?v=4?s=100" width="100px;" alt="Thada Wangthammang"/><br /><sub><b>Thada Wangthammang</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Amildronize" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=mildronize" title="Tests">⚠️</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Amildronize" title="Reviewed Pull Requests">👀</a></td>
-      <td align="center" valign="top" width="11.11%"><a href="https://github.com/rtyt3000"><img src="https://avatars.githubusercontent.com/u/123096124?v=4?s=100" width="100px;" alt="Konstantin Ryshkov"/><br /><sub><b>Konstantin Ryshkov</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Artyt3000" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://github.com/rtyt3000"><img src="https://avatars.githubusercontent.com/u/123096124?v=4?s=100" width="100px;" alt="Konstantin Ryshkov"/><br /><sub><b>Konstantin Ryshkov</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Artyt3000" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=rtyt3000" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/mishkatik"><img src="https://avatars.githubusercontent.com/u/101044644?v=4?s=100" width="100px;" alt="mish"/><br /><sub><b>mish</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Amishkatik" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=mishkatik" title="Code">💻</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/eddienubes"><img src="https://avatars.githubusercontent.com/u/53977359?v=4?s=100" width="100px;" alt="Dmytro Tiapukhin"/><br /><sub><b>Dmytro Tiapukhin</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=eddienubes" title="Documentation">📖</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/Arctomachine"><img src="https://avatars.githubusercontent.com/u/29041820?v=4?s=100" width="100px;" alt="Alexander"/><br /><sub><b>Alexander</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Arctomachine" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="11.11%"><a href="https://github.com/OfficialCodinary"><img src="https://avatars.githubusercontent.com/u/133005277?v=4?s=100" width="100px;" alt="Codinary"/><br /><sub><b>Codinary</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AOfficialCodinary" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://github.com/dotvhs"><img src="https://avatars.githubusercontent.com/u/681416?v=4?s=100" width="100px;" alt=".vhs"/><br /><sub><b>.vhs</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adotvhs" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adotvhs" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="11.11%"><a href="https://agou.im/"><img src="https://avatars.githubusercontent.com/u/55237525?v=4?s=100" width="100px;" alt="agoudbg"/><br /><sub><b>agoudbg</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Aagoudbg" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=agoudbg" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

package/out/context.d.ts

@@ -1279,7 +1279,9 @@ export declare class Context implements RenamedUpdate {
      */
     editMessageText(text: string, other?: Other<"editMessageText", "chat_id" | "message_id" | "inline_message_id" | "text">, signal?: AbortSignal): Promise<true | (Update.Edited & Message.CommonMessage & {
         text: string;
-    })>;
+    } & Partial<{
+        entities: MessageEntity[];
+    }>)>;
     /**
      * Context-aware alias for `api.editMessageCaption`. Use this method to edit captions of messages. On success, if the edited message is not an inline message, the edited Message is returned, otherwise True is returned. Note that business messages that were not sent by the bot and do not contain an inline keyboard can only be edited within 48 hours from the time they were sent.
      *

package/out/context.js

@@ -690,9 +690,6 @@ class Context {
         var _a;
         const msg = this.msg;
         return this.api.forwardMessage(chat_id, orThrow(this.chatId, "forwardMessage"), orThrow(this.msgId, "forwardMessage"), {
-            ...((msg === null || msg === void 0 ? void 0 : msg.is_topic_message)
-                ? { message_thread_id: msg === null || msg === void 0 ? void 0 : msg.message_thread_id }
-                : {}),
             direct_messages_topic_id: (_a = msg === null || msg === void 0 ? void 0 : msg.direct_messages_topic) === null || _a === void 0 ? void 0 : _a.topic_id,
             ...other,
         }, signal);
@@ -711,9 +708,6 @@ class Context {
         var _a;
         const msg = this.msg;
         return this.api.forwardMessages(chat_id, orThrow(this.chatId, "forwardMessages"), message_ids, {
-            ...((msg === null || msg === void 0 ? void 0 : msg.is_topic_message)
-                ? { message_thread_id: msg === null || msg === void 0 ? void 0 : msg.message_thread_id }
-                : {}),
             direct_messages_topic_id: (_a = msg === null || msg === void 0 ? void 0 : msg.direct_messages_topic) === null || _a === void 0 ? void 0 : _a.topic_id,
             ...other,
         }, signal);
@@ -731,9 +725,6 @@ class Context {
         var _a;
         const msg = this.msg;
         return this.api.copyMessage(chat_id, orThrow(this.chatId, "copyMessage"), orThrow(this.msgId, "copyMessage"), {
-            ...((msg === null || msg === void 0 ? void 0 : msg.is_topic_message)
-                ? { message_thread_id: msg === null || msg === void 0 ? void 0 : msg.message_thread_id }
-                : {}),
             direct_messages_topic_id: (_a = msg === null || msg === void 0 ? void 0 : msg.direct_messages_topic) === null || _a === void 0 ? void 0 : _a.topic_id,
             ...other,
         }, signal);
@@ -752,9 +743,6 @@ class Context {
         var _a;
         const msg = this.msg;
         return this.api.copyMessages(chat_id, orThrow(this.chatId, "copyMessages"), message_ids, {
-            ...((msg === null || msg === void 0 ? void 0 : msg.is_topic_message)
-                ? { message_thread_id: msg === null || msg === void 0 ? void 0 : msg.message_thread_id }
-                : {}),
             direct_messages_topic_id: (_a = msg === null || msg === void 0 ? void 0 : msg.direct_messages_topic) === null || _a === void 0 ? void 0 : _a.topic_id,
             ...other,
         }, signal);

package/out/convenience/frameworks.d.ts

@@ -77,11 +77,11 @@ export type CloudflareAdapter = (event: {
 }) => ReqResHandler;
 export type CloudflareModuleAdapter = (request: Request) => ReqResHandler<Response>;
 export type ElysiaAdapter = (ctx: {
-    body: Update;
+    body: unknown;
     headers: Record<string, string | undefined>;
     set: {
-        headers: Record<string, string>;
-        status: number;
+        headers: Record<string, string | number>;
+        status?: string | number;
     };
 }) => ReqResHandler<string>;
 export type ExpressAdapter = (req: {

package/out/convenience/frameworks.js

@@ -167,7 +167,7 @@ const fastify = (request, reply) => ({
         return request.body;
     },
     header: request.headers[SECRET_HEADER_LOWERCASE],
-    end: () => reply.status(200).send(),
+    end: () => reply.send(""),
     respond: (json) => reply.headers({ "Content-Type": "application/json" }).send(json),
     unauthorized: () => reply.code(401).send(WRONG_TOKEN_ERROR),
 });

package/out/core/api.d.ts

@@ -1134,7 +1134,9 @@ export declare class Api<R extends RawApi = RawApi> {
      */
     editMessageText(chat_id: number | string, message_id: number, text: string, other?: Other<R, "editMessageText", "chat_id" | "message_id" | "inline_message_id" | "text">, signal?: AbortSignal): Promise<true | (import("@grammyjs/types/update.js").Update.Edited & import("@grammyjs/types/message.js").Message.CommonMessage & {
         text: string;
-    })>;
+    } & Partial<{
+        entities: import("@grammyjs/types/message.js").MessageEntity[];
+    }>)>;
     /**
      * Use this method to edit text and game inline messages. On success, if the edited message is not an inline message, the edited Message is returned, otherwise True is returned. Note that business messages that were not sent by the bot and do not contain an inline keyboard can only be edited within 48 hours from the time they were sent.
      *
@@ -1146,7 +1148,9 @@ export declare class Api<R extends RawApi = RawApi> {
      */
     editMessageTextInline(inline_message_id: string, text: string, other?: Other<R, "editMessageText", "chat_id" | "message_id" | "inline_message_id" | "text">, signal?: AbortSignal): Promise<true | (import("@grammyjs/types/update.js").Update.Edited & import("@grammyjs/types/message.js").Message.CommonMessage & {
         text: string;
-    })>;
+    } & Partial<{
+        entities: import("@grammyjs/types/message.js").MessageEntity[];
+    }>)>;
     /**
      * Use this method to edit captions of messages. On success, if the edited message is not an inline message, the edited Message is returned, otherwise True is returned. Note that business messages that were not sent by the bot and do not contain an inline keyboard can only be edited within 48 hours from the time they were sent.
      *

package/out/web.mjs

@@ -765,9 +765,6 @@ class Context {
     forwardMessage(chat_id, other, signal) {
         const msg = this.msg;
         return this.api.forwardMessage(chat_id, orThrow(this.chatId, "forwardMessage"), orThrow(this.msgId, "forwardMessage"), {
-            ...msg?.is_topic_message ? {
-                message_thread_id: msg?.message_thread_id
-            } : {},
             direct_messages_topic_id: msg?.direct_messages_topic?.topic_id,
             ...other
         }, signal);
@@ -775,9 +772,6 @@ class Context {
     forwardMessages(chat_id, message_ids, other, signal) {
         const msg = this.msg;
         return this.api.forwardMessages(chat_id, orThrow(this.chatId, "forwardMessages"), message_ids, {
-            ...msg?.is_topic_message ? {
-                message_thread_id: msg?.message_thread_id
-            } : {},
             direct_messages_topic_id: msg?.direct_messages_topic?.topic_id,
             ...other
         }, signal);
@@ -785,9 +779,6 @@ class Context {
     copyMessage(chat_id, other, signal) {
         const msg = this.msg;
         return this.api.copyMessage(chat_id, orThrow(this.chatId, "copyMessage"), orThrow(this.msgId, "copyMessage"), {
-            ...msg?.is_topic_message ? {
-                message_thread_id: msg?.message_thread_id
-            } : {},
             direct_messages_topic_id: msg?.direct_messages_topic?.topic_id,
             ...other
         }, signal);
@@ -795,9 +786,6 @@ class Context {
     copyMessages(chat_id, message_ids, other, signal) {
         const msg = this.msg;
         return this.api.copyMessages(chat_id, orThrow(this.chatId, "copyMessages"), message_ids, {
-            ...msg?.is_topic_message ? {
-                message_thread_id: msg?.message_thread_id
-            } : {},
             direct_messages_topic_id: msg?.direct_messages_topic?.topic_id,
             ...other
         }, signal);
@@ -1984,50 +1972,64 @@ function setup(env) {
         createDebug.namespaces = namespaces;
         createDebug.names = [];
         createDebug.skips = [];
-        let i;
-        const split = (typeof namespaces === "string" ? namespaces : "").split(/[\s,]+/);
-        const len = split.length;
-        for(i = 0; i < len; i++){
-            if (!split[i]) {
-                continue;
+        const split = (typeof namespaces === "string" ? namespaces : "").trim().replace(/\s+/g, ",").split(",").filter(Boolean);
+        for (const ns of split){
+            if (ns[0] === "-") {
+                createDebug.skips.push(ns.slice(1));
+            } else {
+                createDebug.names.push(ns);
             }
-            namespaces = split[i].replace(/\*/g, ".*?");
-            if (namespaces[0] === "-") {
-                createDebug.skips.push(new RegExp("^" + namespaces.slice(1) + "$"));
+        }
+    }
+    function matchesTemplate(search, template) {
+        let searchIndex = 0;
+        let templateIndex = 0;
+        let starIndex = -1;
+        let matchIndex = 0;
+        while(searchIndex < search.length){
+            if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === "*")) {
+                if (template[templateIndex] === "*") {
+                    starIndex = templateIndex;
+                    matchIndex = searchIndex;
+                    templateIndex++;
+                } else {
+                    searchIndex++;
+                    templateIndex++;
+                }
+            } else if (starIndex !== -1) {
+                templateIndex = starIndex + 1;
+                matchIndex++;
+                searchIndex = matchIndex;
             } else {
-                createDebug.names.push(new RegExp("^" + namespaces + "$"));
+                return false;
             }
         }
+        while(templateIndex < template.length && template[templateIndex] === "*"){
+            templateIndex++;
+        }
+        return templateIndex === template.length;
     }
     function disable() {
         const namespaces = [
-            ...createDebug.names.map(toNamespace),
-            ...createDebug.skips.map(toNamespace).map((namespace)=>"-" + namespace)
+            ...createDebug.names,
+            ...createDebug.skips.map((namespace)=>"-" + namespace)
         ].join(",");
         createDebug.enable("");
         return namespaces;
     }
     function enabled(name) {
-        if (name[name.length - 1] === "*") {
-            return true;
-        }
-        let i;
-        let len;
-        for(i = 0, len = createDebug.skips.length; i < len; i++){
-            if (createDebug.skips[i].test(name)) {
+        for (const skip of createDebug.skips){
+            if (matchesTemplate(name, skip)) {
                 return false;
             }
         }
-        for(i = 0, len = createDebug.names.length; i < len; i++){
-            if (createDebug.names[i].test(name)) {
+        for (const ns of createDebug.names){
+            if (matchesTemplate(name, ns)) {
                 return true;
             }
         }
         return false;
     }
-    function toNamespace(regexp) {
-        return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
-    }
     function coerce(val) {
         if (val instanceof Error) {
             return val.stack || val.message;
@@ -2141,7 +2143,8 @@ var browser$1 = createCommonjsModule(function(module, exports) {
         if (typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
             return false;
         }
-        return typeof document !== "undefined" && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance || typeof window !== "undefined" && window.console && (window.console.firebug || window.console.exception && window.console.table) || typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31 || typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/);
+        let m;
+        return typeof document !== "undefined" && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance || typeof window !== "undefined" && window.console && (window.console.firebug || window.console.exception && window.console.table) || typeof navigator !== "undefined" && navigator.userAgent && (m = navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)) && parseInt(m[1], 10) >= 31 || typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/);
     }
     function formatArgs2(args) {
         args[0] = (this.useColors ? "%c" : "") + this.namespace + (this.useColors ? " %c" : " ") + args[0] + (this.useColors ? "%c " : " ") + "+" + module.exports.humanize(this.diff);
@@ -2176,7 +2179,7 @@ var browser$1 = createCommonjsModule(function(module, exports) {
     function load2() {
         let r;
         try {
-            r = exports.storage.getItem("debug");
+            r = exports.storage.getItem("debug") || exports.storage.getItem("DEBUG");
         } catch (error) {}
         if (!r && typeof process !== "undefined" && "env" in process) {
             r = process.env.DEBUG;
@@ -2267,7 +2270,12 @@ function toHttpError(method, sensitiveLogs) {
         throw new HttpError(msg, err);
     };
 }
-const isWindows = globalThis.Deno?.build.os === "windows" || globalThis.navigator?.platform?.startsWith("Win") || globalThis.process?.platform?.startsWith("win") || false;
+function checkWindows() {
+    const global = globalThis;
+    const os = global.Deno?.build?.os;
+    return typeof os === "string" ? os === "windows" : global.navigator?.platform?.startsWith("Win") ?? global.process?.platform?.startsWith("win") ?? false;
+}
+const isWindows = checkWindows();
 function assertPath(path) {
     if (typeof path !== "string") {
         throw new TypeError(`Path must be a string, received "${JSON.stringify(path)}"`);
@@ -2308,6 +2316,17 @@ function assertArgs(path, suffix) {
         throw new TypeError(`Suffix must be a string, received "${JSON.stringify(suffix)}"`);
     }
 }
+function assertArg(url) {
+    url = url instanceof URL ? url : new URL(url);
+    if (url.protocol !== "file:") {
+        throw new TypeError(`URL must be a file URL: received "${url.protocol}"`);
+    }
+    return url;
+}
+function fromFileUrl(url) {
+    url = assertArg(url);
+    return decodeURIComponent(url.pathname.replace(/%(?![0-9A-Fa-f]{2})/g, "%25"));
+}
 function stripTrailingSeparators(segment, isSep) {
     if (segment.length <= 1) {
         return segment;
@@ -2326,6 +2345,9 @@ function isPosixPathSeparator(code) {
     return code === 47;
 }
 function basename(path, suffix = "") {
+    if (path instanceof URL) {
+        path = fromFileUrl(path);
+    }
     assertArgs(path, suffix);
     const lastSegment = lastPathSegment(path, isPosixPathSeparator);
     const strippedSegment = stripTrailingSeparators(lastSegment, isPosixPathSeparator);
@@ -2337,7 +2359,18 @@ function isPathSeparator(code) {
 function isWindowsDeviceRoot(code) {
     return code >= 97 && code <= 122 || code >= 65 && code <= 90;
 }
+function fromFileUrl1(url) {
+    url = assertArg(url);
+    let path = decodeURIComponent(url.pathname.replace(/\//g, "\\").replace(/%(?![0-9A-Fa-f]{2})/g, "%25")).replace(/^\\*([A-Za-z]:)(\\|$)/, "$1\\");
+    if (url.hostname !== "") {
+        path = `\\\\${url.hostname}${path}`;
+    }
+    return path;
+}
 function basename1(path, suffix = "") {
+    if (path instanceof URL) {
+        path = fromFileUrl1(path);
+    }
     assertArgs(path, suffix);
     let start = 0;
     if (path.length >= 2) {
@@ -5279,7 +5312,7 @@ const fastify = (request, reply)=>({
             return request.body;
         },
         header: request.headers[SECRET_HEADER_LOWERCASE],
-        end: ()=>reply.status(200).send(),
+        end: ()=>reply.send(""),
         respond: (json)=>reply.headers({
                 "Content-Type": "application/json"
             }).send(json),

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "grammy",
     "description": "The Telegram Bot Framework.",
-    "version": "1.38.1",
+    "version": "1.38.3",
     "author": "KnorpelSenf",
     "license": "MIT",
     "engines": {
@@ -17,16 +17,16 @@
         "backport": "deno2node tsconfig.json"
     },
     "dependencies": {
-        "@grammyjs/types": "3.22.1",
+        "@grammyjs/types": "3.22.2",
         "abort-controller": "^3.0.0",
-        "debug": "^4.3.4",
+        "debug": "^4.4.3",
         "node-fetch": "^2.7.0"
     },
     "devDependencies": {
         "@types/debug": "^4.1.12",
         "@types/node": "^12.20.55",
         "@types/node-fetch": "2.6.2",
-        "deno2node": "^1.13.0"
+        "deno2node": "^1.16.0"
     },
     "files": [
         "out/"