synced changes

LICENSE.md

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2020 mudkipscience
+Copyright (c) 2018 YorkAARGH
+Copyright (c) 2018-2020 mudkipscience
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

changes.txt

@@ -4,7 +4,7 @@ Bots now get a bot badge in the userinfo command
 Added dogfact and catfact command (terry)
 index.js now has better logging of when things fail to load/initialize (terry)
 added `dice`, rolls a 6 sided die (terry)
-Help command changed, the amount of commands in each category and overall is now displayed
+Help command changed, the amount of commands in each category and overall is now displayed and formatting changed
 added `inspire` as an alias for inspirobot
 ship command
 added find by mention to functions

resources/other/coolpeople.json

@@ -14,6 +14,7 @@
         "264970229514371072",
         "254310746450690048",
         "358390849807319040",
-        "211011138656272386"
+        "211011138656272386",
+        "266472557740425216"
     ]
 }

resources/other/genders.json

@@ -1,4 +1,15 @@
 {
+  "agender": "A gender identity used by someone who has no gender, or sometimes by someone whose gender is neutral",
+  "aporagender": "A gender that is not male, female, or anything on the spectrum between male and female, but that still has a distinct gendered feeling.",
+  "bigender": "Bigender individuals have two gender identities, either simultaneously or varying between the two.",
   "cisgender": "Someone who identifies with their assigned gender at birth.",
-  "transgender": "Someone who identifies with a gender that is not their assigned gender at birth."
+  "demiboy": "Someone who identifies as partially male and partially another gender.",
+  "demiflux": "A gender where one part of someone’s gender is static, and the other part fluctuates in intensity.",
+  "demigender": "Someone who identifies as partially one gender, and partially another.",
+  "demigirl": "Someone who identifies as partially female and partially another gender.",
+  "enby": "Shortened term for “nonbinary”. Used as a noun, like “boy” or “girl” but for nonbinary people.",
+  "genderfluid": "Someone whos gender varies over time. This might be fluctuating between different genders, or expressing multiple aspects of various genders at the same time.",
+  "genderflux": "Someone whose gender fluctuates, usually between agender and something else.",
+  ""
+  "transgender": "Someone whos gender is different from what they were assigned at birth."
 }

src/commands/colourify.js

@@ -1,53 +0,0 @@
-const isURL = require("is-url")
-exports.run = async (client, message, args) => {
-  var img;
-  if(!args[0]) {
-    if(!message.attachments.first()) {
-      return message.channel.send("No attachment")
-    };
-    img = message.attachments.first().attachment;
-  } else {
-    if(isURL(args[0]) == true ) {
-      img = args[0];
-    } else { 
-      user = message.mentions.members.first();
-        
-      if (!user) {
-        let users;
-        users = client.searchForMembers(message.guild, args[0]);
-        if (users.length > 1)
-          return message.channel.send(
-            "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead."
-          );
-        else if (users.length == 0)
-          return message.channel.send(
-            "<:error:466995152976871434> That user doesn't seem to exist. Try again!"
-          );
-        user = users[0];
-      };
-
-      if(user) {
-        img = user.user.avatarURL({format: "png", dynamic: true})
-      }
-    }
-  };
-
-  var attachment = new Discord.MessageAttachment(`https://api.alexflipnote.dev/filter/magik?image=${img}`)
-  message.channel.send(attachment)
-};
-  
-  exports.conf = {
-    enabled: true,
-    guildOnly: false,
-    aliases: [],
-    permLevel: "User",
-    requiredPerms: []
-  };
-  
-  exports.help = {
-    name: "magikt",
-    category: "Fun",
-    description: "Colourifies an image",
-    usage: "colourify user hex1 hex2"
-  };
-  

src/commands/help.js

@@ -3,7 +3,7 @@ exports.run = (client, message, args, level) => {
   embed.setColor(client.embedColour(message));
 
   var ran = false;
-  var output = "";
+  var output = "```";
   var commands = 0;
   var prefix;
   var currentCategory;
@@ -38,18 +38,22 @@ exports.run = (client, message, args, level) => {
       const cat = c.help.category.toProperCase();
       if (currentCategory !== cat) {
         if(ran == true) {
-          embed.addField(currentCategory + ` [${commands}]`, output.slice(0, -2))
+          output = output.slice(0, -2) + "```";
-          output = "";
+          embed.addField(currentCategory + ` [${commands}]`, output)
+          output = "```";
           commands = 0;
         }
         currentCategory = cat;
         ran = true
       }
-    output += `\`${prefix}${c.help.name}\`, `;
+    output += `${prefix}${c.help.name}, `;
     commands = commands + 1;
     });
 
