@mtkruto/node 0.0.902 → 0.0.904

package/esm/client/client.d.ts

@@ -159,7 +159,7 @@ export declare class Client extends ClientAbstract {
         messageThreadId?: number;
         sendAs?: number | string;
         replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
-    }): Promise<Message>;
-    getMessages(chatId: number | string, messageIds: number[]): Promise<Message[]>;
-    getMessage(chatId: number | string, messageId: number): Promise<Message | null>;
+    }): Promise<Omit<Message, "replyToMessage">>;
+    getMessages(chatId: number | string, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
+    getMessage(chatId: number | string, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
 }

package/esm/client/client.js

@@ -1072,10 +1072,10 @@ export class Client extends ClientAbstract {
         if (result instanceof types.Updates) {
             for (const update of result.updates) {
                 if (update instanceof types.UpdateNewMessage) {
-                    return constructMessage(update.message[as](types.Message), this[getEntity].bind(this));
+                    return constructMessage(update.message[as](types.Message), this[getEntity].bind(this), this.getMessage.bind(this));
                 }
                 else if (update instanceof types.UpdateNewChannelMessage) {
-                    return constructMessage(update.message[as](types.Message), this[getEntity].bind(this));
+                    return constructMessage(update.message[as](types.Message), this[getEntity].bind(this), this.getMessage.bind(this));
                 }
             }
         }
@@ -1094,7 +1094,7 @@ export class Client extends ClientAbstract {
             messages_ = await this.invoke(new functions.ChannelsGetMessages({
                 channel: new types.InputChannel({ channelId: peer.channelId, accessHash: peer.accessHash }),
                 id: messageIds.map((v) => new types.InputMessageID({ id: v })),
-            })).then((v) => v[as](types.MessagesMessages));
+            })).then((v) => v[as](types.MessagesChannelMessages));
         }
         else {
             messages_ = await this.invoke(new functions.MessagesGetMessages({
@@ -1103,7 +1103,7 @@ export class Client extends ClientAbstract {
         }
         const messages = new Array();
         for (const message_ of messages_.messages) {
-            messages.push(await constructMessage(message_[as](types.Message), this[getEntity].bind(this)));
+            messages.push(await constructMessage(message_[as](types.Message), this[getEntity].bind(this), null));
         }
         return messages;
     }

package/esm/constants.d.ts

@@ -4,7 +4,7 @@ export declare const publicKeys: Map<bigint, [bigint, bigint]>;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const DEFAULT_INITIAL_DC: DC;
 export declare const LAYER = 158;
-export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.902";
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.904";
 export declare const DEFAULT_DEVICE_MODEL: string;
 export declare const DEFAULT_LANG_CODE: string;
 export declare const DEFAULT_LANG_PACK = "";

package/esm/constants.js

@@ -62,7 +62,7 @@ export const publicKeys = new Map([
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
 export const DEFAULT_INITIAL_DC = "2-test";
 export const LAYER = 158;
-export const DEFAULT_APP_VERSION = "MTKruto 0.0.902";
+export const DEFAULT_APP_VERSION = "MTKruto 0.0.904";
 // @ts-ignore: lib
 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;
 export const DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/esm/tl/1_tl_object.js

@@ -21,6 +21,7 @@ export function analyzeOptionalParam(ntype) {
     return { flagField, bitIndex };
 }
 function serializeSingleParam(writer, value, type, ntype) {
+    const valueRepr = value == null ? null : value.constructor.name;
     if (isTLObjectConstructor(type)) {
         if ((type.name == "TypeX" && value instanceof TLObject) ||
             value instanceof type) {
@@ -28,7 +29,7 @@ function serializeSingleParam(writer, value, type, ntype) {
             return;
         }
         else {
-            throw new TypeError(`Expected ${type.name} but received ${value == null ? null : value.constructor.name}`);
+            throw new TypeError(`Expected ${type.name} but received ${valueRepr}`);
         }
     }
     if (type == Uint8Array) {
@@ -36,7 +37,7 @@ function serializeSingleParam(writer, value, type, ntype) {
             writer.writeBytes(value);
         }
         else {
-            throw new TypeError("Expected Uint8Array");
+            throw new TypeError(`Expected Uint8Array but received ${valueRepr}`);
         }
     }
     switch (type) {
@@ -53,7 +54,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 }
             }
             else {
-                throw new TypeError("Expected bigint");
+                throw new TypeError(`Expected bigint but received ${valueRepr}`);
             }
             break;
         case "boolean":
@@ -66,7 +67,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 }
             }
             else {
-                throw new TypeError("Expected boolean");
+                throw new TypeError(`Expected boolean but received ${valueRepr}`);
             }
             break;
         case "number":
@@ -74,7 +75,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 writer.writeInt32(value);
             }
             else {
-                throw new TypeError("Expected number");
+                throw new TypeError(`Expected number but received ${valueRepr}`);
             }
             break;
         case "string":
@@ -85,12 +86,12 @@ function serializeSingleParam(writer, value, type, ntype) {
                 writer.writeBytes(value);
             }
             else {
-                throw new TypeError("Expected string or Uint8Array");
+                throw new TypeError(`Expected string or Uint8Array but received ${valueRepr}`);
             }
             break;
         case "true":
             if (value !== true) {
-                throw new TypeError("Expected true");
+                throw new TypeError(`Expected true but received ${valueRepr}`);
             }
     }
 }
@@ -146,7 +147,7 @@ export class TLObject {
             return this;
         }
         else {
-            throw new TypeError(`Expected ${constructor.name}, got ${this.constructor.name}`);
+            throw new TypeError(`Expected ${constructor.name} but received ${this.constructor.name}`);
         }
     }
 }

