Merge pull request #66 from FCCouncil/master

Update Development Branch

.gitignore

@@ -8,6 +8,7 @@ config.json
 config.js
 data/
 test.js
+musicsettings.json
 
 # Runtime data
 pids

allowedGuildDB.json

@@ -0,0 +1 @@
+{"allowedGuildIDs":["446067825673633794","446067825673633794"]}

build/config.gypi

@@ -0,0 +1,181 @@
+# Do not edit. File was generated by node-gyp's "configure" step
+{
+  "target_defaults": {
+    "cflags": [],
+    "default_configuration": "Release",
+    "defines": [],
+    "include_dirs": [],
+    "libraries": []
+  },
+  "variables": {
+    "asan": 0,
+    "coverage": "false",
+    "debug_devtools": "node",
+    "debug_http2": "false",
+    "debug_nghttp2": "false",
+    "force_dynamic_crt": 0,
+    "host_arch": "x64",
+    "icu_data_file": "icudt60l.dat",
+    "icu_data_in": "..\\..\\deps/icu-small\\source/data/in\\icudt60l.dat",
+    "icu_endianness": "l",
+    "icu_gyp_path": "tools/icu/icu-generic.gyp",
+    "icu_locales": "en,root",
+    "icu_path": "deps/icu-small",
+    "icu_small": "true",
+    "icu_ver_major": "60",
+    "node_byteorder": "little",
+    "node_enable_d8": "false",
+    "node_enable_v8_vtunejit": "false",
+    "node_install_npm": "true",
+    "node_module_version": 57,
+    "node_no_browser_globals": "false",
+    "node_prefix": "/usr/local",
+    "node_release_urlbase": "https://nodejs.org/download/release/",
+    "node_shared": "false",
+    "node_shared_cares": "false",
+    "node_shared_http_parser": "false",
+    "node_shared_libuv": "false",
+    "node_shared_nghttp2": "false",
+    "node_shared_openssl": "false",
+    "node_shared_zlib": "false",
+    "node_tag": "",
+    "node_target_type": "executable",
+    "node_use_bundled_v8": "true",
+    "node_use_dtrace": "false",
+    "node_use_etw": "true",
+    "node_use_lttng": "false",
+    "node_use_openssl": "true",
+    "node_use_perfctr": "true",
+    "node_use_v8_platform": "true",
+    "node_without_node_options": "false",
+    "openssl_fips": "",
+    "openssl_no_asm": 0,
+    "shlib_suffix": "so.57",
+    "target_arch": "x64",
+    "v8_enable_gdbjit": 0,
+    "v8_enable_i18n_support": 1,
+    "v8_enable_inspector": 1,
+    "v8_no_strict_aliasing": 1,
+    "v8_optimized_debug": 0,
+    "v8_promise_internal_field_count": 1,
+    "v8_random_seed": 0,
+    "v8_trace_maps": 0,
+    "v8_use_snapshot": "true",
+    "want_separate_host_toolset": 0,
+    "nodedir": "C:\\Users\\matth\\.node-gyp\\8.11.4",
+    "standalone_static_library": 1,
+    "access": "",
+    "allow_same_version": "",
+    "also": "",
+    "always_auth": "",
+    "auth_type": "legacy",
+    "bin_links": "true",
+    "browser": "",
+    "ca": "",
+    "cache": "C:\\Users\\matth\\AppData\\Roaming\\npm-cache",
+    "cache_lock_retries": "10",
+    "cache_lock_stale": "60000",
+    "cache_lock_wait": "10000",
+    "cache_max": "Infinity",
+    "cache_min": "10",
+    "cert": "",
+    "cidr": "",
+    "color": "true",
+    "commit_hooks": "true",
+    "depth": "Infinity",
+    "description": "true",
+    "dev": "",
+    "dry_run": "",
+    "editor": "notepad.exe",
+    "engine_strict": "",
+    "fetch_retries": "2",
+    "fetch_retry_factor": "10",
+    "fetch_retry_maxtimeout": "60000",
+    "fetch_retry_mintimeout": "10000",
+    "force": "",
+    "git": "git",
+    "git_tag_version": "true",
+    "global": "",
+    "globalconfig": "C:\\Users\\matth\\AppData\\Roaming\\npm\\etc\\npmrc",
+    "globalignorefile": "C:\\Users\\matth\\AppData\\Roaming\\npm\\etc\\npmignore",
+    "global_style": "",
+    "group": "",
+    "ham_it_up": "",
+    "heading": "npm",
+    "https_proxy": "",
+    "if_present": "",
+    "ignore_prepublish": "",
+    "ignore_scripts": "",
+    "init_author_email": "",
+    "init_author_name": "",
+    "init_author_url": "",
+    "init_license": "ISC",
+    "init_module": "C:\\Users\\matth\\.npm-init.js",
+    "init_version": "1.0.0",
+    "json": "",
+    "key": "",
+    "legacy_bundling": "",
+    "link": "",
+    "local_address": "",
+    "logs_max": "10",
+    "long": "",
+    "maxsockets": "50",
+    "message": "%s",
+    "metrics_registry": "https://registry.npmjs.org/",
+    "node_gyp": "C:\\Program Files\\nodejs\\node_modules\\npm\\node_modules\\node-gyp\\bin\\node-gyp.js",
+    "node_options": "",
+    "node_version": "8.11.4",
+    "offline": "",
+    "onload_script": "",
+    "only": "",
+    "optional": "true",
+    "otp": "",
+    "package_lock": "true",
+    "package_lock_only": "",
+    "parseable": "",
+    "prefer_offline": "",
+    "prefer_online": "",
+    "prefix": "C:\\Users\\matth\\AppData\\Roaming\\npm",
+    "production": "",
+    "progress": "true",
+    "read_only": "",
+    "rebuild_bundle": "true",
+    "registry": "https://registry.npmjs.org/",
+    "rollback": "true",
+    "save": "true",
+    "save_bundle": "",
+    "save_dev": "",
+    "save_exact": "",
+    "save_optional": "",
+    "save_prefix": "^",
+    "save_prod": "",
+    "scope": "",
+    "scripts_prepend_node_path": "warn-only",
+    "script_shell": "",
+    "searchexclude": "",
+    "searchlimit": "20",
+    "searchopts": "",
+    "searchstaleness": "900",
+    "send_metrics": "",
+    "shell": "C:\\Windows\\system32\\cmd.exe",
+    "shrinkwrap": "true",
+    "sign_git_tag": "",
+    "sso_poll_frequency": "500",
+    "sso_type": "oauth",
+    "strict_ssl": "true",
+    "tag": "latest",
+    "tag_version_prefix": "v",
+    "timing": "",
+    "tmp": "C:\\Users\\matth\\AppData\\Local\\Temp",
+    "umask": "0000",
+    "unicode": "",
+    "unsafe_perm": "true",
+    "usage": "",
+    "user": "",
+    "userconfig": "C:\\Users\\matth\\.npmrc",
+    "user_agent": "npm/5.6.0 node/v8.11.4 win32 x64",
+    "version": "",
+    "versions": "",
+    "viewer": "browser"
+  }
+}

