rubjs 2.4.2 → 2.5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubjs",
-  "version": "2.4.2",
+  "version": "2.5.7",
   "main": "rubjs/index.js",
   "types": "rubjs/index.d.ts",
   "keywords": [

package/rubjs/client.d.ts

@@ -27,7 +27,7 @@ declare class Client extends Methods {
     initialize: boolean;
     eventHandlers: {
         callback: Function;
-        filters: ((msg: any) => boolean)[];
+        filters: ((msg: any) => boolean)[] | ((msg: any) => boolean)[][];
         updateType: TypeUpdate;
     }[];
     constructor(sessionFile: string, timeout?: number, platform?: PlatformType);

package/rubjs/index.d.ts

@@ -1,7 +1,6 @@
 import Client from "./client";
 import Crypto from "./crypto";
-import Markdown from "./parser";
 import * as Types from "./types";
 import { Filters, Utils } from "./utils";
 export default Client;
-export { Client, Crypto, Markdown, Utils, Filters, Types };
+export { Client, Crypto, Utils, Filters, Types };

package/rubjs/index.js

@@ -36,13 +36,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Types = exports.Filters = exports.Utils = exports.Markdown = exports.Crypto = exports.Client = void 0;
+exports.Types = exports.Filters = exports.Utils = exports.Crypto = exports.Client = void 0;
 const client_1 = __importDefault(require("./client"));
 exports.Client = client_1.default;
 const crypto_1 = __importDefault(require("./crypto"));
 exports.Crypto = crypto_1.default;
-const parser_1 = __importDefault(require("./parser"));
-exports.Markdown = parser_1.default;
 const Types = __importStar(require("./types"));
 exports.Types = Types;
 const utils_1 = require("./utils");

package/rubjs/methods/extras/deleteMessagebyCount.d.ts

@@ -0,0 +1,3 @@
+import Client from "../..";
+declare function deleteMessagebyCount(this: Client, object_guid: string, message_id: string, count: number, sort?: "FromMin" | "FromMax", filter_type?: "Music" | "File" | "Media" | "Voice" | "Gif" | "Groups" | "Channels"): Promise<boolean>;
+export default deleteMessagebyCount;

package/rubjs/methods/extras/deleteMessagebyCount.js

@@ -0,0 +1,30 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+function deleteMessagebyCount(object_guid_1, message_id_1, count_1) {
+    return __awaiter(this, arguments, void 0, function* (object_guid, message_id, count, sort = "FromMax", filter_type) {
+        const countLoop = Math.ceil(count / 25);
+        const tasks = [];
+        for (let index = 1; index <= countLoop; index++) {
+            const res = yield this.getMessages(object_guid, message_id, "25", sort, filter_type);
+            if (!res.has_continue)
+                break;
+            message_id = res.new_max_id;
+            const messagesID = res.messages.map((message) => message.message_id);
+            tasks.push(this.deleteMessages(object_guid, index !== countLoop
+                ? messagesID
+                : messagesID.slice(0, count - (countLoop - 1) * 25)));
+        }
+        yield Promise.allSettled(tasks);
+        return true;
+    });
+}
+exports.default = deleteMessagebyCount;

package/rubjs/methods/extras/index.d.ts

@@ -1,4 +1,5 @@
 import banMember from "./banMember";
+import deleteMessagebyCount from "./deleteMessagebyCount";
 import getInfo from "./getInfo";
 import getObjectByUsername from "./getObjectByUsername";
 import getProfileLinkItems from "./getProfileLinkItems";
@@ -10,4 +11,4 @@ import reportObject from "./reportObject";
 import searchGlobalObjects from "./searchGlobalObjects";
 import transcribeVoice from "./transcribeVoice";
 import userIsAdmin from "./userIsAdmin";
-export { banMember, getInfo, getObjectByUsername, getProfileLinkItems, getRelatedObjects, getTranscription, join, leaveChat, reportObject, searchGlobalObjects, transcribeVoice, userIsAdmin, };
+export { banMember, getInfo, getObjectByUsername, getProfileLinkItems, getRelatedObjects, getTranscription, join, leaveChat, reportObject, searchGlobalObjects, transcribeVoice, userIsAdmin, deleteMessagebyCount };

package/rubjs/methods/extras/index.js

@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.userIsAdmin = exports.transcribeVoice = exports.searchGlobalObjects = exports.reportObject = exports.leaveChat = exports.join = exports.getTranscription = exports.getRelatedObjects = exports.getProfileLinkItems = exports.getObjectByUsername = exports.getInfo = exports.banMember = void 0;
+exports.deleteMessagebyCount = exports.userIsAdmin = exports.transcribeVoice = exports.searchGlobalObjects = exports.reportObject = exports.leaveChat = exports.join = exports.getTranscription = exports.getRelatedObjects = exports.getProfileLinkItems = exports.getObjectByUsername = exports.getInfo = exports.banMember = void 0;
 const banMember_1 = __importDefault(require("./banMember"));
 exports.banMember = banMember_1.default;
+const deleteMessagebyCount_1 = __importDefault(require("./deleteMessagebyCount"));
+exports.deleteMessagebyCount = deleteMessagebyCount_1.default;
 const getInfo_1 = __importDefault(require("./getInfo"));
 exports.getInfo = getInfo_1.default;
 const getObjectByUsername_1 = __importDefault(require("./getObjectByUsername"));

package/rubjs/methods/index.d.ts

@@ -99,6 +99,7 @@ declare class Methods {
     searchGlobalObjects(this: Client, ...args: Parameters<typeof Extras.searchGlobalObjects>): Promise<any>;
     transcribeVoice(this: Client, ...args: Parameters<typeof Extras.transcribeVoice>): Promise<any>;
     userIsAdmin(this: Client, ...args: Parameters<typeof Extras.userIsAdmin>): Promise<any>;
+    deleteMessagebyCount(this: Client, ...args: Parameters<typeof Extras.deleteMessagebyCount>): Promise<any>;
     addToMyGifSet(this: Client, ...args: Parameters<typeof Gif.addToMyGifSet>): Promise<any>;
     getMyGifSet(this: Client, ...args: Parameters<typeof Gif.getMyGifSet>): Promise<any>;
     removeFromMyGifSet(this: Client, ...args: Parameters<typeof Gif.removeFromMyGifSet>): Promise<any>;
@@ -111,11 +112,11 @@ declare class Methods {
     editGroupInfo(this: Client, ...args: Parameters<typeof Groups.editGroupInfo>): Promise<any>;
     getBannedGroupMembers(this: Client, ...args: Parameters<typeof Groups.getBannedGroupMembers>): Promise<GroupTypes.GetBannedGroupMembers>;
     getGroupAdminAccessList(this: Client, ...args: Parameters<typeof Groups.getGroupAdminAccessList>): Promise<any>;
-    getGroupAdminMembers(this: Client, ...args: Parameters<typeof Groups.getGroupAdminMembers>): Promise<any>;
+    getGroupAdminMembers(this: Client, ...args: Parameters<typeof Groups.getGroupAdminMembers>): Promise<GroupTypes.GetGroupAdminMembers>;
     getGroupOnlineCount(this: Client, ...args: Parameters<typeof Groups.getGroupOnlineCount>): Promise<any>;
     getGroupAllMembers(this: Client, ...args: Parameters<typeof Groups.getGroupAllMembers>): Promise<any>;
     getGroupDefaultAccess(this: Client, ...args: Parameters<typeof Groups.getGroupDefaultAccess>): Promise<any>;
-    getGroupInfo(this: Client, ...args: Parameters<typeof Groups.getGroupInfo>): Promise<any>;
+    getGroupInfo(this: Client, ...args: Parameters<typeof Groups.getGroupInfo>): Promise<GroupTypes.GetGroupInfo>;
     getGroupLink(this: Client, ...args: Parameters<typeof Groups.getGroupLink>): Promise<any>;
     getGroupMentionList(this: Client, ...args: Parameters<typeof Groups.getGroupMentionList>): Promise<any>;
     getGroupVoiceChatUpdates(this: Client, ...args: Parameters<typeof Groups.getGroupVoiceChatUpdates>): Promise<any>;

package/rubjs/methods/index.js

@@ -462,6 +462,11 @@ class Methods {
             return Extras.userIsAdmin.apply(this, args);
         });
     }
+    deleteMessagebyCount(...args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Extras.deleteMessagebyCount.apply(this, args);
+        });
+    }
     // gif
     addToMyGifSet(...args) {
         return __awaiter(this, void 0, void 0, function* () {

package/rubjs/methods/messages/getMessages.d.ts

@@ -1,3 +1,3 @@
 import Client from "../..";
-declare function getMessages(this: Client, object_guid: string, filter_type: string, max_id: string, limit: string, sort?: "FromMin" | "FromMax"): Promise<any>;
+declare function getMessages(this: Client, object_guid: string, max_id: string, limit: string, sort?: "FromMin" | "FromMax", filter_type?: "Music" | "File" | "Media" | "Voice" | "Gif" | "Groups" | "Channels"): Promise<any>;
 export default getMessages;

package/rubjs/methods/messages/getMessages.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-function getMessages(object_guid_1, filter_type_1, max_id_1, limit_1) {
-    return __awaiter(this, arguments, void 0, function* (object_guid, filter_type, max_id, limit, sort = "FromMax") {
+function getMessages(object_guid_1, max_id_1, limit_1) {
+    return __awaiter(this, arguments, void 0, function* (object_guid, max_id, limit, sort = "FromMax", filter_type) {
         return yield this.builder("getMessages", {
             object_guid,
             filter_type,

package/rubjs/network/index.js

@@ -186,15 +186,26 @@ class Network {
                     return;
                 const update = JSON.parse(crypto_1.default.decrypt(data_enc, this.client.key));
                 this.client.eventHandlers.forEach((_a) => __awaiter(this, [_a], void 0, function* ({ callback, filters = [], updateType }) {
-                    var _b;
-                    const messageData = (_b = update[updateType]) === null || _b === void 0 ? void 0 : _b[0];
-                    if (!messageData)
-                        return;
-                    const isValid = filters.length === 0 ||
-                        filters.every((filter) => filter(messageData));
-                    const dataMessage = new types_1.Message(this.client, messageData);
-                    if (isValid) {
-                        yield callback(dataMessage);
+                    if (update[updateType].length > 0) {
+                        for (let messageData of update[updateType]) {
+                            if (!messageData)
+                                return;
+                            const isValid = filters.length === 0 ||
+                                filters.every((filter) => {
+                                    if (typeof filter === "function")
+                                        return filter(messageData);
+                                    for (let filterCriteria of filter) {
+                                        let isMatch = filterCriteria(messageData);
+                                        if (isMatch === true)
+                                            return true;
+                                    }
+                                    return false;
+                                });
+                            const dataMessage = new types_1.Message(this.client, messageData);
+                            if (isValid) {
+                                yield callback(dataMessage);
+                            }
+                        }
                     }
                 }));
             }

package/rubjs/parser/index.js

@@ -100,7 +100,7 @@ class Markdown {
         return returnData;
     }
 }
-Markdown.markdownRegExp = /(^|\s|\n)(````?)([\s\S]+?)(````?)([\s\n\.,:?!;]|$)|(^|\s)(`|\*\*|__|~~|--|\|\|)([^\n]+?)\7([\s\.,:?!;]|$)|@([a-zA-Z0-9]+)\s*\((.+?)\)|\[(.+?)\]\((.+?)\)/m;
+Markdown.markdownRegExp = /(^|\s|\n)(````?)([\s\S]+?)(````?)([\s\n\.,:?!;]|$)|(^|\s)(`|\*\*|__|~~|--|\|\||\^\^)([^\n]+?)\7([\s\.,:?!;]|$)|@([a-zA-Z0-9]+)\s*\((.+?)\)|\[(.+?)\]\((.+?)\)/m;
 Markdown.markdownEntities = {
     "`": "Mono",
     "**": "Bold",
@@ -108,5 +108,6 @@ Markdown.markdownEntities = {
     "||": "Spoiler",
     "~~": "Strike",
     "--": "Underline",
+    "^^": "Quote",
 };
 exports.default = Markdown;

package/rubjs/types/groups.d.ts

@@ -2,6 +2,16 @@ import MessageUpdate, { ChatUpdates } from "./decorators";
 interface ChatReactionSetting {
     reaction_type: string;
 }
+interface AvatarThumbnail {
+    file_id: string;
+    mime: string;
+    dc_id: string;
+    access_hash_rec: string;
+}
+interface OnlineTime {
+    type: string;
+    exact_time: number;
+}
 interface Group {
     group_guid: string;
     group_title: string;
@@ -75,21 +85,13 @@ interface GroupMember {
     member_guid: string;
     first_name: string;
     last_name: string;
-    avatar_thumbnail: {
-        file_id: string;
-        mime: string;
-        dc_id: string;
-        access_hash_rec: string;
-    };
+    avatar_thumbnail: AvatarThumbnail;
     is_verified: boolean;
     is_deleted: boolean;
     last_online: number;
     join_type: string;
     username: string;
-    online_time: {
-        type: string;
-        exact_time: number;
-    };
+    online_time: OnlineTime;
 }
 interface AddGroup {
     group: Group;
@@ -122,8 +124,32 @@ interface BanGroupMember {
 }
 interface GetBannedGroupMembers {
     in_chat_members: GroupMember[];
-    next_start_id: "67b0e8bc1b50d7bec6fc950b";
-    has_continue: false;
-    timestamp: "1739888215";
+    next_start_id: string;
+    has_continue: boolean;
+    timestamp: string;
+}
+interface GetGroupInfo {
+    group: Group;
+    chat: Chat;
+    timestamp: string;
+}
+interface GetGroupAdminMembers {
+    in_chat_members: {
+        member_type: string;
+        member_guid: string;
+        first_name: string;
+        avatar_thumbnail: AvatarThumbnail;
+        is_verified: boolean;
+        is_deleted: boolean;
+        last_online: number;
+        promoted_by_object_guid: string;
+        promoted_by_object_type: string;
+        join_type: string;
+        username: string;
+        online_time: OnlineTime;
+    }[];
+    next_start_id: string;
+    has_continue: boolean;
+    timestamp: string;
 }
-export { AddGroup, DeleteNoAccessGroupChat, CreateGroupVoiceChat, AddGroupMembers, BanGroupMember, GetBannedGroupMembers };
+export { AddGroup, DeleteNoAccessGroupChat, CreateGroupVoiceChat, AddGroupMembers, BanGroupMember, GetBannedGroupMembers, GetGroupInfo, GetGroupAdminMembers, };

package/rubjs/types/message.d.ts

@@ -11,6 +11,7 @@ declare class Message implements MessageUpdate {
     type: string;
     state: string;
     client: Client;
+    originalType: string;
     constructor(client: Client, update: MessageUpdate);
     reply(text?: string, object_guid?: string, message_id?: string, auto_delete?: number, file_inline?: string | Buffer<ArrayBufferLike>, type?: string, is_spoil?: boolean, thumb?: string, audio_info?: boolean): Promise<import("./messages").SendMessageResult>;
     pin(object_guid?: string, message_id?: string, action?: "Pin" | "Unpin"): Promise<import("./messages").SetPinMessage>;

package/rubjs/types/message.js

@@ -9,6 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const getOriginalType = (message) => {
+    if (message.message.type.includes("FileInline")) {
+        return message.message.file_inline.type;
+    }
+    if (message.message.type === "Event") {
+        return message.message.event_data.type;
+    }
+    return message.message.type;
+};
 class Message {
     constructor(client, update) {
         Object.assign(this, update);
@@ -18,6 +27,12 @@ class Message {
             writable: true,
             configurable: true,
         });
+        Object.defineProperty(this, "originalType", {
+            value: getOriginalType(update),
+            enumerable: false,
+            writable: true,
+            configurable: true,
+        });
     }
     reply(text, object_guid, message_id, auto_delete, file_inline, type, is_spoil, thumb, audio_info) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -43,7 +58,9 @@ class Message {
     }
     delete() {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.client.deleteMessages(this.object_guid, [this.message_id]);
+            return yield this.client.deleteMessages(this.object_guid, [
+                this.message_id,
+            ]);
         });
     }
     reaction(reaction_id_1, object_guid_1, message_id_1) {

package/rubjs/utils/filters.d.ts

@@ -3,6 +3,7 @@ declare class Filters {
     static findKey(message: any, key: string): any;
     static guidType(message: MessageUpdate, startWith: string): boolean;
     static isMention(message: MessageUpdate): boolean;
+    static isMarkdown(message: MessageUpdate): boolean;
     static isReply(message: MessageUpdate): boolean;
     static isEdited(message: MessageUpdate): boolean;
     static isLink(message: MessageUpdate): boolean;

package/rubjs/utils/filters.js

@@ -37,6 +37,9 @@ class Filters {
         var _a, _b;
         return !!Filters.findKey((_b = (_a = message.message) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.meta_data_parts, "link");
     }
+    static isMarkdown(message) {
+        return !!Filters.findKey(message.message, "metadata");
+    }
     static isReply(message) {
         return !!Filters.findKey(message, "reply_to_message_id");
     }

package/rubjs/utils/utils.d.ts

@@ -5,6 +5,7 @@ declare class Utils {
     static Spoiler: (text: string) => string;
     static Strike: (text: string) => string;
     static Underline: (text: string) => string;
+    static Quote: (text: string) => string;
     static HyperLink: (text: string, link: string) => string;
 }
 export default Utils;

package/rubjs/utils/utils.js

@@ -8,5 +8,6 @@ Utils.Italic = (text) => `__${text.trim()}__`;
 Utils.Spoiler = (text) => `||${text.trim()}||`;
 Utils.Strike = (text) => `~~${text.trim()}~~`;
 Utils.Underline = (text) => `--${text.trim()}--`;
+Utils.Quote = (text) => `^^${text.trim()}^^`;
 Utils.HyperLink = (text, link) => `[${text.trim()}](${link.trim()})`;
 exports.default = Utils;