HMC
/
handmade-revolt
forked from abner/for-legacy-web
2
0
Fork 0
Code Pull Requests Actions Activity

feat: render masquerade colour

feat/custom-emoji-autocomplete
Paul Makles 2022-07-15 21:38:11 +01:00
parent 62a427b7a7
commit 1a0b4b5703
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/common/user/UserShort.tsx
View File

@ -55,7 +55,7 @@ export const Username = observer(
...otherProps ...otherProps
}: UsernameProps) => { }: UsernameProps) => {
let username = user?.username; let username = user?.username;
let color; let color = masquerade?.colour;
if (user && showServerIdentity) { if (user && showServerIdentity) {
const { server } = useParams<{ server?: string }>(); const { server } = useParams<{ server?: string }>();
@ -75,20 +75,10 @@ export const Username = observer(
} }
} }
const role = member.hoistedRole; if (!color) {
if (role) { for (const [_, { colour }] of member.orderedRoles) {
color = role[1].colour; if (colour) {
} color = colour;
if (member.roles && member.roles.length > 0) {
const srv = client.servers.get(member._id.server);
if (srv?.roles) {
for (const role of member.roles) {
const c = srv.roles[role]?.colour;
if (c) {
color = c;
continue;
}
} }
} }
} }