refactor: adopt redis-macros

Author: ryanccn

Cargo.lock

@@ -20,6 +20,7 @@ once_cell = "1.18.0"
 owo-colors = { version = "3.5.0", features = ["supports-colors"] }
 poise = { git = "https://github.com/serenity-rs/poise.git", branch = "serenity-next" }
 redis = { version = "0.23.3", features = ["tokio-comp", "tokio-rustls-comp"] }
+redis-macros = "0.2.1"
 regex = "1.10.2"
 reqwest = { version = "0.11.22", default-features = false, features = ["rustls-tls", "json", "brotli"] }
 serde = { version = "1.0.189", features = ["derive"] }

Cargo.toml

@@ -1,9 +1,11 @@
-use owo_colors::OwoColorize;
+use crate::Context;
 use poise::{serenity_prelude as serenity, CreateReply};
+
 use redis::AsyncCommands;
+use redis_macros::{FromRedisValue, ToRedisArgs};
 
-use crate::Context;
 use anyhow::Result;
+use owo_colors::OwoColorize;
 
 #[derive(poise::ChoiceParameter, serde::Serialize, serde::Deserialize, Clone, Copy, Debug)]
 #[serde(rename_all = "lowercase")]
@@ -49,7 +51,7 @@ impl std::fmt::Display for PresenceChoice {
     }
 }
 
-#[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
+#[derive(serde::Serialize, serde::Deserialize, FromRedisValue, ToRedisArgs, Clone, Debug)]
 struct PresenceData {
     content: String,
     #[serde(rename = "type")]
@@ -98,19 +100,17 @@ pub async fn presence(
 
     if let Some(redis) = &ctx.data().redis {
         let mut conn = redis.get_async_connection().await?;
-        conn.set("presence-v1", serde_json::to_string(&presence_data)?)
-            .await?;
+        conn.set("presence-v1", presence_data).await?;
     }
 
     Ok(())
 }
 
 pub async fn restore(ctx: &serenity::Context, redis_client: &redis::Client) -> Result<()> {
     let mut conn = redis_client.get_async_connection().await?;
-    let data: Option<String> = conn.get("presence-v1").await?;
+    let data: Option<PresenceData> = conn.get("presence-v1").await?;
 
     if let Some(data) = data {
-        let data: PresenceData = serde_json::from_str(&data)?;
         ctx.set_presence(Some(data.make_activity()), serenity::OnlineStatus::Online);
         println!("{} presence from Redis", "Restored".cyan());
     }