@mtkruto/node 0.0.936 → 0.0.938

package/esm/client/3_client.js

@@ -635,7 +635,7 @@ export class Client extends ClientAbstract {
                     (update instanceof types.UpdateDeleteChannelMessages) ||
                     (update instanceof types.UpdateEditChannelMessage) ||
                     (update instanceof types.UpdateChannelWebPage))) {
-                const channelId = update instanceof types.UpdateNewChannelMessage || update instanceof types.UpdateEditChannelMessage ? update.message[as](types.Message).peerId[as](types.PeerChannel).channelId : update.channelId;
+                const channelId = update instanceof types.UpdateNewChannelMessage || update instanceof types.UpdateEditChannelMessage ? update.message.peerId[as](types.PeerChannel).channelId : update.channelId;
                 let localPts = await this.storage.getChannelPts(channelId);
                 if (!localPts) {
                     localPts = update.pts - update.ptsCount;
@@ -683,7 +683,7 @@ export class Client extends ClientAbstract {
                     (update instanceof types.UpdateDeleteChannelMessages) ||
                     (update instanceof types.UpdateEditChannelMessage) ||
                     (update instanceof types.UpdateChannelWebPage)) {
-                    const channelId = update instanceof types.UpdateNewChannelMessage || update instanceof types.UpdateEditChannelMessage ? update.message[as](types.Message).peerId[as](types.PeerChannel).channelId : update.channelId;
+                    const channelId = update instanceof types.UpdateNewChannelMessage || update instanceof types.UpdateEditChannelMessage ? update.message.peerId[as](types.PeerChannel).channelId : update.channelId;
                     await this.recoverChannelUpdateGap(channelId, "applyUpdate");
                 }
                 else if ((update instanceof types.UpdateNewMessage) ||
@@ -1083,10 +1083,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), this.getMessage.bind(this), this[getStickerSetName].bind(this));
+                    return constructMessage(update.message, this[getEntity].bind(this), this.getMessage.bind(this), this[getStickerSetName].bind(this));
                 }
                 else if (update instanceof types.UpdateNewChannelMessage) {
-                    return constructMessage(update.message[as](types.Message), this[getEntity].bind(this), this.getMessage.bind(this), this[getStickerSetName].bind(this));
+                    return constructMessage(update.message, this[getEntity].bind(this), this.getMessage.bind(this), this[getStickerSetName].bind(this));
                 }
             }
         }
@@ -1114,7 +1114,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), null, this[getStickerSetName].bind(this)));
+            messages.push(await constructMessage(message_, this[getEntity].bind(this), null, this[getStickerSetName].bind(this)));
         }
         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.936";
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.938";
 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.936";
+export const DEFAULT_APP_VERSION = "MTKruto 0.0.938";
 // @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/types/0_location.d.ts

@@ -0,0 +1,8 @@
+export interface Location {
+    latitude: number;
+    longitude: number;
+    horizontalAccuracy?: number;
+    livePeriod?: number;
+    heading?: number;
+    proximityAlertRadius?: number;
+}

package/esm/types/0_location.js

@@ -0,0 +1 @@
+export {};

package/esm/types/0_venue.d.ts

@@ -0,0 +1,10 @@
+import * as types from "../tl/2_types.js";
+import { Location } from "./0_location.js";
+export interface Venue {
+    location: Location;
+    title: string;
+    address: string;
+    foursquareId?: string;
+    foursquareType?: string;
+}
+export declare function constructVenue(media_: types.MessageMediaVenue): Venue;

package/esm/types/0_venue.js

@@ -0,0 +1,16 @@
+import { as } from "../mod.js";
+import * as types from "../tl/2_types.js";
+export function constructVenue(media_) {
+    const geo = media_.geo[as](types.GeoPoint);
+    return {
+        location: {
+            latitude: geo.lat,
+            longitude: geo.long,
+            horizontalAccuracy: geo.accuracyRadius,
+        },
+        title: media_.title,
+        address: media_.address,
+        foursquareId: media_.venueId,
+        foursquareType: media_.venueType,
+    };
+}

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

@@ -18,6 +18,7 @@ import { Voice } from "./0_voice.js";
 import { Dice } from "./0_dice.js";
 import { Contact } from "./0_contact.js";
 import { Game } from "./2_game.js";
