telegram-botbuilder 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/bot-service.js +30 -27
  2. package/package.json +1 -1
  3. package/src/bot-service.ts +4 -4
package/lib/bot-service.js CHANGED
@@ -286,9 +286,9 @@ var BotBuilder = /** @class */ (function () {
286
286
  };
287
287
  BotBuilder.prototype.ChangeDialog = function (chat, id) {
288
288
  return __awaiter(this, void 0, void 0, function () {
289
- var dialog, btns, _a, markup, b, _i, _b, btn, _text, _c, psid, text, _d, _e, msg;
290
- return __generator(this, function (_f) {
291
- switch (_f.label) {
289
+ var dialog, btns, _a, _b, _c, _d, markup, b, _i, _e, btn, _f, _g, psid, text, _h, _j, msg;
290
+ return __generator(this, function (_k) {
291
+ switch (_k.label) {
292
292
  case 0:
293
293
  this._userdialogs[chat].dialog = id;
294
294
  if (this._userdialogs[chat].waiter.statewait) {
@@ -296,45 +296,48 @@ var BotBuilder = /** @class */ (function () {
296
296
  this.ActionSystem.emit("cancel_".concat(this._userdialogs[chat].waiter.descriptor), chat);
297
297
  }
298
298
  dialog = this._getDialog(id);
299
+ _b = (_a = Object).assign;
300
+ _c = [[]];
299
301
  if (!(typeof (dialog === null || dialog === void 0 ? void 0 : dialog.buttons) === 'function')) return [3 /*break*/, 2];
300
302
  return [4 /*yield*/, (dialog === null || dialog === void 0 ? void 0 : dialog.buttons(chat))];
301
303
  case 1:
302
- _a = _f.sent();
304
+ _d = _k.sent();
303
305
  return [3 /*break*/, 3];
304
306
  case 2:
305
- _a = dialog === null || dialog === void 0 ? void 0 : dialog.buttons;
306
- _f.label = 3;
307
+ _d = dialog === null || dialog === void 0 ? void 0 : dialog.buttons;
308
+ _k.label = 3;
307
309
  case 3:
308
- btns = (_a) || [];
310
+ btns = _b.apply(_a, _c.concat([(_d)])) || [];
309
311
  markup = undefined;
310
312
  if (!(btns.length > 0)) return [3 /*break*/, 11];
311
313
  markup = [];
312
314
  b = 0;
313
- _f.label = 4;
315
+ _k.label = 4;
314
316
  case 4:
315
317
  if (!(b < btns.length)) return [3 /*break*/, 11];
316
318
  markup[b] = [];
317
- _i = 0, _b = btns[b];
318
- _f.label = 5;
319
+ _i = 0, _e = btns[b];
320
+ _k.label = 5;
319
321
  case 5:
320
- if (!(_i < _b.length)) return [3 /*break*/, 10];
321
- btn = _b[_i];
322
+ if (!(_i < _e.length)) return [3 /*break*/, 10];
323
+ btn = _e[_i];
324
+ _f = btn;
322
325
  if (!(typeof btn.text === 'function')) return [3 /*break*/, 7];
323
326
  return [4 /*yield*/, btn.text(chat)];
324
327
  case 6:
325
- _c = _f.sent();
328
+ _g = _k.sent();
326
329
  return [3 /*break*/, 8];
327
330
  case 7:
328
- _c = btn.text;
329
- _f.label = 8;
331
+ _g = btn.text;
332
+ _k.label = 8;
330
333
  case 8:
331
- _text = _c;
334
+ _f.text = _g;
332
335
  btn._callback = this._hashbtn(dialog, btn);
333
336
  psid = this._getButtonID(btn._callback);
334
337
  if (psid == -1)
335
338
  this._schema.buttons.push(btn);
336
- markup[b].push({ text: _text, callback_data: btn._callback });
337
- _f.label = 9;
339
+ markup[b].push({ text: btn.text, callback_data: btn._callback });
340
+ _k.label = 9;
338
341
  case 9:
339
342
  _i++;
340
343
  return [3 /*break*/, 5];
@@ -347,25 +350,25 @@ var BotBuilder = /** @class */ (function () {
347
350
  if (!(typeof (dialog === null || dialog === void 0 ? void 0 : dialog.text) === 'function')) return [3 /*break*/, 13];
348
351
  return [4 /*yield*/, (dialog === null || dialog === void 0 ? void 0 : dialog.text(chat))];
349
352
  case 12:
350
- _d = _f.sent();
353
+ _h = _k.sent();
351
354
  return [3 /*break*/, 14];
352
355
  case 13:
353
- _d = dialog === null || dialog === void 0 ? void 0 : dialog.text;
354
- _f.label = 14;
356
+ _h = dialog === null || dialog === void 0 ? void 0 : dialog.text;
357
+ _k.label = 14;
355
358
  case 14:
356
- text = _d;
357
- _f.label = 15;
359
+ text = _h;
360
+ _k.label = 15;
358
361
  case 15:
359
- _f.trys.push([15, 17, , 19]);
362
+ _k.trys.push([15, 17, , 19]);
360
363
  return [4 /*yield*/, this._bot.editMessageText(text || "404", { chat_id: chat, message_id: this._userdialogs[chat].lastid, parse_mode: 'HTML' })];
361
364
  case 16:
362
- _f.sent();
365
+ _k.sent();
363
366
  return [3 /*break*/, 19];
364
367
  case 17:
365
- _e = _f.sent();
368
+ _j = _k.sent();
366
369
  return [4 /*yield*/, this._bot.sendMessage(chat, text || "404", { parse_mode: 'HTML' })];
367
370
  case 18:
368
- msg = _f.sent();
371
+ msg = _k.sent();
369
372
  this._userdialogs[chat].lastid = msg.message_id;
370
373
  return [3 /*break*/, 19];
371
374
  case 19: return [2 /*return*/];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "telegram-botbuilder",
3
- "version": "1.2.0",
3
+ "version": "1.2.1",
4
4
  "main": "lib/index.js",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
package/src/bot-service.ts CHANGED
@@ -160,19 +160,19 @@ export class BotBuilder {
160
160
  }
161
161
 
162
162
  let dialog = this._getDialog(id);
163
- let btns: BotButton[][] = (typeof dialog?.buttons === 'function' ? await dialog?.buttons(chat) : dialog?.buttons) || [];
164
-
163
+ let btns: BotButton[][] = Object.assign([], (typeof dialog?.buttons === 'function' ? await dialog?.buttons(chat) : dialog?.buttons)) || [];
164
+
165
165
  let markup: InlineKeyboardButton[][] | undefined = undefined;
166
166
  if (btns.length > 0) {
167
167
  markup = [];
168
168
  for (let b = 0; b < btns.length; b++) {
169
169
  markup[b] = [];
170
170
  for (let btn of btns[b]) {
171
- let _text = typeof btn.text === 'function' ? await btn.text(chat) : btn.text;
171
+ btn.text = typeof btn.text === 'function' ? await btn.text(chat) : btn.text;
172
172
  btn._callback = this._hashbtn(dialog!, btn);
173
173
  let psid = this._getButtonID(btn._callback);
174
174
  if (psid == -1) this._schema.buttons.push(btn);
175
- markup[b].push({ text: _text, callback_data: btn._callback});
175
+ markup[b].push({ text: btn.text, callback_data: btn._callback});
176
176
  }
177
177
  }
178
178
  }