diff --git a/src/handlers/READY.ts b/src/handlers/misc/READY.ts similarity index 87% rename from src/handlers/READY.ts rename to src/handlers/misc/READY.ts index 0192c696b..80b946646 100644 --- a/src/handlers/READY.ts +++ b/src/handlers/misc/READY.ts @@ -3,14 +3,14 @@ import { lastShardID, setApplicationID, setBotID, -} from "../bot.ts"; -import { DiscordPayload, ReadyPayload } from "../types/discord.ts"; -import { cache } from "../util/cache.ts"; -import { delay } from "../util/utils.ts"; -import { allowNextShard, basicShards } from "../ws/mod.ts"; -import { initialMemberLoadQueue } from "../structures/guild.ts"; -import { structures } from "../structures/mod.ts"; -import { cacheHandlers } from "../cache.ts"; +} from "../../bot.ts"; +import { cacheHandlers } from "../../cache.ts"; +import { initialMemberLoadQueue } from "../../structures/guild.ts"; +import { structures } from "../../structures/mod.ts"; +import { DiscordPayload, ReadyPayload } from "../../types/discord.ts"; +import { cache } from "../../util/cache.ts"; +import { delay } from "../../util/utils.ts"; +import { allowNextShard, basicShards } from "../../ws/mod.ts"; export async function handleReady( data: DiscordPayload, diff --git a/src/handlers/mod.ts b/src/handlers/mod.ts index 0eb9fc2f7..2beaf2764 100644 --- a/src/handlers/mod.ts +++ b/src/handlers/mod.ts @@ -29,10 +29,10 @@ import { handleMessageReactionRemove } from "./messages/MESSAGE_REACTION_REMOVE. import { handleMessageReactionRemoveAll } from "./messages/MESSAGE_REACTION_REMOVE_ALL.ts"; import { handleMessageReactionRemoveEmoji } from "./messages/MESSAGE_REACTION_REMOVE_EMOJI.ts"; import { handleMessageUpdate } from "./messages/MESSAGE_UPDATE.ts"; +import { handleReady } from "./misc/READY.ts"; import { handlePresenceUpdate } from "./presence/PRESENCE_UPDATE.ts"; import { handleTypingStart } from "./presence/TYPING_START.ts"; import { handleUserUpdate } from "./presence/USER_UPDATE.ts"; -import { handleReady } from "./READY.ts"; import { handleGuildRoleCreate } from "./roles/GUILD_ROLE_CREATE.ts"; import { handleGuildRoleDelete } from "./roles/GUILD_ROLE_DELETE.ts"; import { handleGuildRoleUpdate } from "./roles/GUILD_ROLE_UPDATE.ts"; @@ -85,6 +85,7 @@ export { }; export let handlers = { + // misc READY: handleReady, // channels CHANNEL_CREATE: handleChannelCreate, diff --git a/src/helpers/members/disconnect_member.ts b/src/helpers/members/disconnect_member.ts index d29b96485..a9f192cb0 100644 --- a/src/helpers/members/disconnect_member.ts +++ b/src/helpers/members/disconnect_member.ts @@ -1,9 +1,6 @@ import { editMember } from "./edit_member.ts"; /** Kicks a member from a voice channel */ -export function kickFromVoiceChannel(guildID: string, memberID: string) { +export function disconnectMember(guildID: string, memberID: string) { return editMember(guildID, memberID, { channel_id: null }); } - -// aliases -export { kickFromVoiceChannel as disconnectMember }; diff --git a/src/helpers/mod.ts b/src/helpers/mod.ts index b6fed9609..0f06ff11d 100644 --- a/src/helpers/mod.ts +++ b/src/helpers/mod.ts @@ -58,7 +58,7 @@ import { getChannelInvites } from "./invites/get_channel_invites.ts"; import { getInvite } from "./invites/get_invite.ts"; import { getInvites } from "./invites/get_invites.ts"; import { avatarURL } from "./members/avatar_url.ts"; -import { banMember } from "./members/ban_member.ts"; +import { ban, banMember } from "./members/ban_member.ts"; import { disconnectMember } from "./members/disconnect_member.ts"; import { editBotNickname } from "./members/edit_bot_nickname.ts"; import { editBotProfile } from "./members/edit_bot_profile.ts"; @@ -67,12 +67,12 @@ import { fetchMembers } from "./members/fetch_members.ts"; import { getMember } from "./members/get_member.ts"; import { getMembers } from "./members/get_members.ts"; import { getMembersByQuery } from "./members/get_members_by_query.ts"; -import { kickMember } from "./members/kick_member.ts"; +import { kick, kickMember } from "./members/kick_member.ts"; import { moveMember } from "./members/move_member.ts"; import { pruneMembers } from "./members/prune_members.ts"; import { rawAvatarURL } from "./members/raw_avatar_url.ts"; import { sendDirectMessage } from "./members/send_direct_message.ts"; -import { unbanMember } from "./members/unban_member.ts"; +import { unban, unbanMember } from "./members/unban_member.ts"; import { addReaction } from "./messages/add_reaction.ts"; import { addReactions } from "./messages/add_reactions.ts"; import { deleteMessage } from "./messages/delete_message.ts"; @@ -81,14 +81,14 @@ import { editMessage } from "./messages/edit_message.ts"; import { getMessage } from "./messages/get_message.ts"; import { getMessages } from "./messages/get_messages.ts"; import { getReactions } from "./messages/get_reactions.ts"; -import { pinMessage } from "./messages/pin_message.ts"; +import { pin, pinMessage } from "./messages/pin_message.ts"; import { publishMessage } from "./messages/publish_message.ts"; import { removeAllReactions } from "./messages/remove_all_reactions.ts"; import { removeReaction } from "./messages/remove_reaction.ts"; import { removeReactionEmoji } from "./messages/remove_reaction_emoji.ts"; import { removeUserReaction } from "./messages/remove_user_reaction.ts"; import { sendMessage } from "./messages/send_message.ts"; -import { unpinMessage } from "./messages/unpin_message.ts"; +import { unpin, unpinMessage } from "./messages/unpin_message.ts"; import { getGatewayBot } from "./misc/get_gateway_bot.ts"; import { getUser } from "./misc/get_user.ts"; import { addRole } from "./roles/add_role.ts"; @@ -122,6 +122,7 @@ export { addReactions, addRole, avatarURL, + ban, banMember, categoryChildrenIDs, channelOverwriteHasPermission, @@ -213,9 +214,11 @@ export { guildIconURL, guildSplashURL, isChannelSynced, + kick, kickMember, leaveGuild, moveMember, + pin, pinMessage, pruneMembers, publishMessage, @@ -232,7 +235,9 @@ export { swapRoles, syncGuildTemplate, syncIntegration, + unban, unbanMember, + unpin, unpinMessage, upsertSlashCommand, upsertSlashCommands,