Include dispute id on dispute start (#343)

MostroP2P · Aug 18, 2024 · 97609c1 · 97609c1
1 parent 12f14bb
commit 97609c1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,7 +38,7 @@ uuid = { version = "1.8.0", features = [
   "serde",
 ] }
 reqwest = { version = "0.12.1", features = ["json"] }
-mostro-core = { version = "0.6.4", features = ["sqlx"] }
+mostro-core = { version = "0.6.5", features = ["sqlx"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 config = "0.14.0"

diff --git a/src/app/dispute.rs b/src/app/dispute.rs
@@ -7,7 +7,7 @@ use crate::NOSTR_CLIENT;
 
 use anyhow::{Error, Result};
 use mostro_core::dispute::Dispute;
-use mostro_core::message::{Action, Message};
+use mostro_core::message::{Action, Content, Message};
 use mostro_core::order::{Order, Status};
 use nostr_sdk::prelude::*;
 use sqlx::{Pool, Sqlite};
@@ -38,7 +38,13 @@ pub async fn dispute_action(
                 if matches!(st, Status::Active | Status::FiatSent) {
                     order
                 } else {
-                    send_new_order_msg(Some(order.id), Action::NotAllowedByStatus, None, &event.pubkey).await;
+                    send_new_order_msg(
+                        Some(order.id),
+                        Action::NotAllowedByStatus,
+                        None,
+                        &event.pubkey,
+                    )
+                    .await;
                     return Ok(());
                 }
             } else {
@@ -114,7 +120,7 @@ pub async fn dispute_action(
     send_new_order_msg(
         Some(order_id),
         Action::DisputeInitiatedByYou,
-        None,
+        Some(Content::Dispute(dispute.clone().id)),
         &initiator_pubkey,
     )
     .await;
@@ -130,7 +136,7 @@ pub async fn dispute_action(
     send_new_order_msg(
         Some(order_id),
         Action::DisputeInitiatedByPeer,
-        None,
+        Some(Content::Dispute(dispute.clone().id)),
         &counterpart_pubkey,
     )
     .await;