more emote stuff

data/emotefilter.json

@@ -35,6 +35,7 @@
     "BetterDiscord",
     "Boeuf",
     "Bomb",
+	"BOMB",
     "Brille",
     "Brofist",
     "Bruh",
@@ -60,12 +61,14 @@
     "DENIAL",
     "DESU",
     "Deud",
+	"Ding",
     "Dirk",
     "Dood",
     "double",
     "Dunked",
     "Dunno",
     "Eggman",
+	"eHHH",
     "Elementals",
     "elgato",
     "emote",
@@ -108,6 +111,7 @@
     "Hartz",
     "hasOwnProperty",
     "heartless",
+	"HELP",
     "HELLO!",
     "Hello",
     "Herz",
@@ -119,6 +123,7 @@
     "Hobbes",
     "Huehue",
     "Humm",
+	"HYPE",
     "Ibuki",
     "Ichigo",
     "inverse",
@@ -161,6 +166,7 @@
     "Magikarp",
     "MainMenu",
     "Matty",
+	"meditation",
     "Memelord",
     "Meow",
     "MERICA",
@@ -180,6 +186,7 @@
     "Nati",
     "Nebby",
     "Nein",
+	"NICK",
     "Nimbus",
     "Nono",
     "Nooo",
@@ -210,6 +217,7 @@
     "Pineapple",
     "Pinto",
     "PLAYS",
+	"PLEASE",
     "Pleure",
     "PokeBall",
     "Pokeball",

js/main.js

@@ -642,7 +642,7 @@ function EmoteModule() {}
 EmoteModule.prototype.init = async function () {
     this.modifiers = ["flip", "spin", "pulse", "spin2", "spin3", "1spin", "2spin", "3spin", "tr", "bl", "br", "shake", "shake2", "shake3", "flap"];
     this.overrides = ['twitch', 'bttv', 'ffz'];
-    this.categories = ["TwitchGlobal", "TwitchSubscriber", "BTTV", "FrankerFaceZ", "BTTV2"];
+    this.categories = ["TwitchGlobal", "TwitchSubscriber", "BTTV", "BTTV2", "FrankerFaceZ"];
 
     let emoteInfo = {
         'TwitchGlobal': {
@@ -788,8 +788,6 @@ EmoteModule.prototype.loadEmoteData = async function(emoteInfo) {
     let file = bdConfig.dataPath + emoteFile;
     let exists = _fs.existsSync(file);
     
-    
-    
     if (exists && !bdConfig.cache.expired) {
         if (settingsCookie["fork-ps-2"]) mainCore.showToast("Loading emotes from cache.", {type: "info"});
         utils.log("[Emotes] Loading emotes from local cache.")
@@ -1256,6 +1254,7 @@ Utils.prototype.jqDefer = function (fnc) {
 Utils.prototype.getHash = function () {
     $.getJSON("https://api.github.com/repos/rauenzi/BetterDiscordApp/commits/master", function (data) {
         _hash = data.sha;
+        bdConfig.hash = _hash;
     });
 };
 
@@ -1314,14 +1313,13 @@ Utils.prototype.insertElement = function(node, regex, element) {
 		if (child.nodeType != Node.TEXT_NODE) {child = child.nextSibling; continue};
 		var bk = 0;
 		child.data.replace(regex, function(all) {
-			var args = [].slice.call(arguments),
+			var args = [].slice.call(arguments);
-				offset = args[args.length - 2],
+			var offset = args[args.length - 2];
-				newTextNode = child.splitText(offset+bk), tag;
+            var newTextNode = args[1] ? child.splitText(offset + args[1].length + bk) : child.splitText(offset + bk);
 			bk -= child.data.length + all.length;
 
-			newTextNode.data = newTextNode.data.substr(all.length);
+			newTextNode.data = newTextNode.data.substr(all.trim().length);
-			tag = element;
+			child.parentNode.insertBefore(element, newTextNode);
-			child.parentNode.insertBefore(tag, newTextNode);
 			child = newTextNode;
 		});