diff --git a/src/api/Badges.ts b/src/api/Badges.ts index befe2a61..6ea77f77 100644 --- a/src/api/Badges.ts +++ b/src/api/Badges.ts @@ -31,7 +31,7 @@ export interface ProfileBadge { /** Custom component for the badge (tooltip not included) */ component?: ComponentType; /** The custom image to use */ - image?: string; + iconSrc?: string; link?: string; /** Action to perform when you click the badge */ onClick?(event: React.MouseEvent, props: ProfileBadge & BadgeUserArgs): void; diff --git a/src/plugins/_api/badges/index.tsx b/src/plugins/_api/badges/index.tsx index 5eabda9b..61eca12d 100644 --- a/src/plugins/_api/badges/index.tsx +++ b/src/plugins/_api/badges/index.tsx @@ -36,7 +36,7 @@ const CONTRIBUTOR_BADGE = "https://raw.githubusercontent.com/Nexulien/assets/mai const ContributorBadge: ProfileBadge = { description: "Nexulien Contributor", - image: CONTRIBUTOR_BADGE, + iconSrc: CONTRIBUTOR_BADGE, position: BadgePosition.START, shouldShow: ({ userId }) => shouldShowContributorBadge(userId), onClick: (_, { userId }) => openContributorModal(UserStore.getUser(userId)) @@ -77,11 +77,11 @@ function BadgeContextMenu({ badge }: { badge: ProfileBadge & BadgeUserArgs; }) { action={() => copyWithToast(badge.description!)} /> )} - {badge.image && ( + {badge.iconSrc && ( copyWithToast(badge.image!)} + action={() => copyWithToast(badge.iconSrc!)} /> )} @@ -105,8 +105,8 @@ export default definePlugin({ find: "#{intl::PROFILE_USER_BADGES}", replacement: [ { - match: /(alt:" ","aria-hidden":!0,src:)(.+?)(?=,)(?<=href:(\i)\.link.+?)/, - replace: (_, rest, originalSrc, badge) => `...${badge}.props,${rest}${badge}.image??(${originalSrc})` + match: /alt:" ","aria-hidden":!0,src:.{0,50}(\i).iconSrc/, + replace: "...$1.props,$&" }, { match: /(?<="aria-label":(\i)\.description,.{0,200})children:/, @@ -191,7 +191,7 @@ export default definePlugin({ getDonorBadges(userId: string) { return DonorBadges[userId]?.map(badge => ({ - image: badge.badge, + iconSrc: badge.badge, description: badge.tooltip, position: BadgePosition.START, props: { @@ -215,7 +215,7 @@ export default definePlugin({ getNexulienBadges(userId: string) { return NexulienBadges[userId]?.map(badge => ({ - image: badge.badge, + iconSrc: badge.badge, description: badge.tooltip, position: BadgePosition.START, props: { diff --git a/src/plugins/ircColors/index.ts b/src/plugins/ircColors/index.ts index ebfa735e..fbe5431b 100644 --- a/src/plugins/ircColors/index.ts +++ b/src/plugins/ircColors/index.ts @@ -127,7 +127,7 @@ export default definePlugin({ const colorString = context?.colorString; const color = calculateNameColorForUser(id); - if (settings.store.applyColorOnlyInDms && !context?.channel?.isPrivate()) { + if (settings.store.applyColorOnlyInDms && context?.guildId !== undefined) { return colorString; } diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx index 34584242..0bbc974a 100644 --- a/src/plugins/roleColorEverywhere/index.tsx +++ b/src/plugins/roleColorEverywhere/index.tsx @@ -136,7 +136,7 @@ export default definePlugin({ { find: ".reactorDefault", replacement: { - match: /,onContextMenu:\i=>.{0,15}\((\i),(\i),(\i)\).{0,250}tag:"strong"/, + match: /tag:"strong"(?=.{0,50}\i\.name)(?<=onContextMenu:.{0,15}\((\i),(\i),\i\).+?)/, replace: "$&,style:$self.getColorStyle($2?.id,$1?.channel?.id)" }, predicate: () => settings.store.reactorsList, diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 960a6b62..4415e295 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -632,6 +632,10 @@ export const Devs = /* #__PURE__*/ Object.freeze({ name: "thororen", id: 848339671629299742n }, + alfred: { + name: "alfred", + id: 1038466644353232967n + } } satisfies Record); // iife so #__PURE__ works correctly