chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common: Use Duration in message events

Browse Source
This commit is contained in:
Kévin Commaille 2022-03-22 12:14:39 +01:00 committed by GitHub
parent ded83663de
commit 11ef863bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/ruma-common/src/events/room/message.rs
View File

@ -2,7 +2,7 @@
//! //!
//! [`m.room.message`]: https://spec.matrix.org/v1.2/client-server-api/#mroommessage //! [`m.room.message`]: https://spec.matrix.org/v1.2/client-server-api/#mroommessage
use std::{borrow::Cow, fmt}; use std::{borrow::Cow, fmt, time::Duration};
use js_int::UInt; use js_int::UInt;
use ruma_macros::EventContent; use ruma_macros::EventContent;
@ -510,8 +510,12 @@ impl AudioMessageEventContent {
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
pub struct AudioInfo { pub struct AudioInfo {
/// The duration of the audio in milliseconds. /// The duration of the audio in milliseconds.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(
pub duration: Option<UInt>, with = "crate::serde::duration::opt_ms",
default,
skip_serializing_if = "Option::is_none"
)]
pub duration: Option<Duration>,
/// The mimetype of the audio, e.g. "audio/aac". /// The mimetype of the audio, e.g. "audio/aac".
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
@ -1083,8 +1087,12 @@ impl VideoMessageEventContent {
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
pub struct VideoInfo { pub struct VideoInfo {
/// The duration of the video in milliseconds. /// The duration of the video in milliseconds.
#[serde(skip_serializing_if = "Option::is_none")] #[serde(
pub duration: Option<UInt>, with = "crate::serde::duration::opt_ms",
default,
skip_serializing_if = "Option::is_none"
)]
pub duration: Option<Duration>,
/// The height of the video in pixels. /// The height of the video in pixels.
#[serde(rename = "h", skip_serializing_if = "Option::is_none")] #[serde(rename = "h", skip_serializing_if = "Option::is_none")]