telegram-botbuilder 1.1.10 → 1.2.0

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 +24 -25
  2. package/package.json +4 -3
  3. package/src/bot-service.ts +2 -2
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, _c, _d, psid, text, _e, _f, msg;
290
- return __generator(this, function (_g) {
291
- switch (_g.label) {
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) {
292
292
  case 0:
293
293
  this._userdialogs[chat].dialog = id;
294
294
  if (this._userdialogs[chat].waiter.statewait) {
@@ -299,43 +299,42 @@ var BotBuilder = /** @class */ (function () {
299
299
  if (!(typeof (dialog === null || dialog === void 0 ? void 0 : dialog.buttons) === 'function')) return [3 /*break*/, 2];
300
300
  return [4 /*yield*/, (dialog === null || dialog === void 0 ? void 0 : dialog.buttons(chat))];
301
301
  case 1:
302
- _a = _g.sent();
302
+ _a = _f.sent();
303
303
  return [3 /*break*/, 3];
304
304
  case 2:
305
305
  _a = dialog === null || dialog === void 0 ? void 0 : dialog.buttons;
306
- _g.label = 3;
306
+ _f.label = 3;
307
307
  case 3:
308
308
  btns = (_a) || [];
309
309
  markup = undefined;
310
310
  if (!(btns.length > 0)) return [3 /*break*/, 11];
311
311
  markup = [];
312
312
  b = 0;
313
- _g.label = 4;
313
+ _f.label = 4;
314
314
  case 4:
315
315
  if (!(b < btns.length)) return [3 /*break*/, 11];
316
316
  markup[b] = [];
317
317
  _i = 0, _b = btns[b];
318
- _g.label = 5;
318
+ _f.label = 5;
319
319
  case 5:
320
320
  if (!(_i < _b.length)) return [3 /*break*/, 10];
321
321
  btn = _b[_i];
322
- _c = btn;
323
322
  if (!(typeof btn.text === 'function')) return [3 /*break*/, 7];
324
323
  return [4 /*yield*/, btn.text(chat)];
325
324
  case 6:
326
- _d = _g.sent();
325
+ _c = _f.sent();
327
326
  return [3 /*break*/, 8];
328
327
  case 7:
329
- _d = btn.text;
330
- _g.label = 8;
328
+ _c = btn.text;
329
+ _f.label = 8;
331
330
  case 8:
332
- _c.text = _d;
331
+ _text = _c;
333
332
  btn._callback = this._hashbtn(dialog, btn);
334
333
  psid = this._getButtonID(btn._callback);
335
334
  if (psid == -1)
336
335
  this._schema.buttons.push(btn);
337
- markup[b].push({ text: btn.text, callback_data: btn._callback });
338
- _g.label = 9;
336
+ markup[b].push({ text: _text, callback_data: btn._callback });
337
+ _f.label = 9;
339
338
  case 9:
340
339
  _i++;
341
340
  return [3 /*break*/, 5];
@@ -348,25 +347,25 @@ var BotBuilder = /** @class */ (function () {
348
347
  if (!(typeof (dialog === null || dialog === void 0 ? void 0 : dialog.text) === 'function')) return [3 /*break*/, 13];
349
348
  return [4 /*yield*/, (dialog === null || dialog === void 0 ? void 0 : dialog.text(chat))];
350
349
  case 12:
351
- _e = _g.sent();
350
+ _d = _f.sent();
352
351
  return [3 /*break*/, 14];
353
352
  case 13:
354
- _e = dialog === null || dialog === void 0 ? void 0 : dialog.text;
355
- _g.label = 14;
353
+ _d = dialog === null || dialog === void 0 ? void 0 : dialog.text;
354
+ _f.label = 14;
356
355
  case 14:
357
- text = _e;
358
- _g.label = 15;
356
+ text = _d;
357
+ _f.label = 15;
359
358
  case 15:
360
- _g.trys.push([15, 17, , 19]);
361
- 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' })];
359
+ _f.trys.push([15, 17, , 19]);
360
+ return [4 /*yield*/, this._bot.editMessageText(text || "404", { chat_id: chat, message_id: this._userdialogs[chat].lastid, parse_mode: 'HTML' })];
362
361
  case 16:
363
- _g.sent();
362
+ _f.sent();
364
363
  return [3 /*break*/, 19];
365
364
  case 17:
366
- _f = _g.sent();
367
- return [4 /*yield*/, this._bot.sendMessage(chat, text || "404", { reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'HTML' })];
365
+ _e = _f.sent();
366
+ return [4 /*yield*/, this._bot.sendMessage(chat, text || "404", { parse_mode: 'HTML' })];
368
367
  case 18:
369
- msg = _g.sent();
368
+ msg = _f.sent();
370
369
  this._userdialogs[chat].lastid = msg.message_id;
371
370
  return [3 /*break*/, 19];
372
371
  case 19: return [2 /*return*/];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "telegram-botbuilder",
3
- "version": "1.1.10",
3
+ "version": "1.2.0",
4
4
  "main": "lib/index.js",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
@@ -14,9 +14,10 @@
14
14
  "node-telegram-bot-api": "^0.66.0",
15
15
  "object-hash": "^3.0.0",
16
16
  "ts-node": "^10.9.2",
17
- "typescript": "^5.5.3"
17
+ "typescript": "^5.5.3",
18
+ "@types/node-telegram-bot-api": "^0.64.7"
18
19
  },
19
20
  "devDependencies": {
20
- "@types/node-telegram-bot-api": "^0.64.7"
21
+
21
22
  }
22
23
  }
package/src/bot-service.ts CHANGED
@@ -168,11 +168,11 @@ export class BotBuilder {
168
168
  for (let b = 0; b < btns.length; b++) {
169
169
  markup[b] = [];
170
170
  for (let btn of btns[b]) {
171
- btn.text = typeof btn.text === 'function' ? await btn.text(chat) : btn.text;
171
+ let _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: btn.text, callback_data: btn._callback});
175
+ markup[b].push({ text: _text, callback_data: btn._callback});
176
176
  }
177
177
  }
178
178
  }