chore: update workflows, remove text formatting

Signed-off-by: Henry Gressmann <[email protected]>

Author: explodingcamera

.github/workflows/release.yaml

@@ -68,7 +68,7 @@ jobs:
         with:
           name: web-dist
           path: ./web/dist
-      - uses: actions-rust-lang/[email protected].0
+      - uses: actions-rust-lang/[email protected].2
       - uses: taiki-e/[email protected]
         with:
           bin: liwan

.github/workflows/test.yaml

@@ -24,7 +24,9 @@ jobs:
       - uses: actions/checkout@v5
         with:
           persist-credentials: false
-      - uses: actions-rust-lang/[email protected]
+      - uses: actions-rust-lang/[email protected]
+        with:
+          components: clippy, rustfmt
       - uses: Swatinem/[email protected]
       - run: mkdir ./web/dist
       - name: Run tests

src/app/models.rs

@@ -1,3 +1,9 @@
+use std::fmt::Display;
+
+use chrono::{DateTime, Utc};
+use poem_openapi::Enum;
+use serde::{Deserialize, Serialize};
+
 #[derive(Debug, Clone)]
 pub struct Event {
     pub entity_id: String,
@@ -50,6 +56,15 @@ pub enum UserRole {
     User,
 }
 
+impl Display for UserRole {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            UserRole::Admin => write!(f, "admin"),
+            UserRole::User => write!(f, "user"),
+        }
+    }
+}
+
 impl TryFrom<String> for UserRole {
     type Error = String;
 
@@ -62,16 +77,6 @@ impl TryFrom<String> for UserRole {
     }
 }
 
-impl UserRole {
-    #[allow(clippy::inherent_to_string)]
-    pub fn to_string(self) -> String {
-        match self {
-            Self::Admin => "admin".to_string(),
-            Self::User => "user".to_string(),
-        }
-    }
-}
-
 #[macro_export]
 macro_rules! event_params {
     ($event:expr) => {
@@ -99,7 +104,4 @@ macro_rules! event_params {
     };
 }
 
-use chrono::{DateTime, Utc};
 pub use event_params;
-use poem_openapi::Enum;
-use serde::{Deserialize, Serialize};

src/cli.rs

@@ -98,14 +98,14 @@ pub fn handle_command(mut config: Config, cmd: Command) -> Result<()> {
             let app = Liwan::try_new(config)?;
             let users = app.users.all()?;
             if users.is_empty() {
-                println!("{}", bold("No users found"));
+                println!("No users found");
                 println!("Use `liwan add-user` to create a new user");
                 return Ok(());
             }
 
-            println!("{}", bold("Users:"));
+            println!("Users:");
             for user in users {
-                println!(" - {} ({:?})", underline(&user.username), user.role);
+                println!(" - {} ({})", user.username, user.role);
             }
         }
         Command::AddUser(add) => {
@@ -139,15 +139,3 @@ pub fn handle_command(mut config: Config, cmd: Command) -> Result<()> {
 
     Ok(())
 }
-
-pub fn bold(s: &str) -> String {
-    format!("\x1b[1m{}\x1b[0m", s)
-}
-
-pub fn underline(s: &str) -> String {
-    format!("\x1b[4m{}\x1b[0m", s)
-}
-
-pub fn white(s: &str) -> String {
-    format!("\x1b[37m{}\x1b[0m", s)
-}

src/web/mod.rs

@@ -6,7 +6,6 @@ use std::sync::Arc;
 
 use crate::app::Liwan;
 use crate::app::models::Event;
-use crate::cli::{bold, underline, white};
 use crossbeam_channel::Sender;
 use routes::{dashboard_service, event_service};
 use webext::{EmbeddedFilesEndpoint, PoemErrExt, catch_error};
@@ -96,14 +95,13 @@ pub async fn start_webserver(app: Arc<Liwan>, events: Sender<Event>) -> Result<(
 
     match app.onboarding.token()? {
         Some(onboarding) => {
-            let get_started = bold(&format!("{}/setup?t={}", app.config.base_url, onboarding));
-            let command = bold("liwan --help");
-            tracing::info!("{}", white("It looks like you're running Liwan for the first time!"));
-            tracing::info!("{}", white(&format!("You can get started by visiting: {get_started}")));
-            tracing::info!("{}", white(&format!("To see all available commands, run `{command}`")));
+            let get_started = format!("{}/setup?t={}", app.config.base_url, onboarding);
+            tracing::info!("It looks like you're running Liwan for the first time!");
+            tracing::info!("You can get started by visiting: {get_started}");
+            tracing::info!("To see all available commands, run `liwan --help`");
         }
         _ => {
-            tracing::info!("{} {}", white("Liwan is running on "), underline(&app.config.base_url));
+            tracing::info!("Liwan is running on {}", app.config.base_url);
         }
     }