From 5868c7266252f25361c337ad30fbebfd8e579cf3 Mon Sep 17 00:00:00 2001
From: Denis Kasak <dkasak@termina.org.uk>
Date: Wed, 10 Jun 2020 12:01:01 +0200
Subject: [PATCH] Small refactor so we don't duplicate user_id creation.

---
 matrix_sdk_base/src/models/room.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/matrix_sdk_base/src/models/room.rs b/matrix_sdk_base/src/models/room.rs
index 523d15ac..2f25c2a9 100644
--- a/matrix_sdk_base/src/models/room.rs
+++ b/matrix_sdk_base/src/models/room.rs
@@ -341,15 +341,12 @@ impl Room {
     }
 
     fn add_member(&mut self, event: &MemberEvent) -> bool {
-        if self
-            .members
-            .contains_key(&UserId::try_from(event.state_key.as_str()).unwrap())
-        {
+        let new_member = RoomMember::new(event);
+
+        if self.members.contains_key(&new_member.user_id) {
             return false;
         }
 
-        let new_member = RoomMember::new(event);
-
         // Find all users that share the same display name as the joining user.
         let users_with_same_name: Vec<UserId> = self
             .members
@@ -487,6 +484,7 @@ impl Room {
                 } else {
                     return false;
                 };
+
                 if let Some(member) = self.members.get_mut(&user) {
                     member.update_member(event)
                 } else {