gramio 0.0.21 → 0.0.23

package/dist/bot.d.ts

@@ -1,5 +1,6 @@
+import { CallbackData } from "@gramio/callback-data";
 import type { Context, ContextType, MaybeArray, UpdateName } from "@gramio/contexts";
-import type { APIMethodParams, APIMethods, SetMyCommandsParams, TelegramBotCommand, TelegramUser } from "@gramio/types";
+import type { APIMethodParams, APIMethods, SetMyCommandsParams, TelegramBotCommand, TelegramReactionTypeEmojiEmoji, TelegramUser } from "@gramio/types";
 import { Plugin } from "./plugin";
 import type { BotOptions, DeriveDefinitions, ErrorDefinitions, Handler, Hooks, MaybePromise } from "./types";
 import { Updates } from "./updates";
@@ -75,13 +76,19 @@ export declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends D
     preRequest(handler: Hooks.PreRequest): this;
     on<T extends UpdateName>(updateName: MaybeArray<T>, handler: Handler<ContextType<typeof this, T> & Derives["global"] & Derives[T]>): this;
     use(handler: Handler<Context<typeof this> & Derives["global"]>): this;
-    extend<NewPlugin extends Plugin>(plugin: MaybePromise<NewPlugin>): Bot<Errors & NewPlugin["Errors"], Derives & NewPlugin["Derives"]>;
+    extend<NewPlugin extends Plugin<any, any>>(plugin: MaybePromise<NewPlugin>): Bot<Errors & NewPlugin["Errors"], Derives & NewPlugin["Derives"]>;
+    reaction(trigger: MaybeArray<TelegramReactionTypeEmojiEmoji>, handler: (context: ContextType<typeof this, "message_reaction"> & Derives["global"] & Derives["message_reaction"]) => unknown): this;
+    callbackQuery<Trigger extends CallbackData | string | RegExp>(trigger: Trigger, handler: (context: Omit<ContextType<typeof this, "callback_query">, "data"> & Derives["global"] & Derives["callback_query"] & {
+        data: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : RegExpMatchArray | null;
+    }) => unknown): this;
     hears<Ctx = ContextType<typeof this, "message"> & Derives["global"] & Derives["message"]>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
         args: RegExpMatchArray | null;
     }) => unknown): this;
     command(command: string, handler: (context: ContextType<typeof this, "message"> & Derives["global"] & Derives["message"] & {
         args: string | null;
     }) => unknown, options?: Omit<SetMyCommandsParams, "commands"> & Omit<TelegramBotCommand, "command">): this;
