mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-06-24 22:07:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge remote-tracking branch 'upstream/dev' into dev

Browse source 
# Conflicts:
#	eslint.config.mjs
#	package.json
#	pnpm-lock.yaml
#	src/components/PluginSettings/index.tsx
#	src/plugins/imageZoom/index.tsx
#	src/plugins/messageLogger/index.tsx
#	src/plugins/pictureInPicture/index.tsx
#	src/plugins/serverInfo/GuildInfoModal.tsx
#	src/plugins/whoReacted/index.tsx
This commit is contained in:
thororen1234 2025-01-04 17:57:05 -05:00
commit f8879cc801
114 changed files with 2092 additions and 893 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/equicordplugins/showBadgesInChat/index.tsx
View file

@ -15,6 +15,7 @@ const RoleIconComponent = findComponentByCodeLazy("#{intl::ROLE_ICON_ALT_TEXT}")
import "./styles.css";
import { User } from "discord-types/general";
import { JSX } from "react";
import settings from "./settings";
@ -41,6 +42,7 @@ function CheckBadge({ badge, author }: { badge: string; author: User; }): JSX.El
<span style={{ order: settings.store.EquicordDonorPosition }}>
{badges.getEquicordDonorBadges(author.id)?.map((badge: any) => (
<RoleIconComponent
key={author.id}
className={roleIconClassName}
name={badge.description}
size={20}
@ -65,6 +67,7 @@ function CheckBadge({ badge, author }: { badge: string; author: User; }): JSX.El
<span style={{ order: settings.store.VencordDonorPosition }}>
{badges.getDonorBadges(author.id)?.map(badge => (
<RoleIconComponent
key={author.id}
className={roleIconClassName}
name={badge.description}
size={20}
@ -90,6 +93,7 @@ function CheckBadge({ badge, author }: { badge: string; author: User; }): JSX.El
.map(badge => (
<RoleIconComponent
key={author.id}
className={roleIconClassName}
name={badge[1]}
size={20}