daydream

commit afb38af4c49a984f0e575ece859e6ea7c92ebe20
parent bef55d05908e354e725be784cb7b8c48a466f200
Author: Marcel <mtrnord1@gmail.com>
Date:   Thu,  9 Jul 2020 16:41:24 +0200

Remove a clone

Took 5 minutes

Diffstat:
M
src/app/components/events/mod.rs
 | 
2
+-
M
src/app/matrix/mod.rs
 | 
6
+++---
M
src/app/matrix/sync.rs
 | 
6
+++---
M
src/app/matrix/types.rs
 | 
2
+-

4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/app/components/events/mod.rs b/src/app/components/events/mod.rs
@@ -30,5 +30,5 @@ pub fn get_sender_avatar<'a>(homeserver_url: &'a Url, room: &'a Room, event: &'a
         .get(&event.sender)
         .or_else(|| room.invited_members.get(&event.sender))?;
 
-    Some(get_media_download_url(homeserver_url, member.avatar_url.clone()?))
+    Some(get_media_download_url(homeserver_url, member.avatar_url.as_deref()?))
 }
diff --git a/src/app/matrix/mod.rs b/src/app/matrix/mod.rs
@@ -303,7 +303,7 @@ impl Agent for MatrixAgent {
                                 if let Some(image_event_url) = image_event.url {
                                     let new_url = get_media_download_url(
                                         agent.matrix_client.as_ref().unwrap().homeserver(),
-                                        image_event_url,
+                                        &image_event_url,
                                     );
                                     image_event.url = Some(new_url.to_string());
                                 }
@@ -311,7 +311,7 @@ impl Agent for MatrixAgent {
                                     if let Some(thumbnail_url) = info.thumbnail_url.as_ref() {
                                         let new_url = get_media_download_url(
                                             agent.matrix_client.as_ref().unwrap().homeserver(),
-                                            (*thumbnail_url).clone(),
+                                            thumbnail_url,
                                         );
                                         info.thumbnail_url = Some(new_url.to_string());
                                     }
@@ -331,7 +331,7 @@ impl Agent for MatrixAgent {
                                     if let Some(thumbnail_url) = info.thumbnail_url {
                                         let new_url = Some(get_media_download_url(
                                             agent.matrix_client.as_ref().unwrap().homeserver(),
-                                            thumbnail_url,
+                                            &thumbnail_url,
                                         )).unwrap();
                                         info.thumbnail_url = Some(new_url.to_string());
                                     }
diff --git a/src/app/matrix/sync.rs b/src/app/matrix/sync.rs
@@ -130,7 +130,7 @@ impl Sync {
                     let old_image_url = mem::take(image_url);
                     *image_url = get_media_download_url(
                         self.matrix_client.clone().homeserver(),
-                        old_image_url,
+                        &old_image_url,
                     ).to_string();
                 }
 
@@ -139,7 +139,7 @@ impl Sync {
                         let old_thumbnail_url = mem::take(thumbnail_url);
                         *thumbnail_url = get_media_download_url(
                             self.matrix_client.clone().homeserver(),
-                            old_thumbnail_url,
+                            &old_thumbnail_url,
                         ).to_string();
                     }
                 }
@@ -158,7 +158,7 @@ impl Sync {
                         let old_thumbnail_url = mem::take(thumbnail_url);
                         *thumbnail_url = get_media_download_url(
                             self.matrix_client.clone().homeserver(),
-                            old_thumbnail_url,
+                            &old_thumbnail_url,
                         ).to_string();
                     }
                 }
diff --git a/src/app/matrix/types.rs b/src/app/matrix/types.rs
@@ -1,6 +1,6 @@
 use url::Url;
 
-pub fn get_media_download_url(homeserver: &Url, mxc_url: String) -> Url {
+pub fn get_media_download_url(homeserver: &Url, mxc_url: &str) -> Url {
     let url_parts_raw = mxc_url.replace("mxc://", "");
     let url_parts: Vec<&str> = url_parts_raw.split('/').collect();
     let server_name = (*url_parts.first().unwrap()).to_string();