+    /** Currently not isolated!!! */
+    group(grouped: (bot: typeof this) => Bot<any, any>): Bot<any, any>;
     start({ webhook, dropPendingUpdates, allowedUpdates, }?: {
         webhook?: Omit<APIMethodParams<"setWebhook">, "drop_pending_updates" | "allowed_updates">;
         dropPendingUpdates?: boolean;

package/dist/bot.js

@@ -35,6 +35,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bot = void 0;
+const callback_data_1 = require("@gramio/callback-data");
 const files_1 = require("@gramio/files");
 const format_1 = require("@gramio/format");
 const inspectable_1 = require("inspectable");
@@ -268,9 +269,58 @@ let Bot = (() => {
                 else
                     this.derive(updateName, derive);
             }
+            for (const value of plugin.preRequests) {
+                const [preRequest, updateName] = value;
+                if (!updateName)
+                    this.preRequest(preRequest);
+                else
+                    this.preRequest(updateName, preRequest);
+            }
+            for (const handler of plugin.groups) {
+                this.group(handler);
+            }
             this.dependencies.push(plugin.name);
             return this;
         }
+        reaction(trigger, handler) {
+            const reactions = Array.isArray(trigger) ? trigger : [trigger];
+            return this.on("message_reaction", (context, next) => {
+                const newReactions = [];
+                for (const reaction of context.newReactions) {
+                    if (reaction.type !== "emoji")
+                        continue;
+                    const foundIndex = context.oldReactions.findIndex((oldReaction) => oldReaction.type === "emoji" &&
+                        oldReaction.emoji === reaction.emoji);
+                    if (foundIndex === -1) {
+                        newReactions.push(reaction);
+                    }
+                    else {
+                        // TODO: REFACTOR
+                        context.oldReactions.splice(foundIndex, 1);
+                    }
+                }
+                if (!newReactions.some((x) => x.type === "emoji" && reactions.includes(x.emoji)))
+                    return next();
+                return handler(context);
+            });
+        }
+        callbackQuery(trigger, handler) {
+            return this.on("callback_query", (context, next) => {
+                if (!context.data)
+                    return next();
+                if (typeof trigger === "string" && context.data !== trigger)
+                    return next();
+                if (trigger instanceof callback_data_1.CallbackData &&
+                    !trigger.regexp().test(context.data))
+                    return next();
+                if (trigger instanceof RegExp && !trigger.test(context.data))
+                    return next();
+                // @ts-expect-error
+                context.data = trigger.unpack(context.data);
+                //@ts-expect-error
+                return handler(context);
+            });
+        }
         hears(trigger, handler) {
             return this.on("message", (context, next) => {
                 if ((typeof trigger === "string" && context.text === trigger) ||
@@ -310,6 +360,10 @@ let Bot = (() => {
                 return next();
             });
         }
+        /** Currently not isolated!!! */
+        group(grouped) {
+            return grouped(this);
+        }
         async start({ webhook, dropPendingUpdates, allowedUpdates, } = {}) {
             await Promise.all(this.lazyloadPlugins.map(async (plugin) => this.extend(await plugin)));
             this.info = await this.api.getMe();

package/dist/index.d.ts

@@ -8,3 +8,4 @@ export * from "@gramio/files";
 export * from "@gramio/keyboards";
 export * from "@gramio/types";
 export * from "@gramio/format";
+export * from "@gramio/callback-data";

package/dist/index.js

@@ -26,3 +26,4 @@ __exportStar(require("@gramio/files"), exports);
 __exportStar(require("@gramio/keyboards"), exports);
 __exportStar(require("@gramio/types"), exports);
 __exportStar(require("@gramio/format"), exports);
+__exportStar(require("@gramio/callback-data"), exports);

package/dist/plugin.d.ts

@@ -1,6 +1,7 @@
 import type { BotLike, Context, ContextType, MaybeArray, UpdateName } from "@gramio/contexts";
 import type { APIMethods } from "@gramio/types";
 import type { DeriveDefinitions, ErrorDefinitions, Hooks } from "./types";
+import type { Bot } from "./bot";
 export declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends DeriveDefinitions = DeriveDefinitions> {
     Errors: Errors;
     Derives: Derives;
@@ -9,6 +10,7 @@ export declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extend
         Hooks.PreRequest<any>,
         MaybeArray<keyof APIMethods> | undefined
     ][];
+    groups: ((bot: Bot<any, any>) => Bot<any, any>)[];
     name: string;
     errorsDefinitions: Record<string, {
         new (...args: any): any;
@@ -18,6 +20,8 @@ export declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extend
     constructor(name: string, { dependencies }?: {
         dependencies?: string[];
     });
+    /** Currently not isolated!!! */
+    group(grouped: (bot: Bot<Errors, Derives>) => Bot<any, any>): this;
     /**
      * Register custom class-error in plugin
      **/

package/dist/plugin.js

@@ -61,6 +61,7 @@ let Plugin = (() => {
         Derives;
         derives = [];
         preRequests = [];
+        groups = [];
         name;
         errorsDefinitions = {};
         dependencies = [];
@@ -69,6 +70,11 @@ let Plugin = (() => {
             if (dependencies)
                 this.dependencies = dependencies;
         }
+        /** Currently not isolated!!! */
+        group(grouped) {
+            this.groups.push(grouped);
+            return this;
+        }
         /**
          * Register custom class-error in plugin
          **/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gramio",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "Powerful Telegram Bot API framework",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -24,19 +24,20 @@
   "author": "kravets",
   "license": "ISC",
   "devDependencies": {
-    "@biomejs/biome": "1.6.0",
+    "@biomejs/biome": "1.6.2",
     "@gramio/types": "^7.1.7",
-    "@types/node": "^20.11.25",
-    "typescript": "^5.4.2"
+    "@types/node": "^20.11.30",
+    "typescript": "^5.4.3"
   },
   "dependencies": {
+    "@gramio/callback-data": "^0.0.1",
     "@gramio/contexts": "^0.0.7",
     "@gramio/files": "^0.0.3",
     "@gramio/format": "^0.0.8",
-    "@gramio/keyboards": "^0.2.0",
+    "@gramio/keyboards": "^0.2.2",
     "inspectable": "^3.0.0",
     "middleware-io": "^2.8.1",
-    "undici": "^6.7.1"
+    "undici": "^6.10.1"
   },
   "files": [
     "dist"