diff --git a/src/helpers/members/ban_member.ts b/src/helpers/members/ban_member.ts index cb01fa8c9..c1257cf08 100644 --- a/src/helpers/members/ban_member.ts +++ b/src/helpers/members/ban_member.ts @@ -1,5 +1,5 @@ -import { CreateGuildBan } from "../../types/guilds/create_guild_ban.ts"; import { rest } from "../../rest/rest.ts"; +import { CreateGuildBan } from "../../types/guilds/create_guild_ban.ts"; import { endpoints } from "../../util/constants.ts"; import { requireBotGuildPermissions } from "../../util/permissions.ts"; import { camelKeysToSnakeCase } from "../../util/utils.ts"; @@ -12,13 +12,11 @@ export async function ban( ) { await requireBotGuildPermissions(guildId, ["BAN_MEMBERS"]); - const result = await rest.runMethod( + return await rest.runMethod( "put", endpoints.GUILD_BAN(guildId, id), camelKeysToSnakeCase(options), ); - - return result; } // aliases diff --git a/src/helpers/members/edit_bot_nickname.ts b/src/helpers/members/edit_bot_nickname.ts index 5b182cfcd..f9b41bb3c 100644 --- a/src/helpers/members/edit_bot_nickname.ts +++ b/src/helpers/members/edit_bot_nickname.ts @@ -9,9 +9,13 @@ export async function editBotNickname( ) { await requireBotGuildPermissions(guildId, ["CHANGE_NICKNAME"]); - const response = await rest.runMethod("patch", endpoints.USER_NICK(guildId), { - nick: nickname, - }) as { nick: string }; + const response = await rest.runMethod<{ nick: string }>( + "patch", + endpoints.USER_NICK(guildId), + { + nick: nickname, + }, + ); return response.nick; } diff --git a/src/helpers/members/edit_bot_profile.ts b/src/helpers/members/edit_bot_profile.ts index 062d0433f..2e4fd6c7c 100644 --- a/src/helpers/members/edit_bot_profile.ts +++ b/src/helpers/members/edit_bot_profile.ts @@ -1,5 +1,6 @@ import { rest } from "../../rest/rest.ts"; import { Errors } from "../../types/misc/errors.ts"; +import { User } from "../../types/mod.ts"; import { endpoints } from "../../util/constants.ts"; import { urlToBase64 } from "../../util/utils.ts"; @@ -26,10 +27,9 @@ export async function editBotProfile(username?: string, botAvatarURL?: string) { } const avatar = botAvatarURL ? await urlToBase64(botAvatarURL) : undefined; - const result = await rest.runMethod("patch", endpoints.USER_BOT, { + + return await rest.runMethod("patch", endpoints.USER_BOT, { username: username?.trim(), avatar, }); - - return result; } diff --git a/src/helpers/members/edit_member.ts b/src/helpers/members/edit_member.ts index 562bc47ed..915e17cb3 100644 --- a/src/helpers/members/edit_member.ts +++ b/src/helpers/members/edit_member.ts @@ -1,7 +1,7 @@ import { cacheHandlers } from "../../cache.ts"; import { rest } from "../../rest/rest.ts"; import { structures } from "../../structures/mod.ts"; -import { DiscordGuildMember } from "../../types/guilds/guild_member.ts"; +import { GuildMember } from "../../types/guilds/guild_member.ts"; import { Errors } from "../../types/misc/errors.ts"; import { ModifyGuildMember } from "../../types/mod.ts"; import { PermissionStrings } from "../../types/permissions/permission_strings.ts"; @@ -10,10 +10,7 @@ import { requireBotChannelPermissions, requireBotGuildPermissions, } from "../../util/permissions.ts"; -import { - camelKeysToSnakeCase, - snakeKeysToCamelCase, -} from "../../util/utils.ts"; +import { camelKeysToSnakeCase } from "../../util/utils.ts"; /** Edit the member */ export async function editMember( @@ -72,13 +69,14 @@ export async function editMember( await requireBotGuildPermissions(guildId, [...requiredPerms]); - const result = await rest.runMethod( + const result = await rest.runMethod( "patch", endpoints.GUILD_MEMBER(guildId, memberId), camelKeysToSnakeCase(options), - ) as DiscordGuildMember; + ); + const member = await structures.createDiscordenoMember( - snakeKeysToCamelCase(result), + result, guildId, ); diff --git a/src/helpers/members/get_member.ts b/src/helpers/members/get_member.ts index c59716433..8605fbe4c 100644 --- a/src/helpers/members/get_member.ts +++ b/src/helpers/members/get_member.ts @@ -1,7 +1,7 @@ import { cacheHandlers } from "../../cache.ts"; import { rest } from "../../rest/rest.ts"; import { structures } from "../../structures/mod.ts"; -import { DiscordGuildMemberWithUser } from "../../types/guilds/guild_member.ts"; +import { GuildMemberWithUser } from "../../types/guilds/guild_member.ts"; import { endpoints } from "../../util/constants.ts"; /** Returns a guild member object for the specified user. @@ -16,7 +16,7 @@ export async function getMember( const guild = await cacheHandlers.get("guilds", guildId); if (!guild && !options?.force) return; - const data: DiscordGuildMemberWithUser = (await rest.runMethod( + const data = (await rest.runMethod( "get", endpoints.GUILD_MEMBER(guildId, id), )); diff --git a/src/helpers/members/get_members.ts b/src/helpers/members/get_members.ts index 396eb844f..adb3fc607 100644 --- a/src/helpers/members/get_members.ts +++ b/src/helpers/members/get_members.ts @@ -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 { GuildMember } 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"; @@ -49,7 +46,7 @@ export async function getMembers(guildId: string, options?: ListGuildMembers) { ); } - const result: DiscordGuildMember[] = (await rest.runMethod( + const result = (await rest.runMethod( "get", `${endpoints.GUILD_MEMBERS(guildId)}?limit=${ membersLeft > 1000 ? 1000 : membersLeft @@ -59,7 +56,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, ); @@ -71,7 +68,7 @@ export async function getMembers(guildId: string, options?: ListGuildMembers) { return discordenoMember; }), - ) as DiscordenoMember[]; + ); if (!discordenoMembers.length) break; diff --git a/src/helpers/members/kick_member.ts b/src/helpers/members/kick_member.ts index 3adee00f6..8dbefc72e 100644 --- a/src/helpers/members/kick_member.ts +++ b/src/helpers/members/kick_member.ts @@ -20,13 +20,11 @@ export async function kick(guildId: string, memberId: string, reason?: string) { await requireBotGuildPermissions(guildId, ["KICK_MEMBERS"]); - const result = await rest.runMethod( + return await rest.runMethod( "delete", endpoints.GUILD_MEMBER(guildId, memberId), { reason }, ); - - return result; } // aliases diff --git a/src/helpers/members/prune_members.ts b/src/helpers/members/prune_members.ts index 3527136d5..ae8fc190c 100644 --- a/src/helpers/members/prune_members.ts +++ b/src/helpers/members/prune_members.ts @@ -19,11 +19,11 @@ export async function pruneMembers( await requireBotGuildPermissions(guildId, ["KICK_MEMBERS"]); - const result = await rest.runMethod( + const result = await rest.runMethod<{ pruned: number }>( "post", endpoints.GUILD_PRUNE(guildId), camelKeysToSnakeCase(options), ); - return result; + return result.pruned; } diff --git a/src/helpers/members/search_members.ts b/src/helpers/members/search_members.ts index f9fb1b76b..12202aba2 100644 --- a/src/helpers/members/search_members.ts +++ b/src/helpers/members/search_members.ts @@ -2,7 +2,7 @@ import { cacheHandlers } from "../../cache.ts"; import { rest } from "../../rest/rest.ts"; import { DiscordenoMember } from "../../structures/member.ts"; import { structures } from "../../structures/mod.ts"; -import { DiscordGuildMemberWithUser } from "../../types/guilds/guild_member.ts"; +import { GuildMemberWithUser } from "../../types/guilds/guild_member.ts"; import { SearchGuildMembers } from "../../types/members/search_guild_members.ts"; import { Errors } from "../../types/misc/errors.ts"; import { Collection } from "../../util/collection.ts"; @@ -24,7 +24,7 @@ export async function searchMembers( } } - const result = await rest.runMethod( + const result = await rest.runMethod( "get", endpoints.GUILD_MEMBERS_SEARCH(guildId), { diff --git a/src/helpers/members/send_direct_message.ts b/src/helpers/members/send_direct_message.ts index 841e81856..ce01eaeda 100644 --- a/src/helpers/members/send_direct_message.ts +++ b/src/helpers/members/send_direct_message.ts @@ -1,7 +1,7 @@ import { cacheHandlers } from "../../cache.ts"; import { rest } from "../../rest/rest.ts"; import { structures } from "../../structures/mod.ts"; -import { DiscordChannel } from "../../types/channels/channel.ts"; +import { Channel } from "../../types/channels/channel.ts"; import { CreateMessage } from "../../types/messages/create_message.ts"; import { endpoints } from "../../util/constants.ts"; import { sendMessage } from "../messages/send_message.ts"; @@ -14,11 +14,15 @@ export async function sendDirectMessage( let dmChannel = await cacheHandlers.get("channels", memberId); if (!dmChannel) { // If not available in cache create a new one. - const dmChannelData = await rest.runMethod("post", endpoints.USER_DM, { - recipient_id: memberId, - }); + const dmChannelData = await rest.runMethod( + "post", + endpoints.USER_DM, + { + recipient_id: memberId, + }, + ); const discordenoChannel = await structures.createDiscordenoChannel( - dmChannelData as DiscordChannel, + dmChannelData, ); // Recreate the channel and add it undert he users id await cacheHandlers.set("channels", memberId, discordenoChannel); @@ -26,5 +30,5 @@ export async function sendDirectMessage( } // If it does exist try sending a message to this user - return sendMessage(dmChannel.id, content); + return await sendMessage(dmChannel.id, content); } diff --git a/src/helpers/members/unban_member.ts b/src/helpers/members/unban_member.ts index db79fe2fd..a6c429fb8 100644 --- a/src/helpers/members/unban_member.ts +++ b/src/helpers/members/unban_member.ts @@ -6,12 +6,10 @@ import { requireBotGuildPermissions } from "../../util/permissions.ts"; export async function unban(guildId: string, id: string) { await requireBotGuildPermissions(guildId, ["BAN_MEMBERS"]); - const result = await rest.runMethod( + return await rest.runMethod( "delete", endpoints.GUILD_BAN(guildId, id), ); - - return result; } // aliases