fix many lots

Author: Cynosphere

src/allActivities/index.ts

@@ -46,7 +46,7 @@ export const webpackModules: Record<string, ExtensionWebpackModule> = {
       { id: "discord/Constants" },
       { id: "discord/components/common/index" },
       { ext: "componentEditor", id: "memberList" },
-      'applicationStreamingPreviewWrapper:"applicationStreamingPreviewWrapper_',
+      'applicationStreamingPreviewWrapper:"',
       { id: "discord/modules/user_profile/web/UserProfileActivityCardWrapper" }
     ]
   }

src/allActivities/manifest.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://moonlight-mod.github.io/manifest.schema.json",
   "id": "allActivities",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "meta": {
     "name": "Activity Icons",
     "tagline": "Shows activity icons in the member list (and activity viewing/sending related tweaks) (formerly All Activities)",
@@ -10,7 +10,7 @@
     "tags": ["profiles"],
     "source": "https://github.com/Cynosphere/moonlight-extensions",
     "donate": "https://ko-fi.com/Cynosphere",
-    "changelog": "Disable only sending one (1) playing activity"
+    "changelog": "Fixes for latest Discord"
   },
   "dependencies": ["spacepack", "common", "componentEditor"],
   "apiLevel": 2

src/allActivities/style.css

@@ -27,11 +27,11 @@
   filter: drop-shadow(0 0 1px black);
 }
 
