1 files changed, 26 insertions, 23 deletions
diff --git a/filamento/src/logic/online.rs b/filamento/src/logic/online.rs
index febd3e1..b36f9a9 100644
--- a/filamento/src/logic/online.rs
+++ b/filamento/src/logic/online.rs
@@ -11,7 +11,9 @@ use stanza::{
         iq::{self, Iq, IqType, Query}, Stanza
     }, xep_0030::{info, items}, xep_0060::{self, owner, pubsub::{self, Pubsub}}, xep_0084, xep_0172::{self, Nick}, xep_0203::Delay
 };
-use tokio::sync::oneshot;
+use tokio::{sync::oneshot, task::spawn_blocking};
+#[cfg(target_arch = "wasm32")]
+use tokio_with_wasm::alias as tokio;
 use tracing::{debug, error, info};
 use uuid::Uuid;
 
@@ -27,7 +29,7 @@ use super::{
     }, ClientLogic
 };
 
-pub async fn handle_online<Fs: FileStore + Clone>(logic: ClientLogic<Fs>, command: Command<Fs>, connection: Connected) {
+pub async fn handle_online<Fs: FileStore + Clone + 'static>(logic: ClientLogic<Fs>, command: Command<Fs>, connection: Connected) {
     let result = handle_online_result(&logic, command, connection).await;
     match result {
         Ok(_) => {}
@@ -288,12 +290,9 @@ pub async fn handle_accept_subscription_request<Fs: FileStore + Clone>(
     connection: Connected,
     jid: BareJID,
 ) -> Result<(), SubscribeError> {
-    let client_user = logic.db.read_user(logic.jid.clone()).await?;
-    let nick = client_user.nick.map(|nick| Nick(nick));
     let presence = Stanza::Presence(stanza::client::presence::Presence {
         to: Some(jid.into()),
-        r#type: Some(stanza::client::presence::PresenceType::Subscribe),
-        nick,
+        r#type: Some(stanza::client::presence::PresenceType::Subscribed),
         ..Default::default()
     });
     connection.write_handle().write(presence).await?;
@@ -973,29 +972,33 @@ pub async fn handle_change_nick<Fs: FileStore + Clone>(logic: &ClientLogic<Fs>,
     Ok(())
 }
 
-pub async fn handle_change_avatar<Fs: FileStore + Clone>(logic: &ClientLogic<Fs>, img_data: Option<Vec<u8>>) -> Result<(), AvatarPublishError<Fs>> {
+pub async fn handle_change_avatar<Fs: FileStore + Clone + 'static>(logic: &ClientLogic<Fs>, img_data: Option<Vec<u8>>) -> Result<(), AvatarPublishError<Fs>> {
     match img_data {
         // set avatar
         Some(data) => {
-            // load the image data and guess the format
-            let image = ImageReader::new(Cursor::new(data)).with_guessed_format()?.decode()?;
+            let (bytes, hash, data_png, data_b64) = spawn_blocking(move || -> Result<_, _> {
+                // load the image data and guess the format
+                let image = ImageReader::new(Cursor::new(data)).with_guessed_format()?.decode()?;
+                
+                // convert the image to png;
+                let mut data_png = Vec::new();
+                let image = image.resize(192, 192, image::imageops::FilterType::Nearest);
+                image.write_to(&mut Cursor::new(&mut data_png), image::ImageFormat::Jpeg)?;
 
-            // convert the image to png;
-            let mut data_png = Vec::new();
-            let image = image.resize(192, 192, image::imageops::FilterType::Nearest);
-            image.write_to(&mut Cursor::new(&mut data_png), image::ImageFormat::Jpeg)?;
+                // calculate the length of the data in bytes.
+                let bytes = data_png.len().try_into()?;
 
-            // calculate the length of the data in bytes.
-            let bytes = data_png.len().try_into()?;
+                // calculate sha1 hash of the data
+                let mut sha1 = Sha1::new();
+                sha1.update(&data_png);
+                let sha1_result = sha1.finalize();
+                let hash = hex::encode(sha1_result);
 
-            // calculate sha1 hash of the data
-            let mut sha1 = Sha1::new();
-            sha1.update(&data_png);
-            let sha1_result = sha1.finalize();
-            let hash = hex::encode(sha1_result);
+                // encode the image data as base64
+                let data_b64 = BASE64_STANDARD.encode(data_png.clone());
 
-            // encode the image data as base64
-            let data_b64 = BASE64_STANDARD.encode(data_png.clone());
+                Ok::<(u32, String, Vec<u8>, String), AvatarPublishError<Fs>>((bytes, hash, data_png, data_b64))
+            }).await.unwrap()?;
 
             // publish the data to the data node
             logic.client().publish(pep::Item::AvatarData(Some(avatar::Data { hash: hash.clone(), data_b64 })), "urn:xmpp:avatar:data".to_string()).await?;
@@ -1081,7 +1084,7 @@ pub async fn handle_delete_pep_node<Fs: FileStore + Clone>(
 }
 
 // TODO: could probably macro-ise?
-pub async fn handle_online_result<Fs: FileStore + Clone>(
+pub async fn handle_online_result<Fs: FileStore + Clone + 'static>(
     logic: &ClientLogic<Fs>,
     command: Command<Fs>,
     connection: Connected,