Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ mod tests {
content_type: Some("image/png".to_owned()),
ephemeral: true,
filename: "rainbow_dash.png".to_owned(),
flags: None,
description: None,
duration_secs: None,
height: Some(2674),
Expand Down
13 changes: 11 additions & 2 deletions twilight-model/src/channel/attachment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ use crate::{
};
use serde::{Deserialize, Serialize};

use super::AttachmentFlags;

#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
pub struct Attachment {
/// Attachment's [media type].
Expand All @@ -21,6 +23,9 @@ pub struct Attachment {
#[serde(skip_serializing_if = "Option::is_none")]
pub duration_secs: Option<f64>,
pub filename: String,
// Flags for this attachment.
#[serde(skip_serializing_if = "Option::is_none")]
pub flags: Option<AttachmentFlags>,
#[serde(skip_serializing_if = "Option::is_none")]
pub description: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
Expand All @@ -39,7 +44,7 @@ pub struct Attachment {
#[cfg(test)]
mod tests {
use super::Attachment;
use crate::id::Id;
use crate::{channel::AttachmentFlags, id::Id};
use serde::{Deserialize, Serialize};
use serde_test::Token;
use static_assertions::{assert_fields, assert_impl_all};
Expand Down Expand Up @@ -71,6 +76,7 @@ mod tests {
content_type: Some("image/png".to_owned()),
ephemeral: false,
filename: "a.png".to_owned(),
flags: Some(AttachmentFlags::IS_REMIX),
description: Some("a image".to_owned()),
duration_secs: Some(3.2),
height: Some(184),
Expand All @@ -87,7 +93,7 @@ mod tests {
&[
Token::Struct {
name: "Attachment",
len: 11,
len: 12,
},
Token::Str("content_type"),
Token::Some,
Expand All @@ -97,6 +103,9 @@ mod tests {
Token::F64(3.2),
Token::Str("filename"),
Token::Str("a.png"),
Token::Str("flags"),
Token::Some,
Token::U64(4),
Token::Str("description"),
Token::Some,
Token::Str("a image"),
Expand Down
85 changes: 85 additions & 0 deletions twilight-model/src/channel/attachment_flags.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
use bitflags::bitflags;
use serde::{
de::{Deserialize, Deserializer},
ser::{Serialize, Serializer},
};

bitflags! {
pub struct AttachmentFlags: u64 {
/// This attachment has been edited using the remix feature on mobile
const IS_REMIX = 1 << 2;
}
}

impl<'de> Deserialize<'de> for AttachmentFlags {
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
Ok(Self::from_bits_truncate(u64::deserialize(deserializer)?))
}
}

impl Serialize for AttachmentFlags {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
serializer.serialize_u64(self.bits())
}
}

#[cfg(test)]
mod tests {
use super::AttachmentFlags;
use serde::{Deserialize, Serialize};
use serde_test::Token;
use static_assertions::{assert_impl_all, const_assert_eq};
use std::{
fmt::{Binary, Debug, LowerHex, Octal, UpperHex},
hash::Hash,
ops::{
BitAnd, BitAndAssign, BitOr, BitOrAssign, BitXor, BitXorAssign, Not, Sub, SubAssign,
},
};

assert_impl_all!(
AttachmentFlags: Binary,
BitAnd,
BitAndAssign,
BitOr,
BitOrAssign,
BitXor,
BitXorAssign,
Clone,
Copy,
Debug,
Deserialize<'static>,
Eq,
Extend<AttachmentFlags>,
FromIterator<AttachmentFlags>,
Hash,
LowerHex,
Not,
Octal,
Ord,
PartialEq,
PartialOrd,
Send,
Serialize,
Sub,
SubAssign,
Sync,
UpperHex
);

const_assert_eq!(AttachmentFlags::IS_REMIX.bits(), 4);

#[test]
fn serde() {
serde_test::assert_tokens(
&AttachmentFlags::IS_REMIX,
&[Token::U64(AttachmentFlags::IS_REMIX.bits())],
);

// Deserialization truncates unknown bits.
serde_test::assert_de_tokens(&AttachmentFlags::empty(), &[Token::U64(1 << 63)]);
}
}
2 changes: 2 additions & 0 deletions twilight-model/src/channel/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pub mod thread;
pub mod webhook;

mod attachment;
mod attachment_flags;
mod channel_mention;
mod channel_type;
mod flags;
Expand All @@ -14,6 +15,7 @@ mod video_quality_mode;

pub use self::{
attachment::Attachment,
attachment_flags::AttachmentFlags,
channel_mention::ChannelMention,
channel_type::ChannelType,
flags::ChannelFlags,
Expand Down