From e4c7a81a7c82f1727e5490ed7f743bd8e2e60b61 Mon Sep 17 00:00:00 2001
From: Isaiah Inuwa <isaiah.inuwa@gmail.com>
Date: Sat, 23 May 2020 08:02:47 -0500
Subject: [PATCH] Use SystemTime for timestamp fields

---
 Cargo.toml                             | 2 +-
 src/lib.rs                             | 5 +++--
 src/membership/create_join_event/v1.rs | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index adca0af2..58d72b35 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,6 +18,6 @@ matches = "0.1.8"
 ruma-api = "0.16.0-rc.3"
 ruma-events = "0.21.0-beta.1"
 ruma-identifiers = "0.16.0"
-ruma-serde = "0.1.0"
+ruma-serde = "0.2.1"
 serde = { version = "1.0.106", features = ["derive"] }
 serde_json = "1.0.51"
diff --git a/src/lib.rs b/src/lib.rs
index 8be02a60..ea235b73 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,7 +2,7 @@
 
 #![warn(missing_docs)]
 
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, time::SystemTime};
 
 use ::serde::{Deserialize, Serialize};
 use js_int::UInt;
@@ -27,7 +27,8 @@ pub struct RoomV3Pdu {
     pub origin: String,
     /// Timestamp (milliseconds since the UNIX epoch) on originating homeserver
     /// of when this event was created.
-    pub origin_server_ts: UInt,
+    #[serde(with = "ruma_serde::time::ms_since_unix_epoch")]
+    pub origin_server_ts: SystemTime,
 
     // TODO: Replace with event content collection from ruma-events once that exists
     /// The event's type.
diff --git a/src/membership/create_join_event/v1.rs b/src/membership/create_join_event/v1.rs
index 3f5f2874..e4403f04 100644
--- a/src/membership/create_join_event/v1.rs
+++ b/src/membership/create_join_event/v1.rs
@@ -1,6 +1,6 @@
 //! [PUT /_matrix/federation/v1/send_join/{roomId}/{eventId}](https://matrix.org/docs/spec/server_server/r0.1.3#put-matrix-federation-v1-send-join-roomid-eventid)
 
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, time::SystemTime};
 
 use js_int::UInt;
 use ruma_api::ruma_api;
@@ -35,7 +35,8 @@ ruma_api! {
         pub origin: String,
         /// Timestamp (milliseconds since the UNIX epoch) on originating homeserver
         /// of when this event was created.
-        pub origin_server_ts: UInt,
+        #[serde(with = "ruma_serde::time::ms_since_unix_epoch")]
+        pub origin_server_ts: SystemTime,
 
         // TODO: Replace with event content collection from ruma-events once that exists
         /// The event's type.