temp unfinished changes

.idea/workspace.xml

@@ -4,9 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="826c705b-a7fa-4ece-b82a-e278fca7d494" name="Changes" comment="stats without leveling enabled">
+    <list default="true" id="826c705b-a7fa-4ece-b82a-e278fca7d494" name="Changes" comment="more avatar bugs">
+      <change afterPath="$PROJECT_DIR$/slash/fun/nowplaying.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/commands/anime/char.js" beforeDir="false" afterPath="$PROJECT_DIR$/commands/anime/char.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -166,6 +168,15 @@
       <workItem from="1645765271756" duration="14000" />
       <workItem from="1646073200451" duration="122000" />
       <workItem from="1646163659329" duration="994000" />
+      <workItem from="1647134810622" duration="897000" />
+      <workItem from="1647787300624" duration="1797000" />
+      <workItem from="1648877743854" duration="1500000" />
+      <workItem from="1648958883041" duration="864000" />
+      <workItem from="1651642958178" duration="18000" />
+      <workItem from="1651946403697" duration="155000" />
+      <workItem from="1652646106603" duration="1287000" />
+      <workItem from="1655452467524" duration="126000" />
+      <workItem from="1660254007752" duration="1643000" />
     </task>
     <task id="LOCAL-00001" summary="not even gonna explain">
       <created>1640148826800</created>
@@ -293,7 +304,21 @@
       <option name="project" value="LOCAL" />
       <updated>1645679244004</updated>
     </task>
-    <option name="localTasksCounter" value="19" />
+    <task id="LOCAL-00019" summary="fix avatars">
+      <created>1647787801198</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1647787801198</updated>
+    </task>
+    <task id="LOCAL-00020" summary="more avatar bugs">
+      <created>1647788334624</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1647788334624</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -331,6 +356,8 @@
     <MESSAGE value="marriage status" />
     <MESSAGE value="can't marry yourself lul" />
     <MESSAGE value="marriage declining" />
-    <option name="LAST_COMMIT_MESSAGE" value="marriage declining" />
+    <MESSAGE value="fix avatars" />
+    <MESSAGE value="more avatar bugs" />
+    <option name="LAST_COMMIT_MESSAGE" value="more avatar bugs" />
   </component>
 </project>

commands/leveling/chests.js

