fix: fixed from field in getdm command

Author: arkanoider

src/cli/new_order.rs

@@ -164,18 +164,15 @@ pub async fn execute_new_order(
     ));
     table.add_row(create_emoji_field_row(
         "🔑 ",
-        "Trade Keys",
-        &ctx.trade_keys.public_key().to_hex(),
+        "Trade Key",
+        &ctx.trade_keys.public_key.to_hex(),
     ));
     table.add_row(create_emoji_field_row(
         "🎯 ",
         "Target",
         &ctx.mostro_pubkey.to_string(),
     ));
 
-    println!("{table}");
-    println!("💡 Sending new order to Mostro...\n");
-
     // Serialize the message
     let message_json = message
         .as_json()

src/cli/rate_user.rs

@@ -13,31 +13,26 @@ use crate::{
 };
 
 // Get the user rate
-fn get_user_rate(rating: &u8) -> Result<Payload> {
+fn get_user_rate(rating: &u8, order_id: &Uuid) -> Result<Payload> {
     if let Some(rating) = RATING_BOUNDARIES.iter().find(|r| r == &rating) {
+        print_section_header("⭐ Rate User");
+        print_key_value("📋", "Order ID", &order_id.to_string());
+        print_key_value("⭐", "Rating", &format!("{}/5", rating));
+        print_info_line("💡", "Sending user rating...");
+        println!();
         Ok(Payload::RatingUser(*rating))
     } else {
-        Err(anyhow::anyhow!("Rating must be in the range 1 - 5"))
-    }
-}
-
-pub async fn execute_rate_user(order_id: &Uuid, rating: &u8, ctx: &Context) -> Result<()> {
-    // Validate rating before proceeding
-    if !RATING_BOUNDARIES.contains(rating) {
         print_section_header("❌ Invalid Rating");
         print_key_value("⭐", "Rating", &rating.to_string());
         print_info_line("💡", "Rating must be between 1 and 5");
         print_info_line("📊", "Valid ratings: 1, 2, 3, 4, 5");
-        return Err(anyhow::anyhow!("Rating must be in the range 1 - 5"));
+        Err(anyhow::anyhow!("Rating must be in the range 1 - 5"))
     }
-    print_section_header("⭐ Rate User");
-    print_key_value("📋", "Order ID", &order_id.to_string());
-    print_key_value("⭐", "Rating", &format!("{}/5", rating));
-    print_info_line("💡", "Sending user rating...");
-    println!();
+}
 
+pub async fn execute_rate_user(order_id: &Uuid, rating: &u8, ctx: &Context) -> Result<()> {
     // Check boundaries
-    let rating_content = get_user_rate(rating)?;
+    let rating_content = get_user_rate(rating, &order_id)?;
 
     // Get the trade keys
     let trade_keys =

src/parser/dms.rs

@@ -757,7 +757,7 @@ pub async fn parse_dm_events(
             continue;
         }
 
-        let (created_at, message) = match dm.kind {
+        let (created_at, message, sender) = match dm.kind {
             nostr_sdk::Kind::GiftWrap => {
                 let unwrapped_gift = match nip59::extract_rumor(pubkey, dm).await {
                     Ok(u) => u,
@@ -780,7 +780,12 @@ pub async fn parse_dm_events(
                             continue;
                         }
                     };
-                (unwrapped_gift.rumor.created_at, message)
+
+                (
+                    unwrapped_gift.rumor.created_at,
+                    message,
+                    unwrapped_gift.sender,
+                )
             }
             nostr_sdk::Kind::PrivateDirectMessage => {
                 let ck = if let Ok(ck) = ConversationKey::derive(pubkey.secret_key(), &dm.pubkey) {
@@ -813,7 +818,7 @@ pub async fn parse_dm_events(
                         continue;
                     }
                 };
-                (dm.created_at, message)
+                (dm.created_at, message, dm.pubkey)
             }
             _ => continue,
         };
@@ -829,7 +834,7 @@ pub async fn parse_dm_events(
                 continue;
             }
         }
-        direct_messages.push((message, created_at.as_u64(), dm.pubkey));
+        direct_messages.push((message, created_at.as_u64(), sender));
     }
     direct_messages.sort_by(|a, b| a.1.cmp(&b.1));
     direct_messages
@@ -876,14 +881,17 @@ pub async fn print_direct_messages(
         // From label: show 🧌 Mostro if matches provided pubkey
         let from_label = if let Some(pk) = mostro_pubkey {
             if *sender_pubkey == pk {
-                format!("🧌 {}", sender_pubkey.to_hex())
+                format!("🧌 {}", sender_pubkey.to_string())
             } else {
-                sender_pubkey.to_hex()
+                sender_pubkey.to_string()
             }
         } else {
-            sender_pubkey.to_hex()
+            sender_pubkey.to_string()
         };
 
+        println!("mostro pubkey : {}", mostro_pubkey.unwrap());
+        println!("sender pubkey : {}", sender_pubkey);
+
         // Print message header
         println!("📄 Message {}:", i + 1);
         println!("─────────────────────────────────────");