catto.js 0.4.8 → 0.5.0

package/TelegramBot.js

@@ -1,6 +1,7 @@
 var events = require("events");
 var Telegram = require("node-telegram-bot-api");
 var TelegramMessage = require("./TelegramMessage");
+var TelegramInteraction = require("./TelegramInteraction");
 if (typeof EventEmitter === "undefined") {
   var { EventEmitter } = events;
 }
@@ -52,6 +53,9 @@ module.exports = class extends EventEmitter {
       }
       this.emit("message", message);
     });
+    this.client.on("callback_query", interaction => {
+      this.emit("interaction", new TelegramInteraction(interaction, this));
+    });
   }
   command(basic, executor) {
     if (typeof basic === "string") {

package/TelegramChannel.js

@@ -1,3 +1,4 @@
+var TelegramMessageBuilder = require("./TelegramMessageBuilder");
 module.exports = class {
   constructor(data, bot) {
     this.data = data;
@@ -21,11 +22,14 @@ module.exports = class {
     this.typingLoop = null;
   }
   async send(data) {
-    if (typeof data !== "object") {
+    if (typeof data === "string") {
       data = {
         "content": data
       };
     }
+    if (data instanceof TelegramMessageBuilder) {
+      data = data.data;
+    }
     await this.bot.client.sendMessage(this.id, data.content, {
       "reply_parameters": data.replyParameters ? {
         "message_id": data.replyParameters.message.id,

package/TelegramInteraction.js

@@ -0,0 +1,23 @@
+var TelegramMessage = require("./TelegramMessage");
+module.exports = class {
+  constructor(data, bot) {
+    this._data = data;
+    this.bot = bot;
+    this.message = new TelegramMessage(this._data.message, bot);
+  }
+  get id() {
+    return this._data.id;
+  }
+  get data() {
+    return this._data.data;
+  }
+  async notify(text) {
+    await this.bot.client.answerCallbackQuery(this.id, { text });
+  }
+  async modal(text) {
+    await this.bot.client.answerCallbackQuery(this.id, {
+      text,
+      "show_alert": !0
+    });
+  }
+};

package/TelegramMessage.js

@@ -1,9 +1,11 @@
 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 = new TelegramUser(this.data.from, bot);
   }
   get id() {
     return this.data.message_id;

package/TelegramMessageBuilder.js

@@ -0,0 +1,68 @@
+module.exports = class {
+  constructor() {
+    this.data = {};
+  }
+  text(data) {
+    if (!this.data.content) {
+      this.data.content = data;
+    } else {
+      this.data.content += ` ${data}`;
+    }
+    return this;
+  }
+  buttons(rows) {
+    this.data.replyMarkup = {
+      "inline_keyboard": rows.map(row => row.map(btn => {
+        switch(btn.type) {
+          case "web":
+            return {
+              "text": btn.label,
+              "url": btn.link
+            };
+            break;
+          case "webapp":
+            return {
+              "text": btn.label,
+              "web_app": {
+                "url": btn.link
+              }
+            };
+            break;
+          case "interaction":
+            return {
+              "text": btn.label,
+              "callback_data": btn.data
+            };
+            break;
+          default:
+            break;
+        }
+      }).filter(btn => btn))
+    };
+    return this;
+  }
+  keyboard(rows) {
+    this.data.replyMarkup = {
+      "keyboard": rows.map(row => row.map(btn => {
+        switch(btn.type) {
+          case "answer":
+            return {
+              "text": btn.label
+            };
+            break;
+          case "webapp":
+            return {
+              "text": btn.label,
+              "web_app": {
+                "url": btn.link
+              }
+            };
+            break;
+          default:
+            break;
+        }
+      }).filter(btn => btn))
+    };
+    return this;
+  }
+};

package/TelegramUser.js

@@ -0,0 +1,24 @@
+module.exports = class {
+  constructor(data, bot) {
+    this.data = data;
+    this.bot = bot;
+  }
+  get id() {
+    return this.data.id;
+  }
+  get isBot() {
+    return this.data.is_bot;
+  }
+  get firstName() {
+    return this.data.first_name;
+  }
+  get lastName() {
+    return this.data.last_name;
+  }
+  get username() {
+    return this.data.username;
+  }
+  get language() {
+    return this.data.language_code;
+  }
+};

package/index.js

@@ -1,5 +1,5 @@
 var mod = {};
-["random", "Server", "HTML", "request", "AuthClient", "utils", "GitHub", "Base64", "User", "Bitfield", "Flags", "Bot", "Application", "MessageBuilder", "TelegramBot", "TelegramMessage", "TelegramChannel"].forEach(part => {
+["random", "Server", "HTML", "request", "AuthClient", "utils", "GitHub", "Base64", "User", "Bitfield", "Flags", "Bot", "Application", "MessageBuilder", "TelegramBot", "TelegramMessage", "TelegramChannel", "TelegramMessageBuilder", "TelegramInteraction", "TelegramUser"].forEach(part => {
   mod[part] = require(`./${part}`);
 });
 module.exports = mod;

package/package.json

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