From 098124175fa28935824300f55cff3964aaf5ebb0 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Mon, 17 Jun 2024 23:00:25 +0200
Subject: [PATCH] Fix crashes & settings on canary

---
 src/plugins/_core/settings.tsx |  2 +-
 src/plugins/index.ts           | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
index 88ee05ff0..e998b8643 100644
--- a/src/plugins/_core/settings.tsx
+++ b/src/plugins/_core/settings.tsx
@@ -182,7 +182,7 @@ export default definePlugin({
     patchedSettings: new WeakSet(),
 
     addSettings(elements: any[], element: { header?: string; settings: string[]; }, sectionTypes: SectionTypes) {
-        if (this.patchedSettings.has(elements) || !this.isRightSpot(element)) return;
+        if (this.patchedSettings.has(elements)) return;
 
         this.patchedSettings.add(elements);
 
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 32bfe7e97..e7cfb82dc 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -42,7 +42,18 @@ const subscribedFluxEventsPlugins = new Set<string>();
 const pluginsValues = Object.values(Plugins);
 const settings = Settings.plugins;
 
+const forceDisabled = new Set([
+    "MessageLogger",
+    "ShowHiddenChannels",
+    "MoreUserTags",
+    "Decor",
+    "IgnoreActivities",
+    "NoBlockedMessages",
+    "BetterFolders",
+    "NoPendingCount"
+]);
 export function isPluginEnabled(p: string) {
+    if (forceDisabled.has(p)) return false;
     return (
         Plugins[p]?.required ||
         Plugins[p]?.isDependency ||