From 94be5b0fef83e3bec5145e2191e359b96c5f3ba3 Mon Sep 17 00:00:00 2001
From: Devin Ragotzy <devin.ragotzy@gmail.com>
Date: Wed, 30 Dec 2020 16:32:38 -0500
Subject: [PATCH] Update ruma and serde to latest

---
 Cargo.toml        | 8 ++++----
 src/event_auth.rs | 9 ++++-----
 src/lib.rs        | 2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 08874472..e196720a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,17 +13,17 @@ repository = "https://github.com/ruma/state-res"
 
 [dependencies]
 itertools = "0.9.0"
-serde = { version = "1.0.117", features = ["derive"] }
+serde = { version = "1.0.118", features = ["derive"] }
 serde_json = "1.0.60"
 tracing = "0.1.22"
 maplit = "1.0.2"
 thiserror = "1.0.22"
 
 [dependencies.ruma]
-git = "https://github.com/DevinR528/ruma"
-branch = "server-pdu"
+git = "https://github.com/ruma/ruma"
+# branch = "server-pdu"
 # path = "../__forks__/ruma/ruma"
-# rev = "45d01011554f9d07739e9a5edf5498d8ac16f273"
+rev = "210b6dd823ba89c5a44c3c9d913d377c4b54c896"
 features = ["client-api", "federation-api", "appservice-api", "unstable-pre-spec", "unstable-synapse-quirks"]
 
 [features]
diff --git a/src/event_auth.rs b/src/event_auth.rs
index 25bf4122..74b363ce 100644
--- a/src/event_auth.rs
+++ b/src/event_auth.rs
@@ -3,7 +3,6 @@ use std::{collections::BTreeMap, convert::TryFrom, sync::Arc};
 use maplit::btreeset;
 use ruma::{
     events::{
-        pdu::ServerPdu,
         room::{
             self,
             join_rules::JoinRule,
@@ -660,10 +659,10 @@ pub fn check_redaction<E: Event>(
 /// Check that the member event matches `state`.
 ///
 /// This function returns false instead of failing when deserialization fails.
-pub fn check_membership(member_event: Option<Arc<ServerPdu>>, state: MembershipState) -> bool {
+pub fn check_membership<E: Event>(member_event: Option<Arc<E>>, state: MembershipState) -> bool {
     if let Some(event) = member_event {
         if let Ok(content) =
-            serde_json::from_value::<room::member::MemberEventContent>(event.content.clone())
+            serde_json::from_value::<room::member::MemberEventContent>(event.content())
         {
             content.membership == state
         } else {
@@ -675,10 +674,10 @@ pub fn check_membership(member_event: Option<Arc<ServerPdu>>, state: MembershipS
 }
 
 /// Can this room federate based on its m.room.create event.
-pub fn can_federate(auth_events: &StateMap<Arc<ServerPdu>>) -> bool {
+pub fn can_federate<E: Event>(auth_events: &StateMap<Arc<E>>) -> bool {
     let creation_event = auth_events.get(&(EventType::RoomCreate, Some("".into())));
     if let Some(ev) = creation_event {
-        if let Some(fed) = ev.content.get("m.federate") {
+        if let Some(fed) = ev.content().get("m.federate") {
             fed == "true"
         } else {
             false
diff --git a/src/lib.rs b/src/lib.rs
index fde19729..f2c92753 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,7 +7,7 @@ use std::{
 
 use maplit::btreeset;
 use ruma::{
-    events::{pdu::ServerPdu, EventType},
+    events::EventType,
     identifiers::{EventId, RoomId, RoomVersionId},
 };