run cargo fmt && cargo fix

src/api/guilds/mod.rs

@@ -1,3 +1 @@
 pub mod guilds;
-
-use guilds::*;

src/types/config/types/subconfigs/region/mod.rs

@@ -1,7 +1,5 @@
 use serde::{Deserialize, Serialize};
 
-
-
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct LatLong {
     pub latitude: f64,

src/types/entities/attachment.rs

@@ -1,4 +1,3 @@
-use crate::types::Message;
 use serde::{Deserialize, Serialize};
 
 use crate::types::utils::Snowflake;

src/types/entities/audit_log.rs

@@ -13,7 +13,7 @@ pub struct AuditLogEntry {
     pub action_type: u8,
     // to:do add better options type
     pub options: Option<serde_json::Value>,
-    pub reason: Option<String>
+    pub reason: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
@@ -21,5 +21,5 @@ pub struct AuditLogEntry {
 pub struct AuditLogChange {
     pub new_value: Option<serde_json::Value>,
     pub old_value: Option<serde_json::Value>,
-    pub key: String
+    pub key: String,
 }

src/types/entities/auto_moderation.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use serde_repr::{Serialize_repr, Deserialize_repr};
+use serde_repr::{Deserialize_repr, Serialize_repr};
 
 use crate::types::utils::Snowflake;
 
@@ -25,7 +25,7 @@ pub struct AutoModerationRule {
 /// See https://discord.com/developers/docs/resources/auto-moderation#auto-moderation-rule-object-event-types
 pub enum AutoModerationRuleEventType {
     #[default]
-    MessageSend = 1
+    MessageSend = 1,
 }
 
 #[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)]
@@ -37,7 +37,7 @@ pub enum AutoModerationRuleTriggerType {
     Keyword = 1,
     Spam = 3,
     KeywordPreset = 4,
-    MentionSpam = 5
+    MentionSpam = 5,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
@@ -48,7 +48,7 @@ pub enum AutoModerationRuleTriggerMetadata {
     ForKeywordPreset(AutoModerationRuleTriggerMetadataForKeywordPreset),
     ForMentionSpam(AutoModerationRuleTriggerMetadataForMentionSpam),
     #[default]
-    None
+    None,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
@@ -71,7 +71,7 @@ pub struct AutoModerationRuleTriggerMetadataForKeywordPreset {
 pub struct AutoModerationRuleTriggerMetadataForMentionSpam {
     /// Max 50
     pub mention_total_limit: u8,
-    pub mention_raid_protection_enabled: bool
+    pub mention_raid_protection_enabled: bool,
 }
 
 #[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)]
@@ -82,7 +82,7 @@ pub enum AutoModerationRuleKeywordPresetType {
     #[default]
     Profanity = 1,
     SexualContent = 2,
-    Slurs = 3
+    Slurs = 3,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
@@ -90,7 +90,7 @@ pub enum AutoModerationRuleKeywordPresetType {
 pub struct AutoModerationAction {
     #[serde(rename = "type")]
     pub action_type: AutoModerationActionType,
-    pub metadata: Option<AutoModerationActionMetadata>
+    pub metadata: Option<AutoModerationActionMetadata>,
 }
 
 #[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)]
@@ -101,7 +101,7 @@ pub enum AutoModerationActionType {
     #[default]
     BlockMessage = 1,
     SendAlertMessage = 2,
-    Timeout = 3
+    Timeout = 3,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
@@ -112,19 +112,19 @@ pub enum AutoModerationActionMetadata {
     ForSendAlertMessage(AutoModerationActionMetadataForSendAlertMessage),
     ForTimeout(AutoModerationActionMetadataForTimeout),
     #[default]
-    None
+    None,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
 /// See https://discord.com/developers/docs/resources/auto-moderation#auto-moderation-action-object-action-metadata
 pub struct AutoModerationActionMetadataForBlockMessage {
-    pub custom_message: Option<String>
+    pub custom_message: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
 /// See https://discord.com/developers/docs/resources/auto-moderation#auto-moderation-action-object-action-metadata
 pub struct AutoModerationActionMetadataForSendAlertMessage {
-    pub channel_id: Snowflake
+    pub channel_id: Snowflake,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]

src/types/entities/channel.rs

@@ -1,6 +1,9 @@
 use chrono::Utc;
 use serde::{Deserialize, Serialize};
-use serde_aux::prelude::{deserialize_number_from_string, deserialize_option_number_from_string, deserialize_string_from_number};
+use serde_aux::prelude::{
+    deserialize_number_from_string, deserialize_option_number_from_string,
+    deserialize_string_from_number,
+};
 use serde_repr::{Deserialize_repr, Serialize_repr};
 
 use crate::types::{

src/types/entities/emoji.rs

@@ -1,8 +1,7 @@
 use serde::{Deserialize, Serialize};
-use serde_aux::prelude::deserialize_option_number_from_string;
 
 use crate::types::entities::User;
-use crate::types::{Guild, Snowflake};
+use crate::types::Snowflake;
 
 #[derive(Debug, PartialEq, Clone, Deserialize, Serialize, Default)]
 #[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]

src/types/entities/guild.rs

@@ -1,9 +1,9 @@
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
-use serde_repr::{Serialize_repr, Deserialize_repr};
+use serde_repr::{Deserialize_repr, Serialize_repr};
 
 use crate::types::{
-    entities::{Channel, Emoji, GuildTemplate, RoleObject, Sticker, User, VoiceState, Webhook},
+    entities::{Channel, Emoji, RoleObject, Sticker, User, VoiceState, Webhook},
     interfaces::WelcomeScreenObject,
     utils::Snowflake,
 };
@@ -140,7 +140,7 @@ pub struct GuildScheduledEvent {
     pub entity_metadata: Option<GuildScheduledEventEntityMetadata>,
     pub creator: Option<User>,
     pub user_count: Option<u64>,
-    pub image: Option<String>
+    pub image: Option<String>,
 }
 
 #[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone)]
@@ -159,7 +159,7 @@ pub enum GuildScheduledEventStatus {
     Scheduled = 1,
     Active = 2,
     Completed = 3,
-    Canceled = 4
+    Canceled = 4,
 }
 
 #[derive(Serialize_repr, Deserialize_repr, Debug, Default, Clone)]
@@ -175,5 +175,5 @@ pub enum GuildScheduledEventEntityType {
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]
 /// See https://discord.com/developers/docs/resources/guild-scheduled-event#guild-scheduled-event-object-guild-scheduled-event-entity-metadata
 pub struct GuildScheduledEventEntityMetadata {
-    pub location: Option<String>
+    pub location: Option<String>,
 }

src/types/entities/mod.rs

@@ -1,5 +1,7 @@
 mod application;
 mod attachment;
+mod audit_log;
+mod auto_moderation;
 mod channel;
 mod config;
 mod emoji;
@@ -7,8 +9,10 @@ mod guild;
 mod guild_member;
 mod integration;
 mod message;
+mod relationship;
 mod role;
 mod security_key;
+mod stage_instance;
 mod sticker;
 mod team;
 mod template;
@@ -16,13 +20,11 @@ mod user;
 mod user_settings;
 mod voice_state;
 mod webhook;
-mod audit_log;
-mod relationship;
-mod auto_moderation;
-mod stage_instance;
 
 pub use application::*;
 pub use attachment::*;
+pub use audit_log::*;
+pub use auto_moderation::*;
 pub use channel::*;
 pub use config::*;
 pub use emoji::*;
@@ -30,8 +32,10 @@ pub use guild::*;
 pub use guild_member::*;
 pub use integration::*;
 pub use message::*;
+pub use relationship::*;
 pub use role::*;
 pub use security_key::*;
+pub use stage_instance::*;
 pub use sticker::*;
 pub use team::*;
 pub use template::*;
@@ -39,7 +43,3 @@ pub use user::*;
 pub use user_settings::*;
 pub use voice_state::*;
 pub use webhook::*;
-pub use audit_log::*;
-pub use relationship::*;
-pub use auto_moderation::*;
-pub use stage_instance::*;

src/types/entities/relationship.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use serde_repr::{Serialize_repr, Deserialize_repr};
+use serde_repr::{Deserialize_repr, Serialize_repr};
 
 use crate::types::Snowflake;
 
@@ -12,7 +12,7 @@ pub struct Relationship {
     #[serde(rename = "type")]
     pub relationship_type: RelationshipType,
     pub nickname: Option<String>,
-    pub user: PublicUser
+    pub user: PublicUser,
 }
 
 #[derive(Serialize_repr, Deserialize_repr, Debug, Clone, Default)]

src/types/entities/role.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use serde_aux::prelude::{deserialize_string_from_number, deserialize_option_number_from_string};
+use serde_aux::prelude::{deserialize_option_number_from_string, deserialize_string_from_number};
 
 use crate::types::utils::Snowflake;
 
@@ -19,7 +19,7 @@ pub struct RoleObject {
     pub permissions: String,
     pub managed: bool,
     pub mentionable: bool,
-    pub tags: Option<RoleTags>
+    pub tags: Option<RoleTags>,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

src/types/entities/stage_instance.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use serde_repr::{Serialize_repr, Deserialize_repr};
+use serde_repr::{Deserialize_repr, Serialize_repr};
 
 use crate::types::Snowflake;
 
@@ -25,5 +25,5 @@ pub enum StageInstancePrivacyLevel {
     /// deprecated, apparently
     Public = 1,
     #[default]
-    GuildOnly = 2
+    GuildOnly = 2,
 }

src/types/entities/sticker.rs

@@ -1,5 +1,4 @@
 use serde::{Deserialize, Serialize};
-use serde_aux::prelude::{deserialize_option_number_from_string};
 
 use crate::types::{entities::User, utils::Snowflake};
 

src/types/entities/user.rs

@@ -1,12 +1,8 @@
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use serde_aux::prelude::deserialize_option_number_from_string;
-use serde_json::{Map, Value};
 
-use crate::types::{
-    errors::Error,
-    utils::Snowflake, //util::{email::adjust_email, entities::user_setting::UserSettings},
-};
+use crate::types::utils::Snowflake;
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
 #[cfg_attr(feature = "sqlx", derive(sqlx::Type))]

src/types/entities/user_settings.rs

@@ -1,8 +1,6 @@
 use chrono::{serde::ts_milliseconds_option, Utc};
 use serde::{Deserialize, Serialize};
 
-use crate::types::utils::Snowflake;
-
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
 #[cfg_attr(feature = "sqlx", derive(sqlx::Type))]
 #[serde(rename_all = "lowercase")]

src/types/entities/voice_state.rs

@@ -2,7 +2,7 @@ use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
 use crate::types::{
-    entities::{Channel, Guild, GuildMember, User},
+    entities::{Guild, GuildMember},
     utils::Snowflake,
 };
 

src/types/entities/webhook.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 use crate::types::{
-    entities::{Application, Channel, Guild, User},
+    entities::{Guild, User},
     utils::Snowflake,
 };
 

src/types/events/application.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{WebSocketEvent, GuildApplicationCommandPermissions};
+use crate::types::{GuildApplicationCommandPermissions, WebSocketEvent};
 
 #[derive(Debug, Deserialize, Serialize, Default)]
 /// See https://discord.com/developers/docs/topics/gateway-events#application-command-permissions-update

src/types/events/auto_moderation.rs

@@ -1,6 +1,9 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{WebSocketEvent, AutoModerationRule, Snowflake, AutoModerationAction, AutoModerationRuleTriggerType};
+use crate::types::{
+    AutoModerationAction, AutoModerationRule, AutoModerationRuleTriggerType, Snowflake,
+    WebSocketEvent,
+};
 
 #[derive(Debug, Deserialize, Serialize, Default)]
 /// See https://discord.com/developers/docs/topics/gateway-events#auto-moderation-rule-create
@@ -42,7 +45,7 @@ pub struct AutoModerationActionExecution {
     pub alert_system_message_id: Option<Snowflake>,
     pub content: Option<String>,
     pub matched_keyword: Option<String>,
-    pub matched_content: Option<String>
+    pub matched_content: Option<String>,
 }
 
 impl WebSocketEvent for AutoModerationActionExecution {}

src/types/events/channel.rs

@@ -46,7 +46,7 @@ pub struct ChannelUnreadUpdate {
 pub struct ChannelUnreadUpdateObject {
     pub id: String,
     pub last_message_id: String,
-    pub last_pin_timestamp: Option<String>
+    pub last_pin_timestamp: Option<String>,
 }
 
 impl WebSocketEvent for ChannelUnreadUpdate {}

src/types/events/invite.rs

@@ -6,7 +6,7 @@ use crate::types::{GuildInvite, WebSocketEvent};
 /// See https://discord.com/developers/docs/topics/gateway-events#invite-create
 pub struct InviteCreate {
     #[serde(flatten)]
-    pub invite: GuildInvite
+    pub invite: GuildInvite,
 }
 
 impl WebSocketEvent for InviteCreate {}

src/types/events/lazy_request.rs

@@ -22,6 +22,6 @@ pub struct LazyRequest {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub members: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub channels: Option<HashMap<String, Vec<Vec<u64>>>>
+    pub channels: Option<HashMap<String, Vec<Vec<u64>>>>,
 }
 impl WebSocketEvent for LazyRequest {}

src/types/events/message.rs

@@ -1,10 +1,7 @@
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-use crate::types::{
-    entities::{Emoji, GuildMember, Message, User},
-    utils::Snowflake,
-};
+use crate::types::entities::{Emoji, GuildMember, Message, User};
 
 use super::WebSocketEvent;
 
@@ -56,7 +53,7 @@ pub struct MessageCreateUser {
     purchased_flags: Option<i32>,
     premium_usage_flags: Option<i32>,
     disabled: Option<bool>,
-    member: GuildMember
+    member: GuildMember,
 }
 
 impl WebSocketEvent for MessageCreate {}

src/types/events/mod.rs

@@ -1,56 +1,56 @@
 use serde::{Deserialize, Serialize};
 
+mod application;
+mod auto_moderation;
+mod call;
 mod channel;
 mod guild;
 mod heartbeat;
 mod hello;
 mod identify;
+mod integration;
+mod interaction;
+mod invite;
+mod lazy_request;
 mod message;
+mod passive_update;
 mod presence;
 mod ready;
+mod relationship;
 mod request_members;
 mod resume;
+mod session;
+mod stage_instance;
 mod thread;
 mod user;
 mod voice;
-mod session;
 mod webhooks;
-mod passive_update;
-mod integration;
-mod invite;
-mod call;
-mod lazy_request;
-mod relationship;
-mod auto_moderation;
-mod stage_instance;
-mod interaction;
-mod application;
 
+pub use application::*;
+pub use auto_moderation::*;
+pub use call::*;
 pub use channel::*;
 pub use guild::*;
 pub use heartbeat::*;
 pub use hello::*;
 pub use identify::*;
+pub use integration::*;
+pub use interaction::*;
+pub use invite::*;
+pub use lazy_request::*;
 pub use message::*;
+pub use passive_update::*;
 pub use presence::*;
 pub use ready::*;
+pub use relationship::*;
 pub use request_members::*;
 pub use resume::*;
+pub use session::*;
+pub use stage_instance::*;
 pub use thread::*;
 pub use user::*;
 pub use voice::*;
-pub use session::*;
 pub use webhooks::*;
-pub use passive_update::*;
-pub use integration::*;
-pub use invite::*;
-pub use call::*;
-pub use lazy_request::*;
-pub use relationship::*;
-pub use auto_moderation::*;
-pub use stage_instance::*;
-pub use interaction::*;
-pub use application::*;
 
 pub trait WebSocketEvent {}
 

src/types/events/passive_update.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{VoiceState, GuildMember};
 use super::{ChannelUnreadUpdateObject, WebSocketEvent};
+use crate::types::{GuildMember, VoiceState};
 
 #[derive(Debug, Deserialize, Serialize, Default)]
 /// Officially Undocumented

src/types/events/presence.rs

@@ -1,6 +1,6 @@
-use crate::types::PublicUser;
 use crate::types::events::WebSocketEvent;
 use crate::types::interfaces::Activity;
+use crate::types::PublicUser;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize, Serialize, Default, Clone)]

src/types/events/ready.rs

@@ -1,7 +1,7 @@
-use crate::types::entities::{UnavailableGuild, User, Guild};
-use crate::types::events::{WebSocketEvent, Session};
+use crate::types::entities::{Guild, User};
+use crate::types::events::{Session, WebSocketEvent};
 use crate::types::interfaces::ClientStatusObject;
-use crate::types::{PresenceUpdate, GuildMember, Activity, VoiceState};
+use crate::types::{Activity, GuildMember, PresenceUpdate, VoiceState};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize, Serialize, Default)]
@@ -46,7 +46,7 @@ impl WebSocketEvent for GatewayReadySupplemental {}
 #[derive(Debug, Deserialize, Serialize, Default)]
 pub struct MergedPresences {
     pub guilds: Vec<Vec<MergedPresenceGuild>>,
-    pub friends: Vec<MergedPresenceFriend>
+    pub friends: Vec<MergedPresenceFriend>,
 }
 
 #[derive(Debug, Deserialize, Serialize, Default)]
@@ -56,7 +56,7 @@ pub struct MergedPresenceFriend {
     /// Looks like ms??
     pub last_modified: u128,
     pub client_status: ClientStatusObject,
-    pub activities: Vec<Activity>
+    pub activities: Vec<Activity>,
 }
 
 #[derive(Debug, Deserialize, Serialize, Default)]
@@ -66,12 +66,12 @@ pub struct MergedPresenceGuild {
     // ?
     pub game: Option<serde_json::Value>,
     pub client_status: ClientStatusObject,
-    pub activities: Vec<Activity>
+    pub activities: Vec<Activity>,
 }
 
 #[derive(Debug, Deserialize, Serialize, Default)]
 pub struct SupplimentalGuild {
     pub voice_states: Option<Vec<VoiceState>>,
     pub id: String,
-    pub embedded_activities: Vec<serde_json::Value>
+    pub embedded_activities: Vec<serde_json::Value>,
 }

src/types/events/relationship.rs

@@ -1,4 +1,4 @@
-use crate::types::{events::WebSocketEvent, Relationship, Snowflake, RelationshipType};
+use crate::types::{events::WebSocketEvent, Relationship, RelationshipType, Snowflake};
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize, Serialize, Default)]

src/types/events/session.rs

@@ -7,7 +7,7 @@ use crate::types::{Activity, WebSocketEvent};
 /// Seems like it sends active session info to users on connect
 /// [{"activities":[],"client_info":{"client":"web","os":"other","version":0},"session_id":"ab5941b50d818b1f8d93b4b1b581b192","status":"online"}]
 pub struct SessionsReplace {
-    pub sessions: Vec<Session>
+    pub sessions: Vec<Session>,
 }
 
 #[derive(Debug, Deserialize, Serialize, Default)]
@@ -26,7 +26,7 @@ pub struct Session {
 pub struct ClientInfo {
     pub client: String,
     pub os: String,
-    pub version: u8
+    pub version: u8,
 }
 
 impl WebSocketEvent for SessionsReplace {}

src/types/events/stage_instance.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::types::{WebSocketEvent, StageInstance};
+use crate::types::{StageInstance, WebSocketEvent};
 
 #[derive(Debug, Deserialize, Serialize, Default)]
 /// See https://discord.com/developers/docs/topics/gateway-events#stage-instance-create

src/types/events/thread.rs

@@ -1,4 +1,4 @@
-use crate::types::entities::{Channel, GuildMember, ThreadMember};
+use crate::types::entities::{Channel, ThreadMember};
 use crate::types::events::WebSocketEvent;
 use serde::{Deserialize, Serialize};
 

src/types/events/voice.rs

@@ -24,7 +24,7 @@ impl WebSocketEvent for UpdateVoiceState {}
 /// Not to be confused with [UpdateVoiceState]
 pub struct VoiceStateUpdate {
     #[serde(flatten)]
-    pub state: VoiceState
+    pub state: VoiceState,
 }
 
 impl WebSocketEvent for VoiceStateUpdate {}
@@ -34,7 +34,7 @@ impl WebSocketEvent for VoiceStateUpdate {}
 pub struct VoiceServerUpdate {
     pub token: String,
     pub guild_id: String,
-    pub endpoint: Option<String>
+    pub endpoint: Option<String>,
 }
 
 impl WebSocketEvent for VoiceServerUpdate {}

src/types/interfaces/connected_account.rs

@@ -0,0 +1 @@
+