mirror of
https://github.com/discordeno/discordeno.git
synced 2026-09-17 16:57:22 +00:00
Merge branch 'fp-attempt-9001' of https://github.com/discordeno/discordeno into fp-attempt-9001
This commit is contained in:
@@ -9,12 +9,14 @@ export async function handleGuildMembersChunk(bot: Bot, data: DiscordGatewayPayl
|
||||
const guildId = bot.transformers.snowflake(payload.guild_id);
|
||||
|
||||
await bot.cache.execute("GUILD_MEMBER_CHUNK", {
|
||||
members: payload.members.map((m) => bot.transformers.member(bot, m, guildId, bot.transformers.snowflake(m.user.id))),
|
||||
members: payload.members.map((m) =>
|
||||
bot.transformers.member(bot, m, guildId, bot.transformers.snowflake(m.user.id))
|
||||
),
|
||||
users: payload.members.map((m) => bot.transformers.user(bot, m.user)),
|
||||
});
|
||||
|
||||
if (!payload.nonce) return;
|
||||
|
||||
|
||||
// Check if its necessary to resolve the fetchmembers promise for this chunk or if more chunks will be coming
|
||||
const resolve = bot.cache.fetchAllMembersProcessingRequests.get(payload.nonce);
|
||||
if (!resolve) return;
|
||||
@@ -27,4 +29,4 @@ export async function handleGuildMembersChunk(bot: Bot, data: DiscordGatewayPayl
|
||||
|
||||
// TODO: add a helper function that runs await fetch
|
||||
// await fetchMembers();
|
||||
// const members = await bot.cache.members.findMany(guildId);
|
||||
// const members = await bot.cache.members.findMany(guildId);
|
||||
|
||||
@@ -21,7 +21,7 @@ export async function handleMessageDeleteBulk(bot: Bot, data: DiscordGatewayPayl
|
||||
channelId: bot.transformers.snowflake(payload.channel_id),
|
||||
guildId: payload.guild_id ? bot.transformers.snowflake(payload.guild_id) : undefined,
|
||||
},
|
||||
message
|
||||
message
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ export async function handleMessageReactionAdd(bot: Bot, data: DiscordGatewayPay
|
||||
const payload = data.d as SnakeCasedPropertiesDeep<MessageReactionAdd>;
|
||||
|
||||
const guildId = payload.guild_id ? bot.transformers.snowflake(payload.guild_id) : undefined;
|
||||
const userId = bot.transformers.snowflake(payload.user_id)
|
||||
const userId = bot.transformers.snowflake(payload.user_id);
|
||||
bot.events.reactionAdd(bot, {
|
||||
userId,
|
||||
channelId: bot.transformers.snowflake(payload.channel_id),
|
||||
|
||||
@@ -7,8 +7,8 @@ export function handleTypingStart(bot: Bot, data: DiscordGatewayPayload) {
|
||||
const payload = data.d as SnakeCasedPropertiesDeep<TypingStart>;
|
||||
|
||||
const guildId = payload.guild_id ? bot.transformers.snowflake(payload.guild_id) : undefined;
|
||||
const userId = bot.transformers.snowflake(payload.user_id)
|
||||
|
||||
const userId = bot.transformers.snowflake(payload.user_id);
|
||||
|
||||
bot.events.typingStart(bot, {
|
||||
guildId,
|
||||
channelId: bot.transformers.snowflake(payload.channel_id),
|
||||
|
||||
@@ -15,10 +15,7 @@ import type { DiscordenoMember } from "../../transformers/member.ts";
|
||||
*/
|
||||
export async function getMembers(bot: Bot, guildId: bigint, options?: ListGuildMembers & { addToCache?: boolean }) {
|
||||
// Check if intents is not 0 as proxy ws won't set intents in other instances
|
||||
if (
|
||||
bot.intents &&
|
||||
!(bot.intents & DiscordGatewayIntents.GuildMembers)
|
||||
) {
|
||||
if (bot.intents && !(bot.intents & DiscordGatewayIntents.GuildMembers)) {
|
||||
throw new Error(bot.constants.Errors.MISSING_INTENT_GUILD_MEMBERS);
|
||||
}
|
||||
|
||||
@@ -46,7 +43,12 @@ export async function getMembers(bot: Bot, guildId: bigint, options?: ListGuildM
|
||||
|
||||
const discordenoMembers = await Promise.all(
|
||||
result.map(async (member) => {
|
||||
const discordenoMember = bot.transformers.member(bot, member, guildId, bot.transformers.snowflake(member.user.id));
|
||||
const discordenoMember = bot.transformers.member(
|
||||
bot,
|
||||
member,
|
||||
guildId,
|
||||
bot.transformers.snowflake(member.user.id)
|
||||
);
|
||||
|
||||
if (options?.addToCache !== false) {
|
||||
await bot.cache.members.set(discordenoMember.id, discordenoMember);
|
||||
|
||||
@@ -37,7 +37,12 @@ export async function searchMembers(
|
||||
|
||||
const members = await Promise.all(
|
||||
result.map(async (member) => {
|
||||
const discordenoMember = bot.transformers.member(bot, member, guildId, bot.transformers.snowflake(member.user.id));
|
||||
const discordenoMember = bot.transformers.member(
|
||||
bot,
|
||||
member,
|
||||
guildId,
|
||||
bot.transformers.snowflake(member.user.id)
|
||||
);
|
||||
if (options?.cache) {
|
||||
await bot.cache.members.set(discordenoMember.id, discordenoMember);
|
||||
}
|
||||
|
||||
@@ -26,8 +26,8 @@ export function transformInvite(bot: Bot, invite: SnakeCasedPropertiesDeep<Invit
|
||||
targetUser: invite.target_user ? bot.transformers.user(bot, invite.target_user) : undefined,
|
||||
/** The embedded application to open for this voice channel embedded application invite */
|
||||
targetApplication: invite.target_application
|
||||
// @ts-ignore should not break anything even though its partial. if it does blame wolf :)
|
||||
? bot.transformers.application(bot, invite.target_application)
|
||||
? // @ts-ignore should not break anything even though its partial. if it does blame wolf :)
|
||||
bot.transformers.application(bot, invite.target_application)
|
||||
: undefined,
|
||||
/** Whether or not the invite is temporary (invited users will be kicked on disconnect unless they're assigned a role) */
|
||||
temporary: invite.temporary,
|
||||
|
||||
Reference in New Issue
Block a user