+import { Venue } from "./0_venue.js";
 /** This object represents a message. */
 export interface Message {
     /** Unique message identifier inside this chat */
@@ -55,7 +56,7 @@ export interface Message {
     /** Optional. Date the message was last edited in Unix time */
     editDate?: Date;
     /** Optional. True, if the message can't be forwarded */
-    hasProtectedContent: boolean;
+    hasProtectedContent?: boolean;
     /** Optional. The unique identifier of a media message group this message belongs to */
     mediaGroupId?: string;
     /** Optional. Signature of the post author for messages in channels, or the custom title of an anonymous group administrator */
@@ -86,11 +87,15 @@ export interface Message {
     videoNote?: VideoNote;
     contact?: Contact;
     game?: Game;
+    venue?: Venue;
 }
-export declare function constructMessage(message_: types.Message, getEntity: {
+interface EntityGetter {
     (peer: types.PeerUser): MaybePromise<types.User | null>;
     (peer: types.PeerChat): MaybePromise<types.Chat | null>;
     (peer: types.PeerChannel): MaybePromise<types.Channel | null>;
-}, getMessage: {
+}
+type MessageGetter = {
     (chatId: number, messageId: number): MaybePromise<Omit<Message, "replyToMessage"> | null>;
-} | null, getStickerSetName: StickerSetNameGetter): Promise<Message>;
+} | null;
+export declare function constructMessage(message_: types.TypeMessage, getEntity: EntityGetter, getMessage: MessageGetter, getStickerSetName: StickerSetNameGetter): Promise<Message>;
+export {};

package/esm/types/3_message.js

@@ -21,8 +21,61 @@ import { constructDice } from "./0_dice.js";
 import { FileID, FileType, FileUniqueID, FileUniqueType } from "./!0_file_id.js";
 import { constructContact } from "./0_contact.js";
 import { constructGame } from "./2_game.js";
+import { constructVenue } from "./0_venue.js";
 const d = debug("types/Message");
+async function getSender(message_, getEntity) {
+    if (message_.fromId instanceof types.PeerUser) {
+        const entity = await getEntity(message_.fromId);
+        if (entity) {
+            return { from: constructUser(entity) };
+        }
+        else {
+            UNREACHABLE();
+        }
+    }
+    else if (message_.fromId instanceof types.PeerChannel) {
+        const entity = await getEntity(message_.fromId);
+        if (entity) {
+            return { senderChat: constructChat(entity) };
+        }
+        else {
+            UNREACHABLE();
+        }
+    }
+}
+async function getReply(message_, chat, getMessage) {
+    if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
+        let isTopicMessage = false;
+        if (message_.replyTo.forumTopic) {
+            isTopicMessage = true;
+        }
+        const replyToMessage = await getMessage(chat.id, message_.replyTo.replyToMsgId);
+        if (replyToMessage) {
+            return { replyToMessage, threadId: message_.replyTo.replyToTopId, isTopicMessage };
+        }
+        else {
+            d("couldn't get replied message");
+        }
+    }
+    else {
+        return {};
+    }
+}
+async function constructServiceMessage(message_, chat, getEntity, getMessage) {
+    const message = {
+        id: message_.id,
+        chat: chat,
+        date: new Date(message_.date * 1000),
+        isTopicMessage: false,
+    };
+    Object.assign(message, await getReply(message_, chat, getMessage));
+    Object.assign(message, await getSender(message_, getEntity));
+    return message;
+}
 export async function constructMessage(message_, getEntity, getMessage, getStickerSetName) {
+    if (!(message_ instanceof types.Message) && !(message_ instanceof types.MessageService)) {
+        UNREACHABLE();
+    }
     let chat_ = null;
     if (message_.peerId instanceof types.PeerUser) {
         const entity = await getEntity(message_.peerId);
@@ -54,37 +107,25 @@ export async function constructMessage(message_, getEntity, getMessage, getStick
     else {
         UNREACHABLE();
     }
+    if (message_ instanceof types.MessageService) {
+        return await constructServiceMessage(message_, chat_, getEntity, getMessage);
+    }
     const message = {
         id: message_.id,
         chat: chat_,
+        date: new Date(message_.date * 1000),
         views: message_.views,
         isTopicMessage: false,
         hasProtectedContent: message_.noforwards || false,
     };
+    Object.assign(message, await getReply(message_, chat_, getMessage));
+    Object.assign(message, await getSender(message_, getEntity));
     if (message_.media instanceof types.MessageMediaPhoto || message_.media instanceof types.MessageMediaDocument) {
         message.hasMediaSpoiler = message_.media.spoiler || false;
     }
     if (message_.groupedId != undefined) {
         message.mediaGroupId = String(message_.groupedId);
     }
-    if (message_.fromId instanceof types.PeerUser) {
-        const entity = await getEntity(message_.fromId);
-        if (entity) {
-            message.from = constructUser(entity);
-        }
-        else {
-            UNREACHABLE();
-        }
-    }
-    else if (message_.fromId instanceof types.PeerChannel) {
-        const entity = await getEntity(message_.fromId);
-        if (entity) {
-            message.senderChat = constructChat(entity);
-        }
-        else {
-            UNREACHABLE();
-        }
-    }
     if (message_.message) {
         if (message_.media == undefined) {
             message.text = message_.message;
@@ -101,7 +142,6 @@ export async function constructMessage(message_, getEntity, getMessage, getStick
             message.captionEntities = message_.entities.map(constructMessageEntity).filter((v) => v);
         }
     }
-    message.date = new Date(message_.date * 1000);
     if (message_.editDate != undefined) {
         message.editDate = new Date(message_.editDate * 1000);
     }
@@ -122,19 +162,6 @@ export async function constructMessage(message_, getEntity, getMessage, getStick
             UNREACHABLE();
         }
     }
-    if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
-        if (message_.replyTo.forumTopic) {
-            message.isTopicMessage = true;
-        }
-        const replyToMessage = await getMessage(message.chat.id, message_.replyTo.replyToMsgId);
-        if (replyToMessage) {
-            message.replyToMessage = replyToMessage;
-            message.threadId = message_.replyTo.replyToTopId;
-        }
-        else {
-            d("couldn't get replied message");
-        }
-    }
     if (message_.viaBotId != undefined) {
         const viaBot = await getEntity(new types.PeerUser({ userId: message_.viaBotId }));
         if (viaBot) {
@@ -243,6 +270,9 @@ export async function constructMessage(message_, getEntity, getMessage, getStick
         else if (message_.media instanceof types.MessageMediaGame) {
             message.game = constructGame(message_.media);
         }
+        else if (message_.media instanceof types.MessageMediaVenue) {
+            message.venue = constructVenue(message_.media);
+        }
         else {
             console.log(message_.media);
             // not implemented

package/package.json

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

package/script/client/3_client.js

@@ -661,7 +661,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                     (update instanceof types.UpdateDeleteChannelMessages) ||
                     (update instanceof types.UpdateEditChannelMessage) ||
                     (update instanceof types.UpdateChannelWebPage))) {
-                const channelId = update instanceof types.UpdateNewChannelMessage || update instanceof types.UpdateEditChannelMessage ? update.message[_1_tl_object_js_1.as](types.Message).peerId[_1_tl_object_js_1.as](types.PeerChannel).channelId : update.channelId;
+                const channelId = update instanceof types.UpdateNewChannelMessage || update instanceof types.UpdateEditChannelMessage ? update.message.peerId[_1_tl_object_js_1.as](types.PeerChannel).channelId : update.channelId;
                 let localPts = await this.storage.getChannelPts(channelId);
                 if (!localPts) {
                     localPts = update.pts - update.ptsCount;
@@ -709,7 +709,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                     (update instanceof types.UpdateDeleteChannelMessages) ||
                     (update instanceof types.UpdateEditChannelMessage) ||
                     (update instanceof types.UpdateChannelWebPage)) {
-                    const channelId = update instanceof types.UpdateNewChannelMessage || update instanceof types.UpdateEditChannelMessage ? update.message[_1_tl_object_js_1.as](types.Message).peerId[_1_tl_object_js_1.as](types.PeerChannel).channelId : update.channelId;
+                    const channelId = update instanceof types.UpdateNewChannelMessage || update instanceof types.UpdateEditChannelMessage ? update.message.peerId[_1_tl_object_js_1.as](types.PeerChannel).channelId : update.channelId;
                     await this.recoverChannelUpdateGap(channelId, "applyUpdate");
                 }
                 else if ((update instanceof types.UpdateNewMessage) ||
@@ -1109,10 +1109,10 @@ class Client extends _1_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), this.getMessage.bind(this), this[exports.getStickerSetName].bind(this));
+                    return (0, _3_message_js_1.constructMessage)(update.message, this[exports.getEntity].bind(this), this.getMessage.bind(this), this[exports.getStickerSetName].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), this.getMessage.bind(this), this[exports.getStickerSetName].bind(this));
+                    return (0, _3_message_js_1.constructMessage)(update.message, this[exports.getEntity].bind(this), this.getMessage.bind(this), this[exports.getStickerSetName].bind(this));
                 }
             }
         }
@@ -1140,7 +1140,7 @@ class Client extends _1_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), null, this[exports.getStickerSetName].bind(this)));
+            messages.push(await (0, _3_message_js_1.constructMessage)(message_, this[exports.getEntity].bind(this), null, this[exports.getStickerSetName].bind(this)));
         }
         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.936";
