Set room avatar working. Only png files

ara4n · Sep 5, 2017 · 483e0ea · 483e0ea
1 parent 50782e8
commit 483e0ea
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 3 deletions.
diff --git a/res/main_window.glade b/res/main_window.glade
@@ -2,6 +2,11 @@
 <!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
+  <object class="GtkFileFilter" id="filefilter1">
+    <mime-types>
+      <mime-type>image/png</mime-type>
+    </mime-types>
+  </object>
   <object class="GtkListStore" id="members_store">
     <columns>
       <!-- column-name alias -->
@@ -864,6 +869,7 @@ Join a room to start to chat</property>
                   <object class="GtkFileChooserButton" id="room_avatar_filechooser">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="filter">filefilter1</property>
                     <property name="title" translatable="yes"/>
                   </object>
                   <packing>

diff --git a/src/backend.rs b/src/backend.rs
@@ -24,6 +24,9 @@ use types::Member;
 use types::Protocol;
 use types::Room;
 
+use std::fs::File;
+use std::io::prelude::*;
+
 
 pub struct BackendData {
     user_id: String,
@@ -818,10 +821,39 @@ impl Backend {
     }
 
     pub fn set_room_avatar(&self, roomid: String, avatar: String) -> Result<(), Error> {
+        let baseu = self.get_base_url()?;
+        let tk = self.data.lock().unwrap().access_token.clone();
+        let params = vec![("access_token", tk.clone())];
+        let mediaurl = media_url!(&baseu, "upload", params)?;
+        let roomurl = self.url(&format!("rooms/{}/state/m.room.avatar", roomid), vec![])?;
+
+        let mut file = File::open(&avatar)?;
+        let mut contents: Vec<u8> = vec![];
+        file.read_to_end(&mut contents)?;
+
+        let tx = self.tx.clone();
+        thread::spawn(
+            move || {
+                match put_media(mediaurl.as_str(), contents) {
+                    Err(err) => {
+                        tx.send(BKResponse::SetRoomAvatarError(err)).unwrap();
+                    }
+                    Ok(js) => {
+                        let uri = js["content_uri"].as_str().unwrap_or("");
+                        let attrs = json!({ "url": uri });
+                        match json_q("put", &roomurl, &attrs) {
+                            Ok(js) => {
+                                tx.send(BKResponse::SetRoomAvatar).unwrap();
+                            },
+                            Err(err) => {
+                                tx.send(BKResponse::SetRoomAvatarError(err)).unwrap();
+                            }
+                        };
+                    }
+                };
+            },
+        );
 
-        // TODO:
-        //  * upload media. POST /_matrix/media/r0/upload
-        //  * send avatar event. PUT /_matrix/client/r0/rooms/RID/state/m.room.avatar
 
         Ok(())
     }

diff --git a/src/util.rs b/src/util.rs
@@ -28,6 +28,8 @@ use error::Error;
 use types::Message;
 use types::Room;
 
+use self::reqwest::header::ContentType;
+
 
 // from https://stackoverflow.com/a/43992218/1592377
 #[macro_export]
@@ -229,6 +231,21 @@ pub fn get_media(url: &str) -> Result<Vec<u8>, Error> {
     Ok(buffer)
 }
 
+pub fn put_media(url: &str, file: Vec<u8>) -> Result<JsonValue, Error> {
+
+    let client = reqwest::Client::new()?;
+    let mut conn = client.post(url)?;
+    conn.body(file);
+    conn.header(ContentType::png());
+
+    let mut res = conn.send()?;
+
+    match res.json() {
+        Ok(js) => Ok(js),
+        Err(_) => Err(Error::BackendError),
+    }
+}
+
 pub fn dw_media(base: &Url,
                 url: &str,
                 thumb: bool,