telegram-botbuilder 1.1.9 → 1.2.0

package/lib/bot-service.d.ts

@@ -19,6 +19,7 @@ export declare class BotBuilder {
     constructor(schema: Schema, token: string, options?: TelegramBot.ConstructorOptions);
     private _getDialog;
     private _getButton;
+    private _getButtonID;
     private _activateButton;
     ChangeDialog(chat: number, id: string): Promise<void>;
     AttachDataWait(chat: number, descriptor: string): void;

package/lib/bot-service.js

@@ -73,19 +73,6 @@ var BotBuilder = /** @class */ (function () {
         this._bot = new node_telegram_bot_api_1.default(token, options);
         this._schema = schema;
         this._schema.buttons = [];
-        for (var x = 0; x < this._schema.content.length; x++) {
-            if (typeof this._schema.content[x].buttons === 'function')
-                continue;
-            for (var y = 0; y < this._schema.content[x].buttons.length; y++) {
-                // @ts-ignore
-                for (var b = 0; b < this._schema.content[x].buttons[y].length; b++) {
-                    // @ts-ignore
-                    this._schema.content[x].buttons[y][b]._callback = this._hashbtn(this._schema.content[x], this._schema.content[x].buttons[y][b]);
-                    // @ts-ignore
-                    this._schema.buttons.push(this._schema.content[x].buttons[y][b]);
-                }
-            }
-        }
         this.ActionSystem = new events_1.default();
         this._userdialogs = {};
         this._bot.onText(/.+/g, function (msg) { return __awaiter(_this, void 0, void 0, function () {
@@ -259,6 +246,9 @@ var BotBuilder = /** @class */ (function () {
     BotBuilder.prototype._getButton = function (callback) {
         return this._schema.buttons.find(function (x) { return x._callback === callback; });
     };
+    BotBuilder.prototype._getButtonID = function (callback) {
+        return this._schema.buttons.findIndex(function (x) { return x._callback === callback; });
+    };
     BotBuilder.prototype._activateButton = function (chat, btn) {
         return __awaiter(this, void 0, void 0, function () {
             var _btn, _i, _a, act;
@@ -296,7 +286,7 @@ var BotBuilder = /** @class */ (function () {
     };
     BotBuilder.prototype.ChangeDialog = function (chat, id) {
         return __awaiter(this, void 0, void 0, function () {
-            var dialog, btns, _a, markup, b, _i, _b, btn, text_1, _c, text, _d, _e, msg;
+            var dialog, btns, _a, markup, b, _i, _b, btn, _text, _c, psid, text, _d, _e, msg;
             return __generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -338,10 +328,12 @@ var BotBuilder = /** @class */ (function () {
                         _c = btn.text;
                         _f.label = 8;
                     case 8:
-                        text_1 = _c;
+                        _text = _c;
                         btn._callback = this._hashbtn(dialog, btn);
-                        this._schema.buttons.push(btn);
-                        markup[b].push({ text: text_1, callback_data: btn._callback });
+                        psid = this._getButtonID(btn._callback);
+                        if (psid == -1)
+                            this._schema.buttons.push(btn);
+                        markup[b].push({ text: _text, callback_data: btn._callback });
                         _f.label = 9;
                     case 9:
                         _i++;
@@ -365,13 +357,13 @@ var BotBuilder = /** @class */ (function () {
                         _f.label = 15;
                     case 15:
                         _f.trys.push([15, 17, , 19]);
-                        return [4 /*yield*/, this._bot.editMessageText(text || "404", { chat_id: chat, message_id: this._userdialogs[chat].lastid, reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'HTML' })];
+                        return [4 /*yield*/, this._bot.editMessageText(text || "404", { chat_id: chat, message_id: this._userdialogs[chat].lastid, parse_mode: 'HTML' })];
                     case 16:
                         _f.sent();
                         return [3 /*break*/, 19];
                     case 17:
                         _e = _f.sent();
-                        return [4 /*yield*/, this._bot.sendMessage(chat, text || "404", { reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'HTML' })];
+                        return [4 /*yield*/, this._bot.sendMessage(chat, text || "404", { parse_mode: 'HTML' })];
                     case 18:
                         msg = _f.sent();
                         this._userdialogs[chat].lastid = msg.message_id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telegram-botbuilder",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "main": "lib/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -14,9 +14,10 @@
     "node-telegram-bot-api": "^0.66.0",
     "object-hash": "^3.0.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.5.3"
+    "typescript": "^5.5.3",
+    "@types/node-telegram-bot-api": "^0.64.7"
   },
   "devDependencies": {
-    "@types/node-telegram-bot-api": "^0.64.7"
+    
   }
 }

package/src/bot-service.ts

@@ -66,19 +66,6 @@ export class BotBuilder {
     this._schema = schema as BotSchema;
     this._schema.buttons = [];
 
-    for (let x = 0; x < this._schema.content.length; x++) {
-      if (typeof this._schema.content[x].buttons === 'function') continue;
-      for (let y = 0; y < this._schema.content[x].buttons.length; y++) {
-        // @ts-ignore
-        for (let b = 0; b < this._schema.content[x].buttons[y].length; b++) {
-          // @ts-ignore
-          this._schema.content[x].buttons[y][b]._callback = this._hashbtn(this._schema.content[x], this._schema.content[x].buttons[y][b]);
-          // @ts-ignore
-          this._schema.buttons.push(this._schema.content[x].buttons[y][b]);
-        }
-      }
-    }
-
     this.ActionSystem = new EventEmitter();
     this._userdialogs = {};
 
@@ -148,6 +135,9 @@ export class BotBuilder {
   private _getButton(callback: string) {
     return this._schema.buttons.find(x => x._callback === callback);
   }
+  private _getButtonID(callback: string) {
+    return this._schema.buttons.findIndex(x => x._callback === callback);
+  }
   private async _activateButton(chat: number, btn: string | BotButton) {
     let _btn;
     if (typeof btn === 'string') _btn = this._getButton(btn);
@@ -178,10 +168,11 @@ export class BotBuilder {
       for (let b = 0; b < btns.length; b++) {
         markup[b] = [];
         for (let btn of btns[b]) {
-          let text = typeof btn.text === 'function' ? await btn.text(chat) : btn.text;
+          let _text = typeof btn.text === 'function' ? await btn.text(chat) : btn.text;
           btn._callback = this._hashbtn(dialog!, btn);
-          this._schema.buttons.push(btn);
-          markup[b].push({ text, callback_data: btn._callback});
+          let psid = this._getButtonID(btn._callback);
+          if (psid == -1) this._schema.buttons.push(btn);
+          markup[b].push({ text: _text, callback_data: btn._callback});
         }
       }
     }
@@ -189,9 +180,9 @@ export class BotBuilder {
     if (dialog == undefined) markup = [[{text: "Меню", callback_data: this._schema.start}]]; // FIX RAND BTN
     let text = typeof dialog?.text === 'function' ? await dialog?.text(chat) : dialog?.text;
     try {
-      await this._bot.editMessageText(text || "404", {chat_id: chat, message_id: this._userdialogs[chat].lastid, reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'HTML'})
+      await this._bot.editMessageText(text || "404", {chat_id: chat, message_id: this._userdialogs[chat].lastid, parse_mode: 'HTML'})
     } catch {
-      let msg = await this._bot.sendMessage(chat, text || "404", {reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'HTML'});
+      let msg = await this._bot.sendMessage(chat, text || "404", {parse_mode: 'HTML'});
       this._userdialogs[chat].lastid = msg.message_id;
     }
   }