@@ -22,7 +22,6 @@ module.exports = {
     async execute(message, msg, args, cmd, prefix, mention, client) {
         if (!message.member.permissions.has("ADMINISTRATOR")) {return message.channel.send("You must have administrator permissions in order to edit these settings.");}
         if (!args.length) {args[0] = 'enable';}
-
         if (['e', 'enable'].includes(args[0].toLowerCase())) {
             if (client.misc.cache.chests.enabled.includes(message.guild.id)) {return message.channel.send("This server already has chest spawning enabled.")};
             try {

commands/misc/avatar.js

@@ -16,8 +16,8 @@ module.exports = {
     },
     async execute(message, msg, args, cmd, prefix, mention, client) {
         let fail = false;
-        await client.users.fetch(member.id, {force: true}).catch(() => fail = true);
         let member = args.length && !fail ? (mention || client.users.cache.get(args[0]) || message.author) : message.author;
+        await client.users.fetch(member.id, {force: true}).catch(() => fail = true);
         if (message.guild) {message.guild.members.fetch(member.id, {force: true});}
         let name = message.guild ? message.guild.members.cache.get(member.id).displayName : member.username;
         let options = new TagFilter([

commands/misc/invite.js

@@ -14,7 +14,7 @@ module.exports = {
         return message.channel.send({embeds: [new Discord.MessageEmbed()
             .setTitle("My links!")
             .setThumbnail(client.user.displayAvatarURL({size: 2048}))
-            .setDescription("[Bot Invite](https://discord.com/oauth2/authorize?client_id=762701327431237644&scope=bot&permissions=1581116647)\n`->` Use this link to invite Natsuki to your server! This has all the required permissions in it that the I need to work, and it is not recommended that you change them. Doing so will make it so that some commands don't function properly or won't complete (I'll usually tell you when I'm missing a permission).\n\n[Support Server Invite](https://discord.gg/u9c2uD24wB)\n`->` Use this to join my support server! Here you can talk to the devs, suggest features, hang out with the community, get update alerts, report bugs/issues and get help, or just stop and say hi!")
+            .setDescription("[Bot Invite](https://discord.com/api/oauth2/authorize?client_id=762701327431237644&permissions=1507482660086&scope=bot%20applications.commands)\n`->` Use this link to invite Natsuki to your server! This has all the required permissions in it that the I need to work, and it is not recommended that you change them. Doing so will make it so that some commands don't function properly or won't complete (I'll usually tell you when I'm missing a permission).\n\n[Support Server Invite](https://discord.gg/u9c2uD24wB)\n`->` Use this to join my support server! Here you can talk to the devs, suggest features, hang out with the community, get update alerts, report bugs/issues and get help, or just stop and say hi!")
             .setColor("c375f0")
             .setFooter({text: "Natsuki"})
             .setTimestamp()

commands/misc/userinfo.js

@@ -28,7 +28,7 @@ module.exports = {
         let infoembed = new Discord.MessageEmbed()
             .setTitle(`User Info for ${name}`)
             .setDescription(`Requested by ${message.guild ? message.member.displayName : message.author.username}`)
-            .setThumbnail((message.guild ? person : u).displayAvatarURL({size: 4096}))
+            .setThumbnail((message.guild ? person : u).displayAvatarURL({size: 4096, dynamic: true, format: 'png'}))
             .addField("Account Created", `${moment.preciseDiff(Date.now(), u.createdAt)} ago`, true)
             .addField("Bot User?", u.bot ? "Is a bot" : "Is not a bot", true)
             .setColor('c375f0')

commands/utility/checklist.js

@@ -0,0 +1,46 @@
+const Discord = require('discord.js');
+
+const GuildLists = require("../../models/guildlist");
+const Checklists = require("../../models/checklist");
+
+const ask = require('../../util/ask');
+const makeId = require('../../util/makeid');
+
+module.exports = {
+    name: "checklist",
+    aliases: ['chl', 'list'],
+    meta: {
+        category: 'Utility',
+        description: "Create and manage checklists, which let you manage tasks for server members",
+        syntax: '`checklist <create|list|admin|view|edit|delete|archive|assign|unassign>`',
+        extra: null,
+        guildOnly: true
+    },
+    help: new Discord.MessageEmbed()
+        .setTitle("Help -> Checklists")
+        .setDescription("Checklists manage large goals for your server, for any purpose, and can be assigned tasks, members, and more.")
+        .addField("Creation", "Use `checklist admin` to toggle admin-locked checklist creation, making it so only admins can make checklists.")
+        .addField("Syntax", "`checklist <create|list|admin|view|edit|delete|archive|assign|unassign>`"),
+    async execute(message, msg, args, cmd, prefix, mention, client) {
+        if (!args.length) {return message.channel.send(`Syntax: \`${prefix}checklist <create|list|admin|view|edit|delete|archive|assign|unassign>\``);}
+
+        const o = args[0].toLowerCase();
+        if (['c', 'new', 'create'].includes(o)) {
+            let gl = await GuildLists.findOne({gid: message.guild.id});
+            if (gl && gl.admin && !message.member.permissions.has("ADMINISTRATOR")) {return message.channel.send("You must be a server administrator in order to make new lists!");}
+            if (gl && gl.lists.length == 15) {return message.channel.send("Your server has reached the checklist maximum of 15!");}
+            const name = await ask(message, "What would you like to call this checklist?", 60000); if (!name) {return;}
+            if (name.length > 50) {return message.channel.send("Your list's name is too long!");}
+            const desc = await ask(message, "What is the main purpose of this list?", 120000); if (!desc) {return;}
+            if (desc.length > 400) {return message.channel.send("Please shorten that description a little!");}
+            let image = null;
+            let conf = await ask(message, "Would you like to add an image to your list?", 60000); if (!conf) {return;}
+            if (['yes', 'ye', 'y', 'sure'].includes(conf.trim().toLowerCase())) {
+                image = await ask(message, `Please paste the image or a link to the image you'd like to add to your new checklist.`, 60000, false, true);
+                if (!image || !image.match(/^https:\/\/(?:[\w\-].?)+[\/\w\-%()_]+\.(?:png|jpg|jpeg|gif|webp)$/gm)) {return message.channel.send("I don't think that's an image. Try again?");}
+            }
+            if (!gl) {gl = new GuildLists({gid: message.guild.id});}
+            
+        }
+    }
+};

commands/utility/choose.js

@@ -0,0 +1,30 @@
+const Discord = require('discord.js');
+
+const {Tag} = require('../../util/tag');
+const {TagFilter} = require('../../util/tagfilter');
+
+module.exports = {
+    name: "choose",
+    aliases: ['po', 'pick', 'pickone', 'chooseone'],
+    meta: {
+        category: 'Utility',
+        description: "Feeling indecisive? Have Natsuki choose for you!",
+        syntax: '`choose <option> <option> [option] [etc...] ` OR `choose -option option that has spaces -o another one -choice another one -o anotherrr`',
+        extra: null
+    },
+    help: new Discord.MessageEmbed()
+        .setTitle("Help -> Choosing")
+        .setDescription("Have Natsuki choose for you.")
+        .addField("Usage", "All choices are done with a space. Or, you can use tag syntax to have options with spaces")
+        .addField("Syntax", "`choose <option> <option> [option] [etc...] ` OR `choose -option option that has spaces -o another one -choice another one -o anotherrr`"),
+    async execute(message, msg, args, cmd, prefix, mention, client) {
+        if (!args.length) {return message.channel.send(`Syntax: \`${prefix}choose <option> <option> [option] [etc...] \` OR \`choose -option option that has spaces -o another one -choice another one -o anotherrr\``);}
+        const options = new TagFilter([
+            new Tag(['o', 'option', 'choice', 'c', 'ch'], 'options', 'listAppend')
+        ]).test(args.join(" "));
+        let choices = [];
+        choices = options && options.options && options.options.length ? options.options : args;
+        let prer = ["Hmmm, how about", "I pick", "I choose", "And the result is...\\*drumroll*..."];
+        return message.channel.send(`${prer[Math.floor(Math.random() * prer.length)]} "${choices[Math.floor(Math.random() * choices.length)]}"`);
+    }
+};

commands/utility/task.js

@@ -0,0 +1,23 @@
+const Discord = require('discord.js');
+
+const Tasks = require("../../models/task");
+
+module.exports = {
+    name: "task",
+    aliases: ['t'],
+    meta: {
+        category: 'Utility',
+        description: "Create and manage server-wide tasks for checklists",
+        syntax: '`task <create|pulse|list|assign|delete|edit|resign|complete|decomplete|status>`',
+        extra: null,
+        guildOnly: true
+    },
+    help: new Discord.MessageEmbed()
+        .setTitle("Help -> Tasks")
+        .setDescription("Tasks are a subset of checklists (`checklist`). They are based server-wide and are locked to the server. Only task or checklist assignees can mark a task as complete.")
+        .addField("Syntax", "`task <create|pulse|list|assign|delete|edit|resign|complete|decomplete|status>`"),
+    async execute(message, msg, args, cmd, prefix, mention, client) {
+        if (!args.length) {return message.channel.send(`Syntax: \`${prefix}task <create|pulse|list|assign|delete|edit|resign|complete|decomplete|status>\``);}
+        
+    }
+};

models/checklist.js

@@ -0,0 +1,14 @@
+const mongoose = require('mongoose');
+module.exports = mongoose.model('checklist', new mongoose.Schema({
+    id: String,
+    ownerId: String,
+    name: String,
+    description: String,
+    image: String,
+    children: {type: [{
+        list: Boolean,
+        id: String
+    }], default: []},
+    archived: {type: Boolean, default: false},
+    assignees: {type: [String], default: []}
+}));

models/guildlist.js

@@ -0,0 +1,6 @@
+const mongoose = require('mongoose');
+module.exports = mongoose.model('guildlist', new mongoose.Schema({
+    gid: {type: String, unique: true},
+    lists: {type: Object, default: {}},
+    admin: {type: Boolean, default: false}
+}));

package-lock.json

@@ -26,6 +26,7 @@
                 "moment-precise-range-plugin": "^1.3.0",
                 "mongoose": "^5.10.3",
                 "node-fetch": "^2.6.1",
+                "node-osu": "^2.2.1",
                 "ora": "^5.3.0",
                 "swwrap": "^1.0.0",
                 "tinygradient": "^1.1.5",
@@ -366,6 +367,18 @@
                 "ieee754": "^1.1.13"
             }
         },
+        "node_modules/call-bind": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+            "dependencies": {
+                "function-bind": "^1.1.1",
+                "get-intrinsic": "^1.0.2"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/canvas": {
             "version": "2.9.0",
             "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.9.0.tgz",
@@ -470,6 +483,11 @@
                 "node": ">= 0.8"
             }
         },
+        "node_modules/component-emitter": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+            "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+        },
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -480,6 +498,11 @@
             "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
             "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
         },
+        "node_modules/cookiejar": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
+            "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ=="
+        },
         "node_modules/core-util-is": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -691,6 +714,11 @@
                 "node": ">=6"
             }
         },
+        "node_modules/fast-safe-stringify": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+            "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+        },
         "node_modules/form-data": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
@@ -704,6 +732,15 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/formidable": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz",
+            "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==",
+            "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau",
+            "funding": {
+                "url": "https://ko-fi.com/tunnckoCore/commissions"
+            }
+        },
         "node_modules/fs-minipass": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
@@ -720,6 +757,11 @@
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
             "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
         },
+        "node_modules/function-bind": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+        },
         "node_modules/fuzzysort": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/fuzzysort/-/fuzzysort-1.1.4.tgz",
@@ -744,6 +786,19 @@
                 "node": ">=10"
             }
         },
