@mtkruto/node 0.0.902 → 0.0.903
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/esm/client/client.d.ts +3 -3
- package/esm/client/client.js +4 -4
- package/esm/constants.d.ts +1 -1
- package/esm/constants.js +1 -1
- package/esm/types/3_message.d.ts +8 -4
- package/esm/types/3_message.js +12 -1
- package/package.json +1 -1
- package/script/client/client.d.ts +3 -3
- package/script/client/client.js +4 -4
- package/script/constants.d.ts +1 -1
- package/script/constants.js +1 -1
- package/script/types/3_message.d.ts +8 -4
- package/script/types/3_message.js +12 -1
package/esm/client/client.d.ts
CHANGED
|
@@ -159,7 +159,7 @@ export declare class Client extends ClientAbstract {
|
|
|
159
159
|
messageThreadId?: number;
|
|
160
160
|
sendAs?: number | string;
|
|
161
161
|
replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
|
|
162
|
-
}): Promise<Message
|
|
163
|
-
getMessages(chatId: number | string, messageIds: number[]): Promise<Message[]>;
|
|
164
|
-
getMessage(chatId: number | string, messageId: number): Promise<Message | null>;
|
|
162
|
+
}): Promise<Omit<Message, "replyToMessage">>;
|
|
163
|
+
getMessages(chatId: number | string, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
|
|
164
|
+
getMessage(chatId: number | string, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
|
|
165
165
|
}
|
package/esm/client/client.js
CHANGED
|
@@ -1072,10 +1072,10 @@ export class Client extends ClientAbstract {
|
|
|
1072
1072
|
if (result instanceof types.Updates) {
|
|
1073
1073
|
for (const update of result.updates) {
|
|
1074
1074
|
if (update instanceof types.UpdateNewMessage) {
|
|
1075
|
-
return constructMessage(update.message[as](types.Message), this[getEntity].bind(this));
|
|
1075
|
+
return constructMessage(update.message[as](types.Message), this[getEntity].bind(this), this.getMessage.bind(this));
|
|
1076
1076
|
}
|
|
1077
1077
|
else if (update instanceof types.UpdateNewChannelMessage) {
|
|
1078
|
-
return constructMessage(update.message[as](types.Message), this[getEntity].bind(this));
|
|
1078
|
+
return constructMessage(update.message[as](types.Message), this[getEntity].bind(this), this.getMessage.bind(this));
|
|
1079
1079
|
}
|
|
1080
1080
|
}
|
|
1081
1081
|
}
|
|
@@ -1094,7 +1094,7 @@ export class Client extends ClientAbstract {
|
|
|
1094
1094
|
messages_ = await this.invoke(new functions.ChannelsGetMessages({
|
|
1095
1095
|
channel: new types.InputChannel({ channelId: peer.channelId, accessHash: peer.accessHash }),
|
|
1096
1096
|
id: messageIds.map((v) => new types.InputMessageID({ id: v })),
|
|
1097
|
-
})).then((v) => v[as](types.
|
|
1097
|
+
})).then((v) => v[as](types.MessagesChannelMessages));
|
|
1098
1098
|
}
|
|
1099
1099
|
else {
|
|
1100
1100
|
messages_ = await this.invoke(new functions.MessagesGetMessages({
|
|
@@ -1103,7 +1103,7 @@ export class Client extends ClientAbstract {
|
|
|
1103
1103
|
}
|
|
1104
1104
|
const messages = new Array();
|
|
1105
1105
|
for (const message_ of messages_.messages) {
|
|
1106
|
-
messages.push(await constructMessage(message_[as](types.Message), this[getEntity].bind(this)));
|
|
1106
|
+
messages.push(await constructMessage(message_[as](types.Message), this[getEntity].bind(this), null));
|
|
1107
1107
|
}
|
|
1108
1108
|
return messages;
|
|
1109
1109
|
}
|
package/esm/constants.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export declare const publicKeys: Map<bigint, [bigint, bigint]>;
|
|
|
4
4
|
export declare const VECTOR_CONSTRUCTOR = 481674261;
|
|
5
5
|
export declare const DEFAULT_INITIAL_DC: DC;
|
|
6
6
|
export declare const LAYER = 158;
|
|
7
|
-
export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.
|
|
7
|
+
export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.903";
|
|
8
8
|
export declare const DEFAULT_DEVICE_MODEL: string;
|
|
9
9
|
export declare const DEFAULT_LANG_CODE: string;
|
|
10
10
|
export declare const DEFAULT_LANG_PACK = "";
|
package/esm/constants.js
CHANGED
|
@@ -62,7 +62,7 @@ export const publicKeys = new Map([
|
|
|
62
62
|
export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
|
|
63
63
|
export const DEFAULT_INITIAL_DC = "2-test";
|
|
64
64
|
export const LAYER = 158;
|
|
65
|
-
export const DEFAULT_APP_VERSION = "MTKruto 0.0.
|
|
65
|
+
export const DEFAULT_APP_VERSION = "MTKruto 0.0.903";
|
|
66
66
|
// @ts-ignore: lib
|
|
67
67
|
export const DEFAULT_DEVICE_MODEL = typeof dntShim.Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : dntShim.Deno.build.os + "-" + dntShim.Deno.build.arch;
|
|
68
68
|
export const DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];
|
package/esm/types/3_message.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { MaybePromise } from "../utilities/0_types.js";
|
|
1
2
|
import * as types from "../tl/2_types.js";
|
|
2
3
|
import { ForceReply } from "./0_force_reply.js";
|
|
3
4
|
import { MessageEntity } from "./0_message_entity.js";
|
|
@@ -18,9 +19,12 @@ export interface Message {
|
|
|
18
19
|
editDate?: Date;
|
|
19
20
|
views?: number;
|
|
20
21
|
replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
|
|
22
|
+
replyToMessage?: Omit<Message, "replyToMessage">;
|
|
21
23
|
}
|
|
22
24
|
export declare function constructMessage(message_: types.Message, getEntity: {
|
|
23
|
-
(peer: types.PeerUser):
|
|
24
|
-
(peer: types.PeerChat):
|
|
25
|
-
(peer: types.PeerChannel):
|
|
26
|
-
}
|
|
25
|
+
(peer: types.PeerUser): MaybePromise<types.User | null>;
|
|
26
|
+
(peer: types.PeerChat): MaybePromise<types.Chat | null>;
|
|
27
|
+
(peer: types.PeerChannel): MaybePromise<types.Channel | null>;
|
|
28
|
+
}, getMessage: {
|
|
29
|
+
(chatId: number, messageId: number): MaybePromise<Omit<Message, "replyToMessage"> | null>;
|
|
30
|
+
} | null): Promise<Message>;
|
package/esm/types/3_message.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { debug } from "../deps.js";
|
|
1
2
|
import { UNREACHABLE } from "../utilities/0_control.js";
|
|
2
3
|
import { cleanObject } from "../utilities/0_object.js";
|
|
3
4
|
import * as types from "../tl/2_types.js";
|
|
@@ -8,7 +9,8 @@ import { constructChat } from "./1_chat.js";
|
|
|
8
9
|
import { constructUser } from "./1_user.js";
|
|
9
10
|
import { constructInlineKeyboardMarkup } from "./2_inline_keyboard_markup.js";
|
|
10
11
|
import { constructReplyKeyboardMarkup } from "./2_reply_keyboard_markup.js";
|
|
11
|
-
|
|
12
|
+
const d = debug("types/Message");
|
|
13
|
+
export async function constructMessage(message_, getEntity, getMessage) {
|
|
12
14
|
let chat_ = null;
|
|
13
15
|
if (message_.peerId instanceof types.PeerUser) {
|
|
14
16
|
const entity = await getEntity(message_.peerId);
|
|
@@ -87,5 +89,14 @@ export async function constructMessage(message_, getEntity) {
|
|
|
87
89
|
UNREACHABLE();
|
|
88
90
|
}
|
|
89
91
|
}
|
|
92
|
+
if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
|
|
93
|
+
const replyToMessage = await getMessage(message.chat.id, message_.replyTo.replyToMsgId);
|
|
94
|
+
if (replyToMessage) {
|
|
95
|
+
message.replyToMessage = replyToMessage;
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
d("couldn't get replied message");
|
|
99
|
+
}
|
|
100
|
+
}
|
|
90
101
|
return cleanObject(message);
|
|
91
102
|
}
|
package/package.json
CHANGED
|
@@ -159,7 +159,7 @@ export declare class Client extends ClientAbstract {
|
|
|
159
159
|
messageThreadId?: number;
|
|
160
160
|
sendAs?: number | string;
|
|
161
161
|
replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
|
|
162
|
-
}): Promise<Message
|
|
163
|
-
getMessages(chatId: number | string, messageIds: number[]): Promise<Message[]>;
|
|
164
|
-
getMessage(chatId: number | string, messageId: number): Promise<Message | null>;
|
|
162
|
+
}): Promise<Omit<Message, "replyToMessage">>;
|
|
163
|
+
getMessages(chatId: number | string, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
|
|
164
|
+
getMessage(chatId: number | string, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
|
|
165
165
|
}
|
package/script/client/client.js
CHANGED
|
@@ -1098,10 +1098,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
|
|
|
1098
1098
|
if (result instanceof types.Updates) {
|
|
1099
1099
|
for (const update of result.updates) {
|
|
1100
1100
|
if (update instanceof types.UpdateNewMessage) {
|
|
1101
|
-
return (0, _3_message_js_1.constructMessage)(update.message[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this));
|
|
1101
|
+
return (0, _3_message_js_1.constructMessage)(update.message[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this), this.getMessage.bind(this));
|
|
1102
1102
|
}
|
|
1103
1103
|
else if (update instanceof types.UpdateNewChannelMessage) {
|
|
1104
|
-
return (0, _3_message_js_1.constructMessage)(update.message[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this));
|
|
1104
|
+
return (0, _3_message_js_1.constructMessage)(update.message[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this), this.getMessage.bind(this));
|
|
1105
1105
|
}
|
|
1106
1106
|
}
|
|
1107
1107
|
}
|
|
@@ -1120,7 +1120,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
|
|
|
1120
1120
|
messages_ = await this.invoke(new functions.ChannelsGetMessages({
|
|
1121
1121
|
channel: new types.InputChannel({ channelId: peer.channelId, accessHash: peer.accessHash }),
|
|
1122
1122
|
id: messageIds.map((v) => new types.InputMessageID({ id: v })),
|
|
1123
|
-
})).then((v) => v[_1_tl_object_js_1.as](types.
|
|
1123
|
+
})).then((v) => v[_1_tl_object_js_1.as](types.MessagesChannelMessages));
|
|
1124
1124
|
}
|
|
1125
1125
|
else {
|
|
1126
1126
|
messages_ = await this.invoke(new functions.MessagesGetMessages({
|
|
@@ -1129,7 +1129,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
|
|
|
1129
1129
|
}
|
|
1130
1130
|
const messages = new Array();
|
|
1131
1131
|
for (const message_ of messages_.messages) {
|
|
1132
|
-
messages.push(await (0, _3_message_js_1.constructMessage)(message_[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this)));
|
|
1132
|
+
messages.push(await (0, _3_message_js_1.constructMessage)(message_[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this), null));
|
|
1133
1133
|
}
|
|
1134
1134
|
return messages;
|
|
1135
1135
|
}
|
package/script/constants.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export declare const publicKeys: Map<bigint, [bigint, bigint]>;
|
|
|
4
4
|
export declare const VECTOR_CONSTRUCTOR = 481674261;
|
|
5
5
|
export declare const DEFAULT_INITIAL_DC: DC;
|
|
6
6
|
export declare const LAYER = 158;
|
|
7
|
-
export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.
|
|
7
|
+
export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.903";
|
|
8
8
|
export declare const DEFAULT_DEVICE_MODEL: string;
|
|
9
9
|
export declare const DEFAULT_LANG_CODE: string;
|
|
10
10
|
export declare const DEFAULT_LANG_PACK = "";
|
package/script/constants.js
CHANGED
|
@@ -88,7 +88,7 @@ exports.publicKeys = new Map([
|
|
|
88
88
|
exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
|
|
89
89
|
exports.DEFAULT_INITIAL_DC = "2-test";
|
|
90
90
|
exports.LAYER = 158;
|
|
91
|
-
exports.DEFAULT_APP_VERSION = "MTKruto 0.0.
|
|
91
|
+
exports.DEFAULT_APP_VERSION = "MTKruto 0.0.903";
|
|
92
92
|
// @ts-ignore: lib
|
|
93
93
|
exports.DEFAULT_DEVICE_MODEL = typeof dntShim.Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : dntShim.Deno.build.os + "-" + dntShim.Deno.build.arch;
|
|
94
94
|
exports.DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { MaybePromise } from "../utilities/0_types.js";
|
|
1
2
|
import * as types from "../tl/2_types.js";
|
|
2
3
|
import { ForceReply } from "./0_force_reply.js";
|
|
3
4
|
import { MessageEntity } from "./0_message_entity.js";
|
|
@@ -18,9 +19,12 @@ export interface Message {
|
|
|
18
19
|
editDate?: Date;
|
|
19
20
|
views?: number;
|
|
20
21
|
replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
|
|
22
|
+
replyToMessage?: Omit<Message, "replyToMessage">;
|
|
21
23
|
}
|
|
22
24
|
export declare function constructMessage(message_: types.Message, getEntity: {
|
|
23
|
-
(peer: types.PeerUser):
|
|
24
|
-
(peer: types.PeerChat):
|
|
25
|
-
(peer: types.PeerChannel):
|
|
26
|
-
}
|
|
25
|
+
(peer: types.PeerUser): MaybePromise<types.User | null>;
|
|
26
|
+
(peer: types.PeerChat): MaybePromise<types.Chat | null>;
|
|
27
|
+
(peer: types.PeerChannel): MaybePromise<types.Channel | null>;
|
|
28
|
+
}, getMessage: {
|
|
29
|
+
(chatId: number, messageId: number): MaybePromise<Omit<Message, "replyToMessage"> | null>;
|
|
30
|
+
} | null): Promise<Message>;
|
|
@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.constructMessage = void 0;
|
|
27
|
+
const deps_js_1 = require("../deps.js");
|
|
27
28
|
const _0_control_js_1 = require("../utilities/0_control.js");
|
|
28
29
|
const _0_object_js_1 = require("../utilities/0_object.js");
|
|
29
30
|
const types = __importStar(require("../tl/2_types.js"));
|
|
@@ -34,7 +35,8 @@ const _1_chat_js_1 = require("./1_chat.js");
|
|
|
34
35
|
const _1_user_js_1 = require("./1_user.js");
|
|
35
36
|
const _2_inline_keyboard_markup_js_1 = require("./2_inline_keyboard_markup.js");
|
|
36
37
|
const _2_reply_keyboard_markup_js_1 = require("./2_reply_keyboard_markup.js");
|
|
37
|
-
|
|
38
|
+
const d = (0, deps_js_1.debug)("types/Message");
|
|
39
|
+
async function constructMessage(message_, getEntity, getMessage) {
|
|
38
40
|
let chat_ = null;
|
|
39
41
|
if (message_.peerId instanceof types.PeerUser) {
|
|
40
42
|
const entity = await getEntity(message_.peerId);
|
|
@@ -113,6 +115,15 @@ async function constructMessage(message_, getEntity) {
|
|
|
113
115
|
(0, _0_control_js_1.UNREACHABLE)();
|
|
114
116
|
}
|
|
115
117
|
}
|
|
118
|
+
if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
|
|
119
|
+
const replyToMessage = await getMessage(message.chat.id, message_.replyTo.replyToMsgId);
|
|
120
|
+
if (replyToMessage) {
|
|
121
|
+
message.replyToMessage = replyToMessage;
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
124
|
+
d("couldn't get replied message");
|
|
125
|
+
}
|
|
126
|
+
}
|
|
116
127
|
return (0, _0_object_js_1.cleanObject)(message);
|
|
117
128
|
}
|
|
118
129
|
exports.constructMessage = constructMessage;
|