commands/channelinfo.js

@@ -4,13 +4,17 @@ const Discord = require("discord.js");
 
 
 exports.run = async (client, message) => {
+    const msg = await message.channel.send("Loading...");
     const embed = new Discord.RichEmbed()
     .setAuthor(message.guild.name, message.guild.iconURL)
     .setTitle('Channel Information')
     .addField('Name', `${message.channel.name}`, true)
-    .addField('Category', `${message.channel.parent.name}`, true)
-    .addField('Topic', `${message.channel.topic}`, true)
-    if (message.channel.topic != true) {
+    try { 
+        embed.addField('Category', `${message.channel.parent.name}`, true)
+    } catch(err) {
+        embed.addField('Category', 'None', true)
+    }
+    if (!message.channel.topic) {
         embed.addField('Topic', 'None', true)
     }
     else {
@@ -22,12 +26,13 @@ exports.run = async (client, message) => {
         embed.addField('NSFW', 'Yes', true)
     }
     embed.setFooter(client.user.username, client.user.avatarURL)
-    message.channel.send(embed)
+    embed.setTimestamp()
+    msg.edit(embed)
 }
 
 exports.conf = {
     enabled: true,
-    guildOnly: false,
+    guildOnly: true,
     aliases: [],
     permLevel: "Standard User"
   };
@@ -37,4 +42,4 @@ exports.conf = {
     category: "Misc",
     description: "Provides information for the channel.",
     usage: "channel info"
-  };
+  };

commands/checkinvites.js → commands/checkgames.js

@@ -7,12 +7,12 @@ exports.run = (client, msg, args, level) => {
     enabled: true,
     guildOnly: true,
     aliases: ["ci"],
-    permLevel: "Systems Alpha/Dev Tester"
+    permLevel: "Server Moderator"
   };
 
   exports.help = {
-    name: 'checkinvites',
+    name: 'checkgames',
     category: 'Moderation',
     description: 'Returns a list of members with an invite as their game.',
-    usage: 'checkinvites'
+    usage: 'checkgames'
   };

commands/checkservers.js

@@ -0,0 +1,18 @@
+exports.run = (client, message, guild, msg) => {
+    const members = message.guild.members.filter(member => member.user.username && /(discord\.(gg|io|me|li)\/.+|discordapp\.com\/invite\/.+)/i.test(member.user.username));
+  return message.channel.send(members.map(member => `\`${member.id}\` ${member.displayName}`).join("\n") || "No one in this server has a Discord invite as their user name.");
+}
+
+exports.conf = {
+    enabled: true,
+    guildOnly: true,
+    aliases: ["cs"],
+    permLevel: "Server Moderator"
+  };
+
+  exports.help = {
+    name: 'checkservers',
+    category: 'Moderation',
+    description: 'Returns a list of members with an invite as their username.',
+    usage: 'checkservers'
+  };

commands/createinvite.js

@@ -0,0 +1,30 @@
+const Discord = require('discord.js')
+
+exports.run = (client, message, args) => {
+  if(args < 1) {message.channel.createInvite({
+      maxAge: 0
+  })
+  .then(invite => message.channel.send(`Created an invite with a code of discord.gg/${invite.code}`))
+  .catch(console.error);
+}
+if(args > 1) {
+    message.channel.createInvite({
+        maxAge: args[0]
+    })
+    .then(invite => message.channel.send(`Created invite with a code of discord.gg/${invite.code} with the age of ${args[0]} seconds`))
+}
+}
+
+exports.conf = {
+    enabled: true,
+    guildOnly: true,
+    aliases: [],
+    permLevel: "Standard User"
+  };
+
+  exports.help = {
+    name: 'createinvite',
+    category: 'Misc',
+    description: 'Creates an invite for the channel.',
+    usage: 'createinvite [...# of seconds]'
+  };

commands/embed.js

@@ -0,0 +1,26 @@
+const Discord = require('discord.js')
+
+exports.run = (client, message, args) => {
+    const embed = new Discord.RichEmbed()
+    .setFooter(client.user.username, client.user.avatarURL)
+    .setDescription(args.join(" "))
+    .setTimestamp()
+
+    message.delete()
+    message.channel.send(embed)
+}
+
+    exports.conf = {
+        enabled: true,
+        guildOnly: true,
+        aliases: [],
+        permLevel: "Server Moderator"
+      };
+
+      exports.help = {
+        name: "embed",
+        category: "Fun",
+        description: "Sends an embed, like a say command. But with an embed.",
+        usage: "embed [...text]"
+      };
+

commands/eping.js

@@ -0,0 +1,36 @@
+const Discord = require("discord.js");
+const talkedRecently = new Set();
+exports.run = async (client, message) => {
+  if (talkedRecently.has(message.author.id) && !message.member.roles.has("490364533550874644")) {
+
+    message.channel.send("You are being rate limited!" + message.author);
+  } else { // eslint-disable-line no-unused-vars
+  const msg = await message.channel.send("Ping?");
+  const embed = new Discord.RichEmbed()
+    .setAuthor(`${client.user.username}`, `${client.user.avatarURL}`)
+    .setColor(message.member.displayColor)
+    .addField("• Ping Latency", `${msg.createdTimestamp - message.createdTimestamp}ms`, true)
+    .addField("• API Latency", `${Math.round(client.ping)}ms`, true)
+    .setFooter(`${client.user.username} | Beta - Master`);
+  msg.edit(embed);
+  talkedRecently.add(message.author.id);
+  setTimeout(() => {
+    // Removes the user from the set after a minute
+    talkedRecently.delete(message.author.id);
+  }, 2000);
+};
+}
+
+exports.conf = {
+  enabled: true,
+  guildOnly: false,
+  aliases: [],
+  permLevel: "Standard User"
+};
+
+exports.help = {
+  name: "eping",
+  category: "Misc",
+  description: "Pings the bot, but replies with an embed.",
+  usage: "eping"
+};