Merge branch 'main' into main

src/gateway/handlers/index.ts

@@ -1,5 +1,5 @@
 import { GatewayEventHandler } from '../index.ts'
-import { GatewayEvents } from '../../types/gatewayTypes.ts'
+import { GatewayEvents } from '../../types/gateway.ts'
 import { channelCreate } from './channelCreate.ts'
 import { channelDelete } from './channelDelete.ts'
 import { channelUpdate } from './channelUpdate.ts'

src/gateway/handlers/ready.ts

@@ -1,5 +1,5 @@
 import { User } from '../../structures/user.ts'
-import { GuildPayload } from '../../types/guildTypes.ts'
+import { GuildPayload } from '../../types/guild.ts'
 import { Gateway, GatewayEventHandler } from '../index.ts'
 
 export const ready: GatewayEventHandler = async (gateway: Gateway, d: any) => {

src/models/client.ts

@@ -1,5 +1,5 @@
 import { User } from '../structures/user.ts'
-import { GatewayIntents } from '../types/gatewayTypes.ts'
+import { GatewayIntents } from '../types/gateway.ts'
 import { Gateway } from '../gateway/index.ts'
 import { RESTManager } from './rest.ts'
 import EventEmitter from 'https://deno.land/std@0.74.0/node/events.ts'

src/structures/cdn.ts

@@ -1,4 +1,4 @@
-import { ImageFormats, ImageSize } from '../types/cdnTypes.ts'
+import { ImageFormats, ImageSize } from '../types/cdn.ts'
 
 export const ImageURL = (
   url: string,

src/structures/channel.ts

@@ -1,6 +1,6 @@
 import cache from '../models/cache.ts'
 import { Client } from '../models/client.ts'
-import { ChannelPayload, ChannelTypes } from '../types/channelTypes.ts'
+import { ChannelPayload, ChannelTypes } from '../types/channel.ts'
 import { Base } from './base.ts'
 
 export class Channel extends Base {

src/structures/dmChannel.ts

@@ -1,7 +1,7 @@
 import cache from '../models/cache.ts'
 import { Client } from '../models/client.ts'
-import { DMChannelPayload } from '../types/channelTypes.ts'
-import { UserPayload } from '../types/userTypes.ts'
+import { DMChannelPayload } from '../types/channel.ts'
+import { UserPayload } from '../types/user.ts'
 import { TextChannel } from './textChannel.ts'
 
 export class DMChannel extends TextChannel {

src/structures/embed.ts

@@ -8,7 +8,7 @@ import {
   EmbedThumbnail,
   EmbedTypes,
   EmbedVideo
-} from '../types/channelTypes.ts'
+} from '../types/channel.ts'
 
 export class Embed {
   title?: string

src/structures/emoji.ts

@@ -1,5 +1,5 @@
 import { Client } from '../models/client.ts'
-import { EmojiPayload } from '../types/emojiTypes.ts'
+import { EmojiPayload } from '../types/emoji.ts'
 import { USER } from '../types/endpoint.ts'
 import { Base } from './base.ts'
 import { User } from './user.ts'

src/structures/groupChannel.ts

@@ -1,6 +1,6 @@
 import cache from '../models/cache.ts'
 import { Client } from '../models/client.ts'
-import { GroupDMChannelPayload } from '../types/channelTypes.ts'
+import { GroupDMChannelPayload } from '../types/channel.ts'
 import { Channel } from './channel.ts'
 
 export class GroupDMChannel extends Channel {

src/structures/guild.ts

@@ -1,6 +1,6 @@
 import { Client } from '../models/client.ts'
-import { GuildFeatures, GuildPayload } from '../types/guildTypes.ts'
-import { PresenceUpdatePayload } from '../types/presenceTypes.ts'
+import { GuildFeatures, GuildPayload } from '../types/guild.ts'
+import { PresenceUpdatePayload } from '../types/presence.ts'
 import { Base } from './base.ts'
 import { Channel } from './channel.ts'
 import { Emoji } from './emoji.ts'

src/structures/guildCategoryChannel.ts

@@ -3,7 +3,7 @@ import { Channel } from './channel.ts'
 import {
   GuildChannelCategoryPayload,
   Overwrite
-} from '../types/channelTypes.ts'
+} from '../types/channel.ts'
 import cache from '../models/cache.ts'
 
 export class CategoryChannel extends Channel {

src/structures/guildTextChannel.ts

@@ -1,5 +1,5 @@
 import { Client } from '../models/client.ts'
-import { GuildTextChannelPayload, Overwrite } from '../types/channelTypes.ts'
+import { GuildTextChannelPayload, Overwrite } from '../types/channel.ts'
 import cache from '../models/cache.ts'
 import { TextChannel } from './textChannel.ts'
 

src/structures/guildVoiceChannel.ts

@@ -1,6 +1,6 @@
 import cache from '../models/cache.ts'
 import { Client } from '../models/client.ts'
-import { GuildVoiceChannelPayload, Overwrite } from '../types/channelTypes.ts'
+import { GuildVoiceChannelPayload, Overwrite } from '../types/channel.ts'
 import { Channel } from './channel.ts'
 
 export class VoiceChannel extends Channel {

src/structures/guildnewsChannel.ts

@@ -1,5 +1,5 @@
 import { Client } from '../models/client.ts'
-import { GuildNewsChannelPayload, Overwrite } from '../types/channelTypes.ts'
+import { GuildNewsChannelPayload, Overwrite } from '../types/channel.ts'
 import { TextChannel } from './textChannel.ts'
 
 export class NewsChannel extends TextChannel {

src/structures/invite.ts

@@ -1,8 +1,8 @@
 import { Client } from '../models/client.ts'
-import { ChannelPayload } from '../types/channelTypes.ts'
-import { GuildPayload } from '../types/guildTypes.ts'
-import { InvitePayload } from '../types/inviteTypes.ts'
-import { UserPayload } from '../types/userTypes.ts'
+import { ChannelPayload } from '../types/channel.ts'
+import { GuildPayload } from '../types/guild.ts'
+import { InvitePayload } from '../types/invite.ts'
+import { UserPayload } from '../types/user.ts'
 import { Base } from './base.ts'
 
 export class Invite extends Base {

src/structures/member.ts

@@ -1,6 +1,6 @@
 import cache from '../models/cache.ts'
 import { Client } from '../models/client.ts'
-import { MemberPayload } from '../types/guildTypes.ts'
+import { MemberPayload } from '../types/guild.ts'
 import { Base } from './base.ts'
 import { User } from './user.ts'
 

src/structures/message.ts

@@ -8,7 +8,7 @@ import {
   MessagePayload,
   MessageReference,
   Reaction
-} from '../types/channelTypes.ts'
+} from '../types/channel.ts'
 import { Client } from '../models/client.ts'
 import { User } from './user.ts'
 import { Member } from './member.ts'

src/structures/role.ts

@@ -1,7 +1,7 @@
 import cache from '../models/cache.ts'
 import { Client } from '../models/client.ts'
 import { Base } from './base.ts'
-import { RolePayload } from '../types/roleTypes.ts'
+import { RolePayload } from '../types/role.ts'
 
 export class Role extends Base {
   id: string

src/structures/user.ts

@@ -1,6 +1,6 @@
 import cache from '../models/cache.ts'
 import { Client } from '../models/client.ts'
-import { UserPayload } from '../types/userTypes.ts'
+import { UserPayload } from '../types/user.ts'
 import { Base } from './base.ts'
 
 export class User extends Base {

src/structures/voicestate.ts

@@ -1,7 +1,7 @@
 import cache from '../models/cache.ts'
 import { Client } from '../models/client.ts'
-import { MemberPayload } from '../types/guildTypes.ts'
-import { VoiceStatePayload } from '../types/voiceTypes.ts'
+import { MemberPayload } from '../types/guild.ts'
+import { VoiceStatePayload } from '../types/voice.ts'
 import { Base } from './base.ts'
 
 export class VoiceState extends Base {

src/structures/webhook.ts

@@ -1,6 +1,6 @@
 import { Client } from '../models/client.ts'
-import { UserPayload } from '../types/userTypes.ts'
-import { WebhookPayload } from '../types/webhookTypes.ts'
+import { UserPayload } from '../types/user.ts'
+import { WebhookPayload } from '../types/webhook.ts'
 import { Base } from './base.ts'
 
 export class Webhook extends Base {

src/types/channel.ts

@@ -1,7 +1,7 @@
 import { Embed } from '../structures/embed.ts'
-import { EmojiPayload } from './emojiTypes.ts'
-import { MemberPayload } from './guildTypes.ts'
-import { UserPayload } from './userTypes.ts'
+import { EmojiPayload } from './emoji.ts'
+import { MemberPayload } from './guild.ts'
+import { UserPayload } from './user.ts'
 
 export interface ChannelPayload {
   id: string

src/types/emoji.ts

@@ -1,4 +1,4 @@
-import { UserPayload } from './userTypes.ts'
+import { UserPayload } from './user.ts'
 
 export interface EmojiPayload {
   id: string

src/types/gateway.ts

@@ -1,10 +1,10 @@
 // https://discord.com/developers/docs/topics/opcodes-and-status-codes#gateway
 // https://discord.com/developers/docs/topics/gateway#commands-and-events-gateway-events
-import { EmojiPayload } from './emojiTypes.ts'
-import { MemberPayload } from './guildTypes.ts'
-import { ActivityPayload, PresenceUpdatePayload } from './presenceTypes.ts'
-import { RolePayload } from './roleTypes.ts'
-import { UserPayload } from './userTypes.ts'
+import { EmojiPayload } from './emoji.ts'
+import { MemberPayload } from './guild.ts'
+import { ActivityPayload, PresenceUpdatePayload } from './presence.ts'
+import { RolePayload } from './role.ts'
+import { UserPayload } from './user.ts'
 
 /**
  * Gateway OPcodes from Discord docs.

src/types/gatewayResponse.ts

@@ -1,4 +1,4 @@
-import { GatewayOpcodes, GatewayEvents } from '../types/gatewayTypes.ts'
+import { GatewayOpcodes, GatewayEvents } from './gateway.ts'
 
 /**
  * Gateway response from Discord.

src/types/guild.ts

@@ -1,9 +1,9 @@
-import { ChannelPayload } from './channelTypes.ts'
-import { EmojiPayload } from './emojiTypes.ts'
-import { PresenceUpdatePayload } from './presenceTypes.ts'
-import { RolePayload } from './roleTypes.ts'
-import { UserPayload } from './userTypes.ts'
-import { VoiceStatePayload } from './voiceTypes.ts'
+import { ChannelPayload } from './channel.ts'
+import { EmojiPayload } from './emoji.ts'
+import { PresenceUpdatePayload } from './presence.ts'
+import { RolePayload } from './role.ts'
+import { UserPayload } from './user.ts'
+import { VoiceStatePayload } from './voice.ts'
 
 export interface GuildPayload {
   id: string

src/types/invite.ts

@@ -1,6 +1,6 @@
-import { ChannelPayload } from './channelTypes.ts'
-import { GuildPayload } from './guildTypes.ts'
-import { UserPayload } from './userTypes.ts'
+import { ChannelPayload } from './channel.ts'
+import { GuildPayload } from './guild.ts'
+import { UserPayload } from './user.ts'
 
 export interface InvitePayload {
   code: string

src/types/presence.ts

@@ -1,4 +1,4 @@
-import { UserPayload } from './userTypes.ts'
+import { UserPayload } from './user.ts'
 
 export interface PresenceUpdatePayload {
   user: UserPayload

src/types/template.ts

@@ -1,5 +1,5 @@
-import { GuildPayload } from './guildTypes.ts'
-import { UserPayload } from './userTypes.ts'
+import { GuildPayload } from './guild.ts'
+import { UserPayload } from './user.ts'
 
 export interface TemplatePayload {
   code: string

src/utils/getChannelByType.ts

@@ -8,7 +8,7 @@ import {
   GuildNewsChannelPayload,
   GuildTextChannelPayload,
   GuildVoiceChannelPayload
-} from '../types/channelTypes.ts'
+} from '../types/channel.ts'
 import { DMChannel } from '../structures/dmChannel.ts'
 import { GroupDMChannel } from '../structures/groupChannel.ts'
 import { CategoryChannel } from '../structures/guildCategoryChannel.ts'