From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Feb 2021 17:40:37 +0000 (+0000)
Subject: hand: Plumb through xupdates
X-Git-Tag: otter-0.4.0~307
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cc861ea91459c99a29450e3a17386be09e38c85a;p=otter.git

hand: Plumb through xupdates

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/hand.rs b/src/hand.rs
index b958d066..8359e325 100644
--- a/src/hand.rs
+++ b/src/hand.rs
@@ -152,7 +152,9 @@ impl PieceTrait for Hand {
     let gpl = gplayers.byid_mut(player)?;
     let nick = Html(htmlescape::encode_minimal(&gpl.nick));
 
-    let (new_owner, did) = match (opname, xdata.owner.is_some()) {
+    let (new_owner, xupdates, did) =
+      match (opname, xdata.owner.is_some())
+    {
       ("claim", false) => {
         let new_desc = Html(format!("{}'s hand", &nick.0));
         let new_owner = Some(MagicOwner {
@@ -181,15 +183,16 @@ impl PieceTrait for Hand {
         })().map_err(|ie| ApiPieceOpError::ReportViaResponse(ie.into()))?;
         
         // actually do things:
-        create_occultation(gplayers, gpieces, goccults, ipieces,
-                           region, piece, views)?;
+        let xupdates =
+          create_occultation(gplayers, gpieces, goccults, ipieces,
+                             region, piece, views)?;
         // xxx recalculate occultations
 
-        (new_owner, format!("claimed {}", &old_desc.0))
+        (new_owner, xupdates, format!("claimed {}", &old_desc.0))
       }
       ("deactivate", true) => {
         // xxx recalculate occultations
-        (None, format!("deactivated {}", &old_desc.0))
+        (None, vec![], format!("deactivated {}", &old_desc.0))
       }
       ("claim", true) |
       ("deactivate", false) => {
@@ -214,6 +217,6 @@ impl PieceTrait for Hand {
       wrc, log,
       ops: PUOs::Simple(PUO::Modify(())), // xxx
       // xxx want PUU::RecalculateOccultations
-    }, vec![])
+    }, xupdates)
   }
 }