StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge master

Browse source
This commit is contained in:
Dragory 2024-01-27 14:35:11 +02:00
commit 1518d58e25
No known key found for this signature in database
53 changed files with 289 additions and 320 deletions
Download patch file Download diff file Expand all files Collapse all files

15
backend/src/utils/templateSafeObjects.ts
View file

@ -26,7 +26,7 @@ import {
TypedTemplateSafeValueContainer,
ingestDataIntoTemplateSafeValueContainer,
} from "../templateFormatter";
import { UnknownUser, renderUserUsername } from "../utils";
import { UnknownUser, renderUsername } from "../utils";
type InputProps<T> = Omit<
{
@ -49,9 +49,10 @@ export class TemplateSafeUser extends TemplateSafeValueContainer {
id: Snowflake | string;
username: string;
discriminator: string;
globalName?: string;
mention: string;
tag: string;
avatarURL?: string;
avatarURL: string;
bot?: boolean;
createdAt?: number;
renderedUsername: string;
@ -91,7 +92,7 @@ export class TemplateSafeMember extends TemplateSafeUser {
nick: string;
roles: TemplateSafeRole[];
joinedAt?: number;
// guildAvatarURL: string, Once DJS supports per-server avatars
guildAvatarURL: string;
guildName: string;
constructor(data: InputProps<TemplateSafeMember>) {
@ -249,7 +250,7 @@ export function userToTemplateSafeUser(user: User | UnknownUser): TemplateSafeUs
discriminator: "0000",
mention: `<@${user.id}>`,
tag: "Unknown#0000",
renderedUsername: renderUserUsername(user),
renderedUsername: renderUsername(user),
});
}
@ -257,12 +258,13 @@ export function userToTemplateSafeUser(user: User | UnknownUser): TemplateSafeUs
id: user.id,
username: user.username,
discriminator: user.discriminator,
globalName: user.globalName,
mention: `<@${user.id}>`,
tag: user.tag,
avatarURL: user.displayAvatarURL?.(),
avatarURL: user.displayAvatarURL(),
bot: user.bot,
createdAt: user.createdTimestamp,
renderedUsername: renderUserUsername(user),
renderedUsername: renderUsername(user),
});
}
@ -285,6 +287,7 @@ export function memberToTemplateSafeMember(member: GuildMember | PartialGuildMem
nick: member.nickname ?? "*None*",
roles: [...member.roles.cache.mapValues((r) => roleToTemplateSafeRole(r)).values()],
joinedAt: member.joinedTimestamp ?? undefined,
guildAvatarURL: member.displayAvatarURL(),
guildName: member.guild.name,
});
}