Merge pull request #8 from MindfulMinun/dev

Release v3.1.1

CHANGELOG.md

@@ -6,6 +6,26 @@
     See https://semver.org/
 -->
 
+# [Release v3.1.1](https://github.com/MindfulMinun/discord-haruka/releases/tag/v3.1.1)
+
+- Pokémon
+    - Occasionally, searches with the "0" character would return unexpected results. This has now been fixed.
+- Dab
+    - Dab now catches more variations on the word "dab"
+- GitHub
+    - User Agent changed to something meaninful
+- Smash
+    - Add Byleth to Smash
+
+-----
+
+# Development version v3.1.1
+
+- Change GitHub UA to something meaningful
+- Add Byleth to Smash
+
+-----
+
 # [Release v3.1.0](https://github.com/MindfulMinun/discord-haruka/releases/tag/v3.1.0)
 
 - New: Edits

coffeelint.json

@@ -18,7 +18,7 @@
     },
     "max_line_length": {
         "name": "max_line_length",
-        "value": 80,
+        "value": 120,
         "level": "warn",
         "limitComments": true
     },

package.json

@@ -1,6 +1,6 @@
 {
     "name": "discord-haruka",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "description": "A useless Discord bot.",
     "main": "dist/Haruka.js",
     "repository": "github:MindfulMinun/discord-haruka",

src/functions/github.coffee

@@ -31,7 +31,7 @@ handler = (msg, match, H) ->
         url: "https://api.github.com/repos/" + repo
         method: "GET"
         headers: {
-            "User-Agent": "Node.js #{process.version} on Ubuntu 16.04"
+            "User-Agent": require('../package.json').repository
             "Content-Type": "application/json"
         }
     }

src/functions/pkmn.coffee

@@ -43,7 +43,7 @@ handler = (msg, match, Haruka) ->
             you forgot this command’s syntax."
     ].choose()
     [P, species, pkmn] = [{}, null, null]
-    pokeRequest = pokeRequest.replace(/0/g, '')
+    pokeRequest = pokeRequest.replace(/^\s*0/g, '')
 
     #! Fetch pkmn
     r "https://pokeapi.co/api/v2/pokemon-species/#{pokeRequest}/"

src/functions/smash.coffee

@@ -124,6 +124,7 @@ fNameMap = [
     "Hero"
     "Banjo & Kazooie"
     "Terry"
+    "Byleth"
 ]
 
 root = 'https://www.smashbros.com/assets_v2'

src/specials/dab.coffee

@@ -1,13 +1,15 @@
 #! ========================================
 #! Dab
 
+dabRegex = /\bd+a+b+(ing|er|ino|[yi])*\b/gi
 handler = (msg, Haruka) ->
     # React with the dabbing emote every time some1 says
     # "dab" or "dabbing" in any server
 
     # If a message contains "dab" or "dabbing",
     # react with the :rin_dab: emote if it exists
-    if /\b(dab(b?ing)?)\b/gi.test msg.content
+
+    if dabRegex.test msg.content
         rin_dab = msg.guild.emojis.find((e) -> e.name is 'rin_dab')
         if rin_dab? then msg.react rin_dab
         return no

src/specials/dad.coffee

@@ -1,14 +1,15 @@
 #! ========================================
 #! Special: Dad
 
+imRegex = /^(?:i(?:['’]|(?:\s+a))?m)\s+/i
+
 handler = (msg, Haruka) ->
 
-    reg = /^(?:i(?:['’]|(?:\s+a))?m)\s+/i
     # Matches "im ", "i'm ", "i’m ", and "i am "
     # Case insensitive, whitespace required.
 
     # Break if regex doesn't match.
-    if (not reg.test(msg.content)) or msg.author.bot then return no
+    if (not imRegex.test(msg.content)) or msg.author.bot then return no
 
     # If the person's fortunate enough to get a number higher than
     # 1 / 10, they’re spared.
@@ -20,7 +21,7 @@ handler = (msg, Haruka) ->
         "Hey #{reply}, I’m Haruka."
         "Hi #{reply}, I’m Haruka."
         "Hello #{reply}, I’m Haruka. Nice to meet you."
-    ].choose()
+    ].choose(), disableEveryone: yes
 
     # Message doesn't call Haruka, exit prematurely
     yes