-    embed.addField(currentCategory + ` [${commands}]`, output.slice(0, -2));
+    output = output.slice(0, -2);
+    output = output + "```"
+
+    embed.addField(currentCategory + ` [${commands}]`, output);
 
     embed.addField(
       "Invite me",
@@ -87,18 +91,20 @@ exports.run = (client, message, args, level) => {
       const cat = c.help.category.toProperCase();
       if (currentCategory !== cat) {
         if(ran == true) {
-          embed.addField(currentCategory + ` [${commands}]`, output.slice(0, -2))
+          output = output.slice(0, -2) + "```";
-          output = "";
+          embed.addField(currentCategory + ` [${commands}]`, output)
+          output = "```";
           commands = 0;
         }
         currentCategory = cat;
         ran = true
       }
-    output += `\`${prefix}${c.help.name}\`, `;
+    output += `${prefix}${c.help.name}, `;
     commands = commands + 1;
     });
 
-    embed.addField(currentCategory + ` [${commands}]`, output.slice(0, -2));
+    output = output.slice(0, -2) + "```";
+    embed.addField(currentCategory + ` [${commands}]`, output);
 
     embed.addField(
       "Invite me",

src/commands/ship.js

@@ -39,11 +39,9 @@ exports.run = async (client, message, args) => {
       );
     user2 = users[0];
   };
-  
-  var secondLength = Math.floor(user2.username.length / 2);
 
   var first = user.username.slice(0, user.username.length / 2)
-  var second = user2.username.slice(secondLength, user2.username.length / 2)
+  var second = user2.username.slice(Math.floor(user2.username.length / 2), user2.username.length)
 
   try {
     var attachment = new Discord.MessageAttachment(`https://api.alexflipnote.dev/ship?user=${user.avatarURL({format: "png"})}&user2=${user2.avatarURL({format: "png"})}`)

src/commands/ship1.js

@@ -1,65 +0,0 @@
-const request = require('request')
-exports.run = async (client, message, args) => {
-
-
-  //NOT FINISHED
-  
-  if(!args[0] || !args[1]) {
-    return message.channel.send(`<:error:466995152976871434> Please include two to five users`)
-  }
-  message.channel.startTyping();
-
-  var user = client.getUserFromMention(args[0])
-  var user2 = client.getUserFromMention(args[1])
-
-  if (!user) {
-    let users;
-    users = client.searchForMembers(message.guild, args[0]);
-    if (users.length > 1)
-      return message.channel.send(
-        "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead."
-      );
-    else if (users.length == 0)
-      return message.channel.send(
-        "<:error:466995152976871434> That user doesn't seem to exist. Try again!"
-      );
-    user = users[0];
-  };
-
-  if (!user2) {
-    let users;
-    users = client.searchForMembers(message.guild, args[0]);
-    if (users.length > 1)
-      return message.channel.send(
-        "<:error:466995152976871434> Found multiple users! Please be more specific or mention the user instead."
-      );
-    else if (users.length == 0)
-      return message.channel.send(
-        "<:error:466995152976871434> That user doesn't seem to exist. Try again!"
-      );
-    user2 = users[0];
-  };
-  
-  var secondLength = Math.floor(user2.username.length / 2);
-
-  var first = user.username.slice(0, user.username.length / 2)
-  var second = user2.username.slice(secondLength, user2.username.length / 2)
-
-  message.channel.send(`Your ship name is **${shipname}!**`)
-};
-
-exports.conf = {
-  enabled: true,
-  guildOnly: true,
-  aliases: [],
-  permLevel: "User",
-  requiredPerms: []
-};
-
-exports.help = {
-  name: "ship1",
-  category: "Fun",
-  description: "Ship two people together <3",
-  usage: "ship name name2"
-};
-

src/commands/userinfo.js

@@ -1,18 +1,8 @@
 const Discord = require("discord.js");
 const coolPeople = require('../../resources/other/coolpeople.json')
 exports.run = (client, message, args) => {
-  var user;
+  var user, guild, status, createdAt, avurl, tag, id;
-  var guild;
+  var nick, roles, presence, badges = "";
-  var nick = "";
-  var roles = "";
-  var presence = "";
-  var badges = "";
-  var status;
-  var createdAt;
-  var avurl;
-  var tag;
-  var id;
-  var bot;
   var coolPerson = false;
   var friendos = coolPeople.coolPeople;