+        "node_modules/get-intrinsic": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+            "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+            "dependencies": {
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.1"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/glob": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -775,6 +830,17 @@
                 "node": ">=10"
             }
         },
+        "node_modules/has": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+            "dependencies": {
+                "function-bind": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4.0"
+            }
+        },
         "node_modules/has-flag": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -783,6 +849,17 @@
                 "node": ">=8"
             }
         },
+        "node_modules/has-symbols": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+            "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/has-unicode": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -946,6 +1023,25 @@
             "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
             "optional": true
         },
+        "node_modules/methods": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+            "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mime": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+            "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
         "node_modules/mime-db": {
             "version": "1.49.0",
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
@@ -1192,6 +1288,14 @@
                 }
             }
         },
+        "node_modules/node-osu": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/node-osu/-/node-osu-2.2.1.tgz",
+            "integrity": "sha512-SM9kj+7q7j/Y5nkMSRchQi9g2RxgDQ8JjC/zds7VyzUWQPokGQW3KuiskPLHwITn3RW3V98k7Y3RB3zkLIX9jA==",
+            "dependencies": {
+                "superagent": "^5.2.1"
+            }
+        },
         "node_modules/nopt": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
@@ -1225,6 +1329,14 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/object-inspect": {
+            "version": "1.12.0",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+            "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/once": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -1331,6 +1443,20 @@
             "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
             "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
         },
