Add image attachment support with fast-thumbhash library. Update dependencies and refactor image handling logic

Author: nullchinchilla

Cargo.lock

@@ -56,6 +56,7 @@ arboard = { version = "3.6.1", features = [
     "image-data",
     "wayland-data-control",
 ] }
+fast-thumbhash = "0.2.0"
 fastrand = "2.3.0"
 either = "1.15.0"
 futures-util = "0.3.32"

binaries/nullspace-egui/Cargo.toml

@@ -7,10 +7,12 @@ use clap::Parser;
 
 use egui::Modal;
 use egui_file_dialog::FileDialog as EguiFileDialog;
-use nullspace_client::{Client, Config, internal::Event};
+use nullspace_client::{
+    Client, Config,
+    internal::{Event, UploadedRoot},
+};
 use nullspace_crypt::hash::Hash;
 use nullspace_crypt::signing::SigningPublic;
-use nullspace_structs::fragment::Attachment;
 use smol::channel::Receiver;
 use url::Url;
 
@@ -80,10 +82,12 @@ struct AppState {
     attach_updates: u64,
 
     upload_progress: BTreeMap<i64, (u64, u64)>,
-    upload_done: BTreeMap<i64, Attachment>,
+    upload_done: BTreeMap<i64, UploadedRoot>,
     upload_error: BTreeMap<i64, String>,
     download_progress: BTreeMap<Hash, (u64, u64)>,
     download_error: BTreeMap<Hash, String>,
+
+    image_viewer: Option<PathBuf>,
 }
 
 impl NullspaceApp {
@@ -174,6 +178,7 @@ impl NullspaceApp {
                 upload_error: BTreeMap::new(),
                 download_progress: BTreeMap::new(),
                 download_error: BTreeMap::new(),
+                image_viewer: None,
             },
         }
     }
