From e85d763f2273dd95e9fdf3112896e28bd4a39feb Mon Sep 17 00:00:00 2001
From: CanadaHonk <19228318+CanadaHonk@users.noreply.github.com>
Date: Sun, 20 Nov 2022 13:31:00 +0000
Subject: feat(plugin): WebRichPresence (arRPC) (#223)
---
src/plugins/arRPC.tsx | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
create mode 100644 src/plugins/arRPC.tsx
(limited to 'src/plugins/arRPC.tsx')
diff --git a/src/plugins/arRPC.tsx b/src/plugins/arRPC.tsx
new file mode 100644
index 0000000..bfacb6f
--- /dev/null
+++ b/src/plugins/arRPC.tsx
@@ -0,0 +1,74 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 OpenAsar
+ *
+ * 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 .
+*/
+
+import { popNotice,showNotice } from "../api/Notices";
+import { Link } from "../components/Link";
+import { Devs } from "../utils/constants";
+import definePlugin from "../utils/types";
+import { FluxDispatcher, Forms, Toasts } from "../webpack/common";
+
+let ws: WebSocket;
+export default definePlugin({
+ name: "WebRichPresence (arRPC)",
+ description: "Client plugin for arRPC to enable RPC on Discord Web (experimental)",
+ authors: [Devs.Ducko],
+ target: "WEB",
+
+ settingsAboutComponent: () => (
+ <>
+ How to use arRPC
+
+ Follow the instructions in the GitHub repo to get the server running, and then enable the plugin.
+
+
+ ),
+
+ async start() {
+ if (ws) ws.close();
+ ws = new WebSocket("ws://127.0.0.1:1337"); // try to open WebSocket
+
+ ws.onmessage = e => { // on message, set status to data
+ const data = JSON.parse(e.data);
+ FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", ...data });
+ };
+
+ const connectionSuccessful = await new Promise(res => setTimeout(() => res(ws.readyState === WebSocket.OPEN), 1000)); // check if open after 1s
+ if (!connectionSuccessful) {
+ showNotice("Failed to connect to arRPC, is it running?", "Retry", () => { // show notice about failure to connect, with retry/ignore
+ popNotice();
+ this.start();
+ });
+ return;
+ }
+
+ Toasts.show({ // show toast on success
+ message: "Connected to arRPC",
+ type: Toasts.Type.SUCCESS,
+ id: Toasts.genId(),
+ options: {
+ duration: 1000,
+ position: Toasts.Position.BOTTOM
+ }
+ });
+ },
+
+ stop() {
+ FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", activity: null }); // clear status
+ ws.close(); // close WebSocket
+ }
+});
--
cgit
From 9240865f65112f9fee5187e9f5fcdd5ed2758285 Mon Sep 17 00:00:00 2001
From: CanadaHonk <19228318+CanadaHonk@users.noreply.github.com>
Date: Sun, 20 Nov 2022 15:21:42 +0000
Subject: feat(arRPC): update for server 2.0 (#224)
---
src/plugins/arRPC.tsx | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
(limited to 'src/plugins/arRPC.tsx')
diff --git a/src/plugins/arRPC.tsx b/src/plugins/arRPC.tsx
index bfacb6f..54a7473 100644
--- a/src/plugins/arRPC.tsx
+++ b/src/plugins/arRPC.tsx
@@ -16,12 +16,24 @@
* along with this program. If not, see .
*/
-import { popNotice,showNotice } from "../api/Notices";
+import { popNotice, showNotice } from "../api/Notices";
import { Link } from "../components/Link";
import { Devs } from "../utils/constants";
import definePlugin from "../utils/types";
+import { Webpack } from "../Vencord";
import { FluxDispatcher, Forms, Toasts } from "../webpack/common";
+const assetManager = Webpack.mapMangledModuleLazy(
+ "getAssetImage: size must === [number, number] for Twitch",
+ {
+ getAsset: Webpack.filters.byCode("apply("),
+ }
+);
+
+async function lookupAsset(applicationId: string, key: string): Promise {
+ return (await assetManager.getAsset(applicationId, [key, undefined]))[0];
+}
+
let ws: WebSocket;
export default definePlugin({
name: "WebRichPresence (arRPC)",
@@ -42,8 +54,12 @@ export default definePlugin({
if (ws) ws.close();
ws = new WebSocket("ws://127.0.0.1:1337"); // try to open WebSocket
- ws.onmessage = e => { // on message, set status to data
+ ws.onmessage = async e => { // on message, set status to data
const data = JSON.parse(e.data);
+
+ if (data.activity?.assets?.large_image) data.activity.assets.large_image = await lookupAsset(data.activity.application_id, data.activity.assets.large_image);
+ if (data.activity?.assets?.small_image) data.activity.assets.small_image = await lookupAsset(data.activity.application_id, data.activity.assets.small_image);
+
FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", ...data });
};
--
cgit
From 9bcdc8451f2d1e9904303a61eab70c58aebb4dad Mon Sep 17 00:00:00 2001
From: CanadaHonk <19228318+CanadaHonk@users.noreply.github.com>
Date: Sun, 20 Nov 2022 23:57:30 +0000
Subject: feat(arRPC): update for server 2.2 (#230)
---
src/plugins/arRPC.tsx | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
(limited to 'src/plugins/arRPC.tsx')
diff --git a/src/plugins/arRPC.tsx b/src/plugins/arRPC.tsx
index 54a7473..a9b2f3c 100644
--- a/src/plugins/arRPC.tsx
+++ b/src/plugins/arRPC.tsx
@@ -19,21 +19,31 @@
import { popNotice, showNotice } from "../api/Notices";
import { Link } from "../components/Link";
import { Devs } from "../utils/constants";
+import { lazyWebpack } from "../utils/misc";
import definePlugin from "../utils/types";
-import { Webpack } from "../Vencord";
+import { filters, mapMangledModuleLazy } from "../webpack";
import { FluxDispatcher, Forms, Toasts } from "../webpack/common";
-const assetManager = Webpack.mapMangledModuleLazy(
+const assetManager = mapMangledModuleLazy(
"getAssetImage: size must === [number, number] for Twitch",
{
- getAsset: Webpack.filters.byCode("apply("),
+ getAsset: filters.byCode("apply("),
}
);
+const rpcManager = lazyWebpack(filters.byCode(".APPLICATION_RPC("));
+
async function lookupAsset(applicationId: string, key: string): Promise {
return (await assetManager.getAsset(applicationId, [key, undefined]))[0];
}
+const apps: any = {};
+async function lookupApp(applicationId: string): Promise {
+ const socket: any = {};
+ await rpcManager.lookupApp(socket, applicationId);
+ return socket.application;
+}
+
let ws: WebSocket;
export default definePlugin({
name: "WebRichPresence (arRPC)",
@@ -60,6 +70,12 @@ export default definePlugin({
if (data.activity?.assets?.large_image) data.activity.assets.large_image = await lookupAsset(data.activity.application_id, data.activity.assets.large_image);
if (data.activity?.assets?.small_image) data.activity.assets.small_image = await lookupAsset(data.activity.application_id, data.activity.assets.small_image);
+ const appId = data.activity.application_id;
+ if (!apps[appId]) apps[appId] = await lookupApp(appId);
+
+ const app = apps[appId];
+ if (!data.activity.name) data.activity.name = app.name;
+
FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", ...data });
};
--
cgit