Merge PR #189 from TheBastionBot/master

Bastion Bot v6.11.6

changes.json

@@ -1,10 +1,11 @@
 {
-  "date": "April 15, 2018",
-  "image": "https://i.imgur.com/R5rQ4qG.gif",
+  "date": "April 21, 2018",
+  "image": "https://i.imgur.com/7NU3da3.gif",
   "BUG FIXES": [],
   "IMROVEMENTS": [
-    "Bastion is now more expressive with the `generateInvite` command.",
-    "Auto delete level up messages.",
+    "`lmgtfy` now has `lmstfy` (lemme search that for you) and `lmdtfy` (lemme DuckDuckGo that for you) aliases.",
+    "If no garfield comic was found for a date, let it be known istead of keeping quite.",
+    "The `lmstfy` command will use [DuckDuckGo](https://duckduckgo.com) from now, because we *[Spread Privacy](https://spreadprivacy.com)*!",
     "Under-the-hood improvements"
   ]
 }

locales/en/errors.json

@@ -22,7 +22,7 @@
     "channelNameLength": "Channel name should be between %var% and %var% characters.",
     "channelNotFound": "The specified channel was not found.",
     "claimCooldown": "%var% you have recently claimed your daily reward, please try again tomorrow. You can claim daily rewards only once every day.",
-    "commandNoDisable": "You cannot disable %var% command.",
+    "commandNoDisable": "You cannot disable the %var% command.",
     "commandUsage": "That's not how you use the `%var%` command. See the usage below to know how to use the command.",
     "connection": "Some error has occured while receiving data from the server. Please try again later.",
     "cooldown": "%var% you've recently used this command. Please try again later.\n`%var%` command can only be used once in **%var%** minutes.",
@@ -35,7 +35,7 @@
     "giveYourself": "You cannot give yourself %currencyName%.",
     "indexRange": "The index you entered is out of range.",
     "insufficientBalance": "You do not have sufficient balance in your account. Your current account balance is *%var%* %currencySymbol%.",
-    "invalidEmbedObject": "The entered an invalid embed object. You can create an embed object [here](%bastionSite%/embedbuilder/).",
+    "invalidEmbedObject": "The entered embed object is invalid. You can create an embed object [here](%bastionSite%/embedbuilder/).",
     "invalidInput": "The *%var%* entered by you is not valid.",
     "invalidIPPort": "Cannot get stats from the specified server. Please check the IP address and PORT number and if the server is online before trying again.",
     "invalidMusicChannel": "I am not able to join the default voice channel. Either a wrong voice channel has been set or the voice channel has been deleted.",

locales/en/info.json

@@ -14,11 +14,11 @@
 
   "disableAnnouncementChannel": "%var% disabled the announcement channel.",
   "enableAnnouncementChannel": "%var% enabled this channel as the announcement channel for Bastion.",
-  "disableChat": "%var% disabled chat in this server. I'm gonna miss talking with you all.",
-  "enableChat": "%var% enabled chat in this server. I'll talk to you if mention me! I'm here anytime you need me.",
+  "disableChat": "%var% disabled Bastion chat in this server. I'm gonna miss talking with you all.",
+  "enableChat": "%var% enabled Bastion chat in this server. I'll talk to you if you mention me! I'm here anytime you need me.",
   "disableAllCommands": "%var% disabled all commands in this server. You can enable all commands again using the `enableCommand --all` command.",
   "disableCommand": "%var% disabled `%var%` command in this server. You can enable the command again using the `enableCommand` command.",
-  "disableModule": "%var% disabled all commands, in `%var%` module, in this server. You can enable the command again using the `enableCommand` command.",
+  "disableModule": "%var% disabled all commands, in `%var%` module, in this server. You can enable the commands again using the `enableCommand` command.",
   "enableAllCommands": "%var% enabled all commands in this server.",
   "enableCommand": "%var% enabled `%var%` command in this server.",
   "enableModule": "%var% enabled all commands, in `%var%` module, in this server.",
@@ -35,7 +35,7 @@
   "disableGreetingMessages": "%var% disabled greeting messages.",
   "enableGreetingMessages": "%var% enabled greeting messages in this channel.",
   "disablePrivateGreetingMessages": "%var% disabled private greeting messages.",
-  "enablePrivateGreetingMessages": "%var% enabled private greeting messages in this channel.",
+  "enablePrivateGreetingMessages": "%var% enabled private greeting messages.",
   "disableLevelUpMessages": "%var% disabled level up messages in this server. I won't send any messages when someone levels up.",
   "enableLevelUpMessages": "%var% enabled level up messages in this server. I will send messages, congratulating them, when someone levels up in this server.",
   "addLevelUpRole": "%var% added a level up role **%var%** to be added to users at level **%var%**.",
