fix: 🐛 user and bot avatar lost

config/bot.json

@@ -7,8 +7,7 @@
       "name": "Polestar Assistant",
       "desc": "AI Assistant powered by OpenAI.",
       "avatar": {
-        "name": "🌉",
-        "color": "#EDF7FBFF"
+        "url": "outlined_logo.png"
       },
       "cat": "Assistant",
       "tags": [

core/src/utils/fs.rs

@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use home::home_dir;
 
@@ -15,6 +15,7 @@ static CURRENT_USER: &str = "current_user";
 static NONCE_FILE: &str = "nonce";
 static TOKEN_FILE: &str = "token";
 static LOCAL_STATE: &str = "local_state";
+static POLESTAR_STATIC: &str = "static";
 
 pub fn project_home_path() -> PathBuf {
   home_dir()
@@ -103,6 +104,14 @@ pub fn create_if_not_exist_dir(path: PathBuf) {
   }
 }
 
+pub fn get_static_file(file: &str) -> PolestarResult<Vec<u8>> {
+  let mut path = project_home_path();
+  path.push(POLESTAR_STATIC);
+  path.push(file);
+  let content = std::fs::read(&path)?;
+  Ok(content)
+}
+
 pub mod encrypt {
   use std::{fs::File, io::Write};
 
@@ -156,18 +165,18 @@ pub mod encrypt {
 }
 
 pub mod launch {
-  use std::{fs, io::Write};
+  use std::{fs, io::Write, path::PathBuf};
 
   use super::{
-    create_if_not_exist_dir, project_bot_config_path, project_config_path, project_home_path,
-    project_user_path,
+    copy_dir_all, create_if_not_exist_dir, project_bot_config_path, project_config_path,
+    project_home_path, project_user_path, POLESTAR_STATIC,
   };
 
   pub fn setup_project() {
     create_if_not_exist_dir(project_home_path());
     create_if_not_exist_dir(project_user_path());
     create_if_not_exist_dir(project_config_path());
-    write_default_bot_config();
+    copy_static_files_to_user_data();
   }
 
   pub fn write_default_bot_config() {
@@ -183,4 +192,28 @@ pub mod launch {
       .write_all(content.as_bytes())
       .expect("can't write bot.json");
   }
+
+  pub fn copy_static_files_to_user_data() {
+    let mut src = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    src.push("../gui/static");
+    let mut dst = project_home_path();
+    dst.push(POLESTAR_STATIC);
+    copy_dir_all(src, dst).expect("Failed to copy static files");
+  }
+}
+
+use std::{fs, io};
+
+fn copy_dir_all(src: impl AsRef<Path>, dst: impl AsRef<Path>) -> io::Result<()> {
+  fs::create_dir_all(&dst)?;
+  for entry in fs::read_dir(src)? {
+    let entry = entry?;
+    let ty = entry.file_type()?;
+    if ty.is_dir() {
+      copy_dir_all(entry.path(), dst.as_ref().join(entry.file_name()))?;
+    } else {
+      fs::copy(entry.path(), dst.as_ref().join(entry.file_name()))?;
+    }
+  }
+  Ok(())
 }

gui/src/widgets/common/avatar.rs

@@ -1,15 +1,19 @@
-use polestar_core::model::BotAvatar;
+use polestar_core::{get_static_file, model::BotAvatar};
 use ribir::prelude::*;
 
 pub fn w_avatar(avatar: BotAvatar) -> impl WidgetBuilder {
   fn_widget! {
     @ {
       match avatar {
-        BotAvatar::Image { url: _ } => {
-          let data = vec![0];
-          @Avatar {
-            @ { ShareResource::new(PixelImage::from_png(&data)) }
-          }.widget_build(ctx!())
+        BotAvatar::Image { url } => {
+          let data = get_static_file(&url);
+          if let Ok(data) = data {
+            @Avatar {
+              @ { ShareResource::new(PixelImage::from_png(&data)) }
+            }.widget_build(ctx!())
+          } else {
+            @Void {}.widget_build(ctx!())
+          }
         }
         BotAvatar::Text { name, color } => {
           @Avatar {

gui/src/widgets/home/chat/msg_list.rs

@@ -1,12 +1,12 @@
-use polestar_core::model::{ChannelId, MsgCont, MsgId, MsgRole};
+use polestar_core::model::{BotAvatar, ChannelId, MsgCont, MsgId, MsgRole};
 use ribir::prelude::*;
 use uuid::Uuid;
 
 use crate::style::decorator::channel::message_style;
 use crate::style::{GAINSBORO, WHITE};
 use crate::theme::polestar_svg;
 use crate::widgets::app::Chat;
-use crate::widgets::common::IconButton;
+use crate::widgets::common::{w_avatar, IconButton};
 use crate::widgets::helper::send_msg;
 
 use super::onboarding::w_msg_onboarding;
@@ -254,15 +254,33 @@ fn w_msg(
             }
           }
         };
+        let avatar = match role {
+          MsgRole::User => {
+            BotAvatar::Image {
+              url: "user_avatar.png".to_owned(),
+            }
+          }
+          MsgRole::Bot(bot_id) => {
+            let chat = $chat;
+            chat.info().bot(&bot_id).map(|bot| bot.avatar().clone()).unwrap_or(BotAvatar::Image {
+              url: "outlined_logo.png".to_owned(),
+            })
+          }
+          MsgRole::System(_) => {
+            BotAvatar::Image {
+              url: "outlined_logo.png".to_owned(),
+            }
+          }
+        };
         @$stack {
           @Row {
             h_align: match msg.role() {
               MsgRole::User => HAlign::Right,
               _ => HAlign::Left,
             },
             @$row {
-              @Avatar {
-                @ { Label::new("A") }
+              @ {
+                w_avatar(avatar.clone())
               }
               @Column {
                 @ {

gui/src/widgets/home/sidebar/channel_thumbnail_list.rs

@@ -13,11 +13,7 @@ pub fn w_channel_thumbnail_list(
     @InteractiveList {
       active: pipe! {
         let channels = $channel_mgr.channel_ids();
-        let last_idx = if !channels.is_empty() {
-          channels.len() - 1
-        } else {
-          0
-        };
+        let last_idx = (channels.len() - 1).min(0);
         $channel_mgr.cur_channel_id().and_then(|id| {
           channels.iter().position(|ch| ch == id).map(|idx| last_idx - idx)
         }).unwrap_or(last_idx)