Merge pull request #273 from tloncorp/po/promote-1-25

ops: promote 1.25

desk/app/contacts.hoon

@@ -18,7 +18,7 @@
 --
 ::
 %-  agent:dbug
-%+  verb  &
+%+  verb  |
 ^-  agent:gall
 =|  state-0
 =*  state  -

desk/app/treaty.hoon

@@ -4,6 +4,7 @@
 ++  default-ally  ~dister-dozzod-dozzod
 ::
 +$  card  card:agent:gall
++$  state-1  [%1 state-0]
 +$  state-0
   $:  treaties=(map [=ship =desk] treaty)
       sovereign=(map desk treaty)
@@ -15,7 +16,7 @@
 ^-  agent:gall
 %+  verb  |
 %-  agent:dbug
-=|  state-0
+=|  state-1
 =*  state  -
 =<
 |_  =bowl:gall
@@ -30,8 +31,19 @@
 ++  on-save  !>(state)
 ++  on-load
   |=  =vase
+  ?:  =(%1 -.q.vase)
+    =+  !<(old=state-1 vase)
+    `this(state old)
   =+  !<(old=state-0 vase)
-  `this(state old)
+  :_  this(state [%1 old])
+  %-  zing
+  ^-  (list (list card))
+  %+  turn  ~(tap by allies.old)
+  |=  [=ship s=(set *)]
+  ^-  (list card)
+  =*  al  ~(. al:cc ship)
+  ?^  s  ~
+  ~[leave:al watch:al]
 ::
 ++  on-poke
   |=  [=mark =vase]
@@ -59,7 +71,7 @@
     ?<  =(ship our.bowl)
     =*  al   ~(. al:cc ship.update)
     ?-  -.update
-      %add  [~[watch:al] this(allies (~(put by allies) ship *alliance))]
+      %add  [~[leave:al watch:al] this(allies (~(put by allies) ship *alliance))]
       %del  [~[leave:al] this(allies (~(del by allies) ship))]
     ==
   ::
@@ -111,6 +123,17 @@
     ::NOTE  this assumes that all treaties in sovereign are also
     ::      present in the treaties map
     (fact-init:io (treaty-update:cg:cc %ini treaties))^~
+    ::
+      [%treaties @ ~]
+    :_  this
+    =/  =ship  (slav %p i.t.path)
+    =/  alliance  (~(get ju allies) ship)
+    =/  allied
+      %-  ~(gas by *(map [^ship desk] treaty))
+      %+  skim  ~(tap by treaties)
+      |=  [ref=[^ship desk] =treaty]
+      (~(has in alliance) ref)
+    (fact-init:io (treaty-update:cg:ca:cc %ini allied))^~
     ::
       [%alliance ~]
     :_  this
@@ -307,13 +330,14 @@
   ++  leave  (leave:pass dock)
   ++  gone
     ^-  (list card)
-    :~  (fact:io (treaty-update:cg %del ship desk) /treaties ~)
+    :~  (fact:io (treaty-update:cg %del ship desk) /treaties /treaties/[(scot %p ship)] ~)
         (kick-only:io our.bowl path ~)
     ==
   ++  give
     ^-  (list card)
     =/  t=treaty  (~(got by treaties) ship desk)
     :~  (fact:io (treaty-update:cg %add t) /treaties ~)
+        (fact:io (treaty-update:cg %add t) /treaties/[(scot %p ship)] ~)
         (fact:io (treaty:cg t) path ~)
     ==
   --

desk/desk.docket-0

@@ -1,10 +1,10 @@
 :~  title+'Landscape'
     info+'An app launcher for Urbit.'
     color+0xee.5432
-    glob-http+['https://bootstrap.urbit.org/glob-0v3.0dqi8.1csij.8dv08.lhglb.45fpk.glob' 0v3.0dqi8.1csij.8dv08.lhglb.45fpk]
+    glob-http+['https://bootstrap.urbit.org/glob-0v2.2j09f.su13i.4sjhg.eihlk.9kn8b.glob' 0v2.2j09f.su13i.4sjhg.eihlk.9kn8b]
     ::glob-ames+~zod^0v0
     base+'landscape'
-    version+[1 24 0]
+    version+[1 25 0]
     website+'https://tlon.io'
     license+'MIT'
 ==

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "landscape",
-  "version": "1.11.0",
+  "version": "1.25.0",
   "private": true,
   "engines": {
     "node": "^16.0.0"