package/esm/types/3_message.d.ts

@@ -1,3 +1,4 @@
+import { MaybePromise } from "../utilities/0_types.js";
 import * as types from "../tl/2_types.js";
 import { ForceReply } from "./0_force_reply.js";
 import { MessageEntity } from "./0_message_entity.js";
@@ -18,9 +19,12 @@ export interface Message {
     editDate?: Date;
     views?: number;
     replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
+    replyToMessage?: Omit<Message, "replyToMessage">;
 }
 export declare function constructMessage(message_: types.Message, getEntity: {
-    (peer: types.PeerUser): Promise<types.User | null>;
-    (peer: types.PeerChat): Promise<types.Chat | null>;
-    (peer: types.PeerChannel): Promise<types.Channel | null>;
-}): Promise<Message>;
+    (peer: types.PeerUser): MaybePromise<types.User | null>;
+    (peer: types.PeerChat): MaybePromise<types.Chat | null>;
+    (peer: types.PeerChannel): MaybePromise<types.Channel | null>;
+}, getMessage: {
+    (chatId: number, messageId: number): MaybePromise<Omit<Message, "replyToMessage"> | null>;
+} | null): Promise<Message>;

package/esm/types/3_message.js

@@ -1,3 +1,4 @@
+import { debug } from "../deps.js";
 import { UNREACHABLE } from "../utilities/0_control.js";
 import { cleanObject } from "../utilities/0_object.js";
 import * as types from "../tl/2_types.js";
@@ -8,7 +9,8 @@ import { constructChat } from "./1_chat.js";
 import { constructUser } from "./1_user.js";
 import { constructInlineKeyboardMarkup } from "./2_inline_keyboard_markup.js";
 import { constructReplyKeyboardMarkup } from "./2_reply_keyboard_markup.js";
-export async function constructMessage(message_, getEntity) {
+const d = debug("types/Message");
+export async function constructMessage(message_, getEntity, getMessage) {
     let chat_ = null;
     if (message_.peerId instanceof types.PeerUser) {
         const entity = await getEntity(message_.peerId);
@@ -87,5 +89,14 @@ export async function constructMessage(message_, getEntity) {
             UNREACHABLE();
         }
     }
+    if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
+        const replyToMessage = await getMessage(message.chat.id, message_.replyTo.replyToMsgId);
+        if (replyToMessage) {
+            message.replyToMessage = replyToMessage;
+        }
+        else {
+            d("couldn't get replied message");
+        }
+    }
     return cleanObject(message);
 }

package/package.json

@@ -2,7 +2,7 @@
   "module": "./esm/mod.js",
   "main": "./script/mod.js",
   "name": "@mtkruto/node",
-  "version": "0.0.902",
+  "version": "0.0.904",
   "description": "MTKruto for Node.js",
   "author": "Roj <rojvv@icloud.com>",
   "license": "LGPL-3.0-or-later",

package/script/client/client.d.ts

