From c2ff0b251d35c91d265c8ad666a5a8e2daef5ce0 Mon Sep 17 00:00:00 2001
From: Zack Rauen <rauenzi@outlook.com>
Date: Mon, 1 Nov 2021 17:02:46 -0400
Subject: [PATCH] Fix for class name changes

---
 CHANGELOG.md                           | 12 ++++++++++++
 package.json                           |  2 +-
 renderer/src/data/changelog.js         | 17 ++---------------
 renderer/src/modules/discordmodules.js |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8df5afa6..55e84909 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 This changelog starts with the restructured 1.0.0 release that happened after context isolation changes. The changelogs here should more-or-less mirror the ones that get shown in the client but probably with less formatting and pizzazz.
 
+
+## 1.2.4
+
+### Added
+
+### Removed
+
+### Changed
+
+### Fixed
+- Fixed loading sequence using wrong classes
+
 ## 1.2.3
 
 ### Added
diff --git a/package.json b/package.json
index 472ce0eb..94f6d487 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "betterdiscord",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "description": "Enhances Discord by adding functionality and themes.",
     "main": "src/index.js",
     "scripts": {
diff --git a/renderer/src/data/changelog.js b/renderer/src/data/changelog.js
index 99e8763e..0413b06f 100644
--- a/renderer/src/data/changelog.js
+++ b/renderer/src/data/changelog.js
@@ -1,24 +1,11 @@
 export default {
-    description: "Many new crowdsourced translations added, shout-out to our contributors on POEditor!",
+    description: "Expect more soon!",
     changes: [
-        {
-            title: "New Translations",
-            type: "added",
-            items: [
-                "Czech, Spanish, Hindi (partial), Italian, Dutch, Norwegian (partial), Portuguese (PT), Romanian, Russian, Turkish",
-                "Languages also fallback to English when a translation does not exist."
-            ]
-        },
         {
             title: "Fixes",
             type: "fixed",
             items: [
-                "Canary loading no longer blocked by changed class names.",
-                "The following were all thanks to Strencher! (https://github.com/Strencher)",
-                "The public servers button is back!",
-                "Guild related classes are back too!",
-                "Fixed webpack module search on Canary.",
-                "Fixed `window.webpackJsonp` related plugin issues via polyfill. Note: This will be removed in future versions."
+                "BetterDiscord loads against after Discord's useless updates."
             ]
         }
     ]
diff --git a/renderer/src/modules/discordmodules.js b/renderer/src/modules/discordmodules.js
index 0e352b71..527afc0b 100644
--- a/renderer/src/modules/discordmodules.js
+++ b/renderer/src/modules/discordmodules.js
@@ -149,7 +149,7 @@ export default Utilities.memoizeObject({
         const guildsWrapper = WebpackModules.getByProps("base", "guilds");
         const guilds = WebpackModules.getByProps("wrapper", "acronym");
         const pill = WebpackModules.getByProps("circleIconButton");
-        const listItem = WebpackModules.getByProps("listItem");
+        const listItem = WebpackModules.getModule(m => m.listItem && !m.pill);
         return Object.assign({}, guildsWrapper, listItem, guilds, pill);
     },