@skroz/telegram-bot 1.0.15 → 1.0.17
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.
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +21 -22
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
- package/src/index.ts +21 -24
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,UAAU,EACV,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,wBAAwB,EACxB,SAAS,EACV,MAAM,wCAAwC,CAAC;AAYhD,eAAO,MAAM,kBAAkB,eACjB,MAAM,GAAG,MAAM,QACrB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KACxB,MAC0E,CAAC;AAG9E,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAAM,EACf,CAAC;AA6DvC,cAAM,WAAW;IAEb,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;gBADtB,QAAQ,EAAE,MAAM,EAChB,qBAAqB,CAAC,oBAAQ;IAG3C,YAAY,CAChB,MAAM,EAAE,SAAS,EACjB,cAAc,EAAE,CACd,aAAa,EAAE,gBAAgB,EAC/B,kBAAkB,EAAE,MAAM,EAAE,KACzB,OAAO,CAAC,IAAI,CAAC,EAClB,aAAa,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,GAC3C,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,UAAU,EACV,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,wBAAwB,EACxB,SAAS,EACV,MAAM,wCAAwC,CAAC;AAYhD,eAAO,MAAM,kBAAkB,eACjB,MAAM,GAAG,MAAM,QACrB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KACxB,MAC0E,CAAC;AAG9E,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAAM,EACf,CAAC;AA6DvC,cAAM,WAAW;IAEb,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;gBADtB,QAAQ,EAAE,MAAM,EAChB,qBAAqB,CAAC,oBAAQ;IAG3C,YAAY,CAChB,MAAM,EAAE,SAAS,EACjB,cAAc,EAAE,CACd,aAAa,EAAE,gBAAgB,EAC/B,kBAAkB,EAAE,MAAM,EAAE,KACzB,OAAO,CAAC,IAAI,CAAC,EAClB,aAAa,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,GAC3C,OAAO,CAAC,IAAI,CAAC;IAmCV,SAAS,CACb,KAAK,EAAE,iBAAiB,EACxB,OAAO,CAAC,EAAE,UAAU,EACpB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,KAAK,IAAI,GAC7C,OAAO,CAAC,sBAAsB,CAAC;IA6D5B,WAAW,CACf,KAAK,EAAE,mBAAmB,EAC1B,OAAO,CAAC,EAAE,UAAU,EACpB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,KAAK,IAAI,GAC7C,OAAO,CAAC,sBAAsB,CAAC;IAkD5B,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM;IAI1B,UAAU,CAAC,UAAU,EAAE,MAAM;IAI7B,aAAa;IAIb,aAAa,CACjB,QAAQ,EAAE,aAAa,EAAE,GACxB,OAAO,CAAC,wBAAwB,CAAC;IAI9B,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAIlE,cAAc,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;CAGlE;AAED,eAAe,WAAW,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -58,8 +58,7 @@ class TelegramBot {
|
|
|
58
58
|
async handleUpdate(update, handleCallback, handleMessage) {
|
|
59
59
|
const callbackQuery = update.callback_query;
|
|
60
60
|
if (callbackQuery) {
|
|
61
|
-
const { data
|
|
62
|
-
this.sendChatAction({ chat_id: from.id, action: 'typing' });
|
|
61
|
+
const { data } = callbackQuery;
|
|
63
62
|
if (!data) {
|
|
64
63
|
// 1. Коллбэк пришел от WebApp
|
|
65
64
|
// 2. Игровая кнопка
|
|
@@ -81,36 +80,34 @@ class TelegramBot {
|
|
|
81
80
|
/* обработаем сообщение */
|
|
82
81
|
const { message } = update; // его нет, если это нажатие на кнопку callback_query или при редактировании предыдущего сообщения
|
|
83
82
|
if (!callbackQuery && message) {
|
|
84
|
-
const { from } = message;
|
|
85
|
-
if (from) {
|
|
86
|
-
this.sendChatAction({ chat_id: from.id, action: 'typing' });
|
|
87
|
-
}
|
|
88
83
|
/* разбираем входящий текст */
|
|
89
84
|
await handleMessage(message);
|
|
90
85
|
}
|
|
91
86
|
}
|
|
92
87
|
async sendPhoto(input, message, onExpire) {
|
|
93
|
-
const { chat_id, reply_markup, caption, photo } = input;
|
|
88
|
+
// const { chat_id, reply_markup, caption, photo } = input;
|
|
94
89
|
let sendResult;
|
|
95
90
|
const sendPhotoFunction = () => telegram_api_1.default.sendPhoto({
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
91
|
+
...input,
|
|
92
|
+
// chat_id,
|
|
93
|
+
// caption,
|
|
94
|
+
// photo,
|
|
99
95
|
parse_mode: 'HTML',
|
|
100
|
-
reply_markup,
|
|
96
|
+
// reply_markup,
|
|
101
97
|
}, this.botToken);
|
|
102
98
|
if (message) {
|
|
103
99
|
try {
|
|
104
100
|
sendResult = await telegram_api_1.default.editMessageMedia({
|
|
105
101
|
media: {
|
|
106
102
|
type: 'photo',
|
|
107
|
-
media: photo,
|
|
108
|
-
caption,
|
|
103
|
+
media: input.photo,
|
|
104
|
+
caption: input.caption,
|
|
109
105
|
parse_mode: 'HTML',
|
|
110
106
|
},
|
|
107
|
+
...input,
|
|
111
108
|
message_id: message.message_id,
|
|
112
|
-
reply_markup,
|
|
113
|
-
chat_id,
|
|
109
|
+
// reply_markup,
|
|
110
|
+
// chat_id,
|
|
114
111
|
}, this.botToken);
|
|
115
112
|
}
|
|
116
113
|
catch (e) {
|
|
@@ -137,21 +134,23 @@ class TelegramBot {
|
|
|
137
134
|
return sendResult;
|
|
138
135
|
}
|
|
139
136
|
async sendMessage(input, message, onExpire) {
|
|
140
|
-
const { chat_id, reply_markup, text } = input;
|
|
137
|
+
// const { chat_id, reply_markup, text, protect_content } = input;
|
|
141
138
|
let sendResult;
|
|
142
139
|
const sendPhotoFunction = () => telegram_api_1.default.sendMessage({
|
|
143
|
-
chat_id,
|
|
144
|
-
text,
|
|
140
|
+
// chat_id,
|
|
141
|
+
// text,
|
|
145
142
|
parse_mode: 'HTML',
|
|
146
|
-
reply_markup,
|
|
143
|
+
// reply_markup,
|
|
144
|
+
...input,
|
|
147
145
|
}, this.botToken);
|
|
148
146
|
if (message) {
|
|
149
147
|
try {
|
|
150
148
|
sendResult = await telegram_api_1.default.editMessageText({
|
|
151
|
-
text,
|
|
149
|
+
// text,
|
|
152
150
|
message_id: message.message_id,
|
|
153
|
-
reply_markup,
|
|
154
|
-
chat_id,
|
|
151
|
+
// reply_markup,
|
|
152
|
+
// chat_id,
|
|
153
|
+
...input,
|
|
155
154
|
}, this.botToken);
|
|
156
155
|
}
|
|
157
156
|
catch (e) {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@skroz/telegram-bot",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.17",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"repository": "git@gitlab.com:skroz/libs/utils.git",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -21,5 +21,5 @@
|
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@skroz/telegram-api": "^1.0.11"
|
|
23
23
|
},
|
|
24
|
-
"gitHead": "
|
|
24
|
+
"gitHead": "85a348a96b8883d89ffd114de5f97fde44f46193"
|
|
25
25
|
}
|
package/src/index.ts
CHANGED
|
@@ -107,9 +107,7 @@ class TelegramBot {
|
|
|
107
107
|
): Promise<void> {
|
|
108
108
|
const callbackQuery = update.callback_query;
|
|
109
109
|
if (callbackQuery) {
|
|
110
|
-
const { data
|
|
111
|
-
|
|
112
|
-
this.sendChatAction({ chat_id: from.id, action: 'typing' });
|
|
110
|
+
const { data } = callbackQuery;
|
|
113
111
|
|
|
114
112
|
if (!data) {
|
|
115
113
|
// 1. Коллбэк пришел от WebApp
|
|
@@ -136,11 +134,6 @@ class TelegramBot {
|
|
|
136
134
|
const { message } = update; // его нет, если это нажатие на кнопку callback_query или при редактировании предыдущего сообщения
|
|
137
135
|
|
|
138
136
|
if (!callbackQuery && message) {
|
|
139
|
-
const { from } = message;
|
|
140
|
-
if (from) {
|
|
141
|
-
this.sendChatAction({ chat_id: from.id, action: 'typing' });
|
|
142
|
-
}
|
|
143
|
-
|
|
144
137
|
/* разбираем входящий текст */
|
|
145
138
|
await handleMessage(message);
|
|
146
139
|
}
|
|
@@ -151,18 +144,19 @@ class TelegramBot {
|
|
|
151
144
|
message?: TG_Message,
|
|
152
145
|
onExpire?: (resultMessage: TG_Message) => void
|
|
153
146
|
): Promise<TG_SendMessageResponse> {
|
|
154
|
-
const { chat_id, reply_markup, caption, photo } = input;
|
|
147
|
+
// const { chat_id, reply_markup, caption, photo } = input;
|
|
155
148
|
|
|
156
149
|
let sendResult: TG_SendMessageResponse;
|
|
157
150
|
|
|
158
151
|
const sendPhotoFunction = () =>
|
|
159
152
|
TelegramApi.sendPhoto(
|
|
160
153
|
{
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
154
|
+
...input,
|
|
155
|
+
// chat_id,
|
|
156
|
+
// caption,
|
|
157
|
+
// photo,
|
|
164
158
|
parse_mode: 'HTML',
|
|
165
|
-
reply_markup,
|
|
159
|
+
// reply_markup,
|
|
166
160
|
},
|
|
167
161
|
this.botToken
|
|
168
162
|
);
|
|
@@ -173,13 +167,14 @@ class TelegramBot {
|
|
|
173
167
|
{
|
|
174
168
|
media: {
|
|
175
169
|
type: 'photo',
|
|
176
|
-
media: photo as string,
|
|
177
|
-
caption,
|
|
170
|
+
media: input.photo as string,
|
|
171
|
+
caption: input.caption,
|
|
178
172
|
parse_mode: 'HTML',
|
|
179
173
|
},
|
|
174
|
+
...input,
|
|
180
175
|
message_id: message.message_id,
|
|
181
|
-
reply_markup,
|
|
182
|
-
chat_id,
|
|
176
|
+
// reply_markup,
|
|
177
|
+
// chat_id,
|
|
183
178
|
},
|
|
184
179
|
this.botToken
|
|
185
180
|
);
|
|
@@ -214,17 +209,18 @@ class TelegramBot {
|
|
|
214
209
|
message?: TG_Message,
|
|
215
210
|
onExpire?: (resultMessage: TG_Message) => void
|
|
216
211
|
): Promise<TG_SendMessageResponse> {
|
|
217
|
-
const { chat_id, reply_markup, text } = input;
|
|
212
|
+
// const { chat_id, reply_markup, text, protect_content } = input;
|
|
218
213
|
|
|
219
214
|
let sendResult: TG_SendMessageResponse;
|
|
220
215
|
|
|
221
216
|
const sendPhotoFunction = () =>
|
|
222
217
|
TelegramApi.sendMessage(
|
|
223
218
|
{
|
|
224
|
-
chat_id,
|
|
225
|
-
text,
|
|
219
|
+
// chat_id,
|
|
220
|
+
// text,
|
|
226
221
|
parse_mode: 'HTML',
|
|
227
|
-
reply_markup,
|
|
222
|
+
// reply_markup,
|
|
223
|
+
...input,
|
|
228
224
|
},
|
|
229
225
|
this.botToken
|
|
230
226
|
);
|
|
@@ -233,10 +229,11 @@ class TelegramBot {
|
|
|
233
229
|
try {
|
|
234
230
|
sendResult = await TelegramApi.editMessageText(
|
|
235
231
|
{
|
|
236
|
-
text,
|
|
232
|
+
// text,
|
|
237
233
|
message_id: message.message_id,
|
|
238
|
-
reply_markup,
|
|
239
|
-
chat_id,
|
|
234
|
+
// reply_markup,
|
|
235
|
+
// chat_id,
|
|
236
|
+
...input,
|
|
240
237
|
},
|
|
241
238
|
this.botToken
|
|
242
239
|
);
|