From 7610c65bc4cf647ada78b91ffe96d556a37061b2 Mon Sep 17 00:00:00 2001 From: Fang Date: Sat, 13 Jul 2019 17:43:21 +0200 Subject: [PATCH 1/3] Allow glyph binding during ;join and ;create --- pkg/arvo/app/talk.hoon | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkg/arvo/app/talk.hoon b/pkg/arvo/app/talk.hoon index df3a33162..0bd50acb5 100644 --- a/pkg/arvo/app/talk.hoon +++ b/pkg/arvo/app/talk.hoon @@ -66,9 +66,9 @@ == :: ++ work :: interface action $% :: circle management :: - {$join (map circle range)} :: subscribe to + {$join (map circle range) (unit char)} :: subscribe to {$leave audience} :: unsubscribe from - {$create security name cord} :: create circle + {$create security name cord (unit char)} :: create circle {$delete name (unit cord)} :: delete circle {$depict name cord} :: change description {$filter name ? ?} :: change message rules @@ -838,7 +838,7 @@ :: ;~((glue ace) (perk %read ~) cire dem:ag) :: - ;~((glue ace) (perk %join ~) sorz) + ;~((glue ace) (perk %join ~) sorz (punt glyph)) :: ;~((glue ace) (perk %leave ~) cirs) :: @@ -846,6 +846,7 @@ pore cire qut + (punt glyph) == :: ;~ plug (perk %delete ~) @@ -1186,8 +1187,10 @@ :: change local mailbox config to include :: subscriptions to {pas}. :: - |= pos/(map circle range) + |= {pos/(map circle range) gyf/(unit char)} ^+ ..sh-work + =? ..sh-work ?=(^ gyf) + (bind u.gyf `~(key by pos)) =+ pas=~(key by pos) =. ..sh-work sh-prod(active.she pas) @@ -1226,11 +1229,11 @@ :: :: creates circle {nom} with specified config. :: - |= {sec/security nom/name txt/cord} + |= {sec/security nom/name txt/cord gyf/(unit char)} ^+ ..sh-work =. ..sh-work (sh-act %create nom txt sec) - (join [[[self nom] ~] ~ ~]) + (join [[[self nom] ~] ~ ~] gyf) :: ++ delete :: %delete From c98105277e2ab40b3ffecccd738f71d50e6c9884 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 17 Jul 2019 01:12:49 +0200 Subject: [PATCH 2/3] Less repetitive style --- pkg/arvo/app/talk.hoon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/arvo/app/talk.hoon b/pkg/arvo/app/talk.hoon index 0bd50acb5..e4071a2d6 100644 --- a/pkg/arvo/app/talk.hoon +++ b/pkg/arvo/app/talk.hoon @@ -1189,9 +1189,9 @@ :: |= {pos/(map circle range) gyf/(unit char)} ^+ ..sh-work - =? ..sh-work ?=(^ gyf) - (bind u.gyf `~(key by pos)) =+ pas=~(key by pos) + =? ..sh-work ?=(^ gyf) + (bind u.gyf `pas) =. ..sh-work sh-prod(active.she pas) :: default to a day of backlog From f3d3981db89b3dad790d473b79d79cc36d16fb52 Mon Sep 17 00:00:00 2001 From: Fang Date: Wed, 17 Jul 2019 01:19:40 +0200 Subject: [PATCH 3/3] Don't require trailing ace when not binding --- pkg/arvo/app/talk.hoon | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/arvo/app/talk.hoon b/pkg/arvo/app/talk.hoon index e4071a2d6..9e0bba9ae 100644 --- a/pkg/arvo/app/talk.hoon +++ b/pkg/arvo/app/talk.hoon @@ -838,15 +838,14 @@ :: ;~((glue ace) (perk %read ~) cire dem:ag) :: - ;~((glue ace) (perk %join ~) sorz (punt glyph)) + ;~((glue ace) (perk %join ~) ;~(plug sorz (punt ;~(pfix ace glyph)))) :: ;~((glue ace) (perk %leave ~) cirs) :: ;~ (glue ace) (perk %create ~) pore cire - qut - (punt glyph) + ;~(plug qut (punt ;~(pfix ace glyph))) == :: ;~ plug (perk %delete ~)