+export declare const DEFAULT_APP_VERSION = "MTKruto 0.0.938";
 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.936";
+exports.DEFAULT_APP_VERSION = "MTKruto 0.0.938";
 // @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/types/0_location.d.ts

@@ -0,0 +1,8 @@
+export interface Location {
+    latitude: number;
+    longitude: number;
+    horizontalAccuracy?: number;
+    livePeriod?: number;
+    heading?: number;
+    proximityAlertRadius?: number;
+}

package/script/types/0_location.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/script/types/0_venue.d.ts

@@ -0,0 +1,10 @@
+import * as types from "../tl/2_types.js";
+import { Location } from "./0_location.js";
+export interface Venue {
+    location: Location;
+    title: string;
+    address: string;
+    foursquareId?: string;
+    foursquareType?: string;
+}
+export declare function constructVenue(media_: types.MessageMediaVenue): Venue;

package/script/types/0_venue.js

@@ -0,0 +1,43 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.constructVenue = void 0;
+const mod_js_1 = require("../mod.js");
+const types = __importStar(require("../tl/2_types.js"));
+function constructVenue(media_) {
+    const geo = media_.geo[mod_js_1.as](types.GeoPoint);
+    return {
+        location: {
+            latitude: geo.lat,
+            longitude: geo.long,
+            horizontalAccuracy: geo.accuracyRadius,
+        },
+        title: media_.title,
+        address: media_.address,
+        foursquareId: media_.venueId,
+        foursquareType: media_.venueType,
+    };
+}
+exports.constructVenue = constructVenue;

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