+        "node_modules/qs": {
+            "version": "6.10.3",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+            "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+            "dependencies": {
+                "side-channel": "^1.0.4"
+            },
+            "engines": {
+                "node": ">=0.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/readable-stream": {
             "version": "2.3.7",
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -1447,6 +1573,19 @@
             "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
             "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
         },
+        "node_modules/side-channel": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+            "dependencies": {
+                "call-bind": "^1.0.0",
+                "get-intrinsic": "^1.0.2",
+                "object-inspect": "^1.9.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/sift": {
             "version": "13.5.2",
             "resolved": "https://registry.npmjs.org/sift/-/sift-13.5.2.tgz",
@@ -1537,6 +1676,70 @@
                 "node": ">=8"
             }
         },
+        "node_modules/superagent": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
+            "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
+            "deprecated": "Please upgrade to v7.0.2+ of superagent.  We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing.  See the releases tab for more information at <https://github.com/visionmedia/superagent/releases>.",
+            "dependencies": {
+                "component-emitter": "^1.3.0",
+                "cookiejar": "^2.1.2",
+                "debug": "^4.1.1",
+                "fast-safe-stringify": "^2.0.7",
+                "form-data": "^3.0.0",
+                "formidable": "^1.2.2",
+                "methods": "^1.1.2",
+                "mime": "^2.4.6",
+                "qs": "^6.9.4",
+                "readable-stream": "^3.6.0",
+                "semver": "^7.3.2"
+            },
+            "engines": {
+                "node": ">= 7.0.0"
+            }
+        },
+        "node_modules/superagent/node_modules/debug": {
+            "version": "4.3.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+            "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/superagent/node_modules/form-data": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+            "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+            "dependencies": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/superagent/node_modules/readable-stream": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+            "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
         "node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -1995,6 +2198,15 @@
                 "ieee754": "^1.1.13"
             }
         },
