From be0838e7d3cc3659a9ab374261a52b321c4c0bba Mon Sep 17 00:00:00 2001
From: "Ragotzy.devin" <devin.ragotzy@gmail.com>
Date: Thu, 11 Jun 2020 17:48:57 -0400
Subject: [PATCH] Change EncryptedEventContent from StateEventContent to
 MessageEventContent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… and add it to AnyMessageEventContent
---
 ruma-events/src/enums.rs          | 1 +
 ruma-events/src/room/encrypted.rs | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruma-events/src/enums.rs b/ruma-events/src/enums.rs
index 6664d7c7..fb0fcabe 100644
--- a/ruma-events/src/enums.rs
+++ b/ruma-events/src/enums.rs
@@ -41,6 +41,7 @@ event_content_enum! {
         "m.call.invite",
         "m.call.hangup",
         "m.call.candidates",
+        "m.room.encrypted",
         "m.room.message",
         "m.room.message.feedback",
         "m.sticker",
diff --git a/ruma-events/src/room/encrypted.rs b/ruma-events/src/room/encrypted.rs
index f97dfd97..07d97b8c 100644
--- a/ruma-events/src/room/encrypted.rs
+++ b/ruma-events/src/room/encrypted.rs
@@ -3,17 +3,17 @@
 use std::collections::BTreeMap;
 
 use js_int::UInt;
-use ruma_events_macros::StateEventContent;
+use ruma_events_macros::MessageEventContent;
 use ruma_identifiers::DeviceId;
 use serde::{Deserialize, Serialize};
 
-use crate::StateEvent;
+use crate::MessageEvent;
 
 /// An event that defines how messages sent in this room should be encrypted.
-pub type EncryptedEvent = StateEvent<EncryptedEventContent>;
+pub type EncryptedEvent = MessageEvent<EncryptedEventContent>;
 
 /// The payload for `EncryptedEvent`.
-#[derive(Clone, Debug, Deserialize, Serialize, StateEventContent)]
+#[derive(Clone, Debug, Deserialize, Serialize, MessageEventContent)]
 #[non_exhaustive]
 #[ruma_event(type = "m.room.encrypted")]
 #[serde(tag = "algorithm")]