telegram-botbuilder 1.0.7 → 1.0.9

package/lib/bot-service.d.ts

@@ -22,6 +22,6 @@ export declare class BotBuilder {
     Message(chat: number, content: string): Promise<TelegramBot.Message>;
 }
 export declare function ChangeDialog(id: string): Action;
-export declare function CallbackAction(descriptor: string): Action;
+export declare function CallbackAction(descriptor: string, ...args: any[]): Action;
 export declare function WaitForData(descriptor: string): Action;
 export {};

package/lib/bot-service.js

@@ -35,6 +35,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -123,11 +132,17 @@ var BotBuilder = /** @class */ (function () {
         }); });
         this._bot.onText(/\/start/, function (msg) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                if (!this._userdialogs[msg.chat.id])
-                    this._userdialogs[msg.chat.id] = { dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' } };
-                this._bot.deleteMessage(msg.chat.id, msg.message_id).catch(function () { return undefined; });
-                this.ChangeDialog(msg.chat.id, this._schema.start);
-                return [2 /*return*/];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this._runmw(msg.chat.id, msg)];
+                    case 1:
+                        if (_a.sent())
+                            return [2 /*return*/];
+                        if (!this._userdialogs[msg.chat.id])
+                            this._userdialogs[msg.chat.id] = { dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' } };
+                        this._bot.deleteMessage(msg.chat.id, msg.message_id).catch(function () { return undefined; });
+                        this.ChangeDialog(msg.chat.id, this._schema.start);
+                        return [2 /*return*/];
+                }
             });
         }); });
         var _loop_1 = function (cmd) {
@@ -135,29 +150,32 @@ var BotBuilder = /** @class */ (function () {
                 var chat, _i, _a, act;
                 return __generator(this, function (_b) {
                     switch (_b.label) {
-                        case 0:
+                        case 0: return [4 /*yield*/, this._runmw(msg.chat.id, msg)];
+                        case 1:
+                            if (_b.sent())
+                                return [2 /*return*/];
                             chat = msg.chat.id;
-                            if (!Array.isArray(cmd === null || cmd === void 0 ? void 0 : cmd.action)) return [3 /*break*/, 5];
+                            if (!Array.isArray(cmd === null || cmd === void 0 ? void 0 : cmd.action)) return [3 /*break*/, 6];
                             _i = 0, _a = cmd === null || cmd === void 0 ? void 0 : cmd.action;
-                            _b.label = 1;
-                        case 1:
-                            if (!(_i < _a.length)) return [3 /*break*/, 4];
+                            _b.label = 2;
+                        case 2:
+                            if (!(_i < _a.length)) return [3 /*break*/, 5];
                             act = _a[_i];
                             return [4 /*yield*/, act(chat, this, match[1])];
-                        case 2:
-                            _b.sent();
-                            _b.label = 3;
                         case 3:
+                            _b.sent();
+                            _b.label = 4;
+                        case 4:
                             _i++;
-                            return [3 /*break*/, 1];
-                        case 4: return [3 /*break*/, 7];
-                        case 5:
-                            if (!(cmd === null || cmd === void 0 ? void 0 : cmd.action)) return [3 /*break*/, 7];
-                            return [4 /*yield*/, (cmd === null || cmd === void 0 ? void 0 : cmd.action)(chat, this, match[1])];
+                            return [3 /*break*/, 2];
+                        case 5: return [3 /*break*/, 8];
                         case 6:
+                            if (!(cmd === null || cmd === void 0 ? void 0 : cmd.action)) return [3 /*break*/, 8];
+                            return [4 /*yield*/, (cmd === null || cmd === void 0 ? void 0 : cmd.action)(chat, this, match[1])];
+                        case 7:
                             _b.sent();
-                            _b.label = 7;
-                        case 7: return [2 /*return*/];
+                            _b.label = 8;
+                        case 8: return [2 /*return*/];
                     }
                 });
             }); });
@@ -337,10 +355,17 @@ function ChangeDialog(id) {
 }
 function CallbackAction(descriptor) {
     var _this = this;
-    return function (chat, _bot) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-        _bot.ActionSystem.emit(descriptor, { chatid: chat });
-        return [2 /*return*/];
-    }); }); };
+    var args = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args[_i - 1] = arguments[_i];
+    }
+    return function (chat, _bot) { return __awaiter(_this, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            (_a = _bot.ActionSystem).emit.apply(_a, __spreadArray([descriptor, chat], args, false));
+            return [2 /*return*/];
+        });
+    }); };
 }
 function WaitForData(descriptor) {
     return function (chat, _bot) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telegram-botbuilder",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "main": "lib/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/bot-service.ts

@@ -84,6 +84,8 @@ export class BotBuilder {
     });
 
     this._bot.onText(/\/start/, async (msg) => {
+      if (await this._runmw(msg.chat.id, msg)) return;
+
       if (!this._userdialogs[msg.chat.id]) this._userdialogs[msg.chat.id] = {dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' }}
       this._bot.deleteMessage(msg.chat.id, msg.message_id).catch(() => undefined);
       this.ChangeDialog(msg.chat.id, this._schema.start);
@@ -91,6 +93,8 @@ export class BotBuilder {
 
     for (let cmd of this._schema.commands) {
       this._bot.onText(new RegExp('\\/${cmd.text}(?:\\s+(.*))?$'), async (msg, match) => {
+        if (await this._runmw(msg.chat.id, msg)) return;
+
         let chat = msg.chat.id;
         if (Array.isArray(cmd?.action)) {
           for (let act of (cmd?.action as Action[])) {
@@ -163,8 +167,8 @@ export class BotBuilder {
 export function ChangeDialog(id: string): Action {
   return async (chat: number, _bot: BotBuilder) => { await _bot.ChangeDialog(chat, id); };
 }
-export function CallbackAction(descriptor: string): Action {
-  return async (chat: number, _bot: BotBuilder) => { _bot.ActionSystem.emit(descriptor, {chatid: chat}); };
+export function CallbackAction(descriptor: string, ...args: any[]): Action {
+  return async (chat: number, _bot: BotBuilder) => { _bot.ActionSystem.emit(descriptor, chat, ...args); };
 }
 export function WaitForData(descriptor: string): Action {
   return (chat: number, _bot: BotBuilder) => {