Skip to content

Commit 0981241

Browse files
committed
Fix crashes & settings on canary
1 parent c1593e1 commit 0981241

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

src/plugins/_core/settings.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ export default definePlugin({
182182
patchedSettings: new WeakSet(),
183183

184184
addSettings(elements: any[], element: { header?: string; settings: string[]; }, sectionTypes: SectionTypes) {
185-
if (this.patchedSettings.has(elements) || !this.isRightSpot(element)) return;
185+
if (this.patchedSettings.has(elements)) return;
186186

187187
this.patchedSettings.add(elements);
188188

src/plugins/index.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,18 @@ const subscribedFluxEventsPlugins = new Set<string>();
4242
const pluginsValues = Object.values(Plugins);
4343
const settings = Settings.plugins;
4444

45+
const forceDisabled = new Set([
46+
"MessageLogger",
47+
"ShowHiddenChannels",
48+
"MoreUserTags",
49+
"Decor",
50+
"IgnoreActivities",
51+
"NoBlockedMessages",
52+
"BetterFolders",
53+
"NoPendingCount"
54+
]);
4555
export function isPluginEnabled(p: string) {
56+
if (forceDisabled.has(p)) return false;
4657
return (
4758
Plugins[p]?.required ||
4859
Plugins[p]?.isDependency ||

0 commit comments

Comments
 (0)