aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/VencordNative.ts6
-rw-r--r--src/main/ipcMain.ts1
-rw-r--r--src/main/ipcPlugins.ts46
-rw-r--r--src/plugins/openInApp.ts90
-rw-r--r--src/plugins/showConnections/index.tsx7
-rw-r--r--src/plugins/spotifyControls/PlayerComponent.tsx3
-rw-r--r--src/plugins/spotifyControls/SpotifyStore.ts2
-rw-r--r--src/utils/IpcEvents.ts2
-rw-r--r--src/webpack/common/utils.ts11
9 files changed, 149 insertions, 19 deletions
diff --git a/src/VencordNative.ts b/src/VencordNative.ts
index 02de74f..a7c16ef 100644
--- a/src/VencordNative.ts
+++ b/src/VencordNative.ts
@@ -58,4 +58,10 @@ export default {
getVersions: () => process.versions as Partial<NodeJS.ProcessVersions>,
openExternal: (url: string) => invoke<void>(IpcEvents.OPEN_EXTERNAL, url)
},
+
+ pluginHelpers: {
+ OpenInApp: {
+ resolveRedirect: (url: string) => invoke<string>(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, url),
+ },
+ }
};
diff --git a/src/main/ipcMain.ts b/src/main/ipcMain.ts
index 5fcf8b7..d62888c 100644
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@@ -17,6 +17,7 @@
*/
import "./updater";
+import "./ipcPlugins";
import { debounce } from "@utils/debounce";
import { IpcEvents } from "@utils/IpcEvents";
diff --git a/src/main/ipcPlugins.ts b/src/main/ipcPlugins.ts
new file mode 100644
index 0000000..ac2f3d7
--- /dev/null
+++ b/src/main/ipcPlugins.ts
@@ -0,0 +1,46 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2023 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 { IpcEvents } from "@utils/IpcEvents";
+import { ipcMain } from "electron";
+import { request } from "https";
+
+// #region OpenInApp
+// These links don't support CORS, so this has to be native
+const validRedirectUrls = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
+
+function getRedirect(url: string) {
+ return new Promise<string>((resolve, reject) => {
+ const req = request(new URL(url), { method: "HEAD" }, res => {
+ resolve(
+ res.headers.location
+ ? getRedirect(res.headers.location)
+ : url
+ );
+ });
+ req.on("error", reject);
+ req.end();
+ });
+}
+
+ipcMain.handle(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, async (_, url: string) => {
+ if (!validRedirectUrls.test(url)) return url;
+
+ return getRedirect(url);
+});
+// #endregion
diff --git a/src/plugins/openInApp.ts b/src/plugins/openInApp.ts
index 8249ed7..52b418f 100644
--- a/src/plugins/openInApp.ts
+++ b/src/plugins/openInApp.ts
@@ -16,22 +16,41 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
+import { definePluginSettings } from "@api/Settings";
import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
+import definePlugin, { OptionType } from "@utils/types";
+import { showToast, Toasts } from "@webpack/common";
+import { MouseEvent } from "react";
-const SpotifyMatcher = /https:\/\/open\.spotify\.com\/(track|album|artist|playlist|user)\/([^S]+)/;
+const ShortUrlMatcher = /^https:\/\/(spotify\.link|s\.team)\/.+$/;
+const SpotifyMatcher = /^https:\/\/open\.spotify\.com\/(track|album|artist|playlist|user)\/(.+)(?:\?.+?)?$/;
+const SteamMatcher = /^https:\/\/(steamcommunity\.com|(?:help|store)\.steampowered\.com)\/.+$/;
+
+const settings = definePluginSettings({
+ spotify: {
+ type: OptionType.BOOLEAN,
+ description: "Open Spotify links in the Spotify app",
+ default: true,
+ },
+ steam: {
+ type: OptionType.BOOLEAN,
+ description: "Open Steam links in the Steam app",
+ default: true,
+ }
+});
export default definePlugin({
name: "OpenInApp",
- description: "Open spotify URLs in app",
+ description: "Open Spotify and Steam URLs in the Spotify and Steam app instead of your Browser",
authors: [Devs.Ven],
+ settings,
patches: [
{
find: '"MaskedLinkStore"',
replacement: {
match: /return ((\i)\.apply\(this,arguments\))(?=\}function \i.{0,200}\.trusted)/,
- replace: "return $self.handleLink(...arguments)||$1"
+ replace: "return $self.handleLink(...arguments).then(handled => handled || $1)"
}
},
// Make Spotify profile activity links open in app on web
@@ -52,23 +71,60 @@ export default definePlugin({
}
],
- handleLink(data: { href: string; }, event: MouseEvent) {
- if (!data) return;
+ async handleLink(data: { href: string; }, event: MouseEvent) {
+ if (!data) return false;
+
+ let url = data.href;
+ if (!IS_WEB && ShortUrlMatcher.test(url)) {
+ event.preventDefault();
+ // CORS jumpscare
+ url = await VencordNative.pluginHelpers.OpenInApp.resolveRedirect(url);
+ }
- const match = SpotifyMatcher.exec(data.href);
- if (!match) return;
+ spotify: {
+ if (!settings.store.spotify) break spotify;
- const [, type, id] = match;
- VencordNative.native.openExternal(`spotify:${type}:${id}`);
- event.preventDefault();
+ const match = SpotifyMatcher.exec(url);
+ if (!match) break spotify;
- return Promise.resolve();
- },
+ const [, type, id] = match;
+ VencordNative.native.openExternal(`spotify:${type}:${id}`);
+
+ event.preventDefault();
+ return true;
+ }
+
+ steam: {
+ if (!settings.store.steam) break steam;
- handleAccountView(event: MouseEvent, platformType: string, otherUserId: string) {
- if (platformType !== "spotify") return;
+ if (!SteamMatcher.test(url)) break steam;
- VencordNative.native.openExternal(`spotify:user:${otherUserId}`);
- event.preventDefault();
+ VencordNative.native.openExternal(`steam://openurl/${url}`);
+
+ event.preventDefault();
+
+ // Steam does not focus itself so show a toast so it's slightly less confusing
+ showToast("Opened link in Steam", Toasts.Type.SUCCESS);
+ return true;
+ }
+
+ // in case short url didn't end up being something we can handle
+ if (event.defaultPrevented) {
+ window.open(url, "_blank");
+ return true;
+ }
+
+ return false;
+ },
+
+ handleAccountView(event: { preventDefault(): void; }, platformType: string, userId: string) {
+ if (platformType === "spotify") {
+ VencordNative.native.openExternal(`spotify:user:${userId}`);
+ event.preventDefault();
+ } else if (platformType === "steam") {
+ VencordNative.native.openExternal(`steam://openurl/https://steamcommunity.com/profiles/${userId}`);
+ showToast("Opened link in Steam", Toasts.Type.SUCCESS);
+ event.preventDefault();
+ }
}
});
diff --git a/src/plugins/showConnections/index.tsx b/src/plugins/showConnections/index.tsx
index 50fcfe1..404a8db 100644
--- a/src/plugins/showConnections/index.tsx
+++ b/src/plugins/showConnections/index.tsx
@@ -147,6 +147,13 @@ function CompactConnectionComponent({ connection, theme }: { connection: Connect
className="vc-user-connection"
href={url}
target="_blank"
+ onClick={e => {
+ if (Vencord.Plugins.isPluginEnabled("OpenInApp")) {
+ const OpenInApp = Vencord.Plugins.plugins.OpenInApp as any as typeof import("../openInApp").default;
+ // handleLink will .preventDefault() if applicable
+ OpenInApp.handleLink(e.currentTarget, e);
+ }
+ }}
>
{img}
</a>
diff --git a/src/plugins/spotifyControls/PlayerComponent.tsx b/src/plugins/spotifyControls/PlayerComponent.tsx
index f4c7c81..c0ba0fe 100644
--- a/src/plugins/spotifyControls/PlayerComponent.tsx
+++ b/src/plugins/spotifyControls/PlayerComponent.tsx
@@ -23,6 +23,7 @@ import { Flex } from "@components/Flex";
import { ImageIcon, LinkIcon, OpenExternalIcon } from "@components/Icons";
import { Link } from "@components/Link";
import { debounce } from "@utils/debounce";
+import { openImageModal } from "@utils/discord";
import { classes, copyWithToast } from "@utils/misc";
import { ContextMenu, FluxDispatcher, Forms, Menu, React, useEffect, useState, useStateFromStores } from "@webpack/common";
@@ -231,7 +232,7 @@ function AlbumContextMenu({ track }: { track: Track; }) {
id="view-cover"
label="View Album Cover"
// trolley
- action={() => (Vencord.Plugins.plugins.ViewIcons as any).openImage(track.album.image.url)}
+ action={() => openImageModal(track.album.image.url)}
icon={ImageIcon}
/>
<Menu.MenuControlItem
diff --git a/src/plugins/spotifyControls/SpotifyStore.ts b/src/plugins/spotifyControls/SpotifyStore.ts
index c713249..d65be74 100644
--- a/src/plugins/spotifyControls/SpotifyStore.ts
+++ b/src/plugins/spotifyControls/SpotifyStore.ts
@@ -89,7 +89,7 @@ export const SpotifyStore = proxyLazy(() => {
public isSettingPosition = false;
public openExternal(path: string) {
- const url = Settings.plugins.SpotifyControls.useSpotifyUris
+ const url = Settings.plugins.SpotifyControls.useSpotifyUris || Vencord.Plugins.isPluginEnabled("OpenInApp")
? "spotify:" + path.replaceAll("/", (_, idx) => idx === 0 ? "" : ":")
: "https://open.spotify.com" + path;
diff --git a/src/utils/IpcEvents.ts b/src/utils/IpcEvents.ts
index 30a68e8..41d40a7 100644
--- a/src/utils/IpcEvents.ts
+++ b/src/utils/IpcEvents.ts
@@ -30,4 +30,6 @@ export const enum IpcEvents {
UPDATE = "VencordUpdate",
BUILD = "VencordBuild",
OPEN_MONACO_EDITOR = "VencordOpenMonacoEditor",
+
+ OPEN_IN_APP__RESOLVE_REDIRECT = "VencordOIAResolveRedirect",
}
diff --git a/src/webpack/common/utils.ts b/src/webpack/common/utils.ts
index 629d052..40a45da 100644
--- a/src/webpack/common/utils.ts
+++ b/src/webpack/common/utils.ts
@@ -77,6 +77,17 @@ export const Toasts = {
}
};
+/**
+ * Show a simple toast. If you need more options, use Toasts.show manually
+ */
+export function showToast(message: string, type = ToastType.MESSAGE) {
+ Toasts.show({
+ id: Toasts.genId(),
+ message,
+ type
+ });
+}
+
export const UserUtils = {
fetchUser: findByCodeLazy(".USER(", "getUser") as (id: string) => Promise<User>,
};
generated by cgit (git 2.46.0) at 2024-12-14 09:48:57 +0000