-[class^="member_"] > [class^="childContainer_"] {
+div[class*="-member"] > div[class*="-childContainer"] {
   /* hey discord, maybe you should like, actually learn how to position gradients instead of using padding */
   padding-right: 0;
 
-  & > [class^="memberInner_"] {
+  & > div[class*="-memberInner"] {
     width: 100%;
 
     /* controversal rule but w/e, i dont get why discord uses --space-16 on the right side only */

src/allActivities/webpackModules/icons.tsx

@@ -12,9 +12,7 @@ const ConnectionPlatforms = spacepack.findByCode("getByUrl(", "get(", "isSupport
 const UserProfileActivityCard = spacepack.findByCode(`location:${JSON.stringify("UserProfileActivityCard")},`)[0]
   .exports.Z;
 
-const ActivityClasses = spacepack.findByCode(
-  "applicationStreamingPreviewWrapper:" + '"applicationStreamingPreviewWrapper_'
-)[0].exports;
+const ActivityClasses = spacepack.findByCode('applicationStreamingPreviewWrapper:"')[0].exports;
 
 const SpotifyIcon = ConnectionPlatforms.get(PlatformTypes.SPOTIFY).icon.lightSVG;
 const TwitchIcon = ConnectionPlatforms.get(PlatformTypes.TWITCH).icon.lightSVG;

src/betterUploadButton/index.ts

@@ -2,11 +2,10 @@ import { ExtensionWebpackModule, Patch } from "@moonlight-mod/types";
 
 export const patches: Patch[] = [
   {
-    find: '("ChannelAttachButton")',
+    find: ".hasCurrentUserSentMessageSinceAppStart());",
     replace: {
-      match: /(?<="Invalid popout type provided"\)}},children:\i=>\(0,\i\.jsx\)\(\i\.\i,)(\i)\((\i)\({(look|ref):/,
-      replacement: (_, defineProps, mergeProps, firstProp) =>
-        `require("betterUploadButton_fixProps").default(${mergeProps}({${firstProp}:`
+      match: /(?<="Invalid popout type provided"\)}},children:\i=>\(0,\i\.jsx\)\(\i\.\i,)(\i)\((\i)\({ref:/,
+      replacement: (_, defineProps, mergeProps) => `require("betterUploadButton_fixProps").default(${mergeProps}({ref:`
     }
   },
   {

src/betterUploadButton/manifest.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://moonlight-mod.github.io/manifest.schema.json",
   "id": "betterUploadButton",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "meta": {
     "name": "Better Upload Button",
     "tagline": "Makes the upload button single click to upload and right click for other options",

src/colorConsistency/index.ts

@@ -15,10 +15,10 @@ export const patches: Patch[] = [
 
   // Typing
   {
-    find: '("TypingUsers")',
+    find: "this.handleDismissInviteEducation",
     replace: {
-      match: /=>(\i\.\i\.getName\((\i),\i\.id,(\i)\))(?=.+?(\(0,(\i)\.jsxs\)))/,
-      replacement: (_, name, guildId, user, createElement, React) =>
+      match: /(?<=(\(0,(\i)\.jsx\)).+?)=>(\i\.\i\.getName\((\i\.guild_id),\i\.id,(\i)\))/,
+      replacement: (_, createElement, React, name, guildId, user) =>
         `=>${createElement}(require("colorConsistency_wrapper")?.default??${React}.Fragment,{children:${name},userId:${user}.id,guildId:${guildId}})`
     },
     prerequisite: () => moonlight.getConfigOption<boolean>("colorConsistency", "typing") ?? true

src/colorConsistency/manifest.json

@@ -1,15 +1,15 @@
 {
   "$schema": "https://moonlight-mod.github.io/manifest.schema.json",
   "id": "colorConsistency",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "meta": {
     "name": "Color Consistency",
     "tagline": "Add role colors to places missing them",
     "authors": ["Cynosphere"],
     "tags": ["qol", "chat", "accessibility", "appearance", "voice"],
     "source": "https://github.com/Cynosphere/moonlight-extensions",
     "donate": "https://ko-fi.com/Cynosphere",
-    "changelog": "Fixes for latest Discord"
+    "changelog": "Fixes for latest Discord, display name font support"
   },
   "settings": {
     "voice": {

src/colorConsistency/webpackModules/wrapper.tsx

@@ -1,12 +1,16 @@
-import React from "@moonlight-mod/wp/react";
+import React, { useState } from "@moonlight-mod/wp/react";
 import spacepack from "@moonlight-mod/wp/spacepack_spacepack";
-import { GuildMemberStore } from "@moonlight-mod/wp/common_stores";
+import { GuildMemberStore, UserStore } from "@moonlight-mod/wp/common_stores";
 import { useStateFromStores } from "@moonlight-mod/wp/discord/packages/flux";
 
 const useGradient = spacepack.findFunctionByStrings(
-  spacepack.findByCode('"--custom-gradient-color-1":null!=')?.[0]?.exports ?? {},
+  spacepack.findByCode(`${'"--custom-gradient-color-2"'}:null!=`)?.[0]?.exports ?? {},
   ".useMemo("
 );
+const useDisplayNameStylesFont = spacepack.findFunctionByStrings(
+  spacepack.findByCode(".dnsFont")?.[0]?.exports ?? {},
+  ".dnsFont"
+);
 
 const classnames = spacepack.require("classnames");
 
@@ -27,9 +31,14 @@ export default function ColorConsistencyWrapper({
     userId,
     guildId
   ]);
+  const user = useStateFromStores([UserStore], () => UserStore.getUser(userId), [userId]);
+
   const { colorString, colorStrings } = member ?? {};
   let gradientClassname, gradientStyle;
 
+  const displayNameStyles = member?.displayNameStyles ?? user?.displayNameStyles;
+  const fontClass = useDisplayNameStylesFont?.({ displayNameStyles, inProfile: false });
+
   try {
     const gradientRole =
       useGradient?.({ ...(colorStrings ?? {}), roleStyle: "username", includeConvenienceGlow: false }) ?? {};
@@ -39,7 +48,7 @@ export default function ColorConsistencyWrapper({
     // noop
   }
 
-  if (!member || !colorString) return children;
+  if ((!member || !colorString) && !fontClass) return children;
 
   return (
     <span
@@ -48,7 +57,7 @@ export default function ColorConsistencyWrapper({
         filter: speaking ? "brightness(1.75)" : null,
         ...(gradientStyle ?? {})
       }}
-      className={classnames("", gradientClassname ?? {})}
+      className={classnames("", gradientClassname ?? {}, fontClass ?? "")}
     >
       {children}
     </span>

src/dmDates/manifest.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://moonlight-mod.github.io/manifest.schema.json",
   "id": "dmDates",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "meta": {
     "name": "DM Dates",
     "tagline": "Implements dates next to direct messages like mobile",