@@ -297,6 +302,7 @@ impl eframe::App for NullspaceApp {
             }
         }
         egui::CentralPanel::default().show(ctx, |ui| {
+            ui.add(widgets::image_viewer::ImageViewer(&mut self.state.image_viewer));
             if let Some(e) = self.state.error_dialog.clone() {
                 Modal::new("error_modal".into()).show(ctx, |ui| {
                     ui.heading("Error");

binaries/nullspace-egui/src/main.rs

@@ -50,6 +50,7 @@ pub async fn show_notification(
                     let body = match &message.body {
                         MessageContent::PlainText(text) => text.clone(),
                         MessageContent::Attachment { .. } => "Attachment".to_string(),
+                        MessageContent::ImageAttachment { .. } => "Image".to_string(),
                         MessageContent::GroupInvite { .. } => "Group invite".to_string(),
                     };
                     let title = format!("Message from {}", message.sender);

binaries/nullspace-egui/src/notify.rs

@@ -5,8 +5,8 @@ use egui::{Color32, RichText};
 use egui_hooks::UseHookExt;
 use egui_hooks::hook::state::{State, Var};
 use egui_taffy::{Tui, TuiBuilderLogic, tui};
-use nullspace_client::internal::UserDetails;
-use nullspace_structs::fragment::Attachment;
+use nullspace_client::internal::{UploadedRoot, UserDetails};
+use nullspace_structs::fragment::ImageAttachment;
 use pollster::FutureExt;
 use taffy::style_helpers::{auto, fr, length};
 use taffy::{AlignItems, Dimension, Display, FlexDirection, Size as TaffySize, Style};
@@ -21,13 +21,13 @@ use crate::widgets::avatar::Avatar;
 enum AvatarChoice {
     Keep,
     Clear,
-    Set(Attachment),
+    Set(ImageAttachment),
 }
 
 #[derive(Clone)]
 struct SaveRequest {
     display_name: Option<String>,
-    avatar: Option<Attachment>,
+    avatar: Option<ImageAttachment>,
 }
 
 enum SaveOutcome {
@@ -247,7 +247,15 @@ impl Widget for ProfileInner<'_> {
                             ui.add(eframe::egui::ProgressBar::new(progress).text("Uploading..."));
                         } else if let Some(done) = self.app.state.upload_done.get(&upload_id) {
                             let root = done.clone();
-                            avatar_choice.set_next(AvatarChoice::Set(root));
+                            match root {
+                                UploadedRoot::ImageAttachment(root) => {
+                                    avatar_choice.set_next(AvatarChoice::Set(root));
+                                }
+                                UploadedRoot::Attachment(_) => {
+                                    self.app.state.error_dialog =
+                                        Some("avatar upload produced non-image payload".to_string());
+                                }
+                            }
                             avatar_upload_id.set_next(None);
                             self.app.state.upload_done.remove(&upload_id);
                             self.app.state.upload_progress.remove(&upload_id);
@@ -336,7 +344,7 @@ fn start_avatar_upload(app: &mut NullspaceApp, upload_id: &State<Option<i64>>, p
         app.state.error_dialog = Some("avatar must be an image".to_string());
         return;
     }
-    let Ok(id) = flatten_rpc(get_rpc().attachment_upload(path, mime).block_on()) else {
+    let Ok(id) = flatten_rpc(get_rpc().image_attachment_upload(path).block_on()) else {
         return;
     };
     upload_id.set_next(Some(id));

binaries/nullspace-egui/src/screens/profile.rs

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use eframe::egui::{Response, Widget};
 use egui_hooks::UseHookExt;
 use nullspace_crypt::hash::BcsHashExt;
-use nullspace_structs::fragment::Attachment;
+use nullspace_structs::fragment::ImageAttachment;
 use nullspace_structs::username::UserName;
 
 use crate::promises::flatten_rpc;
@@ -13,7 +13,7 @@ use crate::widgets::smooth::SmoothImage;
 
 pub struct Avatar {
     pub sender: UserName,
-    pub attachment: Option<Attachment>,
+    pub attachment: Option<ImageAttachment>,
     pub size: f32,
 }
 
@@ -49,7 +49,7 @@ impl Widget for Avatar {
                 smol::spawn(async move {
                     let _ = flatten_rpc(
                         get_rpc()
-                            .attachment_download_oneshot(sender, attachment, save_to)
+                            .attachment_download_oneshot(sender, attachment.inner, save_to)
                             .await,
                     );
                 })
@@ -60,6 +60,7 @@ impl Widget for Avatar {
                 let size = eframe::egui::vec2(self.size, self.size);
                 ui.add(
                     SmoothImage::new(path.as_path())
+                        .thumbhash(Some(attachment.thumbhash.as_str()))
                         .fit_to_size(size)
                         .corner_radius(circle_corner_radius)
                         .preserve_aspect_ratio(false)
@@ -98,8 +99,8 @@ fn paint_avatar_placeholder(ui: &eframe::egui::Ui, rect: eframe::egui::Rect, use
     );
 }
 
-fn avatar_cache_path(attachment: &Attachment) -> Option<PathBuf> {
+fn avatar_cache_path(attachment: &ImageAttachment) -> Option<PathBuf> {
     let base = dirs::cache_dir()?;
-    let filename = attachment.bcs_hash().to_string();
+    let filename = attachment.inner.bcs_hash().to_string();
     Some(base.join("nullspace").join("avatars").join(filename))
 }

binaries/nullspace-egui/src/widgets/avatar.rs

@@ -3,7 +3,7 @@ use egui::{Button, Color32, Image, Label, Modal, ProgressBar, ScrollArea, TextEd
 use egui_hooks::UseHookExt;
 use egui_hooks::hook::state::Var;
 use egui_infinite_scroll::InfiniteScroll;
-use nullspace_client::internal::{ConvoId, ConvoMessage, OutgoingMessage};
+use nullspace_client::internal::{ConvoId, ConvoMessage, OutgoingMessage, UploadedRoot};
 use nullspace_structs::username::UserName;
 use pollster::block_on;
 use smol_str::SmolStr;
@@ -318,7 +318,12 @@ fn start_upload(attachment: &mut Var<Option<i64>>, path: PathBuf) {
         "picked an attachment, starting upload..."
     );
     let mime = infer_mime(&path);
-    let Ok(upload_id) = flatten_rpc(block_on(get_rpc().attachment_upload(path, mime))) else {
+    let result = if mime.starts_with("image/") {
+        flatten_rpc(block_on(get_rpc().image_attachment_upload(path)))
+    } else {
+        flatten_rpc(block_on(get_rpc().attachment_upload(path, mime)))
+    };
+    let Ok(upload_id) = result else {
         return;
     };
     attachment.replace(upload_id);
@@ -348,11 +353,11 @@ fn render_composer(ui: &mut egui::Ui, app: &mut NullspaceApp, convo_id: ConvoId)
             let root = done.clone();
             let convo_id = convo_id.clone();
             smol::spawn(async move {
-                let _ = flatten_rpc(
-                    get_rpc()
-                        .convo_send(convo_id, OutgoingMessage::Attachment(root))
-                        .await,
-                );
+                let message = match root {
+                    UploadedRoot::Attachment(root) => OutgoingMessage::Attachment(root),
+                    UploadedRoot::ImageAttachment(root) => OutgoingMessage::ImageAttachment(root),
+                };
+                let _ = flatten_rpc(get_rpc().convo_send(convo_id, message).await);
             })
             .detach();
             *attachment = None;

binaries/nullspace-egui/src/widgets/convo.rs

@@ -15,13 +15,15 @@ pub struct MessageRenderMeta {
 enum MessageKind {
     Text,
     Attachment,
+    ImageAttachment,
     GroupInvite,
 }
 
 fn message_kind(message: &ConvoMessage) -> MessageKind {
     match message.body {
         MessageContent::PlainText(_) => MessageKind::Text,
         MessageContent::Attachment { .. } => MessageKind::Attachment,
+        MessageContent::ImageAttachment { .. } => MessageKind::ImageAttachment,
         MessageContent::GroupInvite { .. } => MessageKind::GroupInvite,
     }
 }