Compare commits

..

No commits in common. "3237db708cc846f2f59be99273089e7766af846c" and "5154d04d4a76ecbf9af925c609071b6bf6e81f85" have entirely different histories.

3 changed files with 3 additions and 42 deletions

View File

@ -5,8 +5,7 @@
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::types::{Snowflake, WelcomeScreenObject, Shared, InviteFlags, InviteType, InviteTargetType, Guild, VerificationLevel}; use crate::types::{Snowflake, WelcomeScreenObject, Shared, InviteFlags, InviteType, InviteTargetType};
use crate::types::types::guild_configuration::GuildFeaturesList;
use super::guild::GuildScheduledEvent; use super::guild::GuildScheduledEvent;
use super::{Application, Channel, GuildMember, NSFWLevel, User}; use super::{Application, Channel, GuildMember, NSFWLevel, User};
@ -56,8 +55,8 @@ pub struct InviteGuild {
pub name: String, pub name: String,
pub icon: Option<String>, pub icon: Option<String>,
pub splash: Option<String>, pub splash: Option<String>,
pub verification_level: VerificationLevel, pub verification_level: i32,
pub features: GuildFeaturesList, pub features: Vec<String>,
pub vanity_url_code: Option<String>, pub vanity_url_code: Option<String>,
pub description: Option<String>, pub description: Option<String>,
pub banner: Option<String>, pub banner: Option<String>,
@ -69,32 +68,6 @@ pub struct InviteGuild {
pub welcome_screen: Option<WelcomeScreenObject>, pub welcome_screen: Option<WelcomeScreenObject>,
} }
impl From<Guild> for InviteGuild {
fn from(value: Guild) -> Self {
Self {
id: value.id,
name: value.name.unwrap_or_default(),
icon: value.icon,
splash: value.splash,
verification_level: value.verification_level.unwrap_or_default(),
features: value.features.unwrap_or_default(),
vanity_url_code: value.vanity_url_code,
description: value.description,
banner: value.banner,
premium_subscription_count: value.premium_subscription_count,
nsfw_deprecated: None,
nsfw_level: value.nsfw_level.unwrap_or_default(),
welcome_screen: value.welcome_screen.map(|obj| {
#[cfg(feature = "sqlx")]
let res = obj.0;
#[cfg(not(feature = "sqlx"))]
let res = obj;
res
}),
}
}
}
/// See <https://discord-userdoccers.vercel.app/resources/invite#invite-stage-instance-object> /// See <https://discord-userdoccers.vercel.app/resources/invite#invite-stage-instance-object>
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct InviteStageInstance { pub struct InviteStageInstance {

View File

@ -1,10 +0,0 @@
use serde::{Deserialize, Serialize};
#[derive(Debug, Deserialize, Serialize, Clone, Copy, PartialEq, PartialOrd, Eq, Ord)]
/// Query parameters for the `Get Invite` route.
///
/// # Reference:
/// Read: <https://docs.discord.sex/resources/invite#query-string-params>
pub struct GetInvitesSchema {
pub with_counts: Option<bool>,
}

View File

@ -10,7 +10,6 @@ pub use message::*;
pub use relationship::*; pub use relationship::*;
pub use role::*; pub use role::*;
pub use user::*; pub use user::*;
pub use invites::*;
mod apierror; mod apierror;
mod auth; mod auth;
@ -20,4 +19,3 @@ mod message;
mod relationship; mod relationship;
mod role; mod role;
mod user; mod user;
mod invites;