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

events: Clean up verification relations

Browse Source
This commit is contained in:
Jonas Platte 2021-06-17 18:42:35 +02:00
parent e3084b1f91
commit dfce734974
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
crates/ruma-events/src/key/verification.rs
View File

@ -4,19 +4,12 @@
//! //!
//! The MSC for the in-room variants of the `m.key.verification.*` events can be found //! The MSC for the in-room variants of the `m.key.verification.*` events can be found
//! [here](https://github.com/matrix-org/matrix-doc/pull/2241). //! [here](https://github.com/matrix-org/matrix-doc/pull/2241).
#[cfg(feature = "unstable-pre-spec")]
use std::convert::TryFrom;
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
use ruma_identifiers::EventId; use ruma_identifiers::EventId;
use ruma_serde::StringEnum; use ruma_serde::StringEnum;
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
#[cfg(feature = "unstable-pre-spec")]
use crate::room::relationships::{Reference, RelatesToJsonRepr, RelationJsonRepr};
pub mod accept; pub mod accept;
pub mod cancel; pub mod cancel;
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
@ -83,14 +76,14 @@ pub enum ShortAuthenticationString {
_Custom(String), _Custom(String),
} }
/// The relation that contains info which event the reaction is applying to. /// A relation which associates an `m.key.verification.request` with another key verification event.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
#[cfg_attr(docsrs, doc(cfg(feature = "unstable-pre-spec")))] #[cfg_attr(docsrs, doc(cfg(feature = "unstable-pre-spec")))]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
#[serde(try_from = "RelatesToJsonRepr", into = "RelatesToJsonRepr")] #[serde(tag = "rel_type", rename = "m.reference")]
pub struct Relation { pub struct Relation {
/// The event that is being referenced. /// The event ID of a related `m.key.verification.request`.
pub event_id: EventId, pub event_id: EventId,
} }
@ -102,28 +95,6 @@ impl Relation {
} }
} }
#[cfg(feature = "unstable-pre-spec")]
impl From<Relation> for RelatesToJsonRepr {
fn from(relation: Relation) -> Self {
RelatesToJsonRepr::Relation(RelationJsonRepr::Reference(Reference {
event_id: relation.event_id,
}))
}
}
#[cfg(feature = "unstable-pre-spec")]
impl TryFrom<RelatesToJsonRepr> for Relation {
type Error = &'static str;
fn try_from(value: RelatesToJsonRepr) -> Result<Self, Self::Error> {
if let RelatesToJsonRepr::Relation(RelationJsonRepr::Reference(r)) = value {
Ok(Relation { event_id: r.event_id })
} else {
Err("Expected a relation with a rel_type of `reference`")
}
}
}
/// A Short Authentication String (SAS) verification method. /// A Short Authentication String (SAS) verification method.
#[derive(Clone, Debug, PartialEq, Eq, StringEnum)] #[derive(Clone, Debug, PartialEq, Eq, StringEnum)]
pub enum VerificationMethod { pub enum VerificationMethod {