devproje/project-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

404 page handler

Browse source 
Discord handles incorrect schemes pretty well but `discord:///settings` is a case where it doesn't, so this may be needed to ensure user experience
This commit is contained in:
Kylie C 2024-09-11 18:56:19 -04:00
parent b3e0d2e5b2
commit dbe109c44b
4 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/ipc.ts
View file

@ -18,7 +18,7 @@ import { IpcEvents } from "../shared/IpcEvents";
import { setBadgeCount } from "./appBadge";
import { autoStart } from "./autoStart";
import { VENCORD_FILES_DIR, VENCORD_QUICKCSS_FILE, VENCORD_THEMES_DIR } from "./constants";
import { mainWin } from "./mainWindow";
import { loadUrl, mainWin } from "./mainWindow";
import { Settings, State } from "./settings";
import { handle, handleSync } from "./utils/ipcWrappers";
import { PopoutWindows } from "./utils/popout";
@ -135,6 +135,11 @@ handle(IpcEvents.CLIPBOARD_COPY_IMAGE, async (_, buf: ArrayBuffer, src: string)
});
});
handle(IpcEvents.FOUROHFOUR_PAGE_HANDLER, _ => {
loadUrl(undefined);
console.warn("caught incomplete uri scheme. dumping to main app");
});
function readCss() {
return readFile(VENCORD_QUICKCSS_FILE, "utf-8").catch(() => "");
}

17
src/main/mainWindow.ts
View file

@ -455,25 +455,26 @@ function createMainWindow() {
win.webContents.setUserAgent(BrowserUserAgent);
const branch = Settings.store.discordBranch;
const subdomain = branch === "canary" || branch === "ptb" ? `${branch}.` : "";
const uri = process.argv.find(arg => arg.startsWith("discord://"));
const loadUrl = (url: string | undefined) => {
win.loadURL(`https://${subdomain}discord.com/${url?.replace(RegExp("^discord://[^/]*/?"), "") || "app"}`);
};
let uriFiredDarwin = false;
app.on("open-url", (_, url) => {
uriFiredDarwin ? restoreVesktop() : loadUrl(url);
uriFiredDarwin = true;
});
const uri = process.argv.find(arg => arg.startsWith("discord://"));
uriFiredDarwin || loadUrl(uri);
return win;
}
const runVencordMain = once(() => require(join(VENCORD_FILES_DIR, "vencordDesktopMain.js")));
export function loadUrl(uri: string | undefined) {
const branch = Settings.store.discordBranch;
const subdomain = branch === "canary" || branch === "ptb" ? `${branch}.` : "";
mainWin.loadURL(`https://${subdomain}discord.com/${uri?.replace(RegExp("^discord://[^/]*/?"), "") || "app"}`);
}
export function restoreVesktop() {
if (mainWin) {
if (mainWin.isMinimized()) mainWin.restore();

4
src/preload/index.ts
View file

@ -24,6 +24,10 @@ const style = document.createElement("style");
style.id = "vcd-css-core";
style.textContent = readFileSync(rendererCss, "utf-8");
document.addEventListener("DOMContentLoaded", () => {
if (document.title === "Page Not Found | Discord") ipcRenderer.invoke(IpcEvents.FOUROHFOUR_PAGE_HANDLER);
});
if (document.readyState === "complete") {
document.documentElement.appendChild(style);
} else {

4
src/shared/IpcEvents.ts
View file

@ -50,5 +50,7 @@ export const enum IpcEvents {
ARRPC_ACTIVITY = "VCD_ARRPC_ACTIVITY",
CLIPBOARD_COPY_IMAGE = "VCD_CLIPBOARD_COPY_IMAGE"
CLIPBOARD_COPY_IMAGE = "VCD_CLIPBOARD_COPY_IMAGE",
FOUROHFOUR_PAGE_HANDLER = "VCD_404_PAGE_HANDLER"
}