Merge branch 'apps' of github.com:urbit/urbit into apps

ape/talk.hoon

@@ -1679,7 +1679,7 @@
       "[{(trip p.sep)}]: {(trip q.sep)}"
     ::
         %tax
-      <sep>
+      " {<sep>}"
     ==
   -- 
 ::

ape/work.hoon

@@ -1,5 +1,4 @@
-::  XX  need to deal with versions
-::  not implemented:  set audience, delete, sort
+::  not implemented:  set audience
 ::
 ::::
   ::
@@ -84,36 +83,27 @@
   ::
   ++  create            %+  send  %create
                         tax(date-created now, version 0, date-modified now)
-  ++  send-update       |*(* (send %update id +(version) +<))
-  ++  announce          (send-update %announce ~)
-  ++  release           (cury send-update %release)
-  ++  accept            (send-update %accept ~)
-  ++  delete            (send-update %delete ~)
-  ++  set-date-due      (cury send-update %set-date-due)
-  ++  set-tags          (cury send-update %set-tags)
-  ++  set-title         (cury send-update %set-title)
-  ++  set-description   (cury send-update %set-description)
-  ++  set-done          (cury send-update %set-done)
-  ++  add-comment       (cury send-update %add-comment)
-  ++  set-audience      ~|(%not-implemented !!)
+  ++  send-update       |*(* (send %update id +<))
+  ++  release           |=([vers=@u her=@p] (send-update vers %release her))
+  ++  accept            |=(vers=@u (send-update vers %accept ~))
   ++  process-update
-    |=  up=update
+    |=  [vers=@u up=update]
     ^+  +>
     ?-    -.up
-        %add  ?>(?=(%comment +<.up) (add-comment +>.up))
+        %add  ?>(?=(%comment +<.up) (send-update vers %add-comment +>.up))
         %own
       ?-  +<.up
-        %announce  announce
+        %announce  (send-update vers %announce ~)
         %claim     claim
       ==
         %set
       ?-  +<.up
-        %date-due     (set-date-due +>.up)
-        %title        (set-title +>.up)
-        %description  (set-description +>.up)
-        %tags         (set-tags +>.up)
-        %done         (set-done +>.up)
-        %audience     ~|(%not-implemented !!) ::(set-audience +>.up)
+        %date-due     (send-update vers %set-date-due +>.up)
+        %title        (send-update vers %set-title +>.up)
+        %description  (send-update vers %set-description +>.up)
+        %tags         (send-update vers %set-tags +>.up)
+        %done         (send-update vers %set-done +>.up)
+        %audience     ~|(%not-implemented !!)
       ==
     ==
   --
@@ -149,6 +139,14 @@
               existing-task=existing-task
           ==
       [~ +>.$]
+    ?.  =(0 version.tax.action)
+      ~&  :*  %new-task-version-not-zero
+              her=her
+              from=from
+              new-task=tax.action
+              existing-task=existing-task
+          ==
+      [~ +>.$]
     =.  tasks
       %^  ~(put by tasks)  id.tax.action  |  
       :_  tax.action
@@ -166,7 +164,7 @@
               task=tax
           ==
       [~ +>.$]
-    abet:(release:(at (~(got by tasks) id.action)) her)
+    abet:(release:(at (~(got by tasks) id.action)) +(version.task.tax) her)
   ::
       %update
     =+  tax=(~(get by tasks) id.action)
@@ -201,12 +199,12 @@
                 tax=tax
             ==
         task.u.tax
+      =.  version.task.u.tax        version.action
       =.  date-modified.task.u.tax  when
       ?-    -.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)
@@ -220,7 +218,7 @@
     ?:  ?&  =([%release our] meat.action)
             claiming.u.tax
         ==
-      abet:accept:(at (~(got by tasks) id.action))
+      abet:(accept:(at (~(got by tasks) id.action)) +(+(version.task.u.tax)))
     [~ +>.$]
   ==
 ::
@@ -249,6 +247,8 @@
 ::
 ++  poke-work-command
   |=  cod=command
+  ?.  =(our src)
+    ~|([%wrong-user our=our src=src] !!)
   =^  mos  +>.$
     ?:  connected
       [~ +>.$]
@@ -256,8 +256,9 @@
   =^  mof  +>.$
     ?-  -.cod
       %new    abut:create:(at [| - +]:+.cod)
-      %old    abet:(process-update:(at (~(got by tasks) id.cod)) dif.cod)
-      %sort   ~|(%not-implemented !!)
+      %old    =+  (at (~(got by tasks) id.cod))
+              abet:(process-update:- version.cod dif.cod)
+      %sort   mirror-to-web(sort p.cod)
     ==
   [(welp mos mof) +>.$]
 ::

mar/work/command.hoon

@@ -49,7 +49,7 @@
       ==
     ++  id  (ci (slat %uv) so)
     ++  ship  (su fed:ag)
-    ++  coma  (of new/task old/(ot id/id dif/uppd ~) sort/(ar id) ~)
+    ++  coma  (of new/task old/(ot id/id version/ni dif/uppd ~) sort/(ar id) ~)
     ++  task
       %-  ot  :~
         audience/audi

sur/talk.hoon

@@ -90,7 +90,6 @@
             $%  [%announce ~]                           ::  make available
                 [%release her=ship]                     ::  pass to new owner
                 [%accept ~]                             ::  accept pass
-                [%delete ~]                             ::  delete task
                 [%set-date-due wen=(unit ,@da)]         ::  set due date
                 [%set-tags tag=(set ,@t)]               ::  set tags
                 [%set-title til=@t]                     ::  set title

sur/work.hoon

@@ -31,7 +31,7 @@
 ++  status  ?(%announced %released %accepted)
 ++  command  
   $%  [%new audience=(set station:talk) task]
-      [%old id=@uvH dif=update]
+      [%old id=@uvH version=@u dif=update]
       [%sort p=(list ,@uvH)]
   ==
 ++  update