@mtcute/dispatcher 0.16.0 → 0.16.7
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/README.md +2 -2
- package/cjs/callback-data-builder.d.ts +2 -2
- package/cjs/callback-data-builder.js +8 -6
- package/cjs/callback-data-builder.js.map +1 -1
- package/cjs/context/base.d.ts +2 -2
- package/cjs/context/base.js.map +1 -1
- package/cjs/context/business-message.d.ts +20 -19
- package/cjs/context/business-message.js +3 -3
- package/cjs/context/business-message.js.map +1 -1
- package/cjs/context/callback-query.d.ts +4 -3
- package/cjs/context/callback-query.js.map +1 -1
- package/cjs/context/chat-join-request.d.ts +2 -2
- package/cjs/context/chat-join-request.js.map +1 -1
- package/cjs/context/chosen-inline-result.d.ts +2 -2
- package/cjs/context/chosen-inline-result.js.map +1 -1
- package/cjs/context/inline-query.d.ts +4 -3
- package/cjs/context/inline-query.js.map +1 -1
- package/cjs/context/message.d.ts +6 -5
- package/cjs/context/message.js +3 -3
- package/cjs/context/message.js.map +1 -1
- package/cjs/context/parse.d.ts +5 -5
- package/cjs/context/parse.js +1 -2
- package/cjs/context/parse.js.map +1 -1
- package/cjs/context/pre-checkout-query.d.ts +2 -2
- package/cjs/context/pre-checkout-query.js.map +1 -1
- package/cjs/context/scene-transition.d.ts +1 -1
- package/cjs/context/scene-transition.js.map +1 -1
- package/cjs/dispatcher.d.ts +10 -9
- package/cjs/dispatcher.js +34 -31
- package/cjs/dispatcher.js.map +1 -1
- package/cjs/filters/bots.d.ts +15 -25
- package/cjs/filters/bots.js +36 -34
- package/cjs/filters/bots.js.map +1 -1
- package/cjs/filters/chat.d.ts +5 -5
- package/cjs/filters/chat.js +10 -9
- package/cjs/filters/chat.js.map +1 -1
- package/cjs/filters/group.d.ts +4 -4
- package/cjs/filters/group.js +3 -6
- package/cjs/filters/group.js.map +1 -1
- package/cjs/filters/index.js.map +1 -1
- package/cjs/filters/logic.d.ts +1 -1
- package/cjs/filters/logic.js +5 -7
- package/cjs/filters/logic.js.map +1 -1
- package/cjs/filters/message.d.ts +29 -146
- package/cjs/filters/message.js +84 -72
- package/cjs/filters/message.js.map +1 -1
- package/cjs/filters/state.d.ts +3 -3
- package/cjs/filters/state.js +5 -4
- package/cjs/filters/state.js.map +1 -1
- package/cjs/filters/text.d.ts +8 -8
- package/cjs/filters/text.js +27 -26
- package/cjs/filters/text.js.map +1 -1
- package/cjs/filters/types.d.ts +2 -2
- package/cjs/filters/types.js +0 -3
- package/cjs/filters/types.js.map +1 -1
- package/cjs/filters/updates.d.ts +2 -2
- package/cjs/filters/updates.js +7 -7
- package/cjs/filters/updates.js.map +1 -1
- package/cjs/filters/user.d.ts +4 -3
- package/cjs/filters/user.js +15 -16
- package/cjs/filters/user.js.map +1 -1
- package/cjs/handler.d.ts +5 -5
- package/cjs/handler.js.map +1 -1
- package/cjs/state/key.d.ts +3 -3
- package/cjs/state/key.js.map +1 -1
- package/cjs/state/provider.d.ts +2 -2
- package/cjs/state/provider.js.map +1 -1
- package/cjs/state/providers/memory.d.ts +4 -3
- package/cjs/state/providers/memory.js.map +1 -1
- package/cjs/state/providers/sqlite.d.ts +3 -3
- package/cjs/state/providers/sqlite.js.map +1 -1
- package/cjs/state/repository.d.ts +7 -7
- package/cjs/state/repository.js.map +1 -1
- package/cjs/state/service.d.ts +4 -3
- package/cjs/state/service.js.map +1 -1
- package/cjs/state/update-state.d.ts +1 -1
- package/cjs/state/update-state.js +3 -4
- package/cjs/state/update-state.js.map +1 -1
- package/cjs/wizard.d.ts +8 -7
- package/cjs/wizard.js +3 -1
- package/cjs/wizard.js.map +1 -1
- package/esm/callback-data-builder.d.ts +2 -2
- package/esm/callback-data-builder.js +8 -6
- package/esm/callback-data-builder.js.map +1 -1
- package/esm/context/base.d.ts +2 -2
- package/esm/context/base.js.map +1 -1
- package/esm/context/business-message.d.ts +20 -19
- package/esm/context/business-message.js +3 -3
- package/esm/context/business-message.js.map +1 -1
- package/esm/context/callback-query.d.ts +4 -3
- package/esm/context/callback-query.js.map +1 -1
- package/esm/context/chat-join-request.d.ts +2 -2
- package/esm/context/chat-join-request.js.map +1 -1
- package/esm/context/chosen-inline-result.d.ts +2 -2
- package/esm/context/chosen-inline-result.js.map +1 -1
- package/esm/context/inline-query.d.ts +4 -3
- package/esm/context/inline-query.js.map +1 -1
- package/esm/context/message.d.ts +6 -5
- package/esm/context/message.js +3 -3
- package/esm/context/message.js.map +1 -1
- package/esm/context/parse.d.ts +5 -5
- package/esm/context/parse.js.map +1 -1
- package/esm/context/pre-checkout-query.d.ts +2 -2
- package/esm/context/pre-checkout-query.js.map +1 -1
- package/esm/context/scene-transition.d.ts +1 -1
- package/esm/context/scene-transition.js.map +1 -1
- package/esm/dispatcher.d.ts +10 -9
- package/esm/dispatcher.js +35 -32
- package/esm/dispatcher.js.map +1 -1
- package/esm/filters/bots.d.ts +15 -25
- package/esm/filters/bots.js +32 -30
- package/esm/filters/bots.js.map +1 -1
- package/esm/filters/chat.d.ts +5 -5
- package/esm/filters/chat.js +8 -7
- package/esm/filters/chat.js.map +1 -1
- package/esm/filters/group.d.ts +4 -4
- package/esm/filters/group.js +1 -3
- package/esm/filters/group.js.map +1 -1
- package/esm/filters/index.js.map +1 -1
- package/esm/filters/logic.d.ts +1 -1
- package/esm/filters/logic.js +1 -3
- package/esm/filters/logic.js.map +1 -1
- package/esm/filters/message.d.ts +29 -146
- package/esm/filters/message.js +60 -48
- package/esm/filters/message.js.map +1 -1
- package/esm/filters/state.d.ts +3 -3
- package/esm/filters/state.js +3 -2
- package/esm/filters/state.js.map +1 -1
- package/esm/filters/text.d.ts +8 -8
- package/esm/filters/text.js +22 -20
- package/esm/filters/text.js.map +1 -1
- package/esm/filters/types.d.ts +2 -2
- package/esm/filters/types.js +0 -3
- package/esm/filters/types.js.map +1 -1
- package/esm/filters/updates.d.ts +2 -2
- package/esm/filters/updates.js +7 -7
- package/esm/filters/updates.js.map +1 -1
- package/esm/filters/user.d.ts +4 -3
- package/esm/filters/user.js +15 -16
- package/esm/filters/user.js.map +1 -1
- package/esm/handler.d.ts +5 -5
- package/esm/handler.js.map +1 -1
- package/esm/state/key.d.ts +3 -3
- package/esm/state/key.js.map +1 -1
- package/esm/state/provider.d.ts +2 -2
- package/esm/state/provider.js.map +1 -1
- package/esm/state/providers/memory.d.ts +4 -3
- package/esm/state/providers/memory.js.map +1 -1
- package/esm/state/providers/sqlite.d.ts +3 -3
- package/esm/state/providers/sqlite.js.map +1 -1
- package/esm/state/repository.d.ts +7 -7
- package/esm/state/repository.js.map +1 -1
- package/esm/state/service.d.ts +4 -3
- package/esm/state/service.js +1 -1
- package/esm/state/service.js.map +1 -1
- package/esm/state/update-state.d.ts +1 -1
- package/esm/state/update-state.js +3 -4
- package/esm/state/update-state.js.map +1 -1
- package/esm/wizard.d.ts +8 -7
- package/esm/wizard.js +3 -1
- package/esm/wizard.js.map +1 -1
- package/package.json +3 -3
package/cjs/filters/state.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/filters/state.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/filters/state.ts"],"names":[],"mappings":";;;AAsBA,sBAQC;AA1BD;;GAEG;AACI,MAAM,UAAU,GAAsB,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;IAC9D,IAAI,CAAC,KAAK;QAAE,OAAO,KAAK,CAAA;IAExB,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC,CAAA;AAC/B,CAAC,CAAA;AAJY,QAAA,UAAU,cAItB;AAED;;;;;;;GAOG;AACH,mDAAmD;AACnD,SAAgB,KAAK,CAAmB,SAA8C;IAClF,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACxB,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAA;QACxB,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAA;QAC9B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAA;QAEvB,OAAO,SAAS,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC,CAAA;AACL,CAAC","sourcesContent":["import type { MaybePromise } from '@mtcute/core'\n\nimport type { UpdateFilter } from './types.js'\n\n/**\n * Create a filter for the cases when the state is empty\n */\nexport const stateEmpty: UpdateFilter<any> = async (upd, state) => {\n if (!state) return false\n\n return !(await state.get())\n}\n\n/**\n * Create a filter based on state predicate\n *\n * If state exists and matches `predicate`, update passes\n * this filter, otherwise it doesn't\n *\n * @param predicate State predicate\n */\n// eslint-disable-next-line ts/no-empty-object-type\nexport function state<T extends object>(predicate: (state: T) => MaybePromise<boolean>): UpdateFilter<any, {}, T> {\n return async (upd, state) => {\n if (!state) return false\n const data = await state.get()\n if (!data) return false\n\n return predicate(data)\n }\n}\n"]}
|
package/cjs/filters/text.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BusinessCallbackQuery, BusinessMessage, CallbackQuery, ChosenInlineResult, InlineCallbackQuery, InlineQuery, Message } from '@mtcute/core';
|
|
2
|
-
import { UpdateContextDistributed } from '../context/base.js';
|
|
3
|
-
import { UpdateFilter } from './types.js';
|
|
1
|
+
import type { BusinessCallbackQuery, BusinessMessage, CallbackQuery, ChosenInlineResult, InlineCallbackQuery, InlineQuery, Message } from '@mtcute/core';
|
|
2
|
+
import type { UpdateContextDistributed } from '../context/base.js';
|
|
3
|
+
import type { UpdateFilter } from './types.js';
|
|
4
4
|
type UpdatesWithText = UpdateContextDistributed<Message | BusinessMessage | InlineQuery | ChosenInlineResult | CallbackQuery | InlineCallbackQuery | BusinessCallbackQuery>;
|
|
5
5
|
/**
|
|
6
6
|
* Filter objects that match a given regular expression
|
|
@@ -14,7 +14,7 @@ type UpdatesWithText = UpdateContextDistributed<Message | BusinessMessage | Inli
|
|
|
14
14
|
*
|
|
15
15
|
* @param regex Regex to be matched
|
|
16
16
|
*/
|
|
17
|
-
export declare
|
|
17
|
+
export declare function regex(regex: RegExp): UpdateFilter<UpdatesWithText, {
|
|
18
18
|
match: RegExpMatchArray;
|
|
19
19
|
}>;
|
|
20
20
|
/**
|
|
@@ -27,7 +27,7 @@ export declare const regex: (regex: RegExp) => UpdateFilter<UpdatesWithText, {
|
|
|
27
27
|
* @param str String to be matched
|
|
28
28
|
* @param ignoreCase Whether string case should be ignored
|
|
29
29
|
*/
|
|
30
|
-
export declare
|
|
30
|
+
export declare function equals(str: string, ignoreCase?: boolean): UpdateFilter<UpdatesWithText>;
|
|
31
31
|
/**
|
|
32
32
|
* Filter objects which contain the text given (as a substring)
|
|
33
33
|
* - for `Message`, `Message.text` is used
|
|
@@ -38,7 +38,7 @@ export declare const equals: (str: string, ignoreCase?: boolean) => UpdateFilter
|
|
|
38
38
|
* @param str Substring to be matched
|
|
39
39
|
* @param ignoreCase Whether string case should be ignored
|
|
40
40
|
*/
|
|
41
|
-
export declare
|
|
41
|
+
export declare function contains(str: string, ignoreCase?: boolean): UpdateFilter<UpdatesWithText>;
|
|
42
42
|
/**
|
|
43
43
|
* Filter objects which contain the text starting with a given string
|
|
44
44
|
* - for `Message`, `Message.text` is used
|
|
@@ -49,7 +49,7 @@ export declare const contains: (str: string, ignoreCase?: boolean) => UpdateFilt
|
|
|
49
49
|
* @param str Substring to be matched
|
|
50
50
|
* @param ignoreCase Whether string case should be ignored
|
|
51
51
|
*/
|
|
52
|
-
export declare
|
|
52
|
+
export declare function startsWith(str: string, ignoreCase?: boolean): UpdateFilter<UpdatesWithText>;
|
|
53
53
|
/**
|
|
54
54
|
* Filter objects which contain the text ending with a given string
|
|
55
55
|
* - for `Message`, `Message.text` is used
|
|
@@ -60,5 +60,5 @@ export declare const startsWith: (str: string, ignoreCase?: boolean) => UpdateFi
|
|
|
60
60
|
* @param str Substring to be matched
|
|
61
61
|
* @param ignoreCase Whether string case should be ignored
|
|
62
62
|
*/
|
|
63
|
-
export declare
|
|
63
|
+
export declare function endsWith(str: string, ignoreCase?: boolean): UpdateFilter<UpdatesWithText>;
|
|
64
64
|
export {};
|
package/cjs/filters/text.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.regex = regex;
|
|
4
|
+
exports.equals = equals;
|
|
5
|
+
exports.contains = contains;
|
|
6
|
+
exports.startsWith = startsWith;
|
|
7
|
+
exports.endsWith = endsWith;
|
|
4
8
|
function extractText(obj) {
|
|
5
9
|
switch (obj._name) {
|
|
6
10
|
case 'new_message':
|
|
@@ -30,18 +34,19 @@ function extractText(obj) {
|
|
|
30
34
|
*
|
|
31
35
|
* @param regex Regex to be matched
|
|
32
36
|
*/
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
37
|
+
function regex(regex) {
|
|
38
|
+
return (obj) => {
|
|
39
|
+
const txt = extractText(obj);
|
|
40
|
+
if (!txt)
|
|
41
|
+
return false;
|
|
42
|
+
const m = txt.match(regex);
|
|
43
|
+
if (m) {
|
|
44
|
+
obj.match = m;
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
36
47
|
return false;
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
obj.match = m;
|
|
40
|
-
return true;
|
|
41
|
-
}
|
|
42
|
-
return false;
|
|
43
|
-
};
|
|
44
|
-
exports.regex = regex;
|
|
48
|
+
};
|
|
49
|
+
}
|
|
45
50
|
/**
|
|
46
51
|
* Filter objects which contain the exact text given
|
|
47
52
|
* - for `Message`, `Message.text` is used
|
|
@@ -52,14 +57,13 @@ exports.regex = regex;
|
|
|
52
57
|
* @param str String to be matched
|
|
53
58
|
* @param ignoreCase Whether string case should be ignored
|
|
54
59
|
*/
|
|
55
|
-
|
|
60
|
+
function equals(str, ignoreCase = false) {
|
|
56
61
|
if (ignoreCase) {
|
|
57
62
|
str = str.toLowerCase();
|
|
58
|
-
return
|
|
63
|
+
return obj => extractText(obj)?.toLowerCase() === str;
|
|
59
64
|
}
|
|
60
|
-
return
|
|
61
|
-
}
|
|
62
|
-
exports.equals = equals;
|
|
65
|
+
return obj => extractText(obj) === str;
|
|
66
|
+
}
|
|
63
67
|
/**
|
|
64
68
|
* Filter objects which contain the text given (as a substring)
|
|
65
69
|
* - for `Message`, `Message.text` is used
|
|
@@ -70,7 +74,7 @@ exports.equals = equals;
|
|
|
70
74
|
* @param str Substring to be matched
|
|
71
75
|
* @param ignoreCase Whether string case should be ignored
|
|
72
76
|
*/
|
|
73
|
-
|
|
77
|
+
function contains(str, ignoreCase = false) {
|
|
74
78
|
if (ignoreCase) {
|
|
75
79
|
str = str.toLowerCase();
|
|
76
80
|
return (obj) => {
|
|
@@ -82,8 +86,7 @@ const contains = (str, ignoreCase = false) => {
|
|
|
82
86
|
const txt = extractText(obj);
|
|
83
87
|
return txt != null && txt.includes(str);
|
|
84
88
|
};
|
|
85
|
-
}
|
|
86
|
-
exports.contains = contains;
|
|
89
|
+
}
|
|
87
90
|
/**
|
|
88
91
|
* Filter objects which contain the text starting with a given string
|
|
89
92
|
* - for `Message`, `Message.text` is used
|
|
@@ -94,7 +97,7 @@ exports.contains = contains;
|
|
|
94
97
|
* @param str Substring to be matched
|
|
95
98
|
* @param ignoreCase Whether string case should be ignored
|
|
96
99
|
*/
|
|
97
|
-
|
|
100
|
+
function startsWith(str, ignoreCase = false) {
|
|
98
101
|
if (ignoreCase) {
|
|
99
102
|
str = str.toLowerCase();
|
|
100
103
|
return (obj) => {
|
|
@@ -106,8 +109,7 @@ const startsWith = (str, ignoreCase = false) => {
|
|
|
106
109
|
const txt = extractText(obj);
|
|
107
110
|
return txt != null && txt.substring(0, str.length) === str;
|
|
108
111
|
};
|
|
109
|
-
}
|
|
110
|
-
exports.startsWith = startsWith;
|
|
112
|
+
}
|
|
111
113
|
/**
|
|
112
114
|
* Filter objects which contain the text ending with a given string
|
|
113
115
|
* - for `Message`, `Message.text` is used
|
|
@@ -118,7 +120,7 @@ exports.startsWith = startsWith;
|
|
|
118
120
|
* @param str Substring to be matched
|
|
119
121
|
* @param ignoreCase Whether string case should be ignored
|
|
120
122
|
*/
|
|
121
|
-
|
|
123
|
+
function endsWith(str, ignoreCase = false) {
|
|
122
124
|
if (ignoreCase) {
|
|
123
125
|
str = str.toLowerCase();
|
|
124
126
|
return (obj) => {
|
|
@@ -130,6 +132,5 @@ const endsWith = (str, ignoreCase = false) => {
|
|
|
130
132
|
const txt = extractText(obj);
|
|
131
133
|
return txt != null && txt.substring(0, str.length) === str;
|
|
132
134
|
};
|
|
133
|
-
}
|
|
134
|
-
exports.endsWith = endsWith;
|
|
135
|
+
}
|
|
135
136
|
//# sourceMappingURL=text.js.map
|
package/cjs/filters/text.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../src/filters/text.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"text.js","sourceRoot":"","sources":["../../../src/filters/text.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n BusinessCallbackQuery,\n BusinessMessage,\n CallbackQuery,\n ChosenInlineResult,\n InlineCallbackQuery,\n InlineQuery,\n Message,\n} from '@mtcute/core'\n\nimport type { UpdateContextDistributed } from '../context/base.js'\n\nimport type { UpdateFilter } from './types.js'\n\ntype UpdatesWithText = UpdateContextDistributed<\n | Message\n | BusinessMessage\n | InlineQuery\n | ChosenInlineResult\n | CallbackQuery\n | InlineCallbackQuery\n | BusinessCallbackQuery\n>\n\nfunction extractText(obj: UpdatesWithText): string | null {\n switch (obj._name) {\n case 'new_message':\n case 'new_business_message':\n return obj.text\n case 'inline_query':\n return obj.query\n case 'chosen_inline_result':\n return obj.id\n case 'callback_query':\n case 'inline_callback_query':\n case 'business_callback_query':\n if (obj.raw.data) return obj.dataStr\n }\n\n return null\n}\n\n/**\n * Filter objects that match a given regular expression\n * - for `Message`, `Message.text` is used\n * - for `InlineQuery`, `InlineQuery.query` is used\n * - for {@link ChosenInlineResult}, {@link ChosenInlineResult#id} is used\n * - for callback queries, `dataStr` is used\n *\n * When a regex matches, the match array is stored in a\n * type-safe extension field `.match` of the object\n *\n * @param regex Regex to be matched\n */\nexport function regex(regex: RegExp): UpdateFilter<UpdatesWithText, { match: RegExpMatchArray }> {\n return (obj) => {\n const txt = extractText(obj)\n if (!txt) return false\n\n const m = txt.match(regex)\n\n if (m) {\n (obj as typeof obj & { match: RegExpMatchArray }).match = m\n\n return true\n }\n\n return false\n }\n}\n\n/**\n * Filter objects which contain the exact text given\n * - for `Message`, `Message.text` is used\n * - for `InlineQuery`, `InlineQuery.query` is used\n * - for {@link ChosenInlineResult}, {@link ChosenInlineResult.id} is used\n * - for callback queries, `dataStr` is used\n *\n * @param str String to be matched\n * @param ignoreCase Whether string case should be ignored\n */\nexport function equals(str: string, ignoreCase = false): UpdateFilter<UpdatesWithText> {\n if (ignoreCase) {\n str = str.toLowerCase()\n\n return obj => extractText(obj)?.toLowerCase() === str\n }\n\n return obj => extractText(obj) === str\n}\n\n/**\n * Filter objects which contain the text given (as a substring)\n * - for `Message`, `Message.text` is used\n * - for `InlineQuery`, `InlineQuery.query` is used\n * - for {@link ChosenInlineResult}, {@link ChosenInlineResult.id} is used\n * - for callback queries, `dataStr` is used\n *\n * @param str Substring to be matched\n * @param ignoreCase Whether string case should be ignored\n */\nexport function contains(str: string, ignoreCase = false): UpdateFilter<UpdatesWithText> {\n if (ignoreCase) {\n str = str.toLowerCase()\n\n return (obj) => {\n const txt = extractText(obj)\n\n return txt != null && txt.toLowerCase().includes(str)\n }\n }\n\n return (obj) => {\n const txt = extractText(obj)\n\n return txt != null && txt.includes(str)\n }\n}\n\n/**\n * Filter objects which contain the text starting with a given string\n * - for `Message`, `Message.text` is used\n * - for `InlineQuery`, `InlineQuery.query` is used\n * - for {@link ChosenInlineResult}, {@link ChosenInlineResult.id} is used\n * - for callback queries, `dataStr` is used\n *\n * @param str Substring to be matched\n * @param ignoreCase Whether string case should be ignored\n */\nexport function startsWith(str: string, ignoreCase = false): UpdateFilter<UpdatesWithText> {\n if (ignoreCase) {\n str = str.toLowerCase()\n\n return (obj) => {\n const txt = extractText(obj)\n\n return txt != null && txt.toLowerCase().substring(0, str.length) === str\n }\n }\n\n return (obj) => {\n const txt = extractText(obj)\n\n return txt != null && txt.substring(0, str.length) === str\n }\n}\n\n/**\n * Filter objects which contain the text ending with a given string\n * - for `Message`, `Message.text` is used\n * - for `InlineQuery`, `InlineQuery.query` is used\n * - for {@link ChosenInlineResult}, {@link ChosenInlineResult.id} is used\n * - for callback queries, `dataStr` is used\n *\n * @param str Substring to be matched\n * @param ignoreCase Whether string case should be ignored\n */\nexport function endsWith(str: string, ignoreCase = false): UpdateFilter<UpdatesWithText> {\n if (ignoreCase) {\n str = str.toLowerCase()\n\n return (obj) => {\n const txt = extractText(obj)\n\n return txt != null && txt.toLowerCase().substring(0, str.length) === str\n }\n }\n\n return (obj) => {\n const txt = extractText(obj)\n\n return txt != null && txt.substring(0, str.length) === str\n }\n}\n"]}
|
package/cjs/filters/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { MaybePromise } from '@mtcute/core';
|
|
2
|
-
import { UpdateState } from '../state/update-state.js';
|
|
1
|
+
import type { MaybePromise } from '@mtcute/core';
|
|
2
|
+
import type { UpdateState } from '../state/update-state.js';
|
|
3
3
|
/**
|
|
4
4
|
* Type describing a primitive filter, which is a function taking some `Base`
|
|
5
5
|
* and a {@link TelegramClient}, checking it against some condition
|
package/cjs/filters/types.js
CHANGED
package/cjs/filters/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/filters/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/filters/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { MaybePromise } from '@mtcute/core'\n\nimport type { UpdateState } from '../state/update-state.js'\n/**\n * Type describing a primitive filter, which is a function taking some `Base`\n * and a {@link TelegramClient}, checking it against some condition\n * and returning a boolean.\n *\n * If `true` is returned, the filter is considered\n * to be matched, and the appropriate update handler function is called,\n * otherwise next registered handler is checked.\n *\n * Additionally, filter might contain a type modification\n * to `Base` for better code insights. If it is present,\n * it is used to overwrite types (!) of some of the `Base` fields\n * to given (note that this is entirely compile-time! object is not modified)\n *\n * For parametrized filters (like {@link filters.regex}),\n * type modification can also be used to add additional fields\n * (in case of `regex`, its match array is added to `.match`)\n *\n * Example without type mod:\n * ```typescript\n *\n * const hasPhoto: UpdateFilter<Message> = msg => msg.media?.type === 'photo'\n *\n * // ..later..\n * tg.onNewMessage(hasPhoto, async (msg) => {\n * // `hasPhoto` filter matched, so we can safely assume\n * // that `msg.media` is a Photo.\n * //\n * // but it is very redundant, verbose and error-rome,\n * // wonder if we could make typescript do this automagically and safely...\n * await (msg.media as Photo).downloadToFile(`${msg.id}.jpg`)\n * })\n * ```\n *\n * Example with type mod:\n * ```typescript\n *\n * const hasPhoto: UpdateFilter<Message, { media: Photo }> = msg => msg.media?.type === 'photo'\n *\n * // ..later..\n * tg.onNewMessage(hasPhoto, async (msg) => {\n * // since `hasPhoto` filter matched,\n * // we have applied the modification to `msg`,\n * // and `msg.media` now has type `Photo`\n * //\n * // no more redundancy and type casts!\n * await msg.media.downloadToFile(`${msg.id}.jpg`)\n * })\n * ```\n *\n * > **Note**: Type modification can contain anything, even totally unrelated types\n * > and it is *your* task to keep track that everything is correct.\n * >\n * > Bad example:\n * > ```typescript\n * > // we check for `Photo`, but type contains `Audio`. this will be a problem!\n * > const hasPhoto: UpdateFilter<Message, { media: Audio }> = msg => msg.media?.type === 'photo'\n * >\n * > // ..later..\n * > tg.onNewMessage(hasPhoto, async (msg) => {\n * > // oops! `msg.media` is `Audio` and does not have `.width`!\n * > console.log(msg.media.width)\n * > })\n * > ```\n *\n * > **Warning!** Do not use the generics provided in functions\n * > like `and`, `or`, etc. Those are meant to be inferred by the compiler!\n */\n// we need the second parameter because it carries meta information\n// eslint-disable-next-line unused-imports/no-unused-vars, ts/no-empty-object-type\nexport type UpdateFilter<Base, Mod = {}, State extends object = never> = (\n update: Base,\n state?: UpdateState<State>,\n) => MaybePromise<boolean>\n\nexport type Modify<Base, Mod> = Omit<Base, keyof Mod> & Mod\nexport type Invert<Base, Mod> = {\n [P in keyof Mod & keyof Base]: Exclude<Base[P], Mod[P]>\n}\n\nexport type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never\n\nexport type ExtractBase<Filter> = Filter extends UpdateFilter<infer I, any> ? I : never\n\nexport type ExtractMod<Filter> = Filter extends UpdateFilter<any, infer I> ? I : never\n\nexport type ExtractState<Filter> = Filter extends UpdateFilter<any, any, infer I> ? I : never\n\nexport type TupleKeys<T extends any[]> = Exclude<keyof T, keyof []>\nexport type WrapBase<T extends any[]> = {\n [K in TupleKeys<T>]: { base: ExtractBase<T[K]> }\n}\nexport type Values<T> = T[keyof T]\nexport type UnwrapBase<T> = T extends { base: any } ? T['base'] : never\nexport type ExtractBaseMany<Filters extends any[]> = UnwrapBase<UnionToIntersection<Values<WrapBase<Filters>>>>\n\nexport type EmptyObject = Record<never, never>\n"]}
|
package/cjs/filters/updates.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ChatMemberUpdate, ChatMemberUpdateType, UserStatus, UserStatusUpdate } from '@mtcute/core';
|
|
2
|
-
import { UpdateFilter } from './types.js';
|
|
1
|
+
import type { ChatMemberUpdate, ChatMemberUpdateType, UserStatus, UserStatusUpdate } from '@mtcute/core';
|
|
2
|
+
import type { UpdateFilter } from './types.js';
|
|
3
3
|
/**
|
|
4
4
|
* Create a filter for {@link ChatMemberUpdate} by update type
|
|
5
5
|
*
|
package/cjs/filters/updates.js
CHANGED
|
@@ -10,10 +10,10 @@ exports.chatMemberSelf = exports.userStatus = exports.chatMember = void 0;
|
|
|
10
10
|
const chatMember = (types) => {
|
|
11
11
|
if (Array.isArray(types)) {
|
|
12
12
|
const index = {};
|
|
13
|
-
types.forEach(
|
|
14
|
-
return
|
|
13
|
+
types.forEach(typ => (index[typ] = true));
|
|
14
|
+
return upd => upd.type in index;
|
|
15
15
|
}
|
|
16
|
-
return
|
|
16
|
+
return upd => upd.type === types;
|
|
17
17
|
};
|
|
18
18
|
exports.chatMember = chatMember;
|
|
19
19
|
/**
|
|
@@ -25,16 +25,16 @@ exports.chatMember = chatMember;
|
|
|
25
25
|
const userStatus = (statuses) => {
|
|
26
26
|
if (Array.isArray(statuses)) {
|
|
27
27
|
const index = {};
|
|
28
|
-
statuses.forEach(
|
|
29
|
-
return
|
|
28
|
+
statuses.forEach(typ => (index[typ] = true));
|
|
29
|
+
return upd => upd.status in index;
|
|
30
30
|
}
|
|
31
|
-
return
|
|
31
|
+
return upd => upd.status === statuses;
|
|
32
32
|
};
|
|
33
33
|
exports.userStatus = userStatus;
|
|
34
34
|
/**
|
|
35
35
|
* Create a filter for {@link ChatMemberUpdate} for updates
|
|
36
36
|
* regarding current user
|
|
37
37
|
*/
|
|
38
|
-
const chatMemberSelf =
|
|
38
|
+
const chatMemberSelf = upd => upd.isSelf;
|
|
39
39
|
exports.chatMemberSelf = chatMemberSelf;
|
|
40
40
|
//# sourceMappingURL=updates.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updates.js","sourceRoot":"","sources":["../../../src/filters/updates.ts"],"names":[],"mappings":";;;AAIA;;;;;GAKG;AACI,MAAM,UAAU,GAGnB,CAAC,KAAuC,EAAkC,EAAE;IAC5E,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,KAAK,GAAgD,EAAE,CAAA;QAC7D,KAAK,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"updates.js","sourceRoot":"","sources":["../../../src/filters/updates.ts"],"names":[],"mappings":";;;AAIA;;;;;GAKG;AACI,MAAM,UAAU,GAGnB,CAAC,KAAuC,EAAkC,EAAE;IAC5E,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,KAAK,GAAgD,EAAE,CAAA;QAC7D,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;QAEzC,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,KAAK,CAAA;IACnC,CAAC;IAED,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,KAAK,CAAA;AACpC,CAAC,CAAA;AAZY,QAAA,UAAU,cAYtB;AAED;;;;;GAKG;AACI,MAAM,UAAU,GAYnB,CAAC,QAAgC,EAAkC,EAAE;IACrE,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAsC,EAAE,CAAA;QACnD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;QAE5C,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,KAAK,CAAA;IACrC,CAAC;IAED,OAAO,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,QAAQ,CAAA;AACzC,CAAC,CAAA;AArBY,QAAA,UAAU,cAqBtB;AAED;;;GAGG;AACI,MAAM,cAAc,GAAqD,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAA;AAApF,QAAA,cAAc,kBAAsE","sourcesContent":["import type { ChatMemberUpdate, ChatMemberUpdateType, MaybeArray, UserStatus, UserStatusUpdate } from '@mtcute/core'\n\nimport type { UpdateFilter } from './types.js'\n\n/**\n * Create a filter for {@link ChatMemberUpdate} by update type\n *\n * @param types Update type(s)\n * @link ChatMemberUpdate.Type\n */\nexport const chatMember: {\n <T extends ChatMemberUpdateType>(type: T): UpdateFilter<ChatMemberUpdate, { type: T }>\n <T extends ChatMemberUpdateType[]>(types: T): UpdateFilter<ChatMemberUpdate, { type: T[number] }>\n} = (types: MaybeArray<ChatMemberUpdateType>): UpdateFilter<ChatMemberUpdate> => {\n if (Array.isArray(types)) {\n const index: Partial<Record<ChatMemberUpdateType, true>> = {}\n types.forEach(typ => (index[typ] = true))\n\n return upd => upd.type in index\n }\n\n return upd => upd.type === types\n}\n\n/**\n * Create a filter for {@link UserStatusUpdate} by new user status\n *\n * @param statuses Update type(s)\n * @link User.Status\n */\nexport const userStatus: {\n <T extends UserStatus>(\n status: T,\n ): UpdateFilter<\n UserStatusUpdate,\n {\n type: T\n lastOnline: T extends 'offline' ? Date : null\n nextOffline: T extends 'online' ? Date : null\n }\n >\n <T extends UserStatus[]>(statuses: T): UpdateFilter<UserStatusUpdate, { type: T[number] }>\n} = (statuses: MaybeArray<UserStatus>): UpdateFilter<UserStatusUpdate> => {\n if (Array.isArray(statuses)) {\n const index: Partial<Record<UserStatus, true>> = {}\n statuses.forEach(typ => (index[typ] = true))\n\n return upd => upd.status in index\n }\n\n return upd => upd.status === statuses\n}\n\n/**\n * Create a filter for {@link ChatMemberUpdate} for updates\n * regarding current user\n */\nexport const chatMemberSelf: UpdateFilter<ChatMemberUpdate, { isSelf: true }> = upd => upd.isSelf\n"]}
|
package/cjs/filters/user.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { BotChatJoinRequestUpdate, BusinessCallbackQuery, BusinessMessage, CallbackQuery, ChatMemberUpdate, ChosenInlineResult, DeleteStoryUpdate, HistoryReadUpdate, InlineCallbackQuery, InlineQuery, MaybeArray, Message, PollVoteUpdate, StoryUpdate,
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import type { BotChatJoinRequestUpdate, BusinessCallbackQuery, BusinessMessage, CallbackQuery, ChatMemberUpdate, ChosenInlineResult, DeleteStoryUpdate, HistoryReadUpdate, InlineCallbackQuery, InlineQuery, MaybeArray, Message, PollVoteUpdate, StoryUpdate, UserStatusUpdate, UserTypingUpdate } from '@mtcute/core';
|
|
2
|
+
import { User } from '@mtcute/core';
|
|
3
|
+
import type { UpdateContextDistributed } from '../context/base.js';
|
|
4
|
+
import type { UpdateFilter } from './types.js';
|
|
4
5
|
/**
|
|
5
6
|
* Filter messages generated by yourself (including Saved Messages)
|
|
6
7
|
*/
|
package/cjs/filters/user.js
CHANGED
|
@@ -5,14 +5,13 @@ const core_1 = require("@mtcute/core");
|
|
|
5
5
|
/**
|
|
6
6
|
* Filter messages generated by yourself (including Saved Messages)
|
|
7
7
|
*/
|
|
8
|
-
const me =
|
|
8
|
+
const me = msg => (msg.sender.type === 'user' && msg.sender.isSelf) || msg.isOutgoing;
|
|
9
9
|
exports.me = me;
|
|
10
10
|
/**
|
|
11
11
|
* Filter messages sent by bots
|
|
12
12
|
*/
|
|
13
|
-
const bot =
|
|
13
|
+
const bot = msg => msg.sender.constructor === core_1.User && msg.sender.isBot;
|
|
14
14
|
exports.bot = bot;
|
|
15
|
-
// prettier-ignore
|
|
16
15
|
/**
|
|
17
16
|
* Filter updates by user ID(s) or username(s)
|
|
18
17
|
*
|
|
@@ -42,15 +41,15 @@ const userId = (id) => {
|
|
|
42
41
|
case 'new_business_message':
|
|
43
42
|
case 'edit_business_message': {
|
|
44
43
|
const sender = upd.sender;
|
|
45
|
-
return (matchSelf && sender.isSelf)
|
|
46
|
-
indexId.has(sender.id)
|
|
47
|
-
indexUsername.has(sender.username);
|
|
44
|
+
return (matchSelf && sender.isSelf)
|
|
45
|
+
|| indexId.has(sender.id)
|
|
46
|
+
|| indexUsername.has(sender.username);
|
|
48
47
|
}
|
|
49
48
|
case 'user_status':
|
|
50
49
|
case 'user_typing': {
|
|
51
50
|
const id = upd.userId;
|
|
52
|
-
return (matchSelf && id === upd.client.storage.self.getCached()?.userId)
|
|
53
|
-
indexId.has(id);
|
|
51
|
+
return (matchSelf && id === upd.client.storage.self.getCached()?.userId)
|
|
52
|
+
|| indexId.has(id);
|
|
54
53
|
}
|
|
55
54
|
case 'poll_vote':
|
|
56
55
|
case 'story':
|
|
@@ -58,20 +57,20 @@ const userId = (id) => {
|
|
|
58
57
|
const peer = upd.peer;
|
|
59
58
|
if (peer.type !== 'user')
|
|
60
59
|
return false;
|
|
61
|
-
return (matchSelf && peer.isSelf)
|
|
62
|
-
indexId.has(peer.id)
|
|
63
|
-
Boolean(peer.usernames?.some(
|
|
60
|
+
return (matchSelf && peer.isSelf)
|
|
61
|
+
|| indexId.has(peer.id)
|
|
62
|
+
|| Boolean(peer.usernames?.some(u => indexUsername.has(u.username)));
|
|
64
63
|
}
|
|
65
64
|
case 'history_read': {
|
|
66
65
|
const id = upd.chatId;
|
|
67
|
-
return (matchSelf && id === upd.client.storage.self.getCached()?.userId)
|
|
68
|
-
indexId.has(id);
|
|
66
|
+
return (matchSelf && id === upd.client.storage.self.getCached()?.userId)
|
|
67
|
+
|| indexId.has(id);
|
|
69
68
|
}
|
|
70
69
|
}
|
|
71
70
|
const user = upd.user;
|
|
72
|
-
return ((matchSelf && user.isSelf)
|
|
73
|
-
indexId.has(user.id)
|
|
74
|
-
Boolean(user.usernames?.some(
|
|
71
|
+
return ((matchSelf && user.isSelf)
|
|
72
|
+
|| indexId.has(user.id)
|
|
73
|
+
|| Boolean(user.usernames?.some(u => indexUsername.has(u.username))));
|
|
75
74
|
};
|
|
76
75
|
};
|
|
77
76
|
exports.userId = userId;
|
package/cjs/filters/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/filters/user.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/filters/user.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n BotChatJoinRequestUpdate,\n BusinessCallbackQuery,\n BusinessMessage,\n CallbackQuery,\n ChatMemberUpdate,\n ChosenInlineResult,\n DeleteStoryUpdate,\n HistoryReadUpdate,\n InlineCallbackQuery,\n InlineQuery,\n MaybeArray,\n Message,\n PollVoteUpdate,\n StoryUpdate,\n UserStatusUpdate,\n UserTypingUpdate,\n} from '@mtcute/core'\nimport {\n User,\n} from '@mtcute/core'\n\nimport type { UpdateContextDistributed } from '../context/base.js'\n\nimport type { UpdateFilter } from './types.js'\n\n/**\n * Filter messages generated by yourself (including Saved Messages)\n */\nexport const me: UpdateFilter<Message, { sender: User }> = msg =>\n (msg.sender.type === 'user' && msg.sender.isSelf) || msg.isOutgoing\n\n/**\n * Filter messages sent by bots\n */\nexport const bot: UpdateFilter<Message, { sender: User }> = msg => msg.sender.constructor === User && msg.sender.isBot\n\n/**\n * Filter updates by user ID(s) or username(s)\n *\n * Note that only some updates support filtering by username.\n */\nexport const userId: {\n (id: MaybeArray<number>): UpdateFilter<UpdateContextDistributed<\n | Message\n | BusinessMessage\n | StoryUpdate\n | DeleteStoryUpdate\n | InlineQuery\n | ChatMemberUpdate\n | ChosenInlineResult\n | CallbackQuery\n | InlineCallbackQuery\n | BusinessCallbackQuery\n | PollVoteUpdate\n | BotChatJoinRequestUpdate\n >>\n (id: MaybeArray<number | string>): UpdateFilter<UpdateContextDistributed<\n | Message\n | BusinessMessage\n | UserStatusUpdate\n | UserTypingUpdate\n | StoryUpdate\n | HistoryReadUpdate\n | DeleteStoryUpdate\n | InlineQuery\n | ChatMemberUpdate\n | ChosenInlineResult\n | CallbackQuery\n | InlineCallbackQuery\n | BusinessCallbackQuery\n | PollVoteUpdate\n | BotChatJoinRequestUpdate\n >>\n} = (id) => {\n const indexId = new Set<number>()\n const indexUsername = new Set<string>()\n let matchSelf = false\n\n if (!Array.isArray(id)) id = [id]\n id.forEach((id) => {\n if (id === 'me' || id === 'self') {\n matchSelf = true\n } else if (typeof id === 'string') {\n indexUsername.add(id)\n } else {\n indexId.add(id)\n }\n })\n\n return (upd) => {\n switch (upd._name) {\n case 'new_message':\n case 'edit_message':\n case 'new_business_message':\n case 'edit_business_message': {\n const sender = upd.sender\n\n return (matchSelf && sender.isSelf)\n || indexId.has(sender.id)\n || indexUsername.has(sender.username!)\n }\n case 'user_status':\n case 'user_typing': {\n const id = upd.userId\n\n return (matchSelf && id === upd.client.storage.self.getCached()?.userId)\n || indexId.has(id)\n }\n case 'poll_vote':\n case 'story':\n case 'delete_story': {\n const peer = upd.peer\n if (peer.type !== 'user') return false\n\n return (matchSelf && peer.isSelf)\n || indexId.has(peer.id)\n || Boolean(peer.usernames?.some(u => indexUsername.has(u.username)))\n }\n case 'history_read': {\n const id = upd.chatId\n\n return (matchSelf && id === upd.client.storage.self.getCached()?.userId)\n || indexId.has(id)\n }\n }\n\n const user = upd.user\n\n return (\n (matchSelf && user.isSelf)\n || indexId.has(user.id)\n || Boolean(user.usernames?.some(u => indexUsername.has(u.username)))\n )\n }\n}\n"]}
|
package/cjs/handler.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { BotReactionCountUpdate, BotReactionUpdate, BotStoppedUpdate, BusinessConnection, ChatJoinRequestUpdate, ChatMemberUpdate, DeleteBusinessMessageUpdate, DeleteMessageUpdate, DeleteStoryUpdate, HistoryReadUpdate, MaybePromise, PeersIndex, PollUpdate, PollVoteUpdate, StoryUpdate,
|
|
2
|
-
import { TelegramClient } from '@mtcute/core/client.js';
|
|
3
|
-
import { UpdateContext } from './context/base.js';
|
|
4
|
-
import { BusinessCallbackQueryContext, BusinessMessageContext, CallbackQueryContext, ChatJoinRequestUpdateContext, ChosenInlineResultContext, InlineCallbackQueryContext, InlineQueryContext, MessageContext, PreCheckoutQueryContext } from './context/index.js';
|
|
5
|
-
import { PropagationAction } from './propagation.js';
|
|
1
|
+
import type { BotReactionCountUpdate, BotReactionUpdate, BotStoppedUpdate, BusinessConnection, ChatJoinRequestUpdate, ChatMemberUpdate, DeleteBusinessMessageUpdate, DeleteMessageUpdate, DeleteStoryUpdate, HistoryReadUpdate, MaybePromise, PeersIndex, PollUpdate, PollVoteUpdate, StoryUpdate, UserStatusUpdate, UserTypingUpdate, tl } from '@mtcute/core';
|
|
2
|
+
import type { TelegramClient } from '@mtcute/core/client.js';
|
|
3
|
+
import type { UpdateContext } from './context/base.js';
|
|
4
|
+
import type { BusinessCallbackQueryContext, BusinessMessageContext, CallbackQueryContext, ChatJoinRequestUpdateContext, ChosenInlineResultContext, InlineCallbackQueryContext, InlineQueryContext, MessageContext, PreCheckoutQueryContext } from './context/index.js';
|
|
5
|
+
import type { PropagationAction } from './propagation.js';
|
|
6
6
|
export interface BaseUpdateHandler<Name, Handler, Checker> {
|
|
7
7
|
name: Name;
|
|
8
8
|
callback: Handler;
|
package/cjs/handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/handler.ts"],"names":[],"mappings":";;AA2JA,cAAc","sourcesContent":["import {\n BotReactionCountUpdate,\n BotReactionUpdate,\n BotStoppedUpdate,\n BusinessConnection,\n ChatJoinRequestUpdate,\n ChatMemberUpdate,\n DeleteBusinessMessageUpdate,\n DeleteMessageUpdate,\n DeleteStoryUpdate,\n HistoryReadUpdate,\n MaybePromise,\n PeersIndex,\n PollUpdate,\n PollVoteUpdate,\n StoryUpdate,\n
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/handler.ts"],"names":[],"mappings":";;AA2JA,cAAc","sourcesContent":["import type {\n BotReactionCountUpdate,\n BotReactionUpdate,\n BotStoppedUpdate,\n BusinessConnection,\n ChatJoinRequestUpdate,\n ChatMemberUpdate,\n DeleteBusinessMessageUpdate,\n DeleteMessageUpdate,\n DeleteStoryUpdate,\n HistoryReadUpdate,\n MaybePromise,\n PeersIndex,\n PollUpdate,\n PollVoteUpdate,\n StoryUpdate,\n UserStatusUpdate,\n UserTypingUpdate,\n tl,\n} from '@mtcute/core'\nimport type { TelegramClient } from '@mtcute/core/client.js'\n\nimport type { UpdateContext } from './context/base.js'\nimport type {\n BusinessCallbackQueryContext,\n BusinessMessageContext,\n CallbackQueryContext,\n ChatJoinRequestUpdateContext,\n ChosenInlineResultContext,\n InlineCallbackQueryContext,\n InlineQueryContext,\n MessageContext,\n PreCheckoutQueryContext,\n} from './context/index.js'\nimport type { PropagationAction } from './propagation.js'\n\nexport interface BaseUpdateHandler<Name, Handler, Checker> {\n name: Name\n callback: Handler\n\n check?: Checker\n}\n\nexport type ParsedUpdateHandler<Name, Update, State = never> = BaseUpdateHandler<\n Name,\n (update: Update, state: State) => MaybePromise<void | PropagationAction>,\n (update: Update, state: State) => MaybePromise<boolean>\n>\n\nexport type RawUpdateHandler = BaseUpdateHandler<\n 'raw',\n (\n client: TelegramClient,\n update: tl.TypeUpdate | tl.TypeMessage,\n peers: PeersIndex,\n ) => MaybePromise<void | PropagationAction>,\n (client: TelegramClient, update: tl.TypeUpdate | tl.TypeMessage, peers: PeersIndex) => MaybePromise<boolean>\n>\n\n// begin-codegen\nexport type NewMessageHandler<T = MessageContext, S = never> = ParsedUpdateHandler<'new_message', T, S>\nexport type EditMessageHandler<T = MessageContext, S = never> = ParsedUpdateHandler<'edit_message', T, S>\nexport type MessageGroupHandler<T = MessageContext, S = never> = ParsedUpdateHandler<'message_group', T, S>\nexport type DeleteMessageHandler<T = UpdateContext<DeleteMessageUpdate>> = ParsedUpdateHandler<'delete_message', T>\nexport type ChatMemberUpdateHandler<T = UpdateContext<ChatMemberUpdate>> = ParsedUpdateHandler<'chat_member', T>\nexport type InlineQueryHandler<T = InlineQueryContext> = ParsedUpdateHandler<'inline_query', T>\nexport type ChosenInlineResultHandler<T = ChosenInlineResultContext> = ParsedUpdateHandler<'chosen_inline_result', T>\nexport type CallbackQueryHandler<T = CallbackQueryContext, S = never> = ParsedUpdateHandler<'callback_query', T, S>\nexport type InlineCallbackQueryHandler<T = InlineCallbackQueryContext, S = never> = ParsedUpdateHandler<\n 'inline_callback_query',\n T,\n S\n>\nexport type BusinessCallbackQueryHandler<T = BusinessCallbackQueryContext, S = never> = ParsedUpdateHandler<\n 'business_callback_query',\n T,\n S\n>\nexport type PollUpdateHandler<T = UpdateContext<PollUpdate>> = ParsedUpdateHandler<'poll', T>\nexport type PollVoteHandler<T = UpdateContext<PollVoteUpdate>> = ParsedUpdateHandler<'poll_vote', T>\nexport type UserStatusUpdateHandler<T = UpdateContext<UserStatusUpdate>> = ParsedUpdateHandler<'user_status', T>\nexport type UserTypingHandler<T = UpdateContext<UserTypingUpdate>> = ParsedUpdateHandler<'user_typing', T>\nexport type HistoryReadHandler<T = UpdateContext<HistoryReadUpdate>> = ParsedUpdateHandler<'history_read', T>\nexport type BotStoppedHandler<T = UpdateContext<BotStoppedUpdate>> = ParsedUpdateHandler<'bot_stopped', T>\nexport type BotChatJoinRequestHandler<T = ChatJoinRequestUpdateContext> = ParsedUpdateHandler<\n 'bot_chat_join_request',\n T\n>\nexport type ChatJoinRequestHandler<T = UpdateContext<ChatJoinRequestUpdate>> = ParsedUpdateHandler<\n 'chat_join_request',\n T\n>\nexport type PreCheckoutQueryHandler<T = PreCheckoutQueryContext> = ParsedUpdateHandler<'pre_checkout_query', T>\nexport type StoryUpdateHandler<T = UpdateContext<StoryUpdate>> = ParsedUpdateHandler<'story', T>\nexport type DeleteStoryHandler<T = UpdateContext<DeleteStoryUpdate>> = ParsedUpdateHandler<'delete_story', T>\nexport type BotReactionUpdateHandler<T = UpdateContext<BotReactionUpdate>> = ParsedUpdateHandler<'bot_reaction', T>\nexport type BotReactionCountUpdateHandler<T = UpdateContext<BotReactionCountUpdate>> = ParsedUpdateHandler<\n 'bot_reaction_count',\n T\n>\nexport type BusinessConnectionUpdateHandler<T = UpdateContext<BusinessConnection>> = ParsedUpdateHandler<\n 'business_connection',\n T\n>\nexport type NewBusinessMessageHandler<T = BusinessMessageContext, S = never> = ParsedUpdateHandler<\n 'new_business_message',\n T,\n S\n>\nexport type EditBusinessMessageHandler<T = BusinessMessageContext, S = never> = ParsedUpdateHandler<\n 'edit_business_message',\n T,\n S\n>\nexport type BusinessMessageGroupHandler<T = BusinessMessageContext, S = never> = ParsedUpdateHandler<\n 'business_message_group',\n T,\n S\n>\nexport type DeleteBusinessMessageHandler<T = UpdateContext<DeleteBusinessMessageUpdate>> = ParsedUpdateHandler<\n 'delete_business_message',\n T\n>\n\nexport type UpdateHandler =\n | RawUpdateHandler\n | NewMessageHandler\n | EditMessageHandler\n | MessageGroupHandler\n | DeleteMessageHandler\n | ChatMemberUpdateHandler\n | InlineQueryHandler\n | ChosenInlineResultHandler\n | CallbackQueryHandler\n | InlineCallbackQueryHandler\n | BusinessCallbackQueryHandler\n | PollUpdateHandler\n | PollVoteHandler\n | UserStatusUpdateHandler\n | UserTypingHandler\n | HistoryReadHandler\n | BotStoppedHandler\n | BotChatJoinRequestHandler\n | ChatJoinRequestHandler\n | PreCheckoutQueryHandler\n | StoryUpdateHandler\n | DeleteStoryHandler\n | BotReactionUpdateHandler\n | BotReactionCountUpdateHandler\n | BusinessConnectionUpdateHandler\n | NewBusinessMessageHandler\n | EditBusinessMessageHandler\n | BusinessMessageGroupHandler\n | DeleteBusinessMessageHandler\n\n// end-codegen\n"]}
|
package/cjs/state/key.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { MaybePromise, Peer } from '@mtcute/core';
|
|
2
|
-
import { BusinessMessageContext } from '../context/business-message.js';
|
|
3
|
-
import { CallbackQueryContext, MessageContext } from '../context/index.js';
|
|
1
|
+
import type { MaybePromise, Peer } from '@mtcute/core';
|
|
2
|
+
import type { BusinessMessageContext } from '../context/business-message.js';
|
|
3
|
+
import type { CallbackQueryContext, MessageContext } from '../context/index.js';
|
|
4
4
|
/**
|
|
5
5
|
* Function that determines how the state key is derived.
|
|
6
6
|
*
|
package/cjs/state/key.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../src/state/key.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"key.js","sourceRoot":"","sources":["../../../src/state/key.ts"],"names":[],"mappings":";;;AACA,uCAA0C;AAiB1C;;;;;;;;;;GAUG;AACI,MAAM,uBAAuB,GAAqB,CAAC,GAAG,EAAiB,EAAE;IAC5E,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,cAAc;QACd,OAAO,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACzB,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,KAAK,aAAa,IAAI,GAAG,CAAC,KAAK,KAAK,sBAAsB,EAAE,CAAC;QACtE,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACxB,KAAK,SAAS,CAAC;YACf,KAAK,KAAK,CAAC;YACX,KAAK,SAAS;gBACV,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC9B,KAAK,OAAO,CAAC;YACb,KAAK,YAAY,CAAC;YAClB,KAAK,WAAW;gBACZ,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,CAAA;YAC5C;gBACI,IAAA,kBAAW,EAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACtC,CAAC;IACL,CAAC;IAED,IAAI,GAAG,CAAC,KAAK,KAAK,gBAAgB,EAAE,CAAC;QACjC,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS;YAAE,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAA;QAE5D,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAA;IAC1C,CAAC;IAED,OAAO,IAAI,CAAA;AACf,CAAC,CAAA;AA5BY,QAAA,uBAAuB,2BA4BnC","sourcesContent":["import type { MaybePromise, Peer } from '@mtcute/core'\nimport { assertNever } from '@mtcute/core'\n\nimport type { BusinessMessageContext } from '../context/business-message.js'\nimport type { CallbackQueryContext, MessageContext } from '../context/index.js'\n\n/**\n * Function that determines how the state key is derived.\n *\n * The key is additionally prefixed with current scene, if any.\n *\n * @param msg Message or callback from which to derive the key\n * @param scene Current scene UID, or `null` if none\n */\nexport type StateKeyDelegate = (\n upd: MessageContext | BusinessMessageContext | CallbackQueryContext | Peer,\n) => MaybePromise<string | null>\n\n/**\n * Default state key delegate.\n *\n * Derives key as follows:\n * - If private chat, `msg.chat.id`\n * - If group chat, `msg.chat.id + '_' + msg.sender.id`\n * - If channel, `msg.chat.id`\n * - If non-inline callback query:\n * - If in private chat (i.e. `upd.chatType === 'user'`), `upd.user.id`\n * - If in group/channel/supergroup (i.e. `upd.chatType !== 'user'`), `upd.chatId + '_' + upd.user.id`\n */\nexport const defaultStateKeyDelegate: StateKeyDelegate = (upd): string | null => {\n if ('type' in upd) {\n // User | Chat\n return String(upd.id)\n }\n\n if (upd._name === 'new_message' || upd._name === 'new_business_message') {\n switch (upd.chat.chatType) {\n case 'private':\n case 'bot':\n case 'channel':\n return String(upd.chat.id)\n case 'group':\n case 'supergroup':\n case 'gigagroup':\n return `${upd.chat.id}_${upd.sender.id}`\n default:\n assertNever(upd.chat.chatType)\n }\n }\n\n if (upd._name === 'callback_query') {\n if (upd.chat.chatType === 'private') return `${upd.user.id}`\n\n return `${upd.chat.id}_${upd.user.id}`\n }\n\n return null\n}\n"]}
|
package/cjs/state/provider.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { IStorageProvider } from '@mtcute/core';
|
|
2
|
-
import { IStateRepository } from './repository.js';
|
|
1
|
+
import type { IStorageProvider } from '@mtcute/core';
|
|
2
|
+
import type { IStateRepository } from './repository.js';
|
|
3
3
|
export type IStateStorageProvider = IStorageProvider<{
|
|
4
4
|
state: IStateRepository;
|
|
5
5
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/state/provider.ts"],"names":[],"mappings":"","sourcesContent":["import { IStorageProvider } from '@mtcute/core'\n\nimport { IStateRepository } from './repository.js'\n\nexport type IStateStorageProvider = IStorageProvider<{\n state: IStateRepository\n}>\n"]}
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/state/provider.ts"],"names":[],"mappings":"","sourcesContent":["import type { IStorageProvider } from '@mtcute/core'\n\nimport type { IStateRepository } from './repository.js'\n\nexport type IStateStorageProvider = IStorageProvider<{\n state: IStateRepository\n}>\n"]}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { MaybePromise
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import type { MaybePromise } from '@mtcute/core';
|
|
2
|
+
import { MemoryStorageDriver } from '@mtcute/core';
|
|
3
|
+
import type { IStateStorageProvider } from '../provider.js';
|
|
4
|
+
import type { IStateRepository } from '../repository.js';
|
|
4
5
|
interface StateDto {
|
|
5
6
|
value: string;
|
|
6
7
|
expiresAt?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../../src/state/providers/memory.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../../src/state/providers/memory.ts"],"names":[],"mappings":"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","sourcesContent":["import type { MaybePromise } from '@mtcute/core'\nimport { MemoryStorageDriver } from '@mtcute/core'\n\nimport type { IStateStorageProvider } from '../provider.js'\nimport type { IStateRepository } from '../repository.js'\n\ninterface StateDto {\n value: string\n expiresAt?: number\n}\n\ninterface RateLimitDto {\n reset: number\n remaining: number\n}\n\nclass MemoryStateRepository implements IStateRepository {\n readonly state: Map<string, StateDto>\n readonly rl: Map<string, RateLimitDto>\n constructor(readonly _driver: MemoryStorageDriver) {\n this.state = this._driver.getState<Map<string, StateDto>>('dispatcher_fsm', () => new Map())\n this.rl = this._driver.getState<Map<string, RateLimitDto>>('rl', () => new Map())\n }\n\n setState(key: string, state: string, ttl?: number | undefined): void {\n this.state.set(key, {\n value: state,\n expiresAt: ttl ? Date.now() + ttl * 1000 : undefined,\n })\n }\n\n getState(key: string, now: number): string | null {\n const state = this.state.get(key)\n if (!state) return null\n\n if (state.expiresAt && state.expiresAt < now) {\n this.state.delete(key)\n\n return null\n }\n\n return state.value\n }\n\n deleteState(key: string): void {\n this.state.delete(key)\n }\n\n vacuum(now: number): void {\n for (const [key, state] of this.state.entries()) {\n if (state.expiresAt && state.expiresAt < now) {\n this.state.delete(key)\n }\n }\n\n for (const [key, state] of this.rl.entries()) {\n if (state.reset < now) {\n this.rl.delete(key)\n }\n }\n }\n\n getRateLimit(key: string, now: number, limit: number, window: number): [number, number] {\n // leaky bucket\n const item = this.rl.get(key)\n\n if (!item) {\n const state: RateLimitDto = {\n reset: now + window * 1000,\n remaining: limit,\n }\n\n this.rl.set(key, state)\n\n return [state.remaining, state.reset]\n }\n\n if (item.reset < now) {\n // expired\n\n const state: RateLimitDto = {\n reset: now + window * 1000,\n remaining: limit,\n }\n\n this.rl.set(key, state)\n\n return [state.remaining, state.reset]\n }\n\n item.remaining = item.remaining > 0 ? item.remaining - 1 : 0\n\n return [item.remaining, item.reset]\n }\n\n resetRateLimit(key: string): MaybePromise<void> {\n this.rl.delete(key)\n }\n}\n\nexport class MemoryStateStorage implements IStateStorageProvider {\n readonly state: MemoryStateRepository\n\n constructor(readonly driver: MemoryStorageDriver = new MemoryStorageDriver()) {\n this.state = new MemoryStateRepository(this.driver)\n }\n}\n"]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BaseSqliteStorage, BaseSqliteStorageDriver, MaybePromise } from '@mtcute/core';
|
|
2
|
-
import { IStateStorageProvider } from '../provider.js';
|
|
3
|
-
import { IStateRepository } from '../repository.js';
|
|
1
|
+
import type { BaseSqliteStorage, BaseSqliteStorageDriver, MaybePromise } from '@mtcute/core';
|
|
2
|
+
import type { IStateStorageProvider } from '../provider.js';
|
|
3
|
+
import type { IStateRepository } from '../repository.js';
|
|
4
4
|
declare class SqliteStateRepository implements IStateRepository {
|
|
5
5
|
readonly _driver: BaseSqliteStorageDriver;
|
|
6
6
|
constructor(_driver: BaseSqliteStorageDriver);
|