@@ -49,12 +49,12 @@
   "disableSlowMode": "%var% disabled slow mode in this server. Everyone, get spicy!",
   "enableSlowMode": "%var% enabled slow mode in this server. Beware spammers!",
   "disableStarboard": "%var% disabled starboard in this server.",
-  "enableStarboard": "%var% enabled starboard is this channel. If anyone stars any message is this server, I'll post that starred message here.",
+  "enableStarboard": "%var% enabled starboard. If anyone stars any message is this server, I'll post that starred message here.",
   "streamerRole": "The current streamer role is set to **%var%**",
   "disableStreamerRole": "%var% removed the streamer role in this server.",
   "enableStreamerRole": "%var% set the streamer role to **%var%**",
-  "disableSuggestionChannel": "%var% removed the suggestion channel in this server. Users can now post suggestions in any channel.",
-  "enableSuggestionChannel": "%var% set this channel as the suggestion channel in this server. When users post a suggestions using the `suggest` command, it will be logged in this channel.",
+  "disableSuggestionChannel": "%var% removed the suggestion channel of this server. Users can now post suggestions in any channel.",
+  "enableSuggestionChannel": "%var% set this channel as the suggestion channel of this server. When users post a suggestions using the `suggest` command, it will be logged in this channel.",
 
   "addRole": "%var% added the **%var%** role to **%var%**",
   "ban": "%var% banned **%var%** with the reason **%var%**",

locales/en/modules.json

@@ -12,7 +12,7 @@
     "renameRole": "Renames the specified role of your Discord server.",
     "roleColor": "Changes the color of the specified role of your Discord server.",
     "setTopic": "Sets channel topic of the specified text channel of your Discord server.",
-    "suggest": "Posts a suggestions to the suggestion channel, if a suggestion channel has been set. Otherwise posts the suggestion in the current channel."
+    "suggest": "Posts a suggestion to the suggestion channel, if a suggestion channel has been set. Otherwise posts the suggestion in the current channel."
   },
   "fun": {
     "airhorn": "Plays an airhorn in a voice channel.",
@@ -27,7 +27,7 @@
     "echo": "Sends the same message that you had sent. Just like an echo!",
     "edgeLord": "Shows a message from an edge lord.",
     "emoji": "Sends a large version of the specified emoji.",
-    "fakeBan": "Bans a user for the server*. Oh, not really though, just to mess with them.",
+    "fakeBan": "Bans a user from the server*. Oh, not really though, just to mess with them.",
     "fidgetSpinner": "Spins a fidget spinner for you and shows for how long it was spinning.",
     "flipText": "Sends the same message that you had sent, but flipped.",
     "fortune": "Shows you a fortune from a fortune cookie.",
@@ -101,7 +101,7 @@
     "filterLink": "Toggles automatic deletion of any links posted in the server.",
     "filterMentionSpam": "Toggles filtering of mention spams in the server and also set the threshold and action to be taken.",
     "filterWord": "Toggles automatic deletion of messages that contains any word that is being filtered.",
-    "giveaway": "Starts a giveaway event, with the item of your choice, for the given amount of time, a winner is choosen at random after the event is concluded. Event can run for at least 1 hour and at most 12 hours.",
+    "giveaway": "Starts a giveaway event, with the item of your choice, for the given amount of time, a winner is chosen at random after the event is concluded. Event can run for at least 1 hour and at most 12 hours.",
     "greet": "Toggles sending of greeting message for members who join the server.",
     "greetPrivate": "Toggles sending of greeting message as direct message for members who join the server.",
     "greetPrivateMessage": "Edits the greeting message that is sent as direct message when a member joins the server.",
@@ -141,7 +141,7 @@
     "commandSearch": "Search for a command with the given text.",
     "donate": "Instructions on how to financially support the development of the Bastion Bot project.",
     "guide": "Shows you the guide on how to setup and install Private Bastion Bot. And links to the Bastion HQ.",
-    "help": "Shows help on the specifed command.",
+    "help": "Shows help on the specified command.",
     "support": "Sends the invite link to Bastion HQ.",
     "terms": "Read Bastion's Terms of Service."
   },
@@ -153,9 +153,9 @@
     "checkPermissions": "Shows the permissions Bastion has in the server/channel.",
     "commandAnalytics": "Shows the most used commands in the server.",
     "contributors": "Shows the list of people who contribute to the development of the Bastion Bot on [GitHub](https://github.com/TheBastionBot/Bastion).",
