From 365745c557e3b86488939ad94cef4a9e0ca42b61 Mon Sep 17 00:00:00 2001
From: Mirco Wittrien <mirco.wittrien@gmail.com>
Date: Mon, 9 Sep 2019 09:48:37 +0200
Subject: [PATCH] Update BDFDB.max.js

---
 Plugins/BDFDB.max.js | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/Plugins/BDFDB.max.js b/Plugins/BDFDB.max.js
index cee9124b4c..57897324bd 100644
--- a/Plugins/BDFDB.max.js
+++ b/Plugins/BDFDB.max.js
@@ -1367,7 +1367,6 @@ var BDFDB = {myPlugins: BDFDB && BDFDB.myPlugins ? BDFDB.myPlugins : {}, BDv2Api
 		PopoutContainer: 'popout',
 		PrivateChannelCall: 'callcurrentcontainer',
 		MemberCard: 'guildsettingsmembercard',
-		Message: true,
 		NameTag: 'nametag',
 		SearchResults: 'searchresultswrap',
 		TypingUsers: 'typing',
@@ -1490,14 +1489,14 @@ var BDFDB = {myPlugins: BDFDB && BDFDB.myPlugins ? BDFDB.myPlugins : {}, BDv2Api
 		if (BDFDB.isObject(plugin) && BDFDB.isObject(plugin.patchModules)) {
 			for (let type in plugin.patchModules) {
 				var mapped = webModulesPatchmap[type];
-				var classOrBoolean = webModulesNotFindableModules[type.split(' _ _ ')[1] || type];
+				var classname = webModulesNotFindableModules[type.split(' _ _ ')[1] || type];
 				var patchtype = mapped ? mapped + ' _ _ ' + type : type;
 				if (mapped) {
 					plugin.patchModules[patchtype] = plugin.patchModules[type];
 					delete plugin.patchModules[type];
 				}
-				if (!classOrBoolean) patchInstance(BDFDB.WebModules.findByName(patchtype.split(' _ _ ')[0]), patchtype);
-				else if (typeof classOrBoolean == 'boolean' || DiscordClasses[classOrBoolean]) checkForInstance(classOrBoolean, patchtype);
+				if (!classname) patchInstance(BDFDB.WebModules.findByName(patchtype.split(' _ _ ')[0]), patchtype);
+				else if (DiscordClasses[classname]) checkForInstance(classname, patchtype);
 			}
 			function patchInstance(instance, type) {
 				if (instance) {
@@ -1512,7 +1511,7 @@ var BDFDB = {myPlugins: BDFDB && BDFDB.myPlugins ? BDFDB.myPlugins : {}, BDv2Api
 					}
 				}
 			}
-			function checkForInstance(classOrBoolean, type) {
+			function checkForInstance(classname, type) {
 				const app = document.querySelector(BDFDB.dotCN.app), bdsettings = document.querySelector('#bd-settingspane-container ' + BDFDB.dotCN.scrollerwrap);
 				var instancefound = false;
 				if (app) {
@@ -1530,28 +1529,21 @@ var BDFDB = {myPlugins: BDFDB && BDFDB.myPlugins ? BDFDB.myPlugins : {}, BDv2Api
 					}
 				}
 				if (!instancefound) {
-					var found = false, isBool = typeof classOrBoolean == 'boolean', instanceobserver = new MutationObserver(cs => {cs.forEach(c => {c.addedNodes.forEach(n => {
+					var found = false, instanceobserver = new MutationObserver(cs => {cs.forEach(c => {c.addedNodes.forEach(n => {
 						if (found || !n || !n.tagName) return;
-						else if (isBool) {
-							var ins = BDFDB.getOwnerInstance({node:n, name:"Message", depth:99999999});
-							if (isCorrectInstance(ins, type)) foundInstance(ins);
-						}
-						else {
-							var ele = null;
-							if ((ele = BDFDB.containsClass(n, BDFDB.disCN[classOrBoolean]) ? n : n.querySelector(BDFDB.dotCN[classOrBoolean])) != null) {
-								var ins = BDFDB.getReactInstance(ele);
-								if (isCorrectInstance(ins, type)) foundInstance(ins);
+						var ele = null;
+						if ((ele = BDFDB.containsClass(n, BDFDB.disCN[classOrBoolean]) ? n : n.querySelector(BDFDB.dotCN[classOrBoolean])) != null) {
+							var ins = BDFDB.getReactInstance(ele);
+							if (isCorrectInstance(ins, type)) {
+								found = true;
+								instanceobserver.disconnect();
+								patchInstance(ins, type);
+								BDFDB.WebModules.forceAllUpdates(plugin, type);
 							}
 						}
 					});});});
 					BDFDB.addObserver(plugin, BDFDB.dotCN.appmount, {name:'checkForInstanceObserver', instance:instanceobserver, multi:true
 					}, {childList:true, subtree:true});
-					var foundInstance = instance => {
-						found = true;
-						instanceobserver.disconnect();
-						patchInstance(instance, type);
-						BDFDB.WebModules.forceAllUpdates(plugin, type);
-					};
 				}
 			}
 			function isCorrectInstance(instance, type) {