@@ -18,6 +18,7 @@ import { Voice } from "./0_voice.js";
 import { Dice } from "./0_dice.js";
 import { Contact } from "./0_contact.js";
 import { Game } from "./2_game.js";
+import { Venue } from "./0_venue.js";
 /** This object represents a message. */
 export interface Message {
     /** Unique message identifier inside this chat */
@@ -55,7 +56,7 @@ export interface Message {
     /** Optional. Date the message was last edited in Unix time */
     editDate?: Date;
     /** Optional. True, if the message can't be forwarded */
-    hasProtectedContent: boolean;
+    hasProtectedContent?: boolean;
     /** Optional. The unique identifier of a media message group this message belongs to */
     mediaGroupId?: string;
     /** Optional. Signature of the post author for messages in channels, or the custom title of an anonymous group administrator */
@@ -86,11 +87,15 @@ export interface Message {
     videoNote?: VideoNote;
     contact?: Contact;
     game?: Game;
+    venue?: Venue;
 }
-export declare function constructMessage(message_: types.Message, getEntity: {
+interface EntityGetter {
     (peer: types.PeerUser): MaybePromise<types.User | null>;
     (peer: types.PeerChat): MaybePromise<types.Chat | null>;
     (peer: types.PeerChannel): MaybePromise<types.Channel | null>;
-}, getMessage: {
+}
+type MessageGetter = {
     (chatId: number, messageId: number): MaybePromise<Omit<Message, "replyToMessage"> | null>;
-} | null, getStickerSetName: StickerSetNameGetter): Promise<Message>;
+} | null;
+export declare function constructMessage(message_: types.TypeMessage, getEntity: EntityGetter, getMessage: MessageGetter, getStickerSetName: StickerSetNameGetter): Promise<Message>;
+export {};

package/script/types/3_message.js

@@ -47,8 +47,61 @@ const _0_dice_js_1 = require("./0_dice.js");
 const _0_file_id_js_1 = require("./!0_file_id.js");
 const _0_contact_js_1 = require("./0_contact.js");
 const _2_game_js_1 = require("./2_game.js");
+const _0_venue_js_1 = require("./0_venue.js");
 const d = (0, deps_js_1.debug)("types/Message");
+async function getSender(message_, getEntity) {
+    if (message_.fromId instanceof types.PeerUser) {
+        const entity = await getEntity(message_.fromId);
+        if (entity) {
+            return { from: (0, _1_user_js_1.constructUser)(entity) };
+        }
+        else {
+            (0, _0_control_js_1.UNREACHABLE)();
+        }
+    }
+    else if (message_.fromId instanceof types.PeerChannel) {
+        const entity = await getEntity(message_.fromId);
+        if (entity) {
+            return { senderChat: (0, _1_chat_js_1.constructChat)(entity) };
+        }
+        else {
+            (0, _0_control_js_1.UNREACHABLE)();
+        }
+    }
+}
+async function getReply(message_, chat, getMessage) {
+    if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
+        let isTopicMessage = false;
+        if (message_.replyTo.forumTopic) {
+            isTopicMessage = true;
+        }
+        const replyToMessage = await getMessage(chat.id, message_.replyTo.replyToMsgId);
+        if (replyToMessage) {
+            return { replyToMessage, threadId: message_.replyTo.replyToTopId, isTopicMessage };
+        }
+        else {
+            d("couldn't get replied message");
+        }
+    }
+    else {
+        return {};
+    }
+}
+async function constructServiceMessage(message_, chat, getEntity, getMessage) {
+    const message = {
+        id: message_.id,
+        chat: chat,
+        date: new Date(message_.date * 1000),
+        isTopicMessage: false,
+    };
+    Object.assign(message, await getReply(message_, chat, getMessage));
+    Object.assign(message, await getSender(message_, getEntity));
+    return message;
+}
 async function constructMessage(message_, getEntity, getMessage, getStickerSetName) {
+    if (!(message_ instanceof types.Message) && !(message_ instanceof types.MessageService)) {
+        (0, _0_control_js_1.UNREACHABLE)();
+    }
     let chat_ = null;
     if (message_.peerId instanceof types.PeerUser) {
         const entity = await getEntity(message_.peerId);
@@ -80,37 +133,25 @@ async function constructMessage(message_, getEntity, getMessage, getStickerSetNa
     else {
         (0, _0_control_js_1.UNREACHABLE)();
     }
+    if (message_ instanceof types.MessageService) {
+        return await constructServiceMessage(message_, chat_, getEntity, getMessage);
+    }
     const message = {
         id: message_.id,
         chat: chat_,
+        date: new Date(message_.date * 1000),
         views: message_.views,
         isTopicMessage: false,
         hasProtectedContent: message_.noforwards || false,
     };
+    Object.assign(message, await getReply(message_, chat_, getMessage));
+    Object.assign(message, await getSender(message_, getEntity));
     if (message_.media instanceof types.MessageMediaPhoto || message_.media instanceof types.MessageMediaDocument) {
         message.hasMediaSpoiler = message_.media.spoiler || false;
     }
     if (message_.groupedId != undefined) {
         message.mediaGroupId = String(message_.groupedId);
     }
-    if (message_.fromId instanceof types.PeerUser) {
-        const entity = await getEntity(message_.fromId);
-        if (entity) {
-            message.from = (0, _1_user_js_1.constructUser)(entity);
-        }
-        else {
-            (0, _0_control_js_1.UNREACHABLE)();
-        }
-    }
-    else if (message_.fromId instanceof types.PeerChannel) {
-        const entity = await getEntity(message_.fromId);
-        if (entity) {
-            message.senderChat = (0, _1_chat_js_1.constructChat)(entity);
-        }
-        else {
-            (0, _0_control_js_1.UNREACHABLE)();
-        }
-    }
     if (message_.message) {
         if (message_.media == undefined) {
             message.text = message_.message;
@@ -127,7 +168,6 @@ async function constructMessage(message_, getEntity, getMessage, getStickerSetNa
             message.captionEntities = message_.entities.map(_0_message_entity_js_1.constructMessageEntity).filter((v) => v);
         }
     }
-    message.date = new Date(message_.date * 1000);
     if (message_.editDate != undefined) {
         message.editDate = new Date(message_.editDate * 1000);
     }
@@ -148,19 +188,6 @@ async function constructMessage(message_, getEntity, getMessage, getStickerSetNa
             (0, _0_control_js_1.UNREACHABLE)();
         }
     }
-    if (getMessage && message_.replyTo instanceof types.MessageReplyHeader) {
-        if (message_.replyTo.forumTopic) {
-            message.isTopicMessage = true;
-        }
-        const replyToMessage = await getMessage(message.chat.id, message_.replyTo.replyToMsgId);
-        if (replyToMessage) {
-            message.replyToMessage = replyToMessage;
-            message.threadId = message_.replyTo.replyToTopId;
-        }
-        else {
-            d("couldn't get replied message");
-        }
-    }
     if (message_.viaBotId != undefined) {
         const viaBot = await getEntity(new types.PeerUser({ userId: message_.viaBotId }));
         if (viaBot) {
@@ -269,6 +296,9 @@ async function constructMessage(message_, getEntity, getMessage, getStickerSetNa
         else if (message_.media instanceof types.MessageMediaGame) {
             message.game = (0, _2_game_js_1.constructGame)(message_.media);
         }
+        else if (message_.media instanceof types.MessageMediaVenue) {
+            message.venue = (0, _0_venue_js_1.constructVenue)(message_.media);
+        }
         else {
             console.log(message_.media);
             // not implemented