catto.js 0.1.3 → 0.1.4

package/Application.js

@@ -58,7 +58,7 @@ module.exports = class {
     var p = this.options.flags;
     var f = [];
     while (--i > -1) {
-      if (![22, 21, 20, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0].includes(i) && p >= (1 << i)) {
+      if (p >= (1 << i)) {
         p -= (1 << i);
         f.push(i);
       }
@@ -89,7 +89,7 @@ module.exports = class {
       null,
       "APPLICATION_COMMAND_BADGE"
     ];
-    return f.map(n => fl[n]);
+    return f.map(n => fl[n]).filter(n => n);
   }
   get tags() {
     return this.options.tags;

package/Bot.js

@@ -121,9 +121,9 @@ module.exports = class extends EventEmitter {
     });
     this.client.on("interactionCreate", interaction => {
       if (interaction.isChatInputCommand()) {
-        interaction.user = new User(interaction.user);
+        interaction.user = new User(interaction.user, this);
         if (interaction.member) {
-          interaction.member.user = new User(interaction.member.user);
+          interaction.member.user = new User(interaction.member.user, this);
         }
         var command = this.slashCommands.get(interaction.commandName);
         if (command) {
@@ -141,9 +141,9 @@ module.exports = class extends EventEmitter {
       }
     });
     this.client.on("messageCreate", message => {
-      message.author = new User(message.author);
+      message.author = new User(message.author, this);
       if (message.member) {
-        message.member.user = new User(message.member.user);
+        message.member.user = new User(message.member.user, this);
       }
       var args = message.content.split(" ");
       var cmd = args.shift();

package/User.js

@@ -1,9 +1,8 @@
 var request = require("./request");
 var Application = require("./Application");
 module.exports = class {
-  constructor(options) {
+  constructor(options, bot) {
     this.options = Object.assign({
-      "client": null,
       "id": "",
       "username": "",
       "avatar": "",
@@ -21,8 +20,14 @@ module.exports = class {
       "bot": !1,
       "system": !1
     }, options || {});
+    this.bot = bot;
     if (this.isBot) {
-      request.get(`https://discord.com/api/v${(this.options.client ? this.options.client.rest.version.toString() : "10")}/oauth2/applications/${this.id}/rpc`).then(application => {
+      request.get({
+        "url": `https://discord.com/api/v${(this.bot ? (this.bot.client.rest.version ? this.bot.client.rest.version.toString() : "10") : "10")}/oauth2/applications/${this.id}/rpc`,
+        "headers": {
+          "Authorization": `Bot ${this.bot.client.token}`
+        }
+      }).then(application => {
         this.application = new Application(application.body);
       });
     }
@@ -38,7 +43,7 @@ module.exports = class {
   }
   get avatar() {
     var avataru = this.avatarHash;
-    if (avataru.startsWith("a_")) {
+    if (avataru && avataru.startsWith("a_")) {
       avataru = `https://cdn.discordapp.com/avatars/${this.id}/${avataru}.gif?size=4096`;
     } else if (avataru) {
       avataru = `https://cdn.discordapp.com/avatars/${this.id}/${avataru}.webp?size=4096`;
@@ -98,7 +103,7 @@ module.exports = class {
   }
   get banner() {
     var banneru = this.bannerHash;
-    if (banneru.startsWith("a_")) {
+    if (banneru && banneru.startsWith("a_")) {
       banneru = `https://cdn.discordapp.com/banners/${this.id}/${banneru}.gif?size=4096`;
     } else if (banneru) {
       banneru = `https://cdn.discordapp.com/banners/${this.id}/${banneru}.webp?size=4096`;

package/package.json

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