refactor(helpers): separate functions into files (#667)

* refactor(helpers): separate functions into files

* idk

* idk

src/structures/channel.ts

@@ -1,3 +1,10 @@
+import { channelOverwriteHasPermission } from "../helpers/channels/channel_overwrite_has_permission.ts";
+import { deleteChannel } from "../helpers/channels/delete_channel.ts";
+import { deleteChannelOverwrite } from "../helpers/channels/delete_channel_overwrite.ts";
+import { editChannel } from "../helpers/channels/edit_channel.ts";
+import { editChannelOverwrite } from "../helpers/channels/edit_channel_overwrite.ts";
+import { kickFromVoiceChannel } from "../helpers/members/disconnect_member.ts";
+import { sendMessage } from "../helpers/messages/send_message.ts";
 import {
   ChannelCreatePayload,
   ChannelEditOptions,
@@ -10,17 +17,6 @@ import {
 import { cache } from "../util/cache.ts";
 import { Collection } from "../util/collection.ts";
 import { createNewProp } from "../util/utils.ts";
-import {
-  channelOverwriteHasPermission,
-  editChannel,
-  sendMessage,
-} from "../helpers/channel.ts";
-import {
-  deleteChannel,
-  deleteChannelOverwrite,
-  editChannelOverwrite,
-} from "../helpers/guild.ts";
-import { kickFromVoiceChannel } from "../helpers/member.ts";
 import { CleanVoiceState, Guild } from "./guild.ts";
 import { Member } from "./member.ts";
 import { Message } from "./message.ts";

src/structures/guild.ts

@@ -1,4 +1,16 @@
 import { botID } from "../bot.ts";
+import { cacheHandlers } from "../cache.ts";
+import { deleteServer } from "../helpers/guilds/delete_server.ts";
+import { editGuild } from "../helpers/guilds/edit_guild.ts";
+import { getAuditLogs } from "../helpers/guilds/get_audit_logs.ts";
+import { getBan } from "../helpers/guilds/get_ban.ts";
+import { getBans } from "../helpers/guilds/get_bans.ts";
+import { guildBannerURL } from "../helpers/guilds/guild_banner_url.ts";
+import { guildIconURL } from "../helpers/guilds/guild_icon_url.ts";
+import { leaveGuild } from "../helpers/guilds/leave_guild.ts";
+import { getInvites } from "../helpers/invites/get_invites.ts";
+import { banMember } from "../helpers/members/ban_member.ts";
+import { unbanMember } from "../helpers/members/unban_member.ts";
 import {
   BanOptions,
   CreateGuildPayload,
@@ -16,20 +28,6 @@ import {
 import { cache } from "../util/cache.ts";
 import { Collection } from "../util/collection.ts";
 import { createNewProp } from "../util/utils.ts";
-import { cacheHandlers } from "../cache.ts";
-import {
-  ban,
-  deleteServer,
-  editGuild,
-  getAuditLogs,
-  getBan,
-  getBans,
-  getInvites,
-  guildBannerURL,
-  guildIconURL,
-  leaveGuild,
-  unban,
-} from "../helpers/guild.ts";
 import { Member } from "./member.ts";
 import { Channel, Role, structures } from "./mod.ts";
 
@@ -91,10 +89,10 @@ const baseGuild: Partial<Guild> = {
     return getBans(this.id!);
   },
   ban(memberID, options) {
-    return ban(this.id!, memberID, options);
+    return banMember(this.id!, memberID, options);
   },
   unban(memberID) {
-    return unban(this.id!, memberID);
+    return unbanMember(this.id!, memberID);
   },
   invites() {
     return getInvites(this.id!);
@@ -348,9 +346,9 @@ export interface Guild {
   /** Returns a list of ban objects for the users banned from this guild. Requires the BAN_MEMBERS permission. */
   bans(): ReturnType<typeof getBans>;
   /** Ban a user from the guild and optionally delete previous messages sent by the user. Requires the BAN_MEMBERS permission. */
-  ban(memberID: string, options: BanOptions): ReturnType<typeof ban>;
+  ban(memberID: string, options: BanOptions): ReturnType<typeof banMember>;
   /** Remove the ban for a user. Requires BAN_MEMBERS permission */
-  unban(memberID: string): ReturnType<typeof unban>;
+  unban(memberID: string): ReturnType<typeof unbanMember>;
   /** Get all the invites for this guild. Requires MANAGE_GUILD permission */
   invites(): ReturnType<typeof getInvites>;
 }

src/structures/member.ts

@@ -1,3 +1,11 @@
+import { cacheHandlers } from "../cache.ts";
+import { banMember } from "../helpers/members/ban_member.ts";
+import { editMember } from "../helpers/members/edit_member.ts";
+import { kickMember } from "../helpers/members/kick_member.ts";
+import { rawAvatarURL } from "../helpers/members/raw_avatar_url.ts";
+import { sendDirectMessage } from "../helpers/members/send_direct_message.ts";
+import { addRole } from "../helpers/roles/add_role.ts";
+import { removeRole } from "../helpers/roles/remove_role.ts";
 import {
   BanOptions,
   EditMemberOptions,
@@ -10,16 +18,6 @@ import {
 import { cache } from "../util/cache.ts";
 import { Collection } from "../util/collection.ts";
 import { createNewProp } from "../util/utils.ts";
-import { cacheHandlers } from "../cache.ts";
-import { ban } from "../helpers/guild.ts";
-import {
-  addRole,
-  editMember,
-  kick,
-  rawAvatarURL,
-  removeRole,
-  sendDirectMessage,
-} from "../helpers/member.ts";
 import { Guild } from "./guild.ts";
 
 const baseMember: Partial<Member> = {
@@ -56,13 +54,13 @@ const baseMember: Partial<Member> = {
     return sendDirectMessage(this.id!, content);
   },
   kick(guildID, reason) {
-    return kick(guildID, this.id!, reason);
+    return kickMember(guildID, this.id!, reason);
   },
   edit(guildID, options) {
     return editMember(guildID, this.id!, options);
   },
   ban(guildID, options) {
-    return ban(guildID, this.id!, options);
+    return banMember(guildID, this.id!, options);
   },
   addRole(guildID, roleID, reason) {
     return addRole(guildID, this.id!, roleID, reason);
@@ -181,14 +179,14 @@ export interface Member {
     content: string | MessageContent,
   ): ReturnType<typeof sendDirectMessage>;
   /** Kick the member from a guild */
-  kick(guildID: string, reason?: string): ReturnType<typeof kick>;
+  kick(guildID: string, reason?: string): ReturnType<typeof kickMember>;
   /** Edit the member in a guild */
   edit(
     guildID: string,
     options: EditMemberOptions,
   ): ReturnType<typeof editMember>;
   /** Ban a member in a guild */
-  ban(guildID: string, options: BanOptions): ReturnType<typeof ban>;
+  ban(guildID: string, options: BanOptions): ReturnType<typeof banMember>;
   /** Add a role to the member */
   addRole(
     guildID: string,

src/structures/message.ts

@@ -1,3 +1,14 @@
+import { cacheHandlers } from "../cache.ts";
+import { sendDirectMessage } from "../helpers/members/send_direct_message.ts";
+import { addReaction } from "../helpers/messages/add_reaction.ts";
+import { addReactions } from "../helpers/messages/add_reactions.ts";
+import { deleteMessageByID } from "../helpers/messages/delete_message_by_id.ts";
+import { editMessage } from "../helpers/messages/edit_message.ts";
+import { pinMessage } from "../helpers/messages/pin_message.ts";
+import { removeAllReactions } from "../helpers/messages/remove_all_reactions.ts";
+import { removeReaction } from "../helpers/messages/remove_reaction.ts";
+import { removeReactionEmoji } from "../helpers/messages/remove_reaction_emoji.ts";
+import { sendMessage } from "../helpers/messages/send_message.ts";
 import {
   Activity,
   Application,
@@ -9,24 +20,10 @@ import {
   MessageCreateOptions,
   MessageSticker,
   Reaction,
-  Reference,
   UserPayload,
 } from "../types/mod.ts";
 import { cache } from "../util/cache.ts";
 import { createNewProp } from "../util/utils.ts";
-import { cacheHandlers } from "../cache.ts";
-import { sendMessage } from "../helpers/channel.ts";
-import { sendDirectMessage } from "../helpers/member.ts";
-import {
-  addReaction,
-  addReactions,
-  deleteMessageByID,
-  editMessage,
-  pin,
-  removeAllReactions,
-  removeReaction,
-  removeReactionEmoji,
-} from "../helpers/message.ts";
 import { Channel } from "./channel.ts";
 import { Guild } from "./guild.ts";
 import { Member } from "./member.ts";
@@ -76,7 +73,7 @@ const baseMessage: Partial<Message> = {
     return editMessage(this as Message, content);
   },
   pin() {
-    return pin(this.channelID!, this.id!);
+    return pinMessage(this.channelID!, this.id!);
   },
   addReaction(reaction) {
     return addReaction(this.channelID!, this.id!, reaction);
@@ -260,7 +257,7 @@ export interface Message {
   /** Edit the message */
   edit(content: string | MessageContent): ReturnType<typeof editMessage>;
   /** Pins the message in the channel */
-  pin(): ReturnType<typeof pin>;
+  pin(): ReturnType<typeof pinMessage>;
   /** Add a reaction to the message */
   addReaction(reaction: string): ReturnType<typeof addReaction>;
   /** Add multiple reactions to the message without or without order. */

src/structures/role.ts

@@ -1,8 +1,9 @@
+import { deleteRole } from "../helpers/roles/delete_role.ts";
+import { editRole } from "../helpers/roles/edit_role.ts";
 import { CreateRoleOptions, RoleData } from "../types/mod.ts";
 import { cache } from "../util/cache.ts";
 import { Collection } from "../util/collection.ts";
 import { createNewProp } from "../util/utils.ts";
-import { deleteRole, editRole } from "../helpers/guild.ts";
 import { Guild } from "./guild.ts";
 import { Member } from "./member.ts";