diff --git a/desk/lib/summarize.hoon b/desk/lib/summarize.hoon index ea1c614f4a..94ed262ad1 100644 --- a/desk/lib/summarize.hoon +++ b/desk/lib/summarize.hoon @@ -14,9 +14,7 @@ [(scot %p our) term (scot %da now) spur] :: ++ summarize-activity - ?: .^(? %gu (scry-path %channels /$)) - summarize-activity-new-groups - summarize-activity-old-groups + summarize-activity-new-groups :: ++ summarize-activity-new-groups ^- $: sent=@ud @@ -55,42 +53,6 @@ ?~ p [s r] ?:(=(our author.u.p) [+(s) r] [s +(r)]) :: -++ summarize-activity-old-groups - ^- $: sent=@ud - received=@ud - most-sent-group=@t - == - =- :+ s r - =/ g=flag:chat - =< - - ::TODO crashes if no groups - %+ snag 0 - %+ sort ~(tap by g) - |=([[* a=@ud] [* b=@ud]] (gth a b)) - =< title.meta - .^ group:v2:gv - %gx - (scry-path %groups /groups/(scot %p p.g)/[q.g]/group) - == - %+ roll - %~ tap by - .^ (map flag:chat chat:chat) - %gx - (scry-path %chat /chats/chats) - == - =* onn ((on time writ:chat) lte) - |= [[c=flag:chat chat:chat] g=(map flag:chat @ud) s=@ud r=@ud] - =+ .^ log=((mop time writ:chat) lte) - %gx - %+ scry-path %chat - /chat/(scot %p p.c)/[q.c]/writs/newer/(scot %ud (sub now range))/(scot %ud limit)/chat-writs - == - :- %+ ~(put by g) group.perm - (add (~(gut by g) group.perm 0) (wyt:onn log)) - %+ roll (tap:onn log) - |= [[time writ:chat] s=_s r=_r] - ?:(=(our author) [+(s) r] [s +(r)]) -:: ++ summarize-inactivity ?: .^(? %gu (scry-path %channels /$)) summarize-inactivity-new-groups diff --git a/desk/mar/activity/feed-init.hoon b/desk/mar/activity/feed-init.hoon index d9c3de7407..eaf7085589 100644 --- a/desk/mar/activity/feed-init.hoon +++ b/desk/mar/activity/feed-init.hoon @@ -15,6 +15,6 @@ -- ++ grab |% - ++ noun [all=feed:v4:av mentions=feed:v4:av replies=feed:v4:av] + ++ noun ,[all=feed:v4:av mentions=feed:v4:av replies=feed:v4:av] -- -- diff --git a/desk/mar/activity/summary-pairs-4.hoon b/desk/mar/activity/summary-pairs-4.hoon index 489aee9a01..a3dc9174eb 100644 --- a/desk/mar/activity/summary-pairs-4.hoon +++ b/desk/mar/activity/summary-pairs-4.hoon @@ -9,6 +9,6 @@ -- ++ grab |% - ++ noun (list [source:v8:av activity-summary:v8:av]) + ++ noun (list ,[source:v8:av activity-summary:v8:av]) -- -- diff --git a/desk/mar/broadcaster/action.hoon b/desk/mar/broadcaster/action.hoon index 8288466f3f..ced046f66f 100644 --- a/desk/mar/broadcaster/action.hoon +++ b/desk/mar/broadcaster/action.hoon @@ -7,7 +7,7 @@ +$ action $% [%add-cohort cohort=@t targets=(set ship)] [%del-cohort cohort=@t targets=(set ship)] :: ~ for full deletion - [%broadcast cohort=@t =story:s:d:c] + [%broadcast cohort=@t =story:s:dv:c] == -- |_ =action diff --git a/desk/mar/chat/block-ship.hoon b/desk/mar/chat/block-ship.hoon index 7cb085f690..572d08bd41 100644 --- a/desk/mar/chat/block-ship.hoon +++ b/desk/mar/chat/block-ship.hoon @@ -9,7 +9,7 @@ -- ++ grab |% - ++ noun ship + ++ noun ship:c ++ json block-ship:dejs:j -- -- diff --git a/desk/mar/chat/negotiate.hoon b/desk/mar/chat/negotiate.hoon index 10e02f62df..e58fde685a 100644 --- a/desk/mar/chat/negotiate.hoon +++ b/desk/mar/chat/negotiate.hoon @@ -3,10 +3,12 @@ ++ grow |% ++ noun who + ++ ship who -- ++ grab |% ++ noun @p + ++ ship same ++ json (su:dejs:format ;~(pfix sig fed:ag)) -- -- diff --git a/desk/mar/chat/unblock-ship.hoon b/desk/mar/chat/unblock-ship.hoon index 90216e7b02..8c38ee4dff 100644 --- a/desk/mar/chat/unblock-ship.hoon +++ b/desk/mar/chat/unblock-ship.hoon @@ -9,7 +9,7 @@ -- ++ grab |% - ++ noun ship + ++ noun ^ship ++ json unblock-ship:dejs:j -- -- diff --git a/desk/mar/chat/writs.hoon b/desk/mar/chat/writs.hoon deleted file mode 100644 index 6d3d329f0d..0000000000 --- a/desk/mar/chat/writs.hoon +++ /dev/null @@ -1,14 +0,0 @@ -/- c=chat -/+ j=chat-json -|_ =writs:c -++ grad %noun -++ grow - |% - ++ noun writs - ++ json (writs:enjs:j writs) - -- -++ grab - |% - ++ noun writs:c - -- --- diff --git a/desk/mar/contact/changed-pages.hoon b/desk/mar/contact/changed-pages.hoon index 619b92e371..2f6d579ae0 100644 --- a/desk/mar/contact/changed-pages.hoon +++ b/desk/mar/contact/changed-pages.hoon @@ -18,6 +18,6 @@ -- ++ grab |% - ++ noun (map kip:c (unit page:c)) + ++ noun (map kip:c ,[(unit contact:c) (unit contact:c)]) -- -- diff --git a/desk/mar/emojimart.hoon b/desk/mar/emojimart.hoon index 678524fb10..f2c94d24db 100644 --- a/desk/mar/emojimart.hoon +++ b/desk/mar/emojimart.hoon @@ -6,8 +6,10 @@ [n=@ a=@ b=@ c=@ d=@ e=@] :: neutral & with skin tones -- |_ e=(map @t mote) +++ grad %noun ++ grab |% + ++ noun (map @t mote) ++ jam (cork cue (map @t mote)) -- ++ grow diff --git a/desk/mar/group/create.hoon b/desk/mar/group/create.hoon deleted file mode 100644 index 677eab52a6..0000000000 --- a/desk/mar/group/create.hoon +++ /dev/null @@ -1,14 +0,0 @@ -/- gv=groups-ver -/+ j=groups-json -|_ =create:v7:gv -++ grad %noun -++ grow - |% - ++ noun create - -- -++ grab - |% - ++ noun create:v7:gv - ++ json create:v7:dejs:j - -- --- diff --git a/desk/mar/group/init-0.hoon b/desk/mar/group/init-0.hoon index 081495b4e1..b5daecfd05 100644 --- a/desk/mar/group/init-0.hoon +++ b/desk/mar/group/init-0.hoon @@ -1,6 +1,6 @@ /- gv=groups-ver /+ j=groups-json -|_ =init:zer:old:gv +|_ =init:v0:gv ++ grad %noun ++ grow |% @@ -8,6 +8,6 @@ -- ++ grab |% - ++ noun init:zer:old:gv + ++ noun init:v0:gv -- -- diff --git a/desk/mar/group/invites-1.hoon b/desk/mar/group/invites-1.hoon deleted file mode 100644 index 44cf9f761f..0000000000 --- a/desk/mar/group/invites-1.hoon +++ /dev/null @@ -1,14 +0,0 @@ -/- gv=groups-ver -/+ gj=groups-json -|_ =invites:v7:gv -++ grad %noun -++ grow - |% - ++ noun invites - ++ json (invites:v7:enjs:gvj invites) - -- -++ grab - |% - ++ noun invites:v7:gv - -- --- diff --git a/desk/mar/group/invites.hoon b/desk/mar/group/invites.hoon deleted file mode 100644 index 2d7f17cf69..0000000000 --- a/desk/mar/group/invites.hoon +++ /dev/null @@ -1,15 +0,0 @@ -/- gv=groups-ver -/+ j=groups-json -|_ invites=(list invite:gv -++ grad %noun -++ grow - |% - ++ noun invite - ++ json (invite:enjs:j invite) - -- -++ grab - |% - ++ noun invite:gv - ++ json invite:dejs:j - -- --- diff --git a/desk/mar/group/preview-update.hoon b/desk/mar/group/preview-update.hoon deleted file mode 100644 index 49f5faaa08..0000000000 --- a/desk/mar/group/preview-update.hoon +++ /dev/null @@ -1,12 +0,0 @@ -/- gv=groups-ver -|_ =preview-update:gv -++ grad %noun -++ grow - |% - ++ noun preview-update - -- -++ grab - |% - ++ noun preview-update:gv - -- --- diff --git a/desk/mar/hook/setup-template-args.hoon b/desk/mar/hook/setup-template-args.hoon index a6ac12ff3d..b050e4e92a 100644 --- a/desk/mar/hook/setup-template-args.hoon +++ b/desk/mar/hook/setup-template-args.hoon @@ -14,7 +14,7 @@ -- ++ grab |% - ++ noun [nest:c nest:c] + ++ noun ,[nest:c nest:c] ++ json =, dejs:format %- ot diff --git a/desk/mar/hook/setup-template.hoon b/desk/mar/hook/setup-template.hoon index 49adc4309f..4ea86892a8 100644 --- a/desk/mar/hook/setup-template.hoon +++ b/desk/mar/hook/setup-template.hoon @@ -8,6 +8,6 @@ -- ++ grab |% - ++ noun [=nest:c =template:h] + ++ noun ,[=nest:c =template:h] -- -- diff --git a/desk/mar/reel/metadata.hoon b/desk/mar/reel/metadata.hoon index 09afdba0ac..85550dbac9 100644 --- a/desk/mar/reel/metadata.hoon +++ b/desk/mar/reel/metadata.hoon @@ -4,7 +4,7 @@ ++ grad %noun ++ grab |% - ++ noun metadata + ++ noun metadata:reel ++ json metadata:dejs -- ++ grow diff --git a/desk/mar/reel/undescribe.hoon b/desk/mar/reel/undescribe.hoon index 4787ac0032..712316f107 100644 --- a/desk/mar/reel/undescribe.hoon +++ b/desk/mar/reel/undescribe.hoon @@ -4,7 +4,7 @@ ++ grad %noun ++ grab |% - ++ noun (pair cord cord) + ++ noun cord ++ json (ot:dejs:format ~[token+so:dejs:format]) -- ++ grow diff --git a/desk/mar/sigil.hoon b/desk/mar/sigil.hoon index 4d8a4a1343..a5cade27f5 100644 --- a/desk/mar/sigil.hoon +++ b/desk/mar/sigil.hoon @@ -1,7 +1,9 @@ /? 310 |_ s=(map cord (list manx)) +++ grad %noun ++ grab |% + ++ noun (map cord (list manx)) ++ jam (cork cue (map cord (list manx))) -- ++ grow diff --git a/desk/mar/ui/action.hoon b/desk/mar/ui/action.hoon index c3d14523ae..fc75c4ad40 100644 --- a/desk/mar/ui/action.hoon +++ b/desk/mar/ui/action.hoon @@ -9,7 +9,7 @@ -- ++ grab |% - ++ noun (list whom:u) + ++ noun action:u ++ json ui-action:dejs:gj -- -- diff --git a/desk/mar/writ-diff.hoon b/desk/mar/writ-diff.hoon deleted file mode 100644 index d0b431c146..0000000000 --- a/desk/mar/writ-diff.hoon +++ /dev/null @@ -1,14 +0,0 @@ -/- c=chat -/+ j=chat-json -|_ =diff:writs:c -++ grad %noun -++ grow - |% - ++ noun diff - ++ json (writs-diff:enjs:j diff) - -- -++ grab - |% - ++ noun diff:writs:c - -- ---