Reviewing files that changed from the base of the PR and between 8022076 and 55df7d8.

• Cargo.lock is excluded by !**/*.lock

• Cargo.toml (1 hunks)
• src/app/add_invoice.rs (1 hunks)
• src/app/admin_take_dispute.rs (3 hunks)
• src/app/release.rs (2 hunks)

src/app/add_invoice.rs (1)

82-82: Improved code structure by properly closing the match arm.

This change fixes the control flow structure in the function by properly closing the match arm for the Ok(updated_order) case with a brace, making the code cleaner and more maintainable.

src/app/release.rs (3)

5-5: Added required imports for new functionality.

Added imports for new_event and order_to_tags from crate::nip33 to support the refactored privacy handling in the create_order_event function.

---

406-419: Enhanced privacy handling for order events.

The code now respects user privacy settings when generating order events by checking if either buyer or seller has requested full privacy. This ensures that user data is only included in tags when appropriate.

The implementation correctly:

1. Checks privacy status for both parties using the new is_full_privacy_order() method
2. Only retrieves and includes user data when neither party is in full privacy mode
3. Creates tags without user data when either party has full privacy enabled

This aligns with the PR objective of enhancing privacy handling for orders.

---

425-427: Improved error message for order event creation failures.

The error message has been updated to be more generic when tags cannot be created, using "Error creating order event" instead of a more specific message about invalid public keys. This is appropriate since there could be multiple reasons why tags might not be created.

src/app/admin_take_dispute.rs (3)

26-26: Refactored privacy check to use the new method on Order struct.

The standalone check_full_privacy_order function has been replaced with a direct call to order.is_full_privacy_order(), which simplifies the code and centralizes privacy-checking logic in the Order struct.

---

37-96: Improved handling of user privacy in dispute resolution.

The code now properly handles full privacy orders by:

1. Using Option<User> to explicitly represent the presence or absence of user data
2. Only fetching user data from the database when users are not in full privacy mode
3. Passing None instead of a default User object when privacy is enabled

This change improves both the data handling and the clarity of the code by making it explicit when user data is available vs. when it's being withheld for privacy reasons.

---

99-105:

Details

❓ Verification inconclusive

Updated dispute info creation to handle optional user data.

The SolverDisputeInfo::new function now correctly receives optional user data, passing counterpart and initiator based on privacy settings. This ensures the dispute solver only receives user information that respects privacy preferences.

Let's verify that the SolverDisputeInfo struct in mostro-core has been updated to handle optional user data:

---

🏁 Script executed:

#!/bin/bash
# Check the SolverDisputeInfo struct definition in mostro-core
cd ../mostro-core
rg -A 20 "pub struct SolverDisputeInfo" src/

Length of output: 183

---

I'm having trouble locating the SolverDisputeInfo definition using the provided path. The earlier shell script failed because the relative directory ../mostro-core wasn’t found in this repository. To help us verify that the changes correctly handle optional user details, please run the following search from the repository root:

Once we get output from that search, we can confirm that the struct’s definition has been updated as expected. Please verify that the updated struct correctly handles optional user data based on privacy settings.

Action Required: Please verify the location and update status of the SolverDisputeInfo struct.

---

🏁 Script executed:

#!/bin/bash
rg -A 20 "pub struct SolverDisputeInfo" .

Length of output: 43

---

Action Required: Verify the updated SolverDisputeInfo in mostro-core

The dispute info creation in src/app/admin_take_dispute.rs now passes counterpart and initiator based on privacy settings so that only permitted user data is provided. However, our automated search did not locate the SolverDisputeInfo struct in the codebase. Please manually verify that:

• The SolverDisputeInfo::new function in mostro-core is updated to accept optional user data.
• The struct’s definition properly handles the optional fields based on privacy preferences (omitting or setting them as None when required).

Once you confirm these points, the change can be approved.