convert all manual message stuff to FlashMessage

1 files changed, 7 insertions, 6 deletions

diff --git a/ui/src/scaffold.rs b/ui/src/scaffold.rs
index a115ec3..95074cf 100644
--- a/ui/src/scaffold.rs
+++ b/ui/src/scaffold.rs
@@ -5,7 +5,7 @@
 */
 
 use crate::{
-    CONF,
+    CONF, FlashM,
     locale::{Language, escape, tr, trs},
 };
 use jellycommon::{
@@ -72,11 +72,12 @@ markup::define! {
         }
     }
 
-    FlashDisplay(flash: Option<Result<String, String>>) {
-        @if let Some(flash) = &flash {
-            @match flash {
-                Ok(mesg) => { section.message { p.success { @mesg } } }
-                Err(err) => { section.message { p.error { @err } } }
+    FlashDisplay<'a>(flash: &'a FlashM) {
+        @if let Some((kind,message)) = &flash {
+            @match kind.as_str() {
+                "success" => { section.message { p.success { @message } } }
+                "error" => { section.message { p.error { @message } } }
+                _ => { section.message { p { @message } } }
             }
         }
     }