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

federation-api: Update ts format for create_invite (#258)

Browse Source
This commit is contained in:
Julian Tescher 2020-09-07 16:00:06 -07:00 committed by GitHub
parent 9f814a2415
commit a2dbeeac71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ruma-federation-api/src/membership/create_invite.rs
View File

@ -1,10 +1,10 @@
//! Endpoint for inviting a remote user to a room //! Endpoint for inviting a remote user to a room
use js_int::UInt;
use ruma_events::{room::member::MemberEventContent, EventType}; use ruma_events::{room::member::MemberEventContent, EventType};
use ruma_identifiers::{ServerName, UserId}; use ruma_identifiers::{ServerName, UserId};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use std::time::SystemTime;
pub mod v1; pub mod v1;
pub mod v2; pub mod v2;
@ -37,7 +37,8 @@ pub struct InviteEvent {
pub origin: Box<ServerName>, pub origin: Box<ServerName>,
/// A timestamp added by the inviting homeserver. /// A timestamp added by the inviting homeserver.
pub origin_server_ts: UInt, #[serde(with = "ruma_serde::time::ms_since_unix_epoch")]
pub origin_server_ts: SystemTime,
/// The event type (should always be `m.room.member`). /// The event type (should always be `m.room.member`).
#[serde(rename = "type")] #[serde(rename = "type")]
@ -59,7 +60,7 @@ pub struct InviteEventInit {
pub origin: Box<ServerName>, pub origin: Box<ServerName>,
/// A timestamp added by the inviting homeserver. /// A timestamp added by the inviting homeserver.
pub origin_server_ts: UInt, pub origin_server_ts: SystemTime,
/// The user ID of the invited member. /// The user ID of the invited member.
pub state_key: UserId, pub state_key: UserId,

7
ruma-federation-api/src/membership/create_invite/v1.rs
View File

@ -1,10 +1,10 @@
//! [PUT /_matrix/federation/v1/invite/{roomId}/{eventId}](https://matrix.org/docs/spec/server_server/r0.1.4#put-matrix-federation-v1-invite-roomid-eventid) //! [PUT /_matrix/federation/v1/invite/{roomId}/{eventId}](https://matrix.org/docs/spec/server_server/r0.1.4#put-matrix-federation-v1-invite-roomid-eventid)
use js_int::UInt;
use ruma_api::ruma_api; use ruma_api::ruma_api;
use ruma_events::{room::member::MemberEventContent, EventType}; use ruma_events::{room::member::MemberEventContent, EventType};
use ruma_identifiers::{EventId, RoomId, ServerName, UserId}; use ruma_identifiers::{EventId, RoomId, ServerName, UserId};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::time::SystemTime;
use super::{InviteEvent, StrippedState}; use super::{InviteEvent, StrippedState};
@ -35,7 +35,8 @@ ruma_api! {
pub origin: &'a ServerName, pub origin: &'a ServerName,
/// A timestamp added by the inviting homeserver. /// A timestamp added by the inviting homeserver.
pub origin_server_ts: UInt, #[serde(with = "ruma_serde::time::ms_since_unix_epoch")]
pub origin_server_ts: SystemTime,
/// The value `m.room.member`. /// The value `m.room.member`.
#[serde(rename = "type")] #[serde(rename = "type")]
@ -99,7 +100,7 @@ pub struct RequestInit<'a> {
pub origin: &'a ServerName, pub origin: &'a ServerName,
/// A timestamp added by the inviting homeserver. /// A timestamp added by the inviting homeserver.
pub origin_server_ts: UInt, pub origin_server_ts: SystemTime,
/// The user ID of the invited member. /// The user ID of the invited member.
pub state_key: &'a UserId, pub state_key: &'a UserId,