parent
c91b0df607
commit
faa90eccd3
8 changed files with 182 additions and 27 deletions
|
@ -92,7 +92,7 @@ function makeProxy(settings: any, root = settings, path = ""): Settings {
|
||||||
// Return empty for plugins with no settings
|
// Return empty for plugins with no settings
|
||||||
if (path === "plugins" && p in plugins)
|
if (path === "plugins" && p in plugins)
|
||||||
return target[p] = makeProxy({
|
return target[p] = makeProxy({
|
||||||
enabled: plugins[p].required ?? false
|
enabled: plugins[p].required ?? plugins[p].enabledByDefault ?? false
|
||||||
}, root, `plugins.${p}`);
|
}, root, `plugins.${p}`);
|
||||||
|
|
||||||
// Since the property is not set, check if this is a plugin's setting and if so, try to resolve
|
// Since the property is not set, check if this is a plugin's setting and if so, try to resolve
|
||||||
|
|
|
@ -16,29 +16,12 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { isOutdated, rebuild, update } from "@utils/updater";
|
import { maybePromptToUpdate } from "@utils/updater";
|
||||||
|
|
||||||
export async function handleComponentFailed() {
|
export function handleComponentFailed() {
|
||||||
if (isOutdated) {
|
maybePromptToUpdate(
|
||||||
setImmediate(async () => {
|
"Uh Oh! Failed to render this Page." +
|
||||||
const wantsUpdate = confirm(
|
" However, there is an update available that might fix it." +
|
||||||
"Uh Oh! Failed to render this Page." +
|
" Would you like to update and restart now?"
|
||||||
" However, there is an update available that might fix it." +
|
);
|
||||||
" Would you like to update and restart now?"
|
|
||||||
);
|
|
||||||
if (wantsUpdate) {
|
|
||||||
try {
|
|
||||||
await update();
|
|
||||||
await rebuild();
|
|
||||||
if (IS_WEB)
|
|
||||||
location.reload();
|
|
||||||
else
|
|
||||||
DiscordNative.app.relaunch();
|
|
||||||
} catch (e) {
|
|
||||||
console.error(e);
|
|
||||||
alert("That also failed :( Try updating or reinstalling with the installer!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
134
src/plugins/crashHandler.ts
Normal file
134
src/plugins/crashHandler.ts
Normal file
|
@ -0,0 +1,134 @@
|
||||||
|
/*
|
||||||
|
* Vencord, a modification for Discord's desktop app
|
||||||
|
* Copyright (c) 2022 Vendicated and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { showNotification } from "@api/Notifications";
|
||||||
|
import { definePluginSettings } from "@api/settings";
|
||||||
|
import { Devs } from "@utils/constants";
|
||||||
|
import Logger from "@utils/Logger";
|
||||||
|
import { closeAllModals } from "@utils/modal";
|
||||||
|
import definePlugin, { OptionType } from "@utils/types";
|
||||||
|
import { maybePromptToUpdate } from "@utils/updater";
|
||||||
|
import { FluxDispatcher, NavigationRouter } from "@webpack/common";
|
||||||
|
import type { ReactElement } from "react";
|
||||||
|
|
||||||
|
const CrashHandlerLogger = new Logger("CrashHandler");
|
||||||
|
|
||||||
|
const settings = definePluginSettings({
|
||||||
|
attemptToPreventCrashes: {
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
description: "Whether to attempt to prevent Discord crashes.",
|
||||||
|
default: true
|
||||||
|
},
|
||||||
|
attemptToNavigateToHome: {
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
description: "Whether to attempt to navigate to the home when preventing Discord crashes.",
|
||||||
|
default: false
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
export default definePlugin({
|
||||||
|
name: "CrashHandler",
|
||||||
|
description: "Utility plugin for handling and possibly recovering from Crashes without a restart",
|
||||||
|
authors: [Devs.Nuckyz],
|
||||||
|
enabledByDefault: true,
|
||||||
|
|
||||||
|
popAllModals: undefined as (() => void) | undefined,
|
||||||
|
|
||||||
|
settings,
|
||||||
|
|
||||||
|
patches: [
|
||||||
|
{
|
||||||
|
find: ".Messages.ERRORS_UNEXPECTED_CRASH",
|
||||||
|
replacement: {
|
||||||
|
match: /(?=this\.setState\()/,
|
||||||
|
replace: "$self.handleCrash(this)||"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
find: 'dispatch({type:"MODAL_POP_ALL"})',
|
||||||
|
replacement: {
|
||||||
|
match: /(?<=(?<popAll>\i)=function\(\){\(0,\i\.\i\)\(\);\i\.\i\.dispatch\({type:"MODAL_POP_ALL"}\).+};)/,
|
||||||
|
replace: "$self.popAllModals=$<popAll>;"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
|
||||||
|
handleCrash(_this: ReactElement & { forceUpdate: () => void; }) {
|
||||||
|
try {
|
||||||
|
maybePromptToUpdate("Uh oh, Discord has just crashed... but good news, there is a Vencord update available that might fix this issue! Would you like to update now?", true);
|
||||||
|
|
||||||
|
if (settings.store.attemptToPreventCrashes) {
|
||||||
|
this.handlePreventCrash(_this);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
} catch (err) {
|
||||||
|
CrashHandlerLogger.error("Failed to handle crash", err);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
handlePreventCrash(_this: ReactElement & { forceUpdate: () => void; }) {
|
||||||
|
try {
|
||||||
|
showNotification({
|
||||||
|
color: "#eed202",
|
||||||
|
title: "Discord has crashed!",
|
||||||
|
body: "Attempting to recover...",
|
||||||
|
});
|
||||||
|
} catch { }
|
||||||
|
|
||||||
|
try {
|
||||||
|
FluxDispatcher.dispatch({ type: "CONTEXT_MENU_CLOSE" });
|
||||||
|
} catch (err) {
|
||||||
|
CrashHandlerLogger.debug("Failed to close open context menu.", err);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
this.popAllModals?.();
|
||||||
|
} catch (err) {
|
||||||
|
CrashHandlerLogger.debug("Failed to close old modals.", err);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
closeAllModals();
|
||||||
|
} catch (err) {
|
||||||
|
CrashHandlerLogger.debug("Failed to close all open modals.", err);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
FluxDispatcher.dispatch({ type: "USER_PROFILE_MODAL_CLOSE" });
|
||||||
|
} catch (err) {
|
||||||
|
CrashHandlerLogger.debug("Failed to close user popout.", err);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
FluxDispatcher.dispatch({ type: "LAYER_POP_ALL" });
|
||||||
|
} catch (err) {
|
||||||
|
CrashHandlerLogger.debug("Failed to pop all layers.", err);
|
||||||
|
}
|
||||||
|
if (settings.store.attemptToNavigateToHome) {
|
||||||
|
try {
|
||||||
|
NavigationRouter.transitionTo("/channels/@me");
|
||||||
|
} catch (err) {
|
||||||
|
CrashHandlerLogger.debug("Failed to navigate to home", err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
_this.forceUpdate();
|
||||||
|
} catch (err) {
|
||||||
|
CrashHandlerLogger.debug("Failed to update crash handler component.", err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
|
@ -16,11 +16,13 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import { migratePluginSettings } from "@api/settings";
|
||||||
import { Devs } from "@utils/constants";
|
import { Devs } from "@utils/constants";
|
||||||
import definePlugin from "@utils/types";
|
import definePlugin from "@utils/types";
|
||||||
|
|
||||||
|
migratePluginSettings("NoF1", "No F1");
|
||||||
export default definePlugin({
|
export default definePlugin({
|
||||||
name: "No F1",
|
name: "NoF1",
|
||||||
description: "Disables F1 help bind.",
|
description: "Disables F1 help bind.",
|
||||||
authors: [Devs.Cyn],
|
authors: [Devs.Cyn],
|
||||||
patches: [
|
patches: [
|
||||||
|
|
|
@ -16,11 +16,13 @@
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import { migratePluginSettings } from "@api/settings";
|
||||||
import { Devs } from "@utils/constants";
|
import { Devs } from "@utils/constants";
|
||||||
import definePlugin from "@utils/types";
|
import definePlugin from "@utils/types";
|
||||||
|
|
||||||
|
migratePluginSettings("NoRPC", "No RPC");
|
||||||
export default definePlugin({
|
export default definePlugin({
|
||||||
name: "No RPC",
|
name: "NoRPC",
|
||||||
description: "Disables Discord's RPC server.",
|
description: "Disables Discord's RPC server.",
|
||||||
authors: [Devs.Cyn],
|
authors: [Devs.Cyn],
|
||||||
target: "DESKTOP",
|
target: "DESKTOP",
|
||||||
|
|
|
@ -117,6 +117,7 @@ const ModalAPI = mapMangledModuleLazy("onCloseRequest:null!=", {
|
||||||
openModal: filters.byCode("onCloseRequest:null!="),
|
openModal: filters.byCode("onCloseRequest:null!="),
|
||||||
closeModal: filters.byCode("onCloseCallback&&"),
|
closeModal: filters.byCode("onCloseCallback&&"),
|
||||||
openModalLazy: m => m?.length === 1 && filters.byCode(".apply(this,arguments)")(m),
|
openModalLazy: m => m?.length === 1 && filters.byCode(".apply(this,arguments)")(m),
|
||||||
|
closeAllModals: filters.byCode(".value.key,")
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -142,3 +143,10 @@ export function openModal(render: RenderFunction, options?: ModalOptions, contex
|
||||||
export function closeModal(modalKey: string, contextKey?: string): void {
|
export function closeModal(modalKey: string, contextKey?: string): void {
|
||||||
return ModalAPI.closeModal(modalKey, contextKey);
|
return ModalAPI.closeModal(modalKey, contextKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Close all open modals
|
||||||
|
*/
|
||||||
|
export function closeAllModals(): void {
|
||||||
|
return ModalAPI.closeAllModals();
|
||||||
|
}
|
||||||
|
|
|
@ -75,6 +75,10 @@ export interface PluginDef {
|
||||||
* Whether this plugin is required and forcefully enabled
|
* Whether this plugin is required and forcefully enabled
|
||||||
*/
|
*/
|
||||||
required?: boolean;
|
required?: boolean;
|
||||||
|
/**
|
||||||
|
* Whether this plugin should be enabled by default, but can be disabled
|
||||||
|
*/
|
||||||
|
enabledByDefault?: boolean;
|
||||||
/**
|
/**
|
||||||
* Set this if your plugin only works on Browser or Desktop, not both
|
* Set this if your plugin only works on Browser or Desktop, not both
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -77,3 +77,25 @@ export async function rebuild() {
|
||||||
return oldHashes["patcher.js"] !== newHashes["patcher.js"] ||
|
return oldHashes["patcher.js"] !== newHashes["patcher.js"] ||
|
||||||
oldHashes["preload.js"] !== newHashes["preload.js"];
|
oldHashes["preload.js"] !== newHashes["preload.js"];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function maybePromptToUpdate(confirmMessage: string, checkForDev = false) {
|
||||||
|
if (IS_WEB) return;
|
||||||
|
if (checkForDev && IS_DEV) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const isOutdated = await checkForUpdates();
|
||||||
|
if (isOutdated) {
|
||||||
|
const wantsUpdate = confirm(confirmMessage);
|
||||||
|
if (wantsUpdate && isNewer) return alert("Your local copy has more recent commits. Please stash or reset them.");
|
||||||
|
if (wantsUpdate) {
|
||||||
|
await update();
|
||||||
|
const needFullRestart = await rebuild();
|
||||||
|
if (needFullRestart) DiscordNative.app.relaunch();
|
||||||
|
else location.reload();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
UpdateLogger.error(err);
|
||||||
|
alert("That also failed :( Try updating or re-installing with the installer!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue