kozabrada123/chorus
kozabrada123
/
chorus
mirror of https://github.com/polyphony-chat/chorus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove erroneous serde with attributes

This commit is contained in:
Quat3rnion 2024-06-03 23:59:21 -04:00
parent 40bdafd1a3
commit 4d75aa89c9
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/types/entities/guild.rs
View File

@ -14,7 +14,7 @@ use crate::types::types::guild_configuration::GuildFeaturesList;
use crate::types::{ use crate::types::{
entities::{Channel, Emoji, RoleObject, Sticker, User, VoiceState, Webhook}, entities::{Channel, Emoji, RoleObject, Sticker, User, VoiceState, Webhook},
interfaces::WelcomeScreenObject, interfaces::WelcomeScreenObject,
utils::{Snowflake, serde::*}, utils::Snowflake,
}; };
use super::PublicUser; use super::PublicUser;
@ -67,7 +67,6 @@ pub struct Guild {
#[cfg_attr(feature = "sqlx", sqlx(skip))] #[cfg_attr(feature = "sqlx", sqlx(skip))]
pub invites: Option<Vec<GuildInvite>>, pub invites: Option<Vec<GuildInvite>>,
#[cfg_attr(feature = "sqlx", sqlx(skip))] #[cfg_attr(feature = "sqlx", sqlx(skip))]
#[serde(with = "ts_seconds_option_str", default)]
pub joined_at: Option<DateTime<Utc>>, pub joined_at: Option<DateTime<Utc>>,
pub large: Option<bool>, pub large: Option<bool>,
pub max_members: Option<i32>, pub max_members: Option<i32>,

3
src/types/entities/guild_member.rs
View File

@ -7,7 +7,6 @@ use serde::{Deserialize, Serialize};
use crate::types::Shared; use crate::types::Shared;
use crate::types::{entities::PublicUser, Snowflake}; use crate::types::{entities::PublicUser, Snowflake};
use crate::types::utils::serde::*;
#[derive(Debug, Deserialize, Default, Serialize, Clone)] #[derive(Debug, Deserialize, Default, Serialize, Clone)]
#[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))] #[cfg_attr(feature = "sqlx", derive(sqlx::FromRow))]
@ -20,7 +19,6 @@ pub struct GuildMember {
pub nick: Option<String>, pub nick: Option<String>,
pub avatar: Option<String>, pub avatar: Option<String>,
pub roles: Vec<Snowflake>, pub roles: Vec<Snowflake>,
#[serde(with = "ts_seconds_str")]
pub joined_at: DateTime<Utc>, pub joined_at: DateTime<Utc>,
pub premium_since: Option<String>, pub premium_since: Option<String>,
pub deaf: bool, pub deaf: bool,
@ -28,6 +26,5 @@ pub struct GuildMember {
pub flags: Option<i32>, pub flags: Option<i32>,
pub pending: Option<bool>, pub pending: Option<bool>,
pub permissions: Option<String>, pub permissions: Option<String>,
#[serde(with = "ts_seconds_option_str")]
pub communication_disabled_until: Option<DateTime<Utc>>, pub communication_disabled_until: Option<DateTime<Utc>>,
} }

4
src/types/entities/message.rs
View File

@ -11,7 +11,7 @@ use crate::types::{
Application, Attachment, Channel, Emoji, GuildMember, PublicUser, RoleSubscriptionData, Application, Attachment, Channel, Emoji, GuildMember, PublicUser, RoleSubscriptionData,
Sticker, StickerItem, User, Sticker, StickerItem, User,
}, },
utils::{Snowflake, serde::*}, utils::Snowflake,
}; };
#[derive(Debug, Serialize, Deserialize, Default, Clone)] #[derive(Debug, Serialize, Deserialize, Default, Clone)]
@ -26,9 +26,7 @@ pub struct Message {
#[cfg_attr(feature = "sqlx", sqlx(skip))] #[cfg_attr(feature = "sqlx", sqlx(skip))]
pub author: Option<PublicUser>, pub author: Option<PublicUser>,
pub content: Option<String>, pub content: Option<String>,
// #[serde(with = "ts_seconds_str")]
pub timestamp: DateTime<Utc>, pub timestamp: DateTime<Utc>,
// #[serde(with = "ts_seconds_option_str")]
pub edited_timestamp: Option<DateTime<Utc>>, pub edited_timestamp: Option<DateTime<Utc>>,
pub tts: Option<bool>, pub tts: Option<bool>,
pub mention_everyone: bool, pub mention_everyone: bool,