Merge branch 'master' of https://github.com/Jiiks/BetterDiscordApp

README.md

@@ -65,7 +65,7 @@ Add spoilers to your chat, simply add [!s] to your message.
 **Save Logs Locally:**
 Save chatlogs locally.(soon)
 
-## Adding you server to public servers
+## Adding your server to public servers
 Edit the [Serverlist](https://github.com/Jiiks/BetterDiscordApp/blob/master/data/serverlist.json) and submit a pull request.
 
 ## BetterDiscord Uses the following API's

data/emotefilter.json

@@ -27,6 +27,8 @@
     "Dafuq",
     "vogel",
     "Tower",
-    "Jaffa"
+    "Jaffa",
+    "Black",
+    "Molotov"
   ]
 }

data/serverlist.json

@@ -28,6 +28,13 @@
       "language": "EN",
       "title": "a RinkuTalk's chat for ALL gamers"
     },
+    "Bacon_Space": {
+      "code": "0X6sQJODTVdEYwL0",
+      "description": "The official Server For Bacon_Space",
+      "icon": null,
+      "language": "EN",
+      "title": "Bacon_Space"
+    },
     "Black Desert Online": {
       "code": "0hpSA0xzUj07ABop",
       "description": "BDO",
@@ -105,12 +112,12 @@
       "language": "EN",
       "title": "Blade Symphony"
     },
-    "Bluscream's Server": {
-      "code": "0Xdjjtm2UyoI6Kgu",
-      "description": "Bluscream's Discord Server",
+    "BloodBorne": {
+      "code": "0rWbfWTmpUVHaC9Z",
+      "description": "BloodBorne",
       "icon": null,
       "language": "EN",
-      "title": "Bluscream's Server"
+      "title": "BloodBorne"
     },
     "Borderlands": {
       "code": "0mxtC2FGDw7JkCyb",
@@ -161,6 +168,13 @@
       "language": "EN",
       "title": "Crowfall MMO"
     },
+    "Dark souls": {
+      "code": "0rmIDReRI5pRvVwL",
+      "description": "Souls games in general",
+      "icon": null,
+      "language": "EN",
+      "title": "Dark souls"
+    },
     "DOTA2": {
       "code": "0Pj5D1QKnYAR4GQ7",
       "description": "DOTA 2",
@@ -329,13 +343,6 @@
       "language": "EN",
       "title": "FFXIV Heavensward"
     },
-    "FRENCH": {
-      "code": "0Tx7qmKNCj1yivSy",
-      "description": "FRENCH",
-      "icon": null,
-      "language": "FR",
-      "title": "FRENCH"
-    },
     "Fuckboii squad #1": {
       "code": "0V2bHFWgHEZt0GsE",
       "description": "Fuckboii squad #1",
@@ -350,6 +357,13 @@
       "language": "EN",
       "title": "Games are Magic"
     },
+    "GamerLust": {
+      "code": "0cvtNUFEng8cC0M5",
+      "description": "SG-based Gaming Group for Asia",
+      "icon": null,
+      "language": "EN",
+      "title": "GamerLust"
+    },
     "Guild Wars 2": {
       "code": "0b5yVCmhcVt4C6mr",
       "description": "Guild Wars 2",
@@ -483,6 +497,13 @@
       "language": "EN",
       "title": "MovieClub"
     },
+    "NadekoLog": {
+      "code": "0ehQwTK2RBjAxzEY",
+      "description": "Server for NadekoBot",
+      "icon": null,
+      "language": "EN",
+      "title": "NadekoLog"
+    },
     "NerdChat": {
       "code": "0Z83mQOMvdEpNbBg",
       "description": "NerdChat",
@@ -553,6 +574,13 @@
       "language": "EN",
       "title": "Reflex"
     },
+    "Rampage Knights": {
+      "code": "0q1Yv1bYDsRYK3TH",
+      "description": "Rampage Knights",
+      "icon": null,
+      "language": "EN",
+      "title": "Rampage Knights"
+    },
     "RepZ": {
       "code": "0gAFLYLhoOvyeqBA",
       "description": "RepZ Clan Discord Server",
@@ -693,6 +721,13 @@
       "language": "EN",
       "title": "The Music Bar"
     },
+    "The Prickly Cactus": {
+      "code": "0nkHMl1nnNymyVju",
+      "description": "Social Interaction",
+      "icon": null,
+      "language": "EN",
+      "title": "The Prickly Cactus"
+    },
     "The Sims": {
       "code": "0YjcYngtdfkBMAxn",
       "description": "The Sims",
@@ -853,5 +888,27 @@
       "icon": null,
       "language": "EN",
       "title": "Metal Gear Network"
+    },
+    "All the games!": {
+      "code": "0qKvbnYBZO1Vb4cB",
+      "description": "This server is for people who wanna play games together or just talk about anime or whatever!",
+      "icon": null,
+      "language": "EN",
+      "title": "All the games!"
+    },
+    "League of Legends (España)": {
+      "code": "0pQ5IG864BvI4MZp",
+      "description": "Servidor de League of Legends para la comunidad española.",
+      "icon": null,
+      "language": "SP",
+      "title": "League of Legends (España)"
+    },
+    "Dirty Bomb": {
+      "code": "0gP8aNVcec8Og5Tm",
+      "description": "Official Dirty Bomb Discord!",
+      "icon": null,
+      "language": "EN",
+      "title": "Dirty Bomb"
+    }
+  }
 }
-}}

js/main.js

@@ -532,6 +532,14 @@ EmoteModule.prototype.injectEmote = function (node) {
                 return;
             }
 
+            if (subEmotesTwitch.hasOwnProperty(word)) {
+                var len = Math.round(word.length / 4);
+                var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
+                var url = twitchEmoteUrlStart + subEmotesTwitch[word] + twitchEmoteUrlEnd;
+                parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
+                return;
+            }
+			
             if (typeof emotesFfz !== 'undefined' && settingsCookie["bda-es-1"]) {
                 if (emotesFfz.hasOwnProperty(word)) {
                     var len = Math.round(word.length / 4);
@@ -563,13 +571,6 @@ EmoteModule.prototype.injectEmote = function (node) {
                 }
             }
 
-            if (subEmotesTwitch.hasOwnProperty(word)) {
-                var len = Math.round(word.length / 4);
-                var name = word.substr(0, len) + "\uFDD9" + word.substr(len, len) + "\uFDD9" + word.substr(len * 2, len) + "\uFDD9" + word.substr(len * 3);
-                var url = twitchEmoteUrlStart + subEmotesTwitch[word] + twitchEmoteUrlEnd;
-                parentInnerHTML = parentInnerHTML.replace(word, '<div class="emotewrapper"><img class="emote" alt="' + name + '" src="' + url + '" /><input onclick=\'quickEmoteMenu.favorite(\"' + name + '\", \"' + url + '\");\' class="fav" title="Favorite!" type="button"></div>');
-                return;
-            }
         });
 
         if (parent.parentElement == null) return;