From 359c5280d7181e15404d6f76302828733a6bbc93 Mon Sep 17 00:00:00 2001
From: Denis Kasak <dkasak@termina.org.uk>
Date: Thu, 30 Jul 2020 14:40:27 +0200
Subject: [PATCH] Expose `sender` in `PossiblyRedactedExt`.

Also add a few missing apostrophes.
---
 matrix_sdk_base/src/models/message.rs | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/matrix_sdk_base/src/models/message.rs b/matrix_sdk_base/src/models/message.rs
index fa47b899..6403c60d 100644
--- a/matrix_sdk_base/src/models/message.rs
+++ b/matrix_sdk_base/src/models/message.rs
@@ -10,7 +10,7 @@ use std::{
     vec::IntoIter,
 };
 
-use matrix_sdk_common::identifiers::EventId;
+use matrix_sdk_common::identifiers::{UserId, EventId};
 use serde::{de, ser, Serialize};
 
 use crate::events::AnyPossiblyRedactedSyncMessageEvent;
@@ -18,16 +18,18 @@ use crate::events::AnyPossiblyRedactedSyncMessageEvent;
 /// Exposes some of the field access methods found in the event held by
 /// `AnyPossiblyRedacted*` enums.
 ///
-/// This is just an extension trait to aid the ease of use of certain event enums.
+/// This is just an extension trait to ease the use of certain event enums.
 pub trait PossiblyRedactedExt {
-    /// Access the redacted or full events `event_id` field.
+    /// Access the redacted or full event's `event_id` field.
     fn event_id(&self) -> &EventId;
-    /// Access the redacted or full events `origin_server_ts` field.
+    /// Access the redacted or full event's `origin_server_ts` field.
     fn origin_server_ts(&self) -> &SystemTime;
+    /// Access the redacted or full event's `sender` field.
+    fn sender(&self) -> &UserId;
 }
 
 impl PossiblyRedactedExt for AnyPossiblyRedactedSyncMessageEvent {
-    /// Access the underlying events `event_id`.
+    /// Access the underlying event's `event_id`.
     fn event_id(&self) -> &EventId {
         match self {
             Self::Regular(e) => e.event_id(),
@@ -35,13 +37,21 @@ impl PossiblyRedactedExt for AnyPossiblyRedactedSyncMessageEvent {
         }
     }
 
-    /// Access the underlying events `origin_server_ts`.
+    /// Access the underlying event's `origin_server_ts`.
     fn origin_server_ts(&self) -> &SystemTime {
         match self {
             Self::Regular(e) => e.origin_server_ts(),
             Self::Redacted(e) => e.origin_server_ts(),
         }
     }
+
+    /// Access the underlying event's `sender`.
+    fn sender(&self) -> &UserId {
+        match self {
+            Self::Regular(e) => e.sender(),
+            Self::Redacted(e) => e.sender(),
+        }
+    }
 }
 
 const MESSAGE_QUEUE_CAP: usize = 35;