+        "call-bind": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+            "requires": {
+                "function-bind": "^1.1.1",
+                "get-intrinsic": "^1.0.2"
+            }
+        },
         "canvas": {
             "version": "2.9.0",
             "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.9.0.tgz",
@@ -2068,6 +2280,11 @@
                 "delayed-stream": "~1.0.0"
             }
         },
+        "component-emitter": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+            "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+        },
         "concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -2078,6 +2295,11 @@
             "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
             "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
         },
+        "cookiejar": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
+            "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ=="
+        },
         "core-util-is": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -2241,6 +2463,11 @@
             "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
             "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
         },
+        "fast-safe-stringify": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+            "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
+        },
         "form-data": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
@@ -2251,6 +2478,11 @@
                 "mime-types": "^2.1.12"
             }
         },
+        "formidable": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz",
+            "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ=="
+        },
         "fs-minipass": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
@@ -2264,6 +2496,11 @@
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
             "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
         },
+        "function-bind": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+        },
         "fuzzysort": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/fuzzysort/-/fuzzysort-1.1.4.tgz",
@@ -2285,6 +2522,16 @@
                 "wide-align": "^1.1.2"
             }
         },
+        "get-intrinsic": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+            "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+            "requires": {
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.1"
+            }
+        },
         "glob": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
@@ -2307,11 +2554,24 @@
                 "tinygradient": "^1.1.5"
             }
         },
+        "has": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+            "requires": {
+                "function-bind": "^1.1.1"
+            }
+        },
         "has-flag": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
             "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
+        "has-symbols": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+            "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="
+        },
         "has-unicode": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -2438,6 +2698,16 @@
             "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==",
             "optional": true
         },
+        "methods": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+            "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+        },
+        "mime": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+            "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="
+        },
         "mime-db": {
             "version": "1.49.0",
             "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
@@ -2600,6 +2870,14 @@
                 "whatwg-url": "^5.0.0"
             }
         },
+        "node-osu": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmjs.org/node-osu/-/node-osu-2.2.1.tgz",
+            "integrity": "sha512-SM9kj+7q7j/Y5nkMSRchQi9g2RxgDQ8JjC/zds7VyzUWQPokGQW3KuiskPLHwITn3RW3V98k7Y3RB3zkLIX9jA==",
+            "requires": {
+                "superagent": "^5.2.1"
+            }
+        },
         "nopt": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
@@ -2624,6 +2902,11 @@
             "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
             "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
         },
+        "object-inspect": {
+            "version": "1.12.0",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+            "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
+        },
         "once": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -2698,6 +2981,14 @@
             "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
             "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
         },
+        "qs": {
+            "version": "6.10.3",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+            "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+            "requires": {
+                "side-channel": "^1.0.4"
+            }
+        },
         "readable-stream": {
             "version": "2.3.7",
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
@@ -2778,6 +3069,16 @@
             "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
             "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
         },
+        "side-channel": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+            "requires": {
+                "call-bind": "^1.0.0",
+                "get-intrinsic": "^1.0.2",
+                "object-inspect": "^1.9.0"
+            }
+        },
         "sift": {
             "version": "13.5.2",
             "resolved": "https://registry.npmjs.org/sift/-/sift-13.5.2.tgz",
@@ -2850,6 +3151,54 @@
                 "ansi-regex": "^5.0.1"
             }
         },
