rubika 1.2.1 → 1.2.4

package/bot/methods/index.ts

@@ -39,7 +39,7 @@ export default class Methods {
   async requestSendFile(
     this: Bot,
     ...args: Parameters<typeof Files.requestSendFile>
-  ): Promise<{ upload_url: string }> {
+  ): Promise<Types.REQUEST_SEND_FILE> {
     return Files.requestSendFile.apply(this, args);
   }
 
@@ -209,35 +209,35 @@ export default class Methods {
   async start(
     this: Bot,
     ...args: Parameters<typeof Utilities.start>
-  ): Promise<any> {
+  ): Promise<unknown> {
     return Utilities.start.apply(this, args);
   }
 
   async run(
     this: Bot,
     ...args: Parameters<typeof Utilities.run>
-  ): Promise<any> {
+  ): Promise<unknown> {
     return Utilities.run.apply(this, args);
   }
 
   async getUpdates(
     this: Bot,
     ...args: Parameters<typeof Utilities.getUpdates>
-  ): Promise<any> {
+  ): Promise<Types.GetUpdates> {
     return Utilities.getUpdates.apply(this, args);
   }
 
-  async __setupWebhook(
+  async setupWebhook(
     this: Bot,
     ...args: Parameters<typeof Utilities.setupWebhook>
-  ): Promise<any> {
+  ): Promise<unknown> {
     return Utilities.setupWebhook.apply(this, args);
   }
 
-  async __polling(
+  async polling(
     this: Bot,
     ...args: Parameters<typeof Utilities.polling>
-  ): Promise<any> {
+  ): Promise<unknown> {
     return Utilities.polling.apply(this, args);
   }
 
@@ -245,14 +245,14 @@ export default class Methods {
   async setCommands(
     this: Bot,
     ...args: Parameters<typeof Settings.setCommands>
-  ): Promise<any> {
+  ): Promise<unknown> {
     return Settings.setCommands.apply(this, args);
   }
 
   async updateBotEndpoints(
     this: Bot,
     ...args: Parameters<typeof Settings.updateBotEndpoints>
-  ): Promise<any> {
+  ): Promise<Types.UpdateBotEndpoints> {
     return Settings.updateBotEndpoints.apply(this, args);
   }
 }

package/bot/methods/messages/deleteMessage.ts

@@ -1,14 +1,10 @@
-import Bot from '../..';
+import Bot from "../..";
 
-async function deleteMessage(
-	this: Bot,
-	chat_id: string,
-	message_id: string,
-) {
-	return await this.builder('deleteMessage', {
-		chat_id,
-		message_id,
-	});
+async function deleteMessage(this: Bot, chat_id: string, message_id: string) {
+  return await this.builder("deleteMessage", {
+    chat_id,
+    message_id,
+  });
 }
 
 export default deleteMessage;

package/bot/methods/messages/sendContact.ts

@@ -13,7 +13,7 @@ async function sendContact(
   disable_notification = false,
   reply_to_message_id?: string,
   chat_keypad_type?: ChatKeypadTypeEnum,
-  auto_delete: number | boolean = false,
+  auto_delete: number | false = false,
 ) {
   const data = {
     chat_id,
@@ -37,8 +37,10 @@ async function sendContact(
 
   const res = await this.builder("sendContact", data);
 
-  if (auto_delete !== false) await this.deleteMessage(chat_id, res.message_id);
-
+  if (auto_delete !== false)
+    setTimeout(async () => {
+      await this.deleteMessage(chat_id, res.message_id);
+    }, auto_delete);
   return res;
 }
 

package/bot/methods/messages/sendFile.ts

@@ -13,7 +13,7 @@ async function sendFile(
   disable_notification = false,
   reply_to_message_id?: string,
   chat_keypad_type?: ChatKeypadTypeEnum,
-  auto_delete: number | boolean = false,
+  auto_delete: number | false = false,
 ) {
   return await this._sendFile(
     chat_id,

package/bot/methods/messages/sendGif.ts

@@ -1,32 +1,32 @@
-import Bot from '../..';
+import Bot from "../..";
 import { InlineKeypad, Keypad } from "../../types/interfaces";
 import { ChatKeypadTypeEnum, FileTypeEnum } from "../../types/enums";
 import { FileSource } from "../../types/methods";
 
 async function sendGif(
-	this: Bot,
-	chat_id: string,
-	file: FileSource,
-	text?: string,
-	chat_keypad?: Keypad,
-	inline_keypad?: InlineKeypad,
-	disable_notification = false,
-	reply_to_message_id?: string,
-	chat_keypad_type?: ChatKeypadTypeEnum,
-	auto_delete: number | boolean = false,
+  this: Bot,
+  chat_id: string,
+  file: FileSource,
+  text?: string,
+  chat_keypad?: Keypad,
+  inline_keypad?: InlineKeypad,
+  disable_notification = false,
+  reply_to_message_id?: string,
+  chat_keypad_type?: ChatKeypadTypeEnum,
+  auto_delete: number | false = false,
 ) {
-	return await this._sendFile(
-		chat_id,
-		file,
-		text,
-		FileTypeEnum.Gif,
-		chat_keypad,
-		inline_keypad,
-		disable_notification,
-		reply_to_message_id,
-		chat_keypad_type,
-		auto_delete
-	);
+  return await this._sendFile(
+    chat_id,
+    file,
+    text,
+    FileTypeEnum.Gif,
+    chat_keypad,
+    inline_keypad,
+    disable_notification,
+    reply_to_message_id,
+    chat_keypad_type,
+    auto_delete,
+  );
 }
 
 export default sendGif;

package/bot/methods/messages/sendImage.ts

@@ -1,32 +1,32 @@
-import Bot from '../..';
+import Bot from "../..";
 import { InlineKeypad, Keypad } from "../../types/interfaces";
 import { ChatKeypadTypeEnum, FileTypeEnum } from "../../types/enums";
 import { FileSource } from "../../types/methods";
 
 async function sendImage(
-	this: Bot,
-	chat_id: string,
-	file: FileSource,
-	text?: string,
-	chat_keypad?: Keypad,
-	inline_keypad?: InlineKeypad,
-	disable_notification = false,
-	reply_to_message_id?: string,
-	chat_keypad_type?: ChatKeypadTypeEnum,
-	auto_delete: number | boolean = false,
+  this: Bot,
+  chat_id: string,
+  file: FileSource,
+  text?: string,
+  chat_keypad?: Keypad,
+  inline_keypad?: InlineKeypad,
+  disable_notification = false,
+  reply_to_message_id?: string,
+  chat_keypad_type?: ChatKeypadTypeEnum,
+  auto_delete: number | false = false,
 ) {
-	return await this._sendFile(
-		chat_id,
-		file,
-		text,
-		FileTypeEnum.Image,
-		chat_keypad,
-		inline_keypad,
-		disable_notification,
-		reply_to_message_id,
-		chat_keypad_type,
-		auto_delete
-	);
+  return await this._sendFile(
+    chat_id,
+    file,
+    text,
+    FileTypeEnum.Image,
+    chat_keypad,
+    inline_keypad,
+    disable_notification,
+    reply_to_message_id,
+    chat_keypad_type,
+    auto_delete,
+  );
 }
 
 export default sendImage;

package/bot/methods/messages/sendLocation.ts

@@ -12,7 +12,7 @@ async function sendLocation(
   disable_notification = false,
   reply_to_message_id?: string,
   chat_keypad_type?: ChatKeypadTypeEnum,
-  auto_delete: number | boolean = false,
+  auto_delete: number | false = false,
 ) {
   const data = {
     chat_id,
@@ -32,10 +32,13 @@ async function sendLocation(
   if (inline_keypad && chat_keypad_type) {
     data.chat_keypad_type = ChatKeypadTypeEnum.None;
   }
-  
+
   const res = await this.builder("sendLocation", data);
 
-  if (auto_delete !== false) await this.deleteMessage(chat_id, res.message_id);
+  if (auto_delete !== false)
+    setTimeout(async () => {
+      await this.deleteMessage(chat_id, res.message_id);
+    }, auto_delete);
 
   return res;
 }

package/bot/methods/messages/sendMessage.ts

@@ -13,7 +13,7 @@ async function sendMessage(
   disable_notification = false,
   reply_to_message_id?: string,
   chat_keypad_type?: ChatKeypadTypeEnum,
-  auto_delete: number | boolean = false,
+  auto_delete: number | false = false,
 ) {
   let data: SendType = {
     chat_id,
@@ -36,7 +36,11 @@ async function sendMessage(
 
   const res = await this.builder("sendMessage", data);
 
-  if (auto_delete !== false) await this.deleteMessage(chat_id, res.message_id);
+  if (auto_delete !== false) {
+    setTimeout(async () => {
+      await this.deleteMessage(chat_id, res.message_id);
+    }, auto_delete);
+  }
 
   return res;
 }

package/bot/methods/messages/sendMusic.ts

@@ -1,32 +1,32 @@
-import Bot from '../..';
+import Bot from "../..";
 import { InlineKeypad, Keypad } from "../../types/interfaces";
 import { ChatKeypadTypeEnum, FileTypeEnum } from "../../types/enums";
 import { FileSource } from "../../types/methods";
 
 async function sendMusic(
-	this: Bot,
-	chat_id: string,
-	file: FileSource,
-	text?: string,
-	chat_keypad?: Keypad,
-	inline_keypad?: InlineKeypad,
-	disable_notification = false,
-	reply_to_message_id?: string,
-	chat_keypad_type?: ChatKeypadTypeEnum,
-	auto_delete: number | boolean = false,
+  this: Bot,
+  chat_id: string,
+  file: FileSource,
+  text?: string,
+  chat_keypad?: Keypad,
+  inline_keypad?: InlineKeypad,
+  disable_notification = false,
+  reply_to_message_id?: string,
+  chat_keypad_type?: ChatKeypadTypeEnum,
+  auto_delete: number | false = false,
 ) {
-	return await this._sendFile(
-		chat_id,
-		file,
-		text,
-		FileTypeEnum.Music,
-		chat_keypad,
-		inline_keypad,
-		disable_notification,
-		reply_to_message_id,
-		chat_keypad_type,
-		auto_delete
-	);
+  return await this._sendFile(
+    chat_id,
+    file,
+    text,
+    FileTypeEnum.Music,
+    chat_keypad,
+    inline_keypad,
+    disable_notification,
+    reply_to_message_id,
+    chat_keypad_type,
+    auto_delete,
+  );
 }
 
 export default sendMusic;

package/bot/methods/messages/sendPoll.ts

@@ -5,12 +5,15 @@ async function sendPoll(
   chat_id: string,
   question: string,
   options: string[],
-  auto_delete: number | boolean = false,
+  auto_delete: number | false = false,
 ) {
   const res = await this.builder("sendPoll", { chat_id, question, options });
 
-  if (auto_delete !== false) await this.deleteMessage(chat_id, res.message_id);
-
+  if (auto_delete !== false)
+    setTimeout(async () => {
+      await this.deleteMessage(chat_id, res.message_id);
+    }, auto_delete);
+    
   return res;
 }
 

package/bot/methods/messages/sendSticker.ts

@@ -12,9 +12,9 @@ async function sendSticker(
   disable_notification = false,
   reply_to_message_id?: string,
   chat_keypad_type?: ChatKeypadTypeEnum,
-  auto_delete: number | boolean = false,
+  auto_delete: number | false = false,
 ) {
-  let data: SendType = {
+  const data: SendType = {
     chat_id,
     sticker_id,
     disable_notification,
@@ -34,8 +34,12 @@ async function sendSticker(
   }
 
   const res = await this.builder("sendSticker", data);
-  if (auto_delete !== false) await this.deleteMessage(chat_id, res.message_id);
-  
+
+  if (auto_delete !== false)
+    setTimeout(async () => {
+      await this.deleteMessage(chat_id, res.message_id);
+    }, auto_delete);
+
   return res;
 }
 

package/bot/methods/messages/sendVideo.ts

@@ -1,32 +1,32 @@
-import Bot from '../..';
+import Bot from "../..";
 import { InlineKeypad, Keypad } from "../../types/interfaces";
 import { ChatKeypadTypeEnum, FileTypeEnum } from "../../types/enums";
 import { FileSource } from "../../types/methods";
 
 async function sendVideo(
-	this: Bot,
-	chat_id: string,
-	file: FileSource,
-	text?: string,
-	chat_keypad?: Keypad,
-	inline_keypad?: InlineKeypad,
-	disable_notification = false,
-	reply_to_message_id?: string,
-	chat_keypad_type?: ChatKeypadTypeEnum,
-	auto_delete: number | boolean = false,
+  this: Bot,
+  chat_id: string,
+  file: FileSource,
+  text?: string,
+  chat_keypad?: Keypad,
+  inline_keypad?: InlineKeypad,
+  disable_notification = false,
+  reply_to_message_id?: string,
+  chat_keypad_type?: ChatKeypadTypeEnum,
+  auto_delete: number | false = false,
 ) {
-	return await this._sendFile(
-		chat_id,
-		file,
-		text,
-		FileTypeEnum.Video,
-		chat_keypad,
-		inline_keypad,
-		disable_notification,
-		reply_to_message_id,
-		chat_keypad_type,
-		auto_delete
-	);
+  return await this._sendFile(
+    chat_id,
+    file,
+    text,
+    FileTypeEnum.Video,
+    chat_keypad,
+    inline_keypad,
+    disable_notification,
+    reply_to_message_id,
+    chat_keypad_type,
+    auto_delete,
+  );
 }
 
 export default sendVideo;

package/bot/methods/messages/sendVoice.ts

@@ -1,32 +1,32 @@
-import Bot from '../..';
+import Bot from "../..";
 import { InlineKeypad, Keypad } from "../../types/interfaces";
 import { ChatKeypadTypeEnum, FileTypeEnum } from "../../types/enums";
 import { FileSource } from "../../types/methods";
 
 async function sendVoice(
-	this: Bot,
-	chat_id: string,
-	file: FileSource,
-	text?: string,
-	chat_keypad?: Keypad,
-	inline_keypad?: InlineKeypad,
-	disable_notification = false,
-	reply_to_message_id?: string,
-	chat_keypad_type?: ChatKeypadTypeEnum,
-	auto_delete: number | boolean = false,
+  this: Bot,
+  chat_id: string,
+  file: FileSource,
+  text?: string,
+  chat_keypad?: Keypad,
+  inline_keypad?: InlineKeypad,
+  disable_notification = false,
+  reply_to_message_id?: string,
+  chat_keypad_type?: ChatKeypadTypeEnum,
+  auto_delete: number | false = false,
 ) {
-	return await this._sendFile(
-		chat_id,
-		file,
-		text,
-		FileTypeEnum.Voice,
-		chat_keypad,
-		inline_keypad,
-		disable_notification,
-		reply_to_message_id,
-		chat_keypad_type,
-		auto_delete
-	);
+  return await this._sendFile(
+    chat_id,
+    file,
+    text,
+    FileTypeEnum.Voice,
+    chat_keypad,
+    inline_keypad,
+    disable_notification,
+    reply_to_message_id,
+    chat_keypad_type,
+    auto_delete,
+  );
 }
 
 export default sendVoice;

package/bot/methods/utilities/getUpdates.ts

@@ -1,6 +1,6 @@
 import Bot from "../..";
 
-async function getUpdates(this: Bot, offset_id?: string, limit: number = 10) {
+async function getUpdates(this: Bot, offset_id?: string, limit: number = 100) {
   return await this.builder("getUpdates", { offset_id, limit });
 }
 

package/bot/methods/utilities/handleUpdates.ts

@@ -3,25 +3,23 @@ import Inline from "../../contexts/inline";
 import Update from "../../contexts/update";
 import { UpdateTypeEnum } from "../../types/enums";
 import { checkFilters } from "../../../utils";
+import { InlineMessage, UpdateMessage } from "../../types/interfaces";
 
+type UpdateResult = { inline_message: InlineMessage; update: UpdateMessage };
 const checkTypes = [UpdateTypeEnum.UpdatedMessage, UpdateTypeEnum.NewMessage];
 
 async function handleUpdates(this: Bot, req: Request) {
-  let responseData = null;
+  let data: UpdateResult;
   try {
-    responseData = await req.json();
-  } catch {}
-
-  if (!responseData) return;
+    data = (await req.json()) as UpdateResult;
+  } catch {
+    return;
+  }
 
-  const data = JSON.parse(
-    JSON.stringify(responseData, (_, v) =>
-      typeof v === "bigint" ? v.toString() : v,
-    ),
-  );
+  if (!data) return;
 
-  if (data?.update) {
-    for (let { prefix, filters, handler } of this.handlers.update) {
+  if ("update" in data) {
+    for (const { prefix, filters, handler } of this.handlers.update) {
       const ctx = new Update(data.update, this);
       const passed = await checkFilters(ctx, filters);
 
@@ -38,8 +36,10 @@ async function handleUpdates(this: Bot, req: Request) {
         await handler(ctx);
       }
     }
-  } else if (data?.inline_message) {
-    for (let { filters, handler } of this.handlers.inline) {
+  }
+
+  if ("inline_message" in data) {
+    for (const { filters, handler } of this.handlers.inline) {
       const ctx = new Inline(data.inline_message, this);
       const passed = await checkFilters(ctx, filters);