Merge branch 'main' into fix-sbbb

This commit is contained in:
ITOH
2021-04-29 11:00:15 +02:00
189 changed files with 963 additions and 797 deletions
+4 -7
View File
@@ -4,10 +4,7 @@ import { rest } from "../../rest/rest.ts";
import { DiscordenoMember } from "../../structures/member.ts";
import { structures } from "../../structures/mod.ts";
import { DiscordGatewayIntents } from "../../types/gateway/gateway_intents.ts";
import {
DiscordGuildMember,
DiscordGuildMemberWithUser,
} from "../../types/guilds/guild_member.ts";
import { GuildMemberWithUser } from "../../types/guilds/guild_member.ts";
import { ListGuildMembers } from "../../types/guilds/list_guild_members.ts";
import { Errors } from "../../types/misc/errors.ts";
import { Collection } from "../../util/collection.ts";
@@ -50,7 +47,7 @@ export async function getMembers(guildId: string, options?: ListGuildMembers) {
);
}
const result: DiscordGuildMember[] = (await rest.runMethod(
const result = (await rest.runMethod<GuildMemberWithUser[]>(
"get",
`${endpoints.GUILD_MEMBERS(guildId)}?limit=${
membersLeft > 1000 ? 1000 : membersLeft
@@ -60,7 +57,7 @@ export async function getMembers(guildId: string, options?: ListGuildMembers) {
const discordenoMembers = await Promise.all(
result.map(async (member) => {
const discordenoMember = await structures.createDiscordenoMember(
member as DiscordGuildMemberWithUser,
member,
guildId,
);
@@ -72,7 +69,7 @@ export async function getMembers(guildId: string, options?: ListGuildMembers) {
return discordenoMember;
}),
) as DiscordenoMember[];
);
if (!discordenoMembers.length) break;