diff --git a/src/model/application/command.rs b/src/model/application/command.rs index 42d5b13c75f..63009a7893e 100644 --- a/src/model/application/command.rs +++ b/src/model/application/command.rs @@ -8,18 +8,7 @@ use super::{InstallationContext, InteractionContext}; use crate::builder::CreateCommand; #[cfg(feature = "model")] use crate::http::Http; -use crate::internal::prelude::*; -use crate::model::channel::ChannelType; -use crate::model::id::{ - ApplicationId, - CommandId, - CommandPermissionId, - CommandVersionId, - GuildId, - RoleId, - UserId, -}; -use crate::model::Permissions; +use crate::model::prelude::*; /// The base command model that belongs to an application. /// diff --git a/src/model/application/command_interaction.rs b/src/model/application/command_interaction.rs index 8b0d0c2ea83..282c3fd5213 100644 --- a/src/model/application/command_interaction.rs +++ b/src/model/application/command_interaction.rs @@ -17,27 +17,8 @@ use crate::builder::{ use crate::gateway::client::Context; #[cfg(feature = "model")] use crate::http::Http; -use crate::internal::prelude::*; use crate::internal::utils::lending_for_each; -use crate::model::application::{CommandOptionType, CommandType}; -use crate::model::channel::{Attachment, Message, PartialChannel}; -use crate::model::guild::{Member, PartialMember, Role}; -use crate::model::id::{ - ApplicationId, - AttachmentId, - ChannelId, - CommandId, - GenericId, - GuildId, - InteractionId, - MessageId, - RoleId, - TargetId, - UserId, -}; -use crate::model::monetization::Entitlement; -use crate::model::user::User; -use crate::model::Permissions; +use crate::model::prelude::*; #[cfg(all(feature = "collector", feature = "utils"))] use crate::utils::{CreateQuickModal, QuickModalResponse}; diff --git a/src/model/application/component.rs b/src/model/application/component.rs index bb3dba18afa..e376bdc48c4 100644 --- a/src/model/application/component.rs +++ b/src/model/application/component.rs @@ -2,7 +2,6 @@ use serde::de::Error as DeError; use serde::ser::{Serialize, Serializer}; use serde_json::from_value; -use crate::internal::prelude::*; use crate::model::prelude::*; use crate::model::utils::{default_true, deserialize_val}; diff --git a/src/model/application/component_interaction.rs b/src/model/application/component_interaction.rs index 01cd875ec7c..cd7bb6f4447 100644 --- a/src/model/application/component_interaction.rs +++ b/src/model/application/component_interaction.rs @@ -13,7 +13,6 @@ use crate::builder::{ use crate::gateway::client::Context; #[cfg(feature = "model")] use crate::http::Http; -use crate::internal::prelude::*; use crate::model::prelude::*; #[cfg(all(feature = "collector", feature = "utils"))] use crate::utils::{CreateQuickModal, QuickModalResponse}; diff --git a/src/model/application/mod.rs b/src/model/application/mod.rs index 80bc7ae3e3e..5b33697dae9 100644 --- a/src/model/application/mod.rs +++ b/src/model/application/mod.rs @@ -17,11 +17,7 @@ pub use oauth::*; mod ping_interaction; pub use ping_interaction::*; -use super::id::{ApplicationId, GenericId, GuildId, SkuId, UserId}; -use super::misc::ImageHash; -use super::user::User; -use super::Permissions; -use crate::internal::prelude::*; +use super::prelude::*; /// Partial information about the given application. /// diff --git a/src/model/application/modal_interaction.rs b/src/model/application/modal_interaction.rs index b1b79f14ed5..ee3cfb3a438 100644 --- a/src/model/application/modal_interaction.rs +++ b/src/model/application/modal_interaction.rs @@ -9,7 +9,6 @@ use crate::builder::{ }; #[cfg(feature = "model")] use crate::http::Http; -use crate::internal::prelude::*; use crate::model::prelude::*; /// An interaction triggered by a modal submit. diff --git a/src/model/application/ping_interaction.rs b/src/model/application/ping_interaction.rs index c8bd3b14930..d10e605572f 100644 --- a/src/model/application/ping_interaction.rs +++ b/src/model/application/ping_interaction.rs @@ -1,7 +1,6 @@ use serde::{Deserialize, Serialize}; -use crate::internal::prelude::*; -use crate::model::id::{ApplicationId, InteractionId}; +use crate::model::prelude::*; /// A ping interaction, which can only be received through an endpoint url. /// diff --git a/src/model/channel/attachment.rs b/src/model/channel/attachment.rs index 396da8e53c7..150799d19ba 100644 --- a/src/model/channel/attachment.rs +++ b/src/model/channel/attachment.rs @@ -3,7 +3,6 @@ use nonmax::NonMaxU32; use reqwest::Client as ReqwestClient; use serde_cow::CowStr; -use crate::internal::prelude::*; use crate::model::prelude::*; use crate::model::utils::is_false; diff --git a/src/model/channel/embed.rs b/src/model/channel/embed.rs index 5e84c2bc546..a28060e6e0d 100644 --- a/src/model/channel/embed.rs +++ b/src/model/channel/embed.rs @@ -1,7 +1,6 @@ use nonmax::NonMaxU32; -use crate::internal::prelude::*; -use crate::model::{Colour, Timestamp}; +use crate::model::prelude::*; /// Represents a rich embed which allows using richer markdown, multiple fields and more. This was /// heavily inspired by [slack's attachments]. diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs index f3ec4e6d761..f11b96f11a3 100644 --- a/src/model/channel/guild_channel.rs +++ b/src/model/channel/guild_channel.rs @@ -30,7 +30,6 @@ use crate::collector::{MessageCollector, ReactionCollector}; use crate::gateway::ShardMessenger; #[cfg(feature = "model")] use crate::http::{CacheHttp, Http, Typing}; -use crate::internal::prelude::*; use crate::model::prelude::*; /// Represents a guild's text, news, or voice channel. Some methods are available only for voice diff --git a/src/model/channel/message.rs b/src/model/channel/message.rs index 38ea95c5264..97abcd962e6 100644 --- a/src/model/channel/message.rs +++ b/src/model/channel/message.rs @@ -21,7 +21,6 @@ use crate::constants; use crate::gateway::ShardMessenger; #[cfg(feature = "model")] use crate::http::{CacheHttp, Http}; -use crate::internal::prelude::*; use crate::model::prelude::*; use crate::model::utils::{discord_colours, StrOrInt}; diff --git a/src/model/channel/mod.rs b/src/model/channel/mod.rs index 41f04e64064..9640eccd17d 100644 --- a/src/model/channel/mod.rs +++ b/src/model/channel/mod.rs @@ -25,7 +25,6 @@ pub use self::private_channel::*; pub use self::reaction::*; #[cfg(feature = "model")] use crate::http::Http; -use crate::internal::prelude::*; use crate::model::prelude::*; use crate::model::utils::is_false; diff --git a/src/model/channel/partial_channel.rs b/src/model/channel/partial_channel.rs index 4317986b384..16df1966d2e 100644 --- a/src/model/channel/partial_channel.rs +++ b/src/model/channel/partial_channel.rs @@ -1,7 +1,4 @@ -use crate::internal::prelude::*; -use crate::model::channel::{ChannelType, ThreadMetadata}; -use crate::model::id::{ChannelId, WebhookId}; -use crate::model::Permissions; +use crate::model::prelude::*; /// A container for any partial channel. /// diff --git a/src/model/channel/reaction.rs b/src/model/channel/reaction.rs index a7060589218..52a4a3bd130 100644 --- a/src/model/channel/reaction.rs +++ b/src/model/channel/reaction.rs @@ -15,7 +15,6 @@ use tracing::warn; #[cfg(feature = "model")] use crate::http::{CacheHttp, Http}; -use crate::internal::prelude::*; use crate::model::prelude::*; use crate::model::utils::discord_colours_opt; diff --git a/src/model/connection.rs b/src/model/connection.rs index c47d1f0cbd5..e90be6277ae 100644 --- a/src/model/connection.rs +++ b/src/model/connection.rs @@ -1,7 +1,6 @@ //! Models for user connections. use super::prelude::*; -use crate::internal::prelude::*; /// Information about a connection between the current user and a third party service. /// diff --git a/src/model/event.rs b/src/model/event.rs index ab521d746ff..a5494b50741 100644 --- a/src/model/event.rs +++ b/src/model/event.rs @@ -13,7 +13,6 @@ use strum::{EnumCount, IntoStaticStr, VariantNames}; use tracing::{debug, warn}; use crate::constants::Opcode; -use crate::internal::prelude::*; use crate::internal::utils::lending_for_each; use crate::model::prelude::*; use crate::model::utils::deserialize_val; diff --git a/src/model/gateway.rs b/src/model/gateway.rs index e2f01749cbd..9a23ab5273f 100644 --- a/src/model/gateway.rs +++ b/src/model/gateway.rs @@ -7,7 +7,6 @@ use url::Url; use super::prelude::*; use super::utils::*; -use crate::internal::prelude::*; /// A representation of the data retrieved from the bot gateway endpoint. /// diff --git a/src/model/guild/audit_log/change.rs b/src/model/guild/audit_log/change.rs index f54db74e997..c86d8dffde8 100644 --- a/src/model/guild/audit_log/change.rs +++ b/src/model/guild/audit_log/change.rs @@ -1,21 +1,7 @@ use nonmax::NonMaxU16; -use crate::internal::prelude::*; -use crate::model::channel::PermissionOverwrite; -use crate::model::guild::automod::{Action, EventType, TriggerMetadata, TriggerType}; -use crate::model::guild::{ - AfkTimeout, - DefaultMessageNotificationLevel, - ExplicitContentFilter, - MfaLevel, - SystemChannelFlags, - VerificationLevel, -}; -use crate::model::id::{ApplicationId, ChannelId, GenericId, GuildId, RoleId, UserId}; -use crate::model::misc::ImageHash; -use crate::model::sticker::StickerFormatType; +use crate::model::prelude::*; use crate::model::utils::StrOrInt; -use crate::model::{Permissions, Timestamp}; #[cfg_attr(feature = "typesize", derive(typesize::derive::TypeSize))] #[derive(Debug, PartialEq, Eq, Deserialize, Serialize, Clone)] @@ -165,7 +151,7 @@ generate_change! { "enable_emoticons" => EnableEmoticons(bool), /// Entity type of guild scheduled event was changed. "entity_type" => EntityType(u64), - "event_type" => EventType(EventType), + "event_type" => EventType(AutomodEventType), "exempt_channels" => ExemptChannels(FixedArray), "exempt_roles" => ExemptRoles(FixedArray), /// Behavior of the expiration of an integration was changed. diff --git a/src/model/guild/audit_log/mod.rs b/src/model/guild/audit_log/mod.rs index 8f88168f8cf..c3bef275c28 100644 --- a/src/model/guild/audit_log/mod.rs +++ b/src/model/guild/audit_log/mod.rs @@ -9,7 +9,6 @@ mod utils; pub use change::{AffectedRole, Change, EntityType}; use utils::optional_string; -use crate::internal::prelude::*; use crate::model::prelude::*; /// Determines the action that was done on a target. diff --git a/src/model/guild/automod.rs b/src/model/guild/automod.rs index 149dce8dbf6..d1065f3d8b9 100644 --- a/src/model/guild/automod.rs +++ b/src/model/guild/automod.rs @@ -8,8 +8,7 @@ use serde::de::{Deserializer, Error}; use serde::ser::Serializer; use serde::{Deserialize, Serialize}; -use crate::internal::prelude::*; -use crate::model::id::*; +use crate::model::prelude::*; /// Configured auto moderation rule. /// diff --git a/src/model/guild/emoji.rs b/src/model/guild/emoji.rs index 5f261888aca..c713dd7068b 100644 --- a/src/model/guild/emoji.rs +++ b/src/model/guild/emoji.rs @@ -1,9 +1,6 @@ use std::fmt; -use crate::internal::prelude::*; -use crate::model::id::{EmojiId, RoleId}; -use crate::model::user::User; -use crate::model::utils::default_true; +use crate::model::prelude::*; /// Represents a custom guild emoji, which can either be created using the API, or via an /// integration. Emojis created using the API only work within the guild it was created in. diff --git a/src/model/guild/guild_id.rs b/src/model/guild/guild_id.rs index 28b86e8d5d6..5c0d828edb4 100644 --- a/src/model/guild/guild_id.rs +++ b/src/model/guild/guild_id.rs @@ -31,8 +31,6 @@ use crate::gateway::ShardMessenger; #[cfg(feature = "model")] use crate::http::{CacheHttp, Http, UserPagination}; #[cfg(feature = "model")] -use crate::internal::prelude::*; -#[cfg(feature = "model")] use crate::model::error::Maximum; use crate::model::prelude::*; diff --git a/src/model/guild/guild_preview.rs b/src/model/guild/guild_preview.rs index 5514311848e..a70e841b9bc 100644 --- a/src/model/guild/guild_preview.rs +++ b/src/model/guild/guild_preview.rs @@ -1,8 +1,4 @@ -use crate::internal::prelude::*; -use crate::model::guild::Emoji; -use crate::model::id::GuildId; -use crate::model::misc::ImageHash; -use crate::model::sticker::Sticker; +use crate::model::prelude::*; /// Preview [`Guild`] information. /// diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs index 19e48235e9b..6ef2f6144a2 100644 --- a/src/model/guild/member.rs +++ b/src/model/guild/member.rs @@ -8,7 +8,6 @@ use crate::builder::EditMember; use crate::cache::Cache; #[cfg(feature = "model")] use crate::http::Http; -use crate::internal::prelude::*; use crate::model::prelude::*; #[cfg(feature = "model")] use crate::model::utils::avatar_url; diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs index 8a6f47a1f36..225c963e212 100644 --- a/src/model/guild/mod.rs +++ b/src/model/guild/mod.rs @@ -59,7 +59,6 @@ use crate::constants::LARGE_THRESHOLD; use crate::gateway::ShardMessenger; #[cfg(feature = "model")] use crate::http::{CacheHttp, Http, UserPagination}; -use crate::internal::prelude::*; use crate::model::prelude::*; #[cfg(feature = "model")] use crate::model::utils::*; diff --git a/src/model/guild/partial_guild.rs b/src/model/guild/partial_guild.rs index 2288a7ab45d..2dcd8e422df 100644 --- a/src/model/guild/partial_guild.rs +++ b/src/model/guild/partial_guild.rs @@ -23,7 +23,6 @@ use crate::collector::{MessageCollector, ReactionCollector}; use crate::gateway::ShardMessenger; #[cfg(feature = "model")] use crate::http::{CacheHttp, Http, UserPagination}; -use crate::internal::prelude::*; use crate::internal::utils::lending_for_each; use crate::model::prelude::*; #[cfg(feature = "model")] diff --git a/src/model/guild/role.rs b/src/model/guild/role.rs index 8a9db9775b9..b2cf0797c2d 100644 --- a/src/model/guild/role.rs +++ b/src/model/guild/role.rs @@ -5,7 +5,6 @@ use std::fmt; use crate::builder::EditRole; #[cfg(feature = "model")] use crate::http::Http; -use crate::internal::prelude::*; use crate::model::prelude::*; use crate::model::utils::is_false; diff --git a/src/model/guild/scheduled_event.rs b/src/model/guild/scheduled_event.rs index 6aa978df765..e90c6e0bbf5 100644 --- a/src/model/guild/scheduled_event.rs +++ b/src/model/guild/scheduled_event.rs @@ -1,6 +1,5 @@ use nonmax::NonMaxU64; -use crate::internal::prelude::*; use crate::model::prelude::*; /// Information about a guild scheduled event. diff --git a/src/model/guild/welcome_screen.rs b/src/model/guild/welcome_screen.rs index 29d98ffd286..a0e013ed8f9 100644 --- a/src/model/guild/welcome_screen.rs +++ b/src/model/guild/welcome_screen.rs @@ -1,7 +1,6 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer}; -use crate::internal::prelude::*; -use crate::model::id::{ChannelId, EmojiId}; +use crate::model::prelude::*; /// Information relating to a guild's welcome screen. /// diff --git a/src/model/id.rs b/src/model/id.rs index 59488f8072b..04db7c0bdf2 100644 --- a/src/model/id.rs +++ b/src/model/id.rs @@ -4,8 +4,7 @@ use std::fmt; use nonmax::NonMaxU64; -use super::Timestamp; -use crate::internal::prelude::*; +use super::prelude::*; macro_rules! newtype_display_impl { ($name:ident) => { diff --git a/src/model/invite.rs b/src/model/invite.rs index ed4100c360e..765ab6f9e34 100644 --- a/src/model/invite.rs +++ b/src/model/invite.rs @@ -7,7 +7,6 @@ use super::prelude::*; use crate::builder::CreateInvite; #[cfg(feature = "model")] use crate::http::Http; -use crate::internal::prelude::*; /// Information about an invite code. /// diff --git a/src/model/sticker.rs b/src/model/sticker.rs index 48e3e5e5bc9..d2e6fec739f 100644 --- a/src/model/sticker.rs +++ b/src/model/sticker.rs @@ -2,7 +2,6 @@ use crate::builder::EditSticker; #[cfg(feature = "model")] use crate::http::Http; -use crate::internal::prelude::*; use crate::model::prelude::*; use crate::model::utils::comma_separated_string; diff --git a/src/model/user.rs b/src/model/user.rs index b82b1f98baf..a226b6018f0 100644 --- a/src/model/user.rs +++ b/src/model/user.rs @@ -17,7 +17,6 @@ use crate::collector::{MessageCollector, ReactionCollector}; use crate::gateway::ShardMessenger; #[cfg(feature = "model")] use crate::http::{CacheHttp, Http}; -use crate::internal::prelude::*; #[cfg(feature = "model")] use crate::model::utils::avatar_url; diff --git a/src/model/utils.rs b/src/model/utils.rs index 7b26096f40a..16120d38877 100644 --- a/src/model/utils.rs +++ b/src/model/utils.rs @@ -6,7 +6,6 @@ use serde_cow::CowStr; use small_fixed_array::FixedString; use super::prelude::*; -use crate::internal::prelude::*; pub fn default_true() -> bool { true diff --git a/src/model/voice.rs b/src/model/voice.rs index a25711928b4..979d2007c3b 100644 --- a/src/model/voice.rs +++ b/src/model/voice.rs @@ -3,10 +3,7 @@ use serde::de::{Deserialize, Deserializer}; use serde::Serialize; -use crate::internal::prelude::*; -use crate::model::guild::Member; -use crate::model::id::{ChannelId, GuildId, UserId}; -use crate::model::Timestamp; +use crate::model::prelude::*; /// Information about an available voice region. /// diff --git a/src/model/webhook.rs b/src/model/webhook.rs index c2bab0cc583..49f6179ea22 100644 --- a/src/model/webhook.rs +++ b/src/model/webhook.rs @@ -11,7 +11,6 @@ use crate::builder::{EditWebhook, EditWebhookMessage, ExecuteWebhook}; use crate::cache::{Cache, GuildRef}; #[cfg(feature = "model")] use crate::http::{CacheHttp, Http}; -use crate::internal::prelude::*; use crate::model::prelude::*; enum_number! {