rubika 1.2.3 → 1.2.4

package/client/filters.ts

@@ -1,8 +1,8 @@
-import { MessageUpdate, FileInline } from "./types/decorators.type";
+import { FileInline } from "./types/decorators.type";
 import { Filters as BotFilters } from "../bot";
-class Filters {
-  
+import { Contexts } from ".";
 
+class Filters {
   static findKey(message: any, key: string): any {
     if (!message || typeof message !== "object") {
       return undefined;
@@ -34,113 +34,113 @@ class Filters {
     return undefined;
   }
 
-  static guidType(message: MessageUpdate, startWith: string): boolean {
+  static guidType(message: Contexts.Message<any>, startWith: string): boolean {
     const result = Filters.findKey(message, "object_guid");
     return result?.startsWith(startWith) ?? false;
   }
 
-  static isMention(message: MessageUpdate): boolean {
+  static isMention(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(
       message.message?.metadata?.meta_data_parts,
       "link",
     );
   }
 
-  static isMarkdown(message: MessageUpdate): boolean {
+  static isMarkdown(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(message.message, "metadata");
   }
 
-  static isReply(message: MessageUpdate): boolean {
+  static isReply(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(message, "reply_to_message_id");
   }
 
-  static isEdited(message: MessageUpdate): boolean {
+  static isEdited(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(message, "is_edited");
   }
 
-  static isLink(message: MessageUpdate): boolean {
+  static isLink(message: Contexts.Message<any>): boolean {
     const text = Filters.findKey(message, "text");
     return text ? BotFilters.linkify.test(text) : false;
   }
 
-  static isText(message: MessageUpdate): boolean {
+  static isText(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(message, "text");
   }
 
-  static isGroup(message: MessageUpdate): boolean {
+  static isGroup(message: Contexts.Message<any>): boolean {
     return Filters.guidType(message, "g0");
   }
 
-  static isChannel(message: MessageUpdate): boolean {
+  static isChannel(message: Contexts.Message<any>): boolean {
     return Filters.guidType(message, "c0");
   }
 
-  static isPrivate(message: MessageUpdate): boolean {
+  static isPrivate(message: Contexts.Message<any>): boolean {
     return Filters.guidType(message, "u0");
   }
 
-  static isForward(message: MessageUpdate): boolean {
+  static isForward(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(message, "forwarded_from");
   }
 
-  static fileInline(message: MessageUpdate): FileInline | undefined {
+  static fileInline(message: Contexts.Message<any>): FileInline | undefined {
     return message.message?.file_inline;
   }
 
-  static isFileInline(message: MessageUpdate): boolean {
+  static isFileInline(message: Contexts.Message<any>): boolean {
     return ["FileInline", "FileInlineCaption"].includes(message.message?.type);
   }
 
-  static isFile(message: MessageUpdate): boolean {
+  static isFile(message: Contexts.Message<any>): boolean {
     return Filters.fileInline(message)?.type === "File";
   }
 
-  static isPhoto(message: MessageUpdate): boolean {
+  static isPhoto(message: Contexts.Message<any>): boolean {
     return Filters.fileInline(message)?.type === "Image";
   }
 
-  static isSticker(message: MessageUpdate): boolean {
+  static isSticker(message: Contexts.Message<any>): boolean {
     return Filters.fileInline(message)?.type === "Sticker";
   }
 
-  static isVideo(message: MessageUpdate): boolean {
+  static isVideo(message: Contexts.Message<any>): boolean {
     return Filters.fileInline(message)?.type === "Video";
   }
 
-  static isVoice(message: MessageUpdate): boolean {
+  static isVoice(message: Contexts.Message<any>): boolean {
     return Filters.fileInline(message)?.type === "Voice";
   }
 
-  static isGif(message: MessageUpdate): boolean {
+  static isGif(message: Contexts.Message<any>): boolean {
     return Filters.fileInline(message)?.type === "Gif";
   }
 
-  static isMusic(message: MessageUpdate): boolean {
+  static isMusic(message: Contexts.Message<any>): boolean {
     return Filters.fileInline(message)?.type === "Music";
   }
 
-  static isLocation(message: MessageUpdate): boolean {
+  static isLocation(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(message.message, "location");
   }
 
-  static isContact(message: MessageUpdate): boolean {
+  static isContact(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(message.message, "contact_message");
   }
 
-  static isPoll(message: MessageUpdate): boolean {
+  static isPoll(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(message, "poll");
   }
 
-  static isLive(message: MessageUpdate): boolean {
+  static isLive(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(message, "live_data");
   }
 
-  static isEvent(message: MessageUpdate): boolean {
+  static isEvent(message: Contexts.Message<any>): boolean {
     return !!Filters.findKey(message, "event_data");
   }
 
   static isLength(length: number, object_guid?: string) {
-    return (message: MessageUpdate) => {
+    return (message: Contexts.Message<any>) => {
       if (object_guid) {
         if (object_guid !== message.object_guid) return false;
       }
@@ -156,7 +156,7 @@ class Filters {
     object_guid?: string,
     length?: number,
   ) {
-    return (message: MessageUpdate) => {
+    return (message: Contexts.Message<any>) => {
       if (object_guid) {
         if (object_guid !== message.object_guid) return false;
       }
@@ -170,7 +170,7 @@ class Filters {
   }
 
   static equalCommand(text: string, object_guid?: string) {
-    return (message: MessageUpdate) => {
+    return (message: Contexts.Message<any>) => {
       if (object_guid) {
         if (object_guid !== message.object_guid) return false;
       }

package/client/index.ts

@@ -1,5 +1,9 @@
 import Client from "./client";
+import Crypto from "./crypto";
 import Filters from "./filters";
+import Utils from "../utils/formater";
+export * as Contexts from "./contexts";
+export * from "../utils";
 
 export default Client;
-export { Filters };
+export { Filters, Crypto, Utils };

package/client/methods/advanced/builder.ts

@@ -27,8 +27,10 @@ async function builder(
     const status_det = result.status_det;
 
     if (status == "OK" && status_det == "OK") {
-      return result.data;
+      return { ...result.data, status_message: "OK" };
     }
+
+    return { status_message: status_det };
   }
 }
 

package/client/methods/auth/registerDevice.ts

@@ -1,3 +1,4 @@
+import { Logger } from "../../../utils";
 import Client from "../../client";
 
 type SystemVersions = { [key: string]: string };
@@ -25,6 +26,7 @@ interface BrowserInfo {
 }
 
 async function getBrowser(
+  logger: Logger<Client>,
   userAgent: string,
   langCode: string,
   appVersion: string,
@@ -32,13 +34,12 @@ async function getBrowser(
   const deviceModelMatch = userAgent
     .toLowerCase()
     .match(/(opera|chrome|safari|firefox|msie|trident)\/(\d+)/);
-  let deviceModel = "Unknown";
 
   if (!deviceModelMatch) {
-    return new Error(`Cannot parse user-agent (${userAgent})`);
-  } else {
-    deviceModel = `${deviceModelMatch[1]} ${deviceModelMatch[2]}`;
+    throw logger.error(`Cannot parse user-agent (${userAgent})`, "error");
   }
+  
+  const deviceModel = `${deviceModelMatch[1]} ${deviceModelMatch[2]}`;
 
   let systemVersion = "Unknown";
   for (const [key, value] of Object.entries(systemVersions)) {
@@ -65,10 +66,11 @@ async function registerDevice(this: Client): Promise<void> {
   const result = await this.builder(
     "registerDevice",
     await getBrowser(
+      this.logger,
       this.network.userAgent,
       this.network.defaultPlatform.lang_code,
-      this.network.defaultPlatform.app_version
-    )
+      this.network.defaultPlatform.app_version,
+    ),
   );
 
   return result;

package/client/methods/channels/addChannel.ts

@@ -12,7 +12,7 @@ async function addChannel(
   description?: string,
   member_guids?: string[]
 ) {
-  let input: InputType = { title };
+  const input: InputType = { title };
 
   if (description) input.description = description;
 

package/client/methods/channels/editChannelInfo.ts

@@ -10,7 +10,7 @@ interface InputType {
   channel_type?: string;
   sign_messages?: boolean;
   is_restricted_content?: boolean;
-  chat_reaction_setting?: {};
+  chat_reaction_setting?: object;
   chat_history_for_new_members?: ChatHistory;
 }
 
@@ -22,10 +22,10 @@ async function editChannelInfo(
   channel_type?: string,
   sign_messages?: boolean,
   is_restricted_content?: boolean,
-  chat_reaction_setting?: {},
+  chat_reaction_setting?: object,
   chat_history_for_new_members?: ChatHistory,
 ) {
-  let input: InputType = { channel_guid, updated_parameters: [] };
+  const input: InputType = { channel_guid, updated_parameters: [] };
 
   if (title) {
     input.title = title;

package/client/methods/channels/setChannelVoiceChatSetting.ts

@@ -13,7 +13,7 @@ async function setChannelVoiceChatSetting(
   voice_chat_id: string,
   title?: string
 ) {
-  let input: InputType = {
+  const input: InputType = {
     channel_guid,
     voice_chat_id,
     updated_parameters: [],

package/client/methods/chats/editJoinLink.ts

@@ -19,7 +19,7 @@ async function editJoinLink(
   expire_time?: number,
   usage_limit?: number
 ) {
-  let input: InputType = { object_guid, join_link, update_parameters: [] };
+  const input: InputType = { object_guid, join_link, update_parameters: [] };
 
   if (typeof title === "string") {
     input.update_parameters.push("title");

package/client/methods/chats/seenChats.ts

@@ -1,6 +1,6 @@
 import Client from "../../client";
 
-async function seenChats(this: Client, seen_list: Record<string, any>) {
+async function seenChats(this: Client, seen_list: Record<string, unknown>) {
   return await this.builder("seenChats", { seen_list });
 }
 

package/client/methods/extras/deleteMessagebyCount.ts

@@ -1,49 +1,51 @@
-import Client from '../../client';
+import Client from "../../client";
 
 async function deleteMessagebyCount(
-	this: Client,
-	object_guid: string,
-	message_id: string,
-	count: number,
-	sort: 'FromMin' | 'FromMax' = 'FromMax',
-	filter_type?:
-		| 'Music'
-		| 'File'
-		| 'Media'
-		| 'Voice'
-		| 'Gif'
-		| 'Groups'
-		| 'Channels',
+  this: Client,
+  object_guid: string,
+  message_id: string,
+  count: number,
+  sort: "FromMin" | "FromMax" = "FromMax",
+  filter_type?:
+    | "Music"
+    | "File"
+    | "Media"
+    | "Voice"
+    | "Gif"
+    | "Groups"
+    | "Channels",
 ) {
-	const countLoop = Math.ceil(count / 25);
-	const tasks: Promise<any>[] = [];
+  const countLoop = Math.ceil(count / 25);
+  const tasks: Promise<unknown>[] = [];
 
-	for (let index = 1; index <= countLoop; index++) {
-		const res = await this.getMessages(
-			object_guid,
-			message_id,
-			'25',
-			sort,
-			filter_type,
-		);
+  for (let index = 1; index <= countLoop; index++) {
+    const res = await this.getMessages(
+      object_guid,
+      message_id,
+      "25",
+      sort,
+      filter_type,
+    );
 
-		if (!res.has_continue) break;
+    if (!res.has_continue) break;
 
-		message_id = res.new_max_id;
-		const messagesID = res.messages.map((message: any) => message.message_id);
-		tasks.push(
-			this.deleteMessages(
-				object_guid,
-				index !== countLoop
-					? messagesID
-					: messagesID.slice(0, count - (countLoop - 1) * 25),
-			),
-		);
-	}
+    message_id = res.new_max_id;
+    const messagesID = res.messages.map(
+      (message: Record<string, unknown>) => message.message_id,
+    );
+    tasks.push(
+      this.deleteMessages(
+        object_guid,
+        index !== countLoop
+          ? messagesID
+          : messagesID.slice(0, count - (countLoop - 1) * 25),
+      ),
+    );
+  }
 
-	await Promise.allSettled(tasks);
+  await Promise.allSettled(tasks);
 
-	return true;
+  return true;
 }
 
 export default deleteMessagebyCount;

package/client/methods/extras/onEditMessages.ts

@@ -4,7 +4,7 @@ import Client from "../../client";
 function onEditMessages(
   this: Client,
   object_guid: string,
-  callback: (message: Message) => any,
+  callback: (message: Message<unknown>) => unknown,
 ) {
   let state = Math.round(Date.now() / 1000) - 150;
   const messagesIDs = new Set<string>();

package/client/methods/extras/userIsAdmin.ts

@@ -9,14 +9,14 @@ async function userIsAdmin(
 	let nextStartID = null;
 
 	while (hasContinue) {
-		let result: any = object_guid.startsWith('g0')
+		const result = object_guid.startsWith('g0')
 			? await this.getGroupAdminMembers(object_guid, nextStartID)
 			: await this.getChannelAdminMembers(object_guid, nextStartID);
 
 		hasContinue = result.has_continue;
 		nextStartID = result.next_start_id;
 
-		for (let user of result.in_chat_members)
+		for (const user of result.in_chat_members)
 			if (user_guid === user.member_guid) return true;
 	}
 

package/client/methods/groups/editGroupInfo.ts

@@ -2,6 +2,18 @@ import Client from "../../client";
 
 type ChatHistoryOption = "Hidden" | "Visible";
 
+type InputType = {
+  group_guid: string;
+  title?: string;
+  description?: string;
+  slow_mode?: string;
+  event_messages?: boolean;
+  is_restricted_content?: boolean;
+  chat_reaction_setting?: { [key: string]: string | number } | null | undefined;
+  chat_history_for_new_members?: ChatHistoryOption;
+  updated_parameters: string[];
+};
+
 async function editGroupInfo(
   this: Client,
   group_guid: string,
@@ -14,7 +26,7 @@ async function editGroupInfo(
   chat_history_for_new_members?: ChatHistoryOption,
 ) {
   const updated_parameters: string[] = [];
-  const input_data: Record<string, any> = { group_guid };
+  const input_data: InputType = { group_guid, updated_parameters: [] };
 
   if (title !== undefined) {
     input_data.title = title;

package/client/methods/groups/setGroupVoiceChatSetting.ts

@@ -13,7 +13,7 @@ async function setGroupVoiceChatSetting(
   voice_chat_id: string,
   title?: string
 ) {
-  let input: InputType = {
+  const input: InputType = {
     group_guid,
     voice_chat_id,
     updated_parameters: [],

package/client/methods/messages/sendDocument.ts

@@ -6,18 +6,19 @@ async function sendDocument(
   document: string | Buffer<ArrayBufferLike>,
   caption?: string,
   reply_to_message_id?: string,
-  auto_delete?: number
+  auto_delete?: number,
 ) {
   return await this.sendMessage(
     object_guid,
     caption,
     reply_to_message_id,
     document,
+    undefined,
     "File",
     undefined,
     undefined,
     undefined,
-    auto_delete
+    auto_delete,
   );
 }
 

package/client/methods/messages/sendFileInline.ts

@@ -25,7 +25,7 @@ async function sendFileInline(
   reply_to_message_id?: string,
   auto_delete?: number,
 ) {
-  let input: Record<string, any> = {
+  let input: Record<string, unknown> = {
     object_guid,
     rnd: Math.floor(Math.random() * 1e6 + 1),
     reply_to_message_id,

package/client/methods/messages/sendGif.ts

@@ -6,19 +6,20 @@ async function sendGif(
   gif: string | Buffer<ArrayBufferLike>,
   caption?: string,
   reply_to_message_id?: string,
-  auto_delete?: number
+  auto_delete?: number,
 ) {
   return await this.sendMessage(
     object_guid,
     caption,
     reply_to_message_id,
     gif,
+    undefined,
     "Gif",
     undefined,
     true,
     undefined,
-    auto_delete
+    auto_delete,
   );
 }
 
-export default sendGif;
+export default sendGif;

package/client/methods/messages/sendMessage.ts

@@ -13,6 +13,7 @@ async function sendMessage(
   text: string | null = null,
   reply_to_message_id: string | null = null,
   file_inline: Buffer | string | null = null,
+  aux_data?: { button_id: string },
   type: string = "File",
   is_spoil: boolean = false,
   thumb: boolean | string = true,
@@ -31,7 +32,7 @@ async function sendMessage(
   let fileName: string | null = null;
   let audio_data: any;
 
-  let input: Record<string, any> = {
+  let input: Record<string, unknown> = {
     object_guid,
     rnd: Math.floor(Math.random() * 1e6 + 1),
     reply_to_message_id,
@@ -39,6 +40,8 @@ async function sendMessage(
 
   if (text) input = { ...input, ...Markdown.toMetadata(text) };
 
+  if (aux_data) input["aux_data"] = aux_data;
+
   if (file_inline) {
     if (typeof file_inline === "string") {
       fileName = file_inline;
@@ -70,8 +73,9 @@ async function sendMessage(
       thumb = false;
       if (audio_info) {
         if (!optionalMusicMetadata) {
-          return new Error(
+          return this.logger.error(
             "music-metadata module is not installed. Some features may be disabled.",
+            "error",
           );
         }
 
@@ -121,13 +125,11 @@ async function sendMessage(
   const result = await this.builder("sendMessage", input);
 
   if (auto_delete) {
-    const res = setTimeout(async () => {
+    setTimeout(async () => {
       await this.deleteMessages(
         result.message_update.object_guid,
         result.message_update.message_id,
       );
-
-      clearTimeout(res);
     }, auto_delete * 1000);
   }
 

package/client/methods/messages/sendMessageAPICall.ts

@@ -0,0 +1,18 @@
+import Client from "../../client";
+
+async function sendMessageAPICall(
+  this: Client,
+  text: string,
+  object_guid: string,
+  message_id: string,
+  aux_data: { button_id: string },
+) {
+  return await this.builder("sendMessageAPICall", {
+    text,
+    object_guid,
+    message_id,
+    aux_data,
+  });
+}
+
+export default sendMessageAPICall;

package/client/methods/messages/sendMusic.ts

@@ -8,18 +8,19 @@ async function sendMusic(
   reply_to_message_id?: string,
   is_spoil?: boolean,
   audio_info?: boolean,
-  auto_delete?: number
+  auto_delete?: number,
 ) {
   return await this.sendMessage(
     object_guid,
     caption,
     reply_to_message_id,
     music,
+    undefined,
     "Music",
     is_spoil,
     undefined,
     audio_info,
-    auto_delete
+    auto_delete,
   );
 }
 

package/client/methods/messages/sendPhoto.ts

@@ -7,18 +7,19 @@ async function sendPhoto(
   text?: string,
   reply_id?: string,
   is_spoil?: boolean,
-  auto_delete?: number
+  auto_delete?: number,
 ) {
   return this.sendMessage(
     object_guid,
     text,
     reply_id,
     photo,
+    undefined,
     "Image",
     is_spoil,
     true,
     false,
-    auto_delete
+    auto_delete,
   );
 }
 

package/client/methods/messages/sendText.ts

@@ -5,18 +5,20 @@ async function sendText(
   object_guid: string,
   text: string,
   reply_id?: string,
-  auto_delete?: number
+  aux_data?: { button_id: string },
+  auto_delete?: number,
 ) {
   return await this.sendMessage(
     object_guid,
     text,
     reply_id,
     null,
+    aux_data,
     undefined,
     false,
     false,
     false,
-    auto_delete
+    auto_delete,
   );
 }