catto.js 1.1.2 → 1.1.4

package/Bot.js

@@ -457,7 +457,7 @@ module.exports = class extends EventEmitter {
           console.log(e);
         }
       } else {
-        interaction.deferReply({}).catch(() => {});
+        interaction.deferUpdate({}).catch(() => {});
       }
     } else {
       this.emit("interaction", interaction);

package/TelegramBot.js

@@ -3,6 +3,8 @@ var crypto = require("crypto");
 var Telegraf = null;
 var TelegramMessage = require("./TelegramMessage");
 var TelegramInteraction = require("./TelegramInteraction");
+var TelegramPaymentInProgress = require("./TelegramPaymentInProgress");
+var TelegramPayment = require("./TelegramPayment");
 var TelegramUser = require("./TelegramUser");
 if (typeof EventEmitter === "undefined") {
   var { EventEmitter } = events;
@@ -38,7 +40,13 @@ module.exports = class extends EventEmitter {
       this.client.on("webhook_error", () => {});
     }
     this.client.on("message", message => {
+      if (message.message.successful_payment) {
+        return this.emit("paymentSuccess", new TelegramPayment(message, this));
+      }
       message = new TelegramMessage(message, this);
+      if (!message.content) {
+        return;
+      }
       var args = message.content.split(" ");
       var cmd = args.shift();
       var command = this.slashCommands.get(cmd) || this.commands.get(cmd);
@@ -59,6 +67,9 @@ module.exports = class extends EventEmitter {
     this.client.on("callback_query", interaction => {
       this.emit("interaction", new TelegramInteraction(interaction, this));
     });
+    this.client.on("pre_checkout_query", payment => {
+      this.emit("paymentProgress", new TelegramPaymentInProgress(payment, this));
+    });
   }
   command(basic, executor) {
     if (typeof basic === "string") {

package/TelegramChannel.js

@@ -30,7 +30,7 @@ module.exports = class {
     if (data instanceof TelegramMessageBuilder) {
       data = data.data;
     }
-    await this.bot.client.telegram.sendMessage(this.id, data.content, {
+    await this.bot.client.telegram.sendMessage(this.id, data.content, Object.assign({
       "reply_parameters": data.replyParameters ? {
         "message_id": data.replyParameters.message.id,
         "chat_id": (data.replyParameters.channel ? data.replyParameters.channel.id : this.id),
@@ -39,7 +39,30 @@ module.exports = class {
       "reply_markup": data.replyMarkup ? data.replyMarkup : {
         "remove_keyboard": !0
       }
-    });
+    }, data.extra));
+    if (this.typingLoop !== null) {
+      await this.type();
+    }
+  }
+  async sendPayment(data) {
+    if (typeof data === "string") {
+      data = {
+        "content": data
+      };
+    }
+    if (data instanceof TelegramMessageBuilder) {
+      data = data.data;
+    }
+    await this.bot.client.telegram.sendInvoice(this.id, {
+      "reply_parameters": data.replyParameters ? {
+        "message_id": data.replyParameters.message.id,
+        "chat_id": (data.replyParameters.channel ? data.replyParameters.channel.id : this.id),
+        "allow_sending_without_reply": !1
+      } : void 0,
+      "reply_markup": data.replyMarkup ? data.replyMarkup : {
+        "remove_keyboard": !0
+      }
+    }, data.invoiceExtra);
     if (this.typingLoop !== null) {
       await this.type();
     }

package/TelegramMessageBuilder.js

@@ -34,6 +34,12 @@ module.exports = class {
               "callback_data": btn.data
             };
             break;
+          case "payment":
+            return {
+              "text": btn.label,
+              "pay": !0
+            };
+            break;
           default:
             break;
         }
@@ -65,4 +71,17 @@ module.exports = class {
     };
     return this;
   }
+  payment(data) {
+    this.data.invoiceExtra = {
+      "title": data.title,
+      "description": data.description,
+      "payload": data.data,
+      "currency": "XTR",
+      "prices": [{
+        "label": data.item,
+        "amount": data.price
+      }]
+    };
+    return this;
+  }
 };

package/TelegramPayment.js

@@ -0,0 +1,22 @@
+var TelegramChannel = require("./TelegramChannel");
+var TelegramUser = require("./TelegramUser");
+
+module.exports = class {
+  constructor(data, bot) {
+    this._data = data;
+    this.bot = bot;
+    this.channel = new TelegramChannel(this._data.chat, bot);
+    this.user = this.bot.users.get(this._data.from.id) || new TelegramUser(this._data.from, bot);
+    this.user.data = this._data.from;
+    this.bot.users.set(this.user.id, this.user);
+  }
+  get id() {
+    return this._data.message.successful_payment.telegram_payment_charge_id;
+  }
+  get data() {
+    return this._data.message.successful_payment.invoice_payload;
+  }
+  get price() {
+    return this._data.message.successful_payment.total_amount;
+  }
+};

package/TelegramPaymentInProgress.js

@@ -0,0 +1,18 @@
+module.exports = class {
+  constructor(data, bot) {
+    this._data = data;
+    this.bot = bot;
+  }
+  get id() {
+    return this._data.update.pre_checkout_query.id;
+  }
+  get data() {
+    return this._data.update.pre_checkout_query.invoice_payload;
+  }
+  async approve() {
+    await this.bot.client.telegram.answerPreCheckoutQuery(this.id, !0);
+  }
+  async decline(text) {
+    await this.bot.client.telegram.answerPreCheckoutQuery(this.id, !1, text);
+  }
+};

package/index.js

@@ -1,6 +1,6 @@
 var mod = {};
 var version = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
-var parts = ["random", "Server", "HTML", "request", "AuthClient", "utils", "GitHub", "Base64", "User", "Bitfield", "Application", "TelegramBot", "TelegramMessage", "TelegramChannel", "TelegramMessageBuilder", "TelegramInteraction", "TelegramUser", "TelegramFile"];
+var parts = ["random", "Server", "HTML", "request", "AuthClient", "utils", "GitHub", "Base64", "User", "Bitfield", "Application", "TelegramBot", "TelegramMessage", "TelegramChannel", "TelegramMessageBuilder", "TelegramInteraction", "TelegramPaymentInProgress", "TelegramPayment", "TelegramUser", "TelegramFile"];
 if (version >= 18.20) {
   parts.push("Bot", "MessageBuilder");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "catto.js",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Universal module for everything.",
   "main": "index.js",
   "scripts": {