daenamnu/discordeno
1
0
Fork 0
mirror of https://github.com/discordeno/discordeno.git synced 2026-09-17 08:47:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: undefined handling of guilds

Browse Source
This commit is contained in:
Skillz4Killz
2021-08-15 17:39:55 +00:00
committed by GitHub
parent b8a993b6b8
commit cc59c977ad
1 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/structures/member.ts
+21 -23
View File
@@ -165,29 +165,9 @@ export async function createDiscordenoMember(
MEMBER_SNOWFLAKES.includes(key) ? (user[key] ? snowflakeToBigint(user[key] as string) : undefined) : user[key]
);
}
const member: DiscordenoMember = Object.create(baseMember, props);
/** The guild related data mapped by guild id */
if (!cache.requiredStructureProperties.members.size || cache.requiredStructureProperties.members.has("guilds")) {
props.guilds = createNewProp(new Collection<bigint, GuildMember>());
const cached = await cacheHandlers.get("members", snowflakeToBigint(user.id));
if (cached) {
for (const [id, guild] of cached.guilds.entries()) {
eventHandlers.debug?.("loop", `Running for of for cached.guilds.entries() loop in DiscordenoMember function.`);
member.guilds.set(id, guild);
}
// User was never cached before
member.guilds.set(guildId, {
nick: data.nick,
roles: data.roles.map((id) => snowflakeToBigint(id)),
joinedAt: joinedAt ? Date.parse(joinedAt) : undefined,
premiumSince: premiumSince ? Date.parse(premiumSince) : undefined,
deaf: data.deaf,
mute: data.mute,
});
}
}
if (!cache.requiredStructureProperties.members.size || cache.requiredStructureProperties.members.has("bitfield"))
@@ -196,6 +176,26 @@ export async function createDiscordenoMember(
if (!cache.requiredStructureProperties.members.size || cache.requiredStructureProperties.members.has("cachedAt"))
props.cachedAt = createNewProp(Date.now());
const member: DiscordenoMember = Object.create(baseMember, props);
const cached = await cacheHandlers.get("members", snowflakeToBigint(user.id));
if (cached?.guilds) {
for (const [id, guild] of cached.guilds.entries()) {
eventHandlers.debug?.("loop", `Running for of for cached.guilds.entries() loop in DiscordenoMember function.`);
member.guilds.set(id, guild);
}
// User was never cached before
member.guilds.set(guildId, {
nick: data.nick,
roles: data.roles.map((id) => snowflakeToBigint(id)),
joinedAt: joinedAt ? Date.parse(joinedAt) : undefined,
premiumSince: premiumSince ? Date.parse(premiumSince) : undefined,
deaf: data.deaf,
mute: data.mute,
});
}
return member;
}
@@ -239,9 +239,7 @@ export interface DiscordenoMember extends Omit<User, "discriminator" | "id" | "a
/** Get the nickname or the username if no nickname */
name(guildId: bigint): string;
/** Get the guild member object for the specified guild */
guildMember(
guildId: bigint
):
guildMember(guildId: bigint):
| (Omit<GuildMember, "joinedAt" | "premiumSince" | "roles"> & {
joinedAt?: number;
premiumSince?: number;