+        "superagent": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
+            "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
+            "requires": {
+                "component-emitter": "^1.3.0",
+                "cookiejar": "^2.1.2",
+                "debug": "^4.1.1",
+                "fast-safe-stringify": "^2.0.7",
+                "form-data": "^3.0.0",
+                "formidable": "^1.2.2",
+                "methods": "^1.1.2",
+                "mime": "^2.4.6",
+                "qs": "^6.9.4",
+                "readable-stream": "^3.6.0",
+                "semver": "^7.3.2"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "4.3.3",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+                    "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+                    "requires": {
+                        "ms": "2.1.2"
+                    }
+                },
+                "form-data": {
+                    "version": "3.0.1",
+                    "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+                    "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+                    "requires": {
+                        "asynckit": "^0.4.0",
+                        "combined-stream": "^1.0.8",
+                        "mime-types": "^2.1.12"
+                    }
+                },
+                "readable-stream": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+                    "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+                    "requires": {
+                        "inherits": "^2.0.3",
+                        "string_decoder": "^1.1.1",
+                        "util-deprecate": "^1.0.1"
+                    }
+                }
+            }
+        },
         "supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",

package.json

@@ -23,6 +23,7 @@
         "moment-precise-range-plugin": "^1.3.0",
         "mongoose": "^5.10.3",
         "node-fetch": "^2.6.1",
+        "node-osu": "^2.2.1",
         "ora": "^5.3.0",
         "swwrap": "^1.0.0",
         "tinygradient": "^1.1.5",

slash/fun/nowplaying.js

@@ -0,0 +1,65 @@
+const Discord = require('discord.js');
+const {SlashCommand} = require('../../util/slash');
+const {SlashCommandBuilder} = require('@discordjs/builders');
+
+const Saves = require("../../models/saves");
+
+module.exports = (client) => {
+    return new SlashCommand('nowplaying', client,
+        new SlashCommandBuilder()
+            .setName('nowplaying')
+            .setDescription("Show off the music you're currently listening to through last.fm!")
+            .addBooleanOption(option => option
+                .setName("send")
+                .setDescription("Whether or not the response should be sent")
+            )
+            .addStringOption()
+        );
+};
+
+module.exports = {
+    name: "nowplaying",
+    aliases: ['np'],
+    meta: {
+        category: 'Fun',
+        description: "Show off the music you're currently listening to through last.fm!",
+        syntax: '`nowplaying [@mention]`',
+        extra: null
+    },
+    help: new Discord.MessageEmbed()
+        .setTitle("Help -> Now Playing")
+        .setDescription("Accesses last.fm's API to show off what music you're currently listening to. Use the `lfm` command for more information.")
+        .addField("Syntax", "`nowplaying [@mention]`"),
+    async execute(message, msg, args, cmd, prefix, mention, client) {
+        let savess = await Saves.findOne({name: 'lfm'}) ? await Saves.findOne({name: 'lfm'}) : new Saves({name: 'lfm'});
+        let saves = savess.saves;
+        let user = mention || message.author;
+        if (!saves.get(user.id)) {return message.channel.send(`${mention ? "That person's" : "Your"} last.fm username isn't set! ${mention ? "They" : "You"} can set it with \`${prefix}lfm set <username>\``);}
+
+        let found = false;
+        try {
+            const glfm = function() {return new Promise(resolve => {
+                let timeout = setTimeout(() => {return resolve(undefined);}, 3000);
+                let stream = client.lfm.stream(saves.get(user.id));
+                stream.on('nowPlaying', t => {
+                    clearTimeout(timeout);
+                    message.channel.send({embeds: [new Discord.MessageEmbed()
+                            .setAuthor({name: message.guild ? message.guild.members.cache.get(user.id) ? message.guild.members.cache.get(user.id).displayName : user.username : user.username, iconURL: user.displayAvatarURL()})
+                            .setTitle(`${saves.get(user.id)} | Now Playing`)
+                            .setDescription(`<@${user.id}> is currently listening to **${t.name}** by **${t.artist['#text']}**.\nView the song [here](${t.url}).`)
+                            .setColor("c375f0")
+                            .setThumbnail(t.image[3]['#text'])
+                            .setTimestamp()
+                        ]})
+                    found = true;
+                    stream.stop();
+                    return resolve(undefined);
+                });
+                stream.start();
+            });}
+            await glfm().catch((e) => {console.error(e);});
+        } catch (e) {console.error(e);}
+
+        if (!found) {return message.channel.send(`I couldn't find what \"${saves.get(user.id)}\" is listening to. Perhaps ${!mention ? "you" : "they"}'re not listening to anything, or you got ${!mention ? "your" : "their"} name wrong?`);}
+    }
+};