move some types around

ape/work.hoon

@@ -24,13 +24,13 @@
   ::
 |_  [bowl client connected=_|]
 ++  at
-  |=  [task audience=(set station:talk) claiming=?]
+  |=  [claiming=? audience=(set station:talk) task]
-  =*  tax  +<-
+  =*  tax  +<+>
   =|  moves=(list move)
   |%
   ++  abet
     ^-  [(list move) _+>.$]
-    [(flop moves) +>.$(tasks (~(put by tasks) id tax audience claiming))]
+    [(flop moves) +>.$(tasks (~(put by tasks) id +<.$))]
   ::
   ++  abut
     ^-  [(list move) _+>.$]
@@ -148,8 +148,8 @@
           ==
       [~ +>.$]
     =.  tasks
-      %^  ~(put by tasks)  id.tax.action  tax.action
+      %^  ~(put by tasks)  id.tax.action  |  
-      :_  |
+      :_  tax.action
       ?~  existing-task  from
       (~(uni in audience.u.existing-task) from)
     =.  sort  ?^(existing-task sort [id.tax.action sort])
@@ -185,35 +185,35 @@
       [~ +>.$]
     =.  tasks
       %^  ~(put by tasks)  id.action
-        ?:  ?&  ?=(?(%announce %release %accept) -.meat.action)
+        ?:  ?=(%release -.meat.action)
-                !=(her owner.task.u.tax)
+          |
-            ==
+        claiming.u.tax
-          ~&  :*  %not-owner
-                  her=her
-                  from=from
-                  action=action
-                  tax=tax
-              ==
-          task.u.tax
-        ?-    -.meat.action
-          %announce         task.u.tax(status %announced)
-          %release          task.u.tax(owner her.meat.action, status %released)
-          %accept           task.u.tax(status %accepted)
-          %delete           ~|(%not-implemented !!)
-          %set-date-due     task.u.tax(date-due wen.meat.action)
-          %set-tags         task.u.tax(tags tag.meat.action)
-          %set-title        task.u.tax(title til.meat.action)
-          %set-description  task.u.tax(description des.meat.action)
-          %set-done         task.u.tax(done ?.(don.meat.action ~ `when))
-          %add-comment
-            %=  task.u.tax
-              discussion  [[when her com.meat.action] discussion.task.u.tax]
-            ==
-        ==
       :-  (~(uni in audience.u.tax) from)
-      ?:  ?=(%release -.meat.action)
+      ?:  ?&  ?=(?(%announce %release %accept) -.meat.action)
-        |
+              !=(her owner.task.u.tax)
-      claiming.u.tax
+          ==
+        ~&  :*  %not-owner
+                her=her
+                from=from
+                action=action
+                tax=tax
+            ==
+        task.u.tax
+      ?-    -.meat.action
+        %announce         task.u.tax(status %announced)
+        %release          task.u.tax(owner her.meat.action, status %released)
+        %accept           task.u.tax(status %accepted)
+        %delete           ~|(%not-implemented !!)
+        %set-date-due     task.u.tax(date-due wen.meat.action)
+        %set-tags         task.u.tax(tags tag.meat.action)
+        %set-title        task.u.tax(title til.meat.action)
+        %set-description  task.u.tax(description des.meat.action)
+        %set-done         task.u.tax(done ?.(don.meat.action ~ `when))
+        %add-comment
+          %=  task.u.tax
+            discussion  [[when her com.meat.action] discussion.task.u.tax]
+          ==
+      ==
     ?:  ?&  =([%release our] meat.action)
             claiming.u.tax
         ==
@@ -252,7 +252,7 @@
     initialize
   =^  mof  +>.$
     ?-  -.cod
-      %new    abut:create:(at [+ - |]:+.cod)
+      %new    abut:create:(at [| - +]:+.cod)
       %old    abet:(process-update:(at (~(got by tasks) id.cod)) dif.cod)
       %sort   ~|(%not-implemented !!)
     ==

pub/work/test.work-task

@@ -1,7 +1,7 @@
 0v0_~1999.1.1 2~1999.1.2 ~1999.5.20
   Tagged!
 Yoooo
-~fyr.gave
+~fyr.announced
   Testin
 ~doznec ~2015.1.3
   how long has

sur/work.hoon

@@ -5,9 +5,9 @@
       sort=(list ,@uvH)
   ==
 ++  client-task
-  $:  task=task
+  $:  claiming=_|
       audience=(set station:talk)
-      claiming=_|
+      task=task
   ==
 ++  task
   $:  id=@uvH