-    "discrim": "Searches for the users of your Discord server for the specifed discriminator.",
-    "emojiInfo": "Shows information of a specifed emoji of your Discord server.",
-    "inRole": "Shows members that have a specifed role in your Discord server.",
+    "discrim": "Searches for the users of your Discord server for the specified discriminator.",
+    "emojiInfo": "Shows information of a specified emoji of your Discord server.",
+    "inRole": "Shows members that have a specified role in your Discord server.",
     "level": "Shows the current level of the specified user's account.",
     "patrons": "Shows the list of people who continuously supports the development of the Bastion Bot project, by being my patron, on [Patreon](https://patreon.com/bastionbot). But if you're hosting Bastion yourself, and you're a Patreon creator, it will show the list of your Patrons.",
     "ping": "Shows the response time and average WebSocket ping of Bastion.",
@@ -179,7 +179,7 @@
   },
   "moderation": {
     "addRole": "Adds the specified role to a specified user of your Discord server.",
-    "ban": "Bans the specified user from your Discord server, and removes 7 days of their message history.",
+    "ban": "Bans the specified user from your Discord server and removes 7 days of their message history.",
     "clear": "Deletes a bulk of specified messages from a text channel of your Discord server.",
     "clearWarn": "Clears all warnings from the given user.",
     "deafen": "Deafens a specified user server-wide in your Discord server.",
@@ -192,7 +192,7 @@
     "removeAllRoles": "Removes all the roles from the specified user of your Discord server.",
     "removeRole": "Removes the specified role from a specified user of your Discord server.",
     "report": "Reports a user of your Discord server. *Moderation logs needs to be enabled.*",
-    "softBan": "Bans & unbans the specified user, immediately, from your Discord server, and removes 7 days of their message history.",
+    "softBan": "Bans & unbans the specified user, immediately, from your Discord server and removes 7 days of their message history.",
     "textMute": "Text mutes a specified user from the specified text channel (for specified minutes) or globally on your Discord server.",
     "textUnMute": "Text unmutes from specified user from the specified text channel of your Discord server.",
     "unBan": "Unbans a specified user for your Discord server.",
@@ -215,26 +215,26 @@
     "myGifts": "Shows the gifts you currently have in your possession.",
     "myItems": "Shows the items you've bought from the server's shop.",
     "roleStore": "Lists/Adds/Removes roles from the Role Store of your server. Listed roles in the Role Store can be bought by anyone, with Bastion Currencies, in your server using the `buyRole` command. When users buy roles, the server owner gets 90% of the profit.",
-    "shop": "Lists/Adds/Removes items from the your server's shop. Listed items in the shop can be bought by anyone, with Bastion Currencies, in your server using the `buy` command. When users buy item, the server owner gets 90% of the profit.",
+    "shop": "Lists/Adds/Removes items from your server's shop. Listed items in the shop can be bought by anyone, with Bastion Currencies, in your server using the `buy` command. When users buy item, the server owner gets 90% of the profit.",
     "take": "Take the specified amount of Bastion Currencies from the specified user."
   },
   "music": {
     "clean": "Removes all the songs from the current queue of your Discord server.",
     "lyrics": "Shows the lyrics of the specified song.",
-    "musicChannel": "Shows/Removes/Adds a voice channel specified by the ID and a text channel (the channel this command was used in) of you Discord server as default for the music module. Bastion will only accept music commands in that text channel and if any one asks him to join a voice channel, it will automatically join the specified voice channel.",
+    "musicChannel": "Shows/Removes/Adds a voice channel specified by the ID and a text channel (the channel this command was used in) of you Discord server as default for the music module. Bastion will only accept music commands in that text channel and if anyone asks him to join a voice channel, it will automatically join the specified voice channel.",
     "musicMasterRole": "Adds a role specified by its ID as the Music Master role of Bastion, in your Discord server. Users with this role get access to restricted music commands like `summon`, `play`, etc. and can summon and play music in any voice channel of your Discord server.",
     "nowPlaying": "Shows details of the song currently being played, by Bastion, in your Discord server.",
     "pause": "Pauses the current playback in your Discord server.",
-    "play": "Plays a song, or adds the song to the current music queue if Bastion is already playing in your Discord server, specified either by the name, or the link, or from your favourite songs list, or from a YouTube playlist link.",
+    "play": "Plays a song or adds the song to the current music queue if Bastion is already playing in your Discord server, specified either by the name, or the link, or from your favourite songs list, or from a YouTube playlist link.",
     "playlist": "Add a song to a given playlist or display the list of songs in a playlist.",
     "queue": "Shows the list of all the songs in the current music queue of your Discord server.",
-    "removeSong": "Removes a song from the current music queue by it's position number.",
+    "removeSong": "Removes a song from the current music queue by its position number.",
     "repeat": "Adds the current song to the repeat queue, so it will repeat once again after the current playback is complete.",
     "resume": "Resumes the previously paused playback.",
     "shuffle": "Shuffles Bastion's entire music queue of your Discord server.",
     "skip": "Skips the currently playing song, in your Discord server, and moves to the next one in the queue.",
     "stop": "Stops the current playback and cleans the music queue and exits the voice channel.",
-    "summon": "Asks Bastion to join a voice channel in you Discord server. It joins the default voice channel (if one is set by the Bot Owner), or joins any channel you are in (if you are the Bot Owner or you have are in the Music Master role).",
+    "summon": "Asks Bastion to join a voice channel in you Discord server. It joins the default voice channel (if one is set by the Bot Owner) or any channel you are in (if you are the Bot Owner or you have are in the Music Master role).",
     "volume": "Changes/sets the volume of current playback in your Discord."
   },
   "owner": {
@@ -267,7 +267,7 @@
     "sql": "Execute SQL query on Bastion's database.",
     "todo": "Adds an specified item to your TODO list.",
     "updateDatabase": "Updates Bastion's Database to the current release, if required.",
-    "userBlacklist": "Adds/Removes a specified user to Bastion's blacklist. Blacklisted users can not use any of the Bastion's commands."
+    "userBlacklist": "Adds/Removes a specified user to Bastion's blacklist. Blacklisted users cannot use any of the Bastion's commands."
   },
   "queries": {
     "anime": "Searches for the details of an Anime.",
@@ -278,8 +278,8 @@
     "colour": "Convert the provided color in `HEX` format to `RGB`, `CMYK`, `HSL`, `HSV`, `HWB`, `LAB`, `ANSI16`, `ANSI256`, `XYZ`, `HCG`, `Apple`, `Gray` and `CSS` Keyword (Approximates to closest color) formats.",
     "date": "Shows the local date and time of any specified city.",
     "define": "Searches the definition of the specified word from English, French or German dictionary.",
-    "endpoll": "Ends a currently running poll in the same text channel channel and shows the result.",
-    "followURL": "Follows a URL to until it reaches the last URL and shows you the the followed URL. Useful for getting past shortened URLs.",
+    "endpoll": "Ends a currently running poll in the same text channel and shows the result.",
+    "followURL": "Follows a URL to until it reaches the last URL and shows you the followed URL. Useful for getting past shortened URLs.",
     "forecast": "Shows the weather forecast for 5 days of the specified city.",
     "game": "Searches for the details of a Game.",
     "generateInvite": "Generates an invite link of the current text channel of your Discord server.",
@@ -288,7 +288,7 @@
     "isBreached": "Check if a site has been breached in the past.",
     "lastSeen": "Shows the time since the specified user was last seen socializing in Discord.",
     "live": "Shows the list of users in your Discord server who are currently streaming.",
-    "lmgtfy": "Searches Google, for the specified query, and teaches users how to use Google's internet search.",
+    "lmgtfy": "Teach users how to do an internet search and get answers to their questions.",
     "manga": "Searches for the details of a Manga.",
     "map": "Get the map of the specified location.",
     "morseCode": "Encodes a given text in Morse Code.",
@@ -297,7 +297,7 @@
     "poll": "Starts a poll in the current text channel asking users to vote with the specified time. If no time is specified, poll ends in 60 minutes.",
     "pollStats": "Shows the stats of the currently running poll in the channel.",
     "reminder": "Bastion sets a reminder to remind you of specified message, via direct message, after a specified duration.",
-    "shorten": "Shortens a specified URL using Google URL Shortner.",
+    "shorten": "Shortens a specified URL using Google URL Shortener.",
     "steam": "Browse the games in different categories of the Steam Store.",
     "tapCode": "Encodes a given text in Tap Code.",
     "translate": "Translates your message to the specified language.",

modules/fun/garfield.js

@@ -22,6 +22,9 @@ exports.exec = (Bastion, message) => {
   message.channel.send({
     files: [ `https://d1ejxu6vysztl5.cloudfront.net/comics/garfield/${year}/${year}-${month}-${date}.gif` ]
   }).catch(e => {
+    if (e.status === 404) {
+      return Bastion.emit('error', '', 'I\'m sorry. I was unable to react Garfield at that moment. Could you try again?', message.channel);
+    }
     Bastion.log.error(e);
   });
 };

modules/info/serverInfo.js

@@ -50,7 +50,7 @@ exports.exec = (Bastion, message) => {
         },
         {
           name: 'Members',
-          value: `${message.guild.members.filter(m => !m.user.bot).size} Users\n${message.guild.members.filter(m => m.user.bot).size} BOTs`,
+          value: `${message.guild.members.filter(m => !m.user.bot).size} Cached Users\n${message.guild.members.filter(m => m.user.bot).size} Cached BOTs`,
           inline: true
         },
         {