inAppNotifications: lazy load useRoleIcon

Cynosphere · Jan 25, 2025 · 2aa2c17 · 2aa2c17
1 parent 6f0ca77
commit 2aa2c17
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/inAppNotifications/manifest.json b/src/inAppNotifications/manifest.json
@@ -1,14 +1,15 @@
 {
   "$schema": "https://moonlight-mod.github.io/manifest.schema.json",
   "id": "inAppNotifications",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "meta": {
     "name": "In App Notifications",
     "tagline": "In app notifications akin to mobile",
     "authors": ["Cynosphere"],
     "tags": ["qol", "chat"],
     "source": "https://github.com/Cynosphere/moonlight-extensions",
-    "donate": "https://ko-fi.com/Cynosphere"
+    "donate": "https://ko-fi.com/Cynosphere",
+    "changelog": "Lazy load `useRoleIcon` to fix not loading on first load sometimes"
   },
   "dependencies": ["spacepack", "common"],
   "settings": {

diff --git a/src/inAppNotifications/webpackModules/notification.tsx b/src/inAppNotifications/webpackModules/notification.tsx
@@ -36,7 +36,6 @@ const isMessageNewerThanImprovedMarkdownEpoch = Object.values(
 
 const createMessageHeader = spacepack.findByCode(".isInteractionPlaceholder(),")[0].exports.ZP;
 const getMessageAuthor = spacepack.findByCode('"Result cannot be null because the message is not null"')[0].exports.ZP;
-const useRoleIcon = spacepack.findFunctionByStrings(spacepack.findByCode(',"roleIcon",')[0].exports, ',"roleIcon",');
 
 const isSystemMessage = spacepack.findByCode(".USER_MESSAGE.has")[0].exports.Z;
 
@@ -61,9 +60,11 @@ type _MemoizeReferencedMessage = (
   referencedMessage: any,
   compat: boolean
 ) => React.ComponentType<any>;
+type UseRoleIcon = (props: { guildId?: string; roleId: string }, subscription?: string) => React.ReactElement;
 
 let makeTextChatNotification: MakeTextChatNotification,
   shouldNotify: ShouldNotify,
+  useRoleIcon: UseRoleIcon,
   MemoizeReferencedMessage: _MemoizeReferencedMessage,
   SystemMessage: React.ComponentType<any>,
   EmbedClasses: Record<string, string>;
@@ -80,6 +81,11 @@ function lazyLoad() {
       ".SUPPRESS_NOTIFICATIONS))return!1"
     ) as ShouldNotify;
 
+    useRoleIcon = spacepack.findFunctionByStrings(
+      spacepack.findByCode(',"roleIcon",')[0].exports,
+      ',"roleIcon",'
+    ) as UseRoleIcon;
+
     MemoizeReferencedMessage = spacepack.findByCode("isReplyAuthorBlocked:", ".REPLY||null==")[0].exports.Z;
 
     SystemMessage = spacepack.findByCode('("SystemMessage")')[0].exports.Z;