@@ -159,7 +159,7 @@ export declare class Client extends ClientAbstract {
         messageThreadId?: number;
         sendAs?: number | string;
         replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
-    }): Promise<Message>;
-    getMessages(chatId: number | string, messageIds: number[]): Promise<Message[]>;
-    getMessage(chatId: number | string, messageId: number): Promise<Message | null>;
+    }): Promise<Omit<Message, "replyToMessage">>;
+    getMessages(chatId: number | string, messageIds: number[]): Promise<Omit<Message, "replyToMessage">[]>;
+    getMessage(chatId: number | string, messageId: number): Promise<Omit<Message, "replyToMessage"> | null>;
 }

package/script/client/client.js

@@ -1098,10 +1098,10 @@ class Client extends client_abstract_js_1.ClientAbstract {
         if (result instanceof types.Updates) {
             for (const update of result.updates) {
                 if (update instanceof types.UpdateNewMessage) {
-                    return (0, _3_message_js_1.constructMessage)(update.message[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this));
+                    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));
                 }
                 else if (update instanceof types.UpdateNewChannelMessage) {
-                    return (0, _3_message_js_1.constructMessage)(update.message[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this));
+                    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));
                 }
             }
         }
@@ -1120,7 +1120,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
             messages_ = await this.invoke(new functions.ChannelsGetMessages({
                 channel: new types.InputChannel({ channelId: peer.channelId, accessHash: peer.accessHash }),
                 id: messageIds.map((v) => new types.InputMessageID({ id: v })),
-            })).then((v) => v[_1_tl_object_js_1.as](types.MessagesMessages));
+            })).then((v) => v[_1_tl_object_js_1.as](types.MessagesChannelMessages));
         }
         else {
             messages_ = await this.invoke(new functions.MessagesGetMessages({
@@ -1129,7 +1129,7 @@ class Client extends client_abstract_js_1.ClientAbstract {
         }
         const messages = new Array();
         for (const message_ of messages_.messages) {
-            messages.push(await (0, _3_message_js_1.constructMessage)(message_[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this)));
+            messages.push(await (0, _3_message_js_1.constructMessage)(message_[_1_tl_object_js_1.as](types.Message), this[exports.getEntity].bind(this), null));
         }
         return messages;
     }

package/script/constants.d.ts

@@ -4,7 +4,7 @@ export declare const publicKeys: Map<bigint, [bigint, bigint]>;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const DEFAULT_INITIAL_DC: DC;
 export declare const LAYER = 158;
-export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.902";
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.904";
 export declare const DEFAULT_DEVICE_MODEL: string;
 export declare const DEFAULT_LANG_CODE: string;
 export declare const DEFAULT_LANG_PACK = "";

package/script/constants.js

@@ -88,7 +88,7 @@ exports.publicKeys = new Map([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.DEFAULT_INITIAL_DC = "2-test";
 exports.LAYER = 158;
-exports.DEFAULT_APP_VERSION = "MTKruto 0.0.902";
+exports.DEFAULT_APP_VERSION = "MTKruto 0.0.904";
 // @ts-ignore: lib
 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;
 exports.DEFAULT_LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/script/tl/1_tl_object.js

@@ -26,6 +26,7 @@ function analyzeOptionalParam(ntype) {
 }
 exports.analyzeOptionalParam = analyzeOptionalParam;
 function serializeSingleParam(writer, value, type, ntype) {
+    const valueRepr = value == null ? null : value.constructor.name;
     if (isTLObjectConstructor(type)) {
         if ((type.name == "TypeX" && value instanceof TLObject) ||
             value instanceof type) {
@@ -33,7 +34,7 @@ function serializeSingleParam(writer, value, type, ntype) {
             return;
         }
         else {
-            throw new TypeError(`Expected ${type.name} but received ${value == null ? null : value.constructor.name}`);
+            throw new TypeError(`Expected ${type.name} but received ${valueRepr}`);
         }
     }
     if (type == Uint8Array) {
@@ -41,7 +42,7 @@ function serializeSingleParam(writer, value, type, ntype) {
             writer.writeBytes(value);
         }
         else {
-            throw new TypeError("Expected Uint8Array");
+            throw new TypeError(`Expected Uint8Array but received ${valueRepr}`);
         }
     }
     switch (type) {
@@ -58,7 +59,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 }
             }
             else {
-                throw new TypeError("Expected bigint");
+                throw new TypeError(`Expected bigint but received ${valueRepr}`);
             }
             break;
         case "boolean":
@@ -71,7 +72,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 }
             }
             else {
-                throw new TypeError("Expected boolean");
+                throw new TypeError(`Expected boolean but received ${valueRepr}`);
             }
             break;
         case "number":
@@ -79,7 +80,7 @@ function serializeSingleParam(writer, value, type, ntype) {
                 writer.writeInt32(value);
             }
             else {
-                throw new TypeError("Expected number");
+                throw new TypeError(`Expected number but received ${valueRepr}`);
             }
             break;
         case "string":
@@ -90,12 +91,12 @@ function serializeSingleParam(writer, value, type, ntype) {
                 writer.writeBytes(value);
             }
             else {
-                throw new TypeError("Expected string or Uint8Array");
+                throw new TypeError(`Expected string or Uint8Array but received ${valueRepr}`);
             }
             break;
         case "true":
             if (value !== true) {
-                throw new TypeError("Expected true");
+                throw new TypeError(`Expected true but received ${valueRepr}`);
             }
     }
 }
@@ -151,7 +152,7 @@ class TLObject {
             return this;
         }
         else {
-            throw new TypeError(`Expected ${constructor.name}, got ${this.constructor.name}`);
+            throw new TypeError(`Expected ${constructor.name} but received ${this.constructor.name}`);
         }
     }
 }

package/script/types/3_message.d.ts

@@ -1,3 +1,4 @@
+import { MaybePromise } from "../utilities/0_types.js";
 import * as types from "../tl/2_types.js";
 import { ForceReply } from "./0_force_reply.js";
 import { MessageEntity } from "./0_message_entity.js";
@@ -18,9 +19,12 @@ export interface Message {
     editDate?: Date;
     views?: number;
     replyMarkup?: InlineKeyboardMarkup | ReplyKeyboardMarkup | ReplyKeyboardRemove | ForceReply;
+    replyToMessage?: Omit<Message, "replyToMessage">;
 }
 export declare function constructMessage(message_: types.Message, getEntity: {
-    (peer: types.PeerUser): Promise<types.User | null>;
-    (peer: types.PeerChat): Promise<types.Chat | null>;
-    (peer: types.PeerChannel): Promise<types.Channel | null>;
-}): Promise<Message>;
+    (peer: types.PeerUser): MaybePromise<types.User | null>;
+    (peer: types.PeerChat): MaybePromise<types.Chat | null>;
+    (peer: types.PeerChannel): MaybePromise<types.Channel | null>;
+}, getMessage: {
+    (chatId: number, messageId: number): MaybePromise<Omit<Message, "replyToMessage"> | null>;
+} | null): Promise<Message>;

package/script/types/3_message.js

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.constructMessage = void 0;
+const deps_js_1 = require("../deps.js");
 const _0_control_js_1 = require("../utilities/0_control.js");
 const _0_object_js_1 = require("../utilities/0_object.js");
 const types = __importStar(require("../tl/2_types.js"));
@@ -34,7 +35,8 @@ const _1_chat_js_1 = require("./1_chat.js");
 const _1_user_js_1 = require("./1_user.js");
 const _2_inline_keyboard_markup_js_1 = require("./2_inline_keyboard_markup.js");
 const _2_reply_keyboard_markup_js_1 = require("./2_reply_keyboard_markup.js");
-async function constructMessage(message_, getEntity) {
+const d = (0, deps_js_1.debug)("types/Message");
+async function constructMessage(message_, getEntity, getMessage) {
     let chat_ = null;
     if (message_.peerId instanceof types.PeerUser) {
         const entity = await getEntity(message_.peerId);
@@ -113,6 +115,15 @@ async function constructMessage(message_, getEntity) {
             (0, _0_control_js_1.UNREACHABLE)();
         }
     }
+    if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
+        const replyToMessage = await getMessage(message.chat.id, message_.replyTo.replyToMsgId);
+        if (replyToMessage) {
+            message.replyToMessage = replyToMessage;
+        }
+        else {
+            d("couldn't get replied message");
+        }
+    }
     return (0, _0_object_js_1.cleanObject)(message);
 }
 exports.constructMessage = constructMessage;