From 1f72a0fc27d8fdfa9b83e51e172a16538cc3e5eb Mon Sep 17 00:00:00 2001
From: CanadaHonk <19228318+CanadaHonk@users.noreply.github.com>
Date: Mon, 21 Nov 2022 19:40:40 +0000
Subject: [PATCH] fix(arRPC): fix error on null activity (#244)

---
 src/plugins/arRPC.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/arRPC.tsx b/src/plugins/arRPC.tsx
index a9b2f3ca5..081ea4819 100644
--- a/src/plugins/arRPC.tsx
+++ b/src/plugins/arRPC.tsx
@@ -70,11 +70,13 @@ 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);
+            if (data.activity) {
+                const appId = data.activity.application_id;
+                apps[appId] ||= await lookupApp(appId);
 
-            const app = apps[appId];
-            if (!data.activity.name) data.activity.name = app.name;
+                const app = apps[appId];
+                data.activity.name ||= app.name;
+            }
 
             FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", ...data });
         };