Remove redundant internal prelude imports

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.
 ///

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};
 

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};
 

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};

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.
 ///

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.

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.
 ///

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;
 

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].

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

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};
 

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;
 

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.
 ///

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;
 

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.
 ///

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;

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.
 ///

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<ChannelId>),
  "exempt_roles" => ExemptRoles(FixedArray<RoleId>),
  /// Behavior of the expiration of an integration was changed.

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.

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.
 ///

src/model/guild/emoji.rs

@@ -1,8 +1,6 @@
 use std::fmt;
 
-use crate::internal::prelude::*;
-use crate::model::id::{EmojiId, RoleId};
-use crate::model::user::User;
+use crate::model::prelude::*;
 use crate::model::utils::default_true;
 
 /// Represents a custom guild emoji, which can either be created using the API, or via an

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::*;
 

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.
 ///

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;

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::*;

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")]

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;
 

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.

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.
 ///

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) => {

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.
 ///

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;
 

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;
 

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

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.
 ///

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! {