resolver fixes and mentionAvatars resolver compat

Author: Cynosphere

src/mentionAvatars/manifest.json

@@ -1,15 +1,15 @@
 {
   "$schema": "https://moonlight-mod.github.io/manifest.schema.json",
   "id": "mentionAvatars",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "meta": {
     "name": "Mention Avatars",
     "tagline": "Shows avatars on user mentions",
     "authors": ["Cynosphere"],
     "tags": ["qol", "chat"],
     "source": "https://github.com/Cynosphere/moonlight-extensions",
     "donate": "https://ko-fi.com/Cynosphere",
-    "changelog": "Fixes for latest Discord for the last time (relies on remapped name now)"
+    "changelog": "Null user checking and compatibility with embed mentions updated by Resolver"
   },
   "dependencies": ["common"],
   "settings": {

src/mentionAvatars/webpackModules/avatar.tsx

@@ -5,22 +5,17 @@ import { Avatar, AvatarSizes } from "@moonlight-mod/wp/discord/components/common
 import { ChannelStore, UserStore } from "@moonlight-mod/wp/common_stores";
 
 type MessageAvatarProps = {
-  userId: string;
+  userId: string | undefined;
+  parsedUserId?: string;
   channelId: string;
 };
 
-export default function MessageAvatar({ userId, channelId }: MessageAvatarProps) {
-  const user = useStateFromStores([UserStore], () => UserStore.getUser(userId)!, [userId]);
+export default function MessageAvatar({ userId, parsedUserId, channelId }: MessageAvatarProps) {
+  const user = useStateFromStores([UserStore], () => UserStore.getUser(userId ?? parsedUserId), [userId, parsedUserId]);
   const channel = useStateFromStores([ChannelStore], () => ChannelStore.getChannel(channelId), [channelId]);
   const guildId = channel?.getGuildId();
 
-  return (
-    <Avatar
-      // @ts-expect-error fixed next mappings
-      className="mentionAvatar"
-      src={user.getAvatarURL(guildId, 16)}
-      // @ts-expect-error fixed next mappings
-      size={AvatarSizes.SIZE_16}
-    />
+  return user == null ? null : (
+    <Avatar className="mentionAvatar" src={user.getAvatarURL(guildId, 16)} size={AvatarSizes.SIZE_16} />
   );
 }

src/resolver/index.ts

@@ -1,4 +1,16 @@
-import { ExtensionWebpackModule } from "@moonlight-mod/types";
+import { ExtensionWebpackModule, Patch } from "@moonlight-mod/types";
+
+export const patches: Patch[] = [
+  {
+    find: "discord/modules/messages/web/UserMention",
+    replace: [
+      {
+        match: /\.default\.getUser\((\i)\)/,
+        replacement: (_, id) => `.default.getUser(${id}??arguments[0].parsedUserId)`
+      }
+    ]
+  }
+];
 
 export const webpackModules: Record<string, ExtensionWebpackModule> = {
   user: {

src/resolver/manifest.json

@@ -1,15 +1,16 @@
 {
   "$schema": "https://moonlight-mod.github.io/manifest.schema.json",
   "id": "resolver",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "meta": {
     "name": "Resolver",
     "tagline": "Resolve uncached users",
     "description": "User resolving is done through the unknown user mention context menu, it is not and never will be automatic.\n\n-# More features eventually\u2122",
     "authors": ["Cynosphere"],
     "tags": ["fixes", "chat"],
     "source": "https://github.com/Cynosphere/moonlight-extensions",
-    "donate": "https://ko-fi.com/Cynosphere"
+    "donate": "https://ko-fi.com/Cynosphere",
+    "changelog": "Fixes for latest Discord and mentions in embeds"
   },
   "dependencies": ["contextMenu", "spacepack"],
   "apiLevel": 2

src/resolver/webpackModules/user.tsx

@@ -3,7 +3,14 @@ import spacepack from "@moonlight-mod/wp/spacepack_spacepack";
 import { addItem, MenuItem } from "@moonlight-mod/wp/contextMenu_contextMenu";
 import { ToastType, createToast, showToast } from "@moonlight-mod/wp/discord/components/common/index";
 
-const { getUser } = spacepack.require("discord/actions/UserActionCreators");
+const UserActionCreators = spacepack.require("discord/actions/UserActionCreators");
+// TODO: fix mapping
+const getUser = spacepack.findFunctionByStrings(
+  UserActionCreators,
+  ".get({url:",
+  ".USER(",
+  '.dispatch({type:"USER_UPDATE",user:'
+)!;
 const { openUserProfileModal } = spacepack.require("discord/actions/UserProfileModalActionCreators");
 
 const logger = moonlight.getLogger("Resolver");