diff --git a/app/talk-agent.hoon b/app/talk-agent.hoon index 4bf534704..b6697fee5 100644 --- a/app/talk-agent.hoon +++ b/app/talk-agent.hoon @@ -68,12 +68,12 @@ $% :: circle management :: {$join p/where} ::< subscribe to {$leave p/where} ::< unsubscribe from - {$create p/security q/knot r/cord} ::< create circle + {$create p/security q/knot r/cord} ::< create circle {$delete p/knot q/(unit cord)} ::< delete circle {$depict p/knot q/cord} ::< change description - {$source p/knot q/(set partner)} ::< add source {$invite p/knot q/(set ship)} ::< give permission {$banish p/knot q/(set ship)} ::< deny permission + {$source p/knot q/(set partner)} ::< add source {$enlist p/knot q/(set ship)} ::< allow federation {$retire p/knot q/(set ship)} ::< deny federation {$burden p/circle} ::< help federate @@ -626,12 +626,12 @@ :: ;~((glue ace) (perk %depict ~) cire qut) :: - ;~((glue ace) (perk %source ~) cire parz) - :: ;~((glue ace) (perk %invite ~) cire shiz) :: ;~((glue ace) (perk %banish ~) cire shiz) :: + ;~((glue ace) (perk %source ~) cire parz) + :: ;~((glue ace) (perk %enlist ~) cire shiz) :: ;~((glue ace) (perk %retire ~) cire shiz) @@ -823,9 +823,9 @@ $create (create +.job) $delete (delete +.job) $depict (depict +.job) - $source (source +.job) $invite (invite +.job) $banish (banish +.job) + $source (source +.job) $enlist (enlist +.job) $retire (retire +.job) $burden (burden +.job) @@ -979,13 +979,6 @@ ^+ ..sh-work (sh-act %depict nom txt) :: - ++ source ::< %source - ::> adds {pas} to {nom}'s src. - :: - |= {nom/knot pas/(set partner)} - ^+ ..sh-work - (sh-act %source nom & pas) - :: ++ invite ::< %invite ::> invites {sis} to our circle {nom}. :: @@ -1000,6 +993,13 @@ ^+ ..sh-work (sh-act %permit nom | sis) :: + ++ source ::< %source + ::> adds {pas} to {nom}'s src. + :: + |= {nom/knot pas/(set partner)} + ^+ ..sh-work + (sh-act %source nom & pas) + :: ++ enlist ::> :: diff --git a/app/talk-guardian.hoon b/app/talk-guardian.hoon index 7c296dda1..09bd34f0d 100644 --- a/app/talk-guardian.hoon +++ b/app/talk-guardian.hoon @@ -347,18 +347,19 @@ == (ta-react red %fail (crip "{(trip nom)}: already exists") `act) :: - ++ action-source ::< un/sub p to/from r - ::> add/remove {pas} as sources for story {nom}. + ++ action-delete ::< delete + announce + ::> delete story {nom}, optionally announcing the + ::> event with message {mes}. :: - |= {nom/knot sub/? pas/(set partner)} + |= {nom/knot mes/(unit cord)} ^+ ..ta-action - %- (affect nom) |= {sor/_so soy/story} - =. src.shape.soy - %. pas - ?: sub - ~(uni in src.shape.soy) - ~(dif in src.shape.soy) - (ta-config nom shape.soy) + %- (affect nom) |= * + =. ..ta-action ::TODO =? + ?~ mes ..ta-action + %+ action-phrase + [[%& our.bol nom] ~ ~] + [%lin | u.mes]~ + (ta-unconfig nom) :: ++ action-depict ::< change description ::> change description of story {nom} to {des}. @@ -377,19 +378,18 @@ %- (affect nom) |= {sor/_so *} =< so-done (so-permit:sor inv sis) :: - ++ action-delete ::< delete + announce - ::> delete story {nom}, optionally announcing the - ::> event with message {mes}. + ++ action-source ::< un/sub p to/from r + ::> add/remove {pas} as sources for story {nom}. :: - |= {nom/knot mes/(unit cord)} + |= {nom/knot sub/? pas/(set partner)} ^+ ..ta-action - %- (affect nom) |= * - =. ..ta-action ::TODO =? - ?~ mes ..ta-action - %+ action-phrase - [[%& our.bol nom] ~ ~] - [%lin | u.mes]~ - (ta-unconfig nom) + %- (affect nom) |= {sor/_so soy/story} + =. src.shape.soy + %. pas + ?: sub + ~(uni in src.shape.soy) + ~(dif in src.shape.soy) + (ta-config nom shape.soy) :: ++ action-enlist ::< dis/allow federation ::> adds {sis} to story {nom}'s list of allowed diff --git a/sur/talk.hoon b/sur/talk.hoon index a6a223d26..c8d47cd07 100644 --- a/sur/talk.hoon +++ b/sur/talk.hoon @@ -12,10 +12,10 @@ ++ action ::> user action $% :: circle configuration :: {$create nom/knot des/cord sec/security} ::< create circle - {$source nom/knot sub/? src/(set partner)} ::< un/sub p to/from r + {$delete nom/knot ano/(unit cord)} ::< delete + announce {$depict nom/knot des/cord} ::< change description {$permit nom/knot inv/? sis/(set ship)} ::< invite/banish - {$delete nom/knot ano/(unit cord)} ::< delete + announce + {$source nom/knot sub/? src/(set partner)} ::< un/sub to/from src {$enlist nom/knot fed/? sis/(set ship)} ::< dis/allow federation {$burden circle} ::< help federate :: messaging ::