[Various] Fix new Canary for core things

src/index.js

@@ -99,12 +99,16 @@ const init = async function () {
 
   this.cssCache.load();
 
-  while (document.querySelectorAll('.flex-1xMQg5.flex-1O1GKY.horizontal-1ae9ci.horizontal-2EEEnY.flex-1O1GKY.directionRow-3v3tfG.justifyStart-2NDFzi.alignStretch-DpGPf3.noWrap-3jynv6 > [type="button"]:last-child').length === 0 || (window.webpackJsonp === undefined && window.webpackChunkdiscord_app === undefined)) {
+  while ((window.webpackJsonp === undefined && window.webpackChunkdiscord_app === undefined)) {
     await sleep(10);
   }
 
   for (let x of scopeSetterFncs) {
-    await x(this);
+    try {
+      await x(this);
+    } catch (e) {
+      console.warn('[GooseMod] Failed to scopeset', e, x);
+    }
   }
 
   this.versioning = {

src/ui/settings/home/index.js

@@ -94,9 +94,9 @@ export default async (goosemodScope) => {
   };
 
   const handleItemClick = (title, type) => {
-    const parentEl = [...document.querySelector(`.content-98HsJk`).children].find((x, i) => i !== 0 && !x.classList.contains('erd_scroll_detection_container'));
+    const parentEl = [...document.querySelector(`.content-1SgpWY`).children].find((x, i) => i !== 0 && !x.classList.contains('erd_scroll_detection_container'));
 
-    for (const x of document.querySelector(`.scroller-1JbKMe`).children[0].children) {
+    for (const x of document.querySelector(`.scroller-WSmht3`).children[0].children) {
       if (!x.className?.replace) continue;
       x.className = x.className.replace(LinkButtonClasses.selected, LinkButtonClasses.clickable);
     }
@@ -171,7 +171,7 @@ export default async (goosemodScope) => {
     };
 
     setTimeout(() => {
-      document.querySelector(`.scroller-1JbKMe`).addEventListener('click', (e) => {
+      document.querySelector(`.scroller-WSmht3`).addEventListener('click', (e) => {
         const buttonEl = findClassInParentTree(e.target, ChannelLinkButtonClasses.channel);
         if (buttonEl && !buttonEl.id.startsWith('gm-home-')) {
           document.querySelectorAll('[id^="gm-home-"]').forEach((x) => x.className = x.className.replace(LinkButtonClasses.selected, LinkButtonClasses.clickable)); 
@@ -225,7 +225,7 @@ export default async (goosemodScope) => {
 
     itemWrapper(React.createElement(LinkButton, {
       style: {
-        display: expanded || document.querySelector('.title-29uC1r')?.textContent === '#terms.store.themes#' ? 'block' : 'none'
+        display: expanded || document.querySelector('.title-17SveM')?.textContent === '#terms.store.themes#' ? 'block' : 'none'
       },
 
       icon: () => homeIcons.themes,
@@ -240,7 +240,7 @@ export default async (goosemodScope) => {
 
     itemWrapper(React.createElement(LinkButton, {
       style: {
-        display: expanded || document.querySelector('.title-29uC1r')?.textContent === '#terms.store.plugins#' ? 'block' : 'none'
+        display: expanded || document.querySelector('.title-17SveM')?.textContent === '#terms.store.plugins#' ? 'block' : 'none'
       },
 
       icon: () => homeIcons.plugins,
@@ -255,7 +255,7 @@ export default async (goosemodScope) => {
 
     snippetsEnabled ? itemWrapper(React.createElement(LinkButton, {
       style: {
-        display: expanded || document.querySelector('.title-29uC1r')?.textContent === '#terms.store.snippets#' ? 'block' : 'none'
+        display: expanded || document.querySelector('.title-17SveM')?.textContent === '#terms.store.snippets#' ? 'block' : 'none'
       },
 
       icon: () => homeIcons.snippets,
@@ -271,7 +271,7 @@ export default async (goosemodScope) => {
   }));
 
   // If home currently open, force update sidebar via routing
-  if (document.querySelector(`.privateChannels-1nO12o`)) {
+  if (document.querySelector(`.privateChannels-oVe7HL`)) {
     RoutingUtils.transitionTo('/invalid');
     RoutingUtils.back();
   }

src/ui/settings/settingsSidebar.js

@@ -1,5 +1,12 @@
-export default (goosemodScope, gmSettings) => {
-  const SettingsView = goosemodScope.webpackModules.findByDisplayName('SettingsView');
+import sleep from '../../util/sleep';
+
+export default async (goosemodScope, gmSettings) => {
+  let SettingsView;
+  
+  while (!SettingsView?.prototype) {
+    await sleep(100);
+    SettingsView = goosemodScope.webpackModules.findByDisplayName('SettingsView');
+  }
 
   const Text = goosemodScope.webpackModules.findByDisplayName('Text');
   const VersionClasses = goosemodScope.webpackModules.findByProps('versionHash', 'line');