feat: add message actions

Author: Mivik

phira/src/charts_view.rs

@@ -4,7 +4,7 @@ use crate::{
     client::{Chart, ChartRef},
     dir, get_data, get_data_mut,
     icons::Icons,
-    page::{ChartItem, ChartType, Fader, Illustration, CHOOSE_COVER, CHOSEN_COVER},
+    page::{ChartItem, Fader, CHOOSE_COVER, CHOSEN_COVER},
     popup::Popup,
     save_data,
     scene::{render_release_to_refresh, SongScene, MP_PANEL},
@@ -59,12 +59,7 @@ impl ChartDisplayItem {
 
     pub fn from_remote(chart: &Chart) -> Self {
         Self::new(
-            Some(ChartItem {
-                info: chart.to_info(),
-                illu: Illustration::from_file_thumbnail(chart.illustration.clone()),
-                local_path: None,
-                chart_type: ChartType::Downloaded,
-            }),
+            Some(ChartItem::from_remote(chart)),
             if chart.stable_request {
                 Some('+')
             } else if !chart.reviewed {

phira/src/client/model/message.rs

@@ -1,6 +1,12 @@
 use chrono::{DateTime, Utc};
 use serde::Deserialize;
 
+#[derive(Deserialize)]
+pub struct MessageAction {
+    pub name: String,
+    pub action: String,
+}
+
 #[derive(Deserialize)]
 #[allow(dead_code)]
 pub struct Message {
@@ -9,4 +15,6 @@ pub struct Message {
     pub content: String,
     pub author: String,
     pub time: DateTime<Utc>,
+    #[serde(default)]
+    pub actions: Vec<MessageAction>,
 }

phira/src/page.rs

@@ -27,7 +27,7 @@ pub use settings::SettingsPage;
 use tokio::sync::Notify;
 
 use crate::{
-    client::{ChartRef, File},
+    client::{Chart, ChartRef, File},
     data::BriefChartInfo,
     dir, get_data,
     images::Images,
@@ -214,6 +214,15 @@ impl ChartItem {
     pub fn to_ref(&self) -> ChartRef {
         ChartRef::new_bare(self.info.id, self.local_path.as_deref())
     }
+
+    pub fn from_remote(chart: &Chart) -> Self {
+        ChartItem {
+            info: chart.to_info(),
+            illu: Illustration::from_file_thumbnail(chart.illustration.clone()),
+            local_path: None,
+            chart_type: ChartType::Downloaded,
+        }
+    }
 }
 
 #[derive(Clone, Copy)]

phira/src/page/home.rs

@@ -410,7 +410,7 @@ impl Page for HomePage {
                 return Ok(true);
             }
             if self.btn_msg.touch(touch, t) {
-                self.next_page = Some(NextPage::Overlay(Box::new(MessagePage::new())));
+                self.next_page = Some(NextPage::Overlay(Box::new(MessagePage::new(Arc::clone(&self.icons), s.icons.clone()))));
                 return Ok(true);
             }
             if self.btn_settings.touch(touch, t) {

phira/src/page/message.rs

@@ -1,17 +1,21 @@
 prpr_l10n::tl_file!("message");
 
-use std::borrow::Cow;
+use std::{borrow::Cow, sync::Arc};
 
 use super::{Page, SharedState};
 use crate::{
-    client::{recv_raw, Client, Message},
-    get_data, get_data_mut, save_data,
+    client::{recv_raw, Chart, Client, Message, Ptr},
+    get_data, get_data_mut,
+    icons::Icons,
+    page::{ChartItem, SFader},
+    save_data,
+    scene::{ProfileScene, SongScene},
 };
 use anyhow::Result;
 use chrono::Local;
 use macroquad::prelude::*;
 use prpr::{
-    ext::{semi_black, semi_white, RectExt},
+    ext::{open_url, semi_black, semi_white, RectExt, SafeTexture},
     scene::show_error,
     task::Task,
     ui::{DRectButton, Scroll, Ui},
@@ -25,10 +29,17 @@ pub struct MessagePage {
 
     btns_scroll: Scroll,
     scroll: Scroll,
+
+    action_btns: Vec<DRectButton>,
+
+    sf: SFader,
+    chart_task: Option<Task<Result<Arc<Chart>>>>,
+    icons: Arc<Icons>,
+    rank_icons: [SafeTexture; 8],
 }
 
 impl MessagePage {
-    pub fn new() -> Self {
+    pub fn new(icons: Arc<Icons>, rank_icons: [SafeTexture; 8]) -> Self {
         Self {
             msgs: None,
             load_task: None,
@@ -37,6 +48,13 @@ impl MessagePage {
 
             btns_scroll: Scroll::new(),
             scroll: Scroll::new(),
+
+            action_btns: Vec::new(),
+
+            sf: SFader::new(),
+            chart_task: None,
+            icons,
+            rank_icons,
         }
     }
 
@@ -53,6 +71,46 @@ impl MessagePage {
             Ok(recv_raw(req).await?.json().await?)
         }));
     }
+
+    fn execute_action(&mut self, t: f32, action: String) -> Result<()> {
+        let (ty, param) = match action.split_once(':') {
+            Some(it) => it,
+            None => {
+                warn!("invalid action: {action}");
+                return Ok(());
+            }
+        };
+        match ty {
+            "url" => {
+                open_url(param)?;
+            }
+            "chart" => {
+                let id = match param.parse::<i32>() {
+                    Ok(it) => it,
+                    Err(_) => {
+                        warn!("invalid chart id: {param}");
+                        return Ok(());
+                    }
+                };
+                self.chart_task = Some(Task::new(async move { Ptr::<Chart>::new(id).fetch().await }));
+            }
+            "user" => {
+                let id = match param.parse::<i32>() {
+                    Ok(it) => it,
+                    Err(_) => {
+                        warn!("invalid user id: {param}");
+                        return Ok(());
+                    }
+                };
+                self.sf.goto(t, ProfileScene::new(id, self.icons.user.clone(), self.rank_icons.clone()));
+            }
+            _ => {
+                warn!("unknown action type: {ty}");
+            }
+        }
+
+        Ok(())
+    }
 }
 
 impl Page for MessagePage {
@@ -67,6 +125,9 @@ impl Page for MessagePage {
 
     fn touch(&mut self, touch: &Touch, s: &mut SharedState) -> Result<bool> {
         let t = s.t;
+        if self.chart_task.is_some() {
+            return Ok(false);
+        }
         if self.load_task.is_none() {
             if self.btns_scroll.touch(touch, t) {
                 return Ok(true);
@@ -86,6 +147,15 @@ impl Page for MessagePage {
                         return Ok(true);
                     }
                 }
+                if let Some(index) = self.index {
+                    for (btn, action) in self.action_btns.iter_mut().zip(&msgs[index].0.actions) {
+                        if btn.touch(touch, t) {
+                            let action = action.action.clone();
+                            self.execute_action(t, action)?;
+                            return Ok(true);
+                        }
+                    }
+                }
             }
         }
         if self.scroll.touch(touch, t) {
@@ -118,6 +188,29 @@ impl Page for MessagePage {
                 self.load_task = None;
             }
         }
+        if self.chart_task.is_some() {
+            if let Some(res) = self.chart_task.as_mut().unwrap().take() {
+                match res {
+                    Err(err) => {
+                        show_error(err);
+                    }
+                    Ok(chart) => {
+                        let data = get_data();
+                        let (local_path, mods) = data
+                            .charts
+                            .iter()
+                            .find(|it| it.info.id == Some(chart.id))
+                            .map(|it| (Some(it.local_path.clone()), it.mods))
+                            .unwrap_or_default();
+                        self.sf.goto(
+                            t,
+                            SongScene::new(ChartItem::from_remote(chart.as_ref()), local_path, self.icons.clone(), self.rank_icons.clone(), mods),
+                        );
+                    }
+                }
+                self.chart_task = None;
+            }
+        }
         Ok(())
     }
 
@@ -162,10 +255,24 @@ impl Page for MessagePage {
         });
         s.render_fader(ui, |ui| {
             ui.fill_path(&cr.rounded(0.005), semi_black(0.4));
-            let pad = 0.03;
-            ui.dx(cr.x + pad + 0.01);
-            ui.dy(cr.y + pad);
+
             if let Some(msg) = self.index.and_then(|it| self.msgs.as_ref().map(|msgs| &msgs[it].0)) {
+                let pad = 0.03;
+                ui.scope(|ui| {
+                    ui.dx(cr.right() - pad);
+                    ui.dy(cr.bottom() - pad);
+                    self.action_btns.resize_with(msg.actions.len(), DRectButton::new);
+                    let mut r = Rect::new(0., 0., 0.28, 0.1);
+                    r.x -= r.w;
+                    r.y -= r.h;
+                    for (btn, action) in self.action_btns.iter_mut().zip(&msg.actions) {
+                        btn.render_text(ui, r, t, &action.name, 0.5, false);
+                        ui.dy(-r.h - 0.01);
+                    }
+                });
+
+                ui.dx(cr.x + pad + 0.01);
+                ui.dy(cr.y + pad);
                 let mw = cr.w - pad * 2. - 0.01;
                 let mut h = 0.;
                 macro_rules! dy {
@@ -193,6 +300,14 @@ impl Page for MessagePage {
                 });
             }
         });
+        self.sf.render(ui, t);
+        if self.chart_task.is_some() {
+            ui.full_loading_simple(t);
+        }
         Ok(())
     }
+
+    fn next_scene(&mut self, s: &mut SharedState) -> prpr::scene::NextScene {
+        self.sf.next_scene(s.t).unwrap_or_default()
+    }
 }