telegram-botbuilder 1.5.0 → 1.5.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 (6) hide show
  1. package/lib/bot-service.d.ts +2 -2
  2. package/lib/bot-service.d.ts.map +1 -1
  3. package/lib/bot-service.js +16 -7
  4. package/lib/bot-service.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/bot-service.ts +15 -8
package/lib/bot-service.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import TelegramBot from 'node-telegram-bot-api';
2
- import { Schema, Action, BotBuilderMiddleware, CallbackActionFunc } from './bot-struct';
2
+ import { Schema, Action, BotBuilderMiddleware, CallbackActionFunc, Dialog } from './bot-struct';
3
3
  import EventEmitter from 'events';
4
4
  export declare class BotBuilder {
5
5
  _bot: TelegramBot;
@@ -17,7 +17,7 @@ export declare class BotBuilder {
17
17
  private _getButton;
18
18
  private _getButtonID;
19
19
  private _activateButton;
20
- ChangeDialog(chat: number, id: string): Promise<void>;
20
+ ChangeDialog(chat: number, id: string | Dialog): Promise<void>;
21
21
  AttachDataWait(chat: number, descriptor: string): void;
22
22
  Message(chat: number, content: string): Promise<TelegramBot.Message>;
23
23
  }
package/lib/bot-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bot-service.d.ts","sourceRoot":"","sources":["../src/bot-service.ts"],"names":[],"mappings":"AAAA,OAAO,WAAsD,MAAO,uBAAuB,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,MAAM,EAAuD,oBAAoB,EAAe,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC1J,OAAO,YAAY,MAAM,QAAQ,CAAC;AAOlC,qBAAa,UAAU;IACd,IAAI,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,OAAO,CAAY;IACpB,YAAY,EAAE,YAAY,CAAC;IAClC,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,QAAQ,CAAmB;IAE5B,GAAG,CAAC,IAAI,EAAE,oBAAoB;IAGrC,OAAO,CAAC,KAAK;YAKC,MAAM;IAgBpB,OAAO,CAAC,QAAQ;gBAIH,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,kBAAkB;IAmFpF,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY;YAGN,eAAe;IAchB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IA8C3C,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAI/C,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAG7C;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAE/C;AACD,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAE9F;AACD,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,GAAG,MAAM,CAoB3E"}
1
+ {"version":3,"file":"bot-service.d.ts","sourceRoot":"","sources":["../src/bot-service.ts"],"names":[],"mappings":"AAAA,OAAO,WAAsD,MAAO,uBAAuB,CAAC;AAC5F,OAAO,EAAE,MAAM,EAAE,MAAM,EAAuD,oBAAoB,EAAe,kBAAkB,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAClK,OAAO,YAAY,MAAM,QAAQ,CAAC;AAOlC,qBAAa,UAAU;IACd,IAAI,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,OAAO,CAAY;IACpB,YAAY,EAAE,YAAY,CAAC;IAClC,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,WAAW,CAA8B;IACjD,OAAO,CAAC,QAAQ,CAAmB;IAE5B,GAAG,CAAC,IAAI,EAAE,oBAAoB;IAGrC,OAAO,CAAC,KAAK;YAKC,MAAM;IAgBpB,OAAO,CAAC,QAAQ;gBAIH,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,kBAAkB;IAmFpF,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,UAAU;IAGlB,OAAO,CAAC,YAAY;YAGN,eAAe;IAchB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM;IAqDpD,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAI/C,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAG7C;AAED,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAE/C;AACD,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAE9F;AACD,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,GAAG,MAAM,CAoB3E"}
package/lib/bot-service.js CHANGED
@@ -95,7 +95,7 @@ class BotBuilder {
95
95
  catch { }
96
96
  this._bot.onText(/.+/gms, async (msg) => {
97
97
  if (!this._userdialogs[msg.chat.id])
98
- this._userdialogs[msg.chat.id] = { dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' } };
98
+ this._userdialogs[msg.chat.id] = { dialog: this._schema.start, lastid: msg.message_id, waiter: { statewait: false, descriptor: '' } };
99
99
  if (await this._runmw(msg.chat.id, msg))
100
100
  return;
101
101
  let chat = msg.chat.id;
@@ -123,12 +123,12 @@ class BotBuilder {
123
123
  if (await this._runmw(query.message.chat.id, query))
124
124
  return;
125
125
  if (!this._userdialogs[query.message.chat.id])
126
- this._userdialogs[query.message.chat.id] = { dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' } };
126
+ this._userdialogs[query.message.chat.id] = { dialog: this._schema.start, lastid: query.message?.message_id || -1, waiter: { statewait: false, descriptor: '' } };
127
127
  this._activateButton(query.message.chat.id, query.data);
128
128
  });
129
129
  this._bot.on('document', async (msg) => {
130
130
  if (!this._userdialogs[msg.chat.id])
131
- this._userdialogs[msg.chat.id] = { dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' } };
131
+ this._userdialogs[msg.chat.id] = { dialog: this._schema.start, lastid: msg.message_id, waiter: { statewait: false, descriptor: '' } };
132
132
  if (await this._runmw(msg.chat.id, msg))
133
133
  return;
134
134
  if (!msg.document)
@@ -179,12 +179,23 @@ class BotBuilder {
179
179
  }
180
180
  }
181
181
  async ChangeDialog(chat, id) {
182
- this._userdialogs[chat].dialog = id;
182
+ if (typeof id != 'string') {
183
+ this._userdialogs[chat].dialog = id.id;
184
+ }
185
+ else {
186
+ this._userdialogs[chat].dialog = id;
187
+ }
183
188
  if (this._userdialogs[chat].waiter.statewait) {
184
189
  this._userdialogs[chat].waiter.statewait = false;
185
190
  this.ActionSystem.emit(`cancel_${this._userdialogs[chat].waiter.descriptor}`, chat);
186
191
  }
187
- let dialog = this._getDialog(id);
192
+ let dialog;
193
+ if (typeof id == 'string') {
194
+ dialog = this._getDialog(id);
195
+ }
196
+ else {
197
+ dialog = id;
198
+ }
188
199
  let btns = deepcopy.default()((typeof dialog?.buttons === 'function' ? await dialog?.buttons(chat) : dialog?.buttons)) || [];
189
200
  let markup = undefined;
190
201
  if (btns.length > 0) {
@@ -203,8 +214,6 @@ class BotBuilder {
203
214
  }
204
215
  }
205
216
  }
206
- if (process.env['DEBUG_BOT'] == 'true')
207
- console.log(markup);
208
217
  if (dialog == undefined)
209
218
  markup = [[{ text: "Меню", callback_data: this._schema.start }]]; // FIX RAND BTN
210
219
  let text = typeof dialog?.text === 'function' ? await dialog?.text(chat) : dialog?.text;
package/lib/bot-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bot-service.js","sourceRoot":"","sources":["../src/bot-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bot-service.js","sourceRoot":"","sources":["../src/bot-service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "telegram-botbuilder",
3
- "version": "1.5.0",
3
+ "version": "1.5.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
@@ -1,5 +1,5 @@
1
1
  import TelegramBot, { InlineKeyboardButton, InputMediaPhoto } from 'node-telegram-bot-api';
2
- import { Schema, Action, BotSchema, Button, BotButton, BotDialog, UserDialog, BotBuilderMiddleware, MWBreakDown, CallbackActionFunc } from './bot-struct';
2
+ import { Schema, Action, BotSchema, Button, BotButton, BotDialog, UserDialog, BotBuilderMiddleware, MWBreakDown, CallbackActionFunc, Dialog } from './bot-struct';
3
3
  import EventEmitter from 'events';
4
4
  import { readFileSync, rmSync } from 'fs';
5
5
  import * as deepcopy from 'rfdc';
@@ -70,7 +70,7 @@ export class BotBuilder {
70
70
 
71
71
 
72
72
  this._bot.onText(/.+/gms, async (msg) => {
73
- if (!this._userdialogs[msg.chat.id]) this._userdialogs[msg.chat.id] = {dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' }}
73
+ if (!this._userdialogs[msg.chat.id]) this._userdialogs[msg.chat.id] = {dialog: this._schema.start, lastid: msg.message_id, waiter: { statewait: false, descriptor: '' }}
74
74
  if (await this._runmw(msg.chat.id, msg)) return;
75
75
 
76
76
  let chat = msg.chat.id;
@@ -96,12 +96,12 @@ export class BotBuilder {
96
96
  this._bot.on('callback_query', async (query) => {
97
97
  if (await this._runmw(query.message!.chat.id, query)) return;
98
98
 
99
- if (!this._userdialogs[query.message!.chat.id]) this._userdialogs[query.message!.chat.id] = {dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' }}
99
+ if (!this._userdialogs[query.message!.chat.id]) this._userdialogs[query.message!.chat.id] = {dialog: this._schema.start, lastid: query.message?.message_id || -1, waiter: { statewait: false, descriptor: '' }}
100
100
  this._activateButton(query.message!.chat.id, query.data!)
101
101
  });
102
102
 
103
103
  this._bot.on('document', async (msg) => {
104
- if (!this._userdialogs[msg.chat.id]) this._userdialogs[msg.chat.id] = {dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' }}
104
+ if (!this._userdialogs[msg.chat.id]) this._userdialogs[msg.chat.id] = {dialog: this._schema.start, lastid: msg.message_id, waiter: { statewait: false, descriptor: '' }}
105
105
  if (await this._runmw(msg.chat.id, msg)) return;
106
106
 
107
107
  if (!msg.document) return;
@@ -149,14 +149,22 @@ export class BotBuilder {
149
149
  }
150
150
  }
151
151
 
152
- public async ChangeDialog(chat: number, id: string) {
153
- this._userdialogs[chat].dialog = id;
152
+ public async ChangeDialog(chat: number, id: string | Dialog) {
153
+ if (typeof id != 'string') {
154
+ this._userdialogs[chat].dialog = id.id;
155
+ } else {
156
+ this._userdialogs[chat].dialog = id;
157
+ }
158
+
154
159
  if (this._userdialogs[chat].waiter.statewait) {
155
160
  this._userdialogs[chat].waiter.statewait = false;
156
161
  this.ActionSystem.emit(`cancel_${this._userdialogs[chat].waiter.descriptor}`, chat)
157
162
  }
158
163
 
159
- let dialog = this._getDialog(id);
164
+ let dialog: BotDialog | undefined;
165
+ if (typeof id == 'string') { dialog = this._getDialog(id); }
166
+ else { dialog = id as BotDialog; }
167
+
160
168
  let btns: BotButton[][] = deepcopy.default()((typeof dialog?.buttons === 'function' ? await dialog?.buttons(chat) : dialog?.buttons)) || [];
161
169
 
162
170
  let markup: InlineKeyboardButton[][] | undefined = undefined;
@@ -174,7 +182,6 @@ export class BotBuilder {
174
182
  }
175
183
  }
176
184
  }
177
- if (process.env['DEBUG_BOT'] == 'true') console.log(markup);
178
185
 
179
186
  if (dialog == undefined) markup = [[{text: "Меню", callback_data: this._schema.start}]]; // FIX RAND BTN
180
187
  let text = typeof dialog?.text === 'function' ? await dialog?.text(chat) : dialog?.text;