ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-05 13:55:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

More renaming of talk structures.

Browse Source
This commit is contained in:
Fang 2017-04-26 23:33:25 +02:00
parent 04997b5c10
commit f3533eae4f
4 changed files with 75 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/talk-agent.hoon
View File

@ -35,7 +35,7 @@
known/(map serial @ud) ::< messages heard
sources/(set partner) ::< our subscriptions
:: partner details ::
remotes/(map partner atlas) ::< remote presences
remotes/(map partner group) ::< remote presences
mirrors/(map circle config) ::< remote configs
:: ui state ::
folks/(map ship human) ::< human identities
@ -68,7 +68,7 @@
$% :: circle management ::
{$join p/where} ::< subscribe to
{$leave p/where} ::< unsubscribe from
{$create p/posture 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
@ -303,17 +303,17 @@
::
++ ta-low-precs ::< apply changed precs
::> applies new presences.
::> other clients might care for {tas}, but we're
::> other clients might care for {gop}, but we're
::> only ever getting this for the mailbox, where
::> we're the only ones present.
::
|= {tas/atlas pas/(map partner atlas)}
|= {gop/group pas/(map partner group)}
^+ +>
=/ ner/_remotes :: per-partner uni
%- ~(urn by pas)
|= {p/partner a/atlas}
|= {p/partner g/group}
=+ o=(~(get by remotes) p)
?~(o a (~(uni by u.o) a))
?~(o g (~(uni by u.o) g))
=. ner (~(uni by remotes) ner) :: fill in the gaps
?: =(remotes ner) +>.$ :: no change
=. +>.$
@ -566,7 +566,7 @@
(stag 0 dem:ag)
==
::
++ pore ::< posture
++ pore ::< security
;~ pose
(cold %black (jest %channel))
(cold %white (jest %village))
@ -946,10 +946,10 @@
++ create ::< %create
::> creates circle {nom} with specified config.
::
|= {por/posture nom/knot txt/cord}
|= {sec/security nom/knot txt/cord}
^+ ..sh-work
=. ..sh-work
(sh-act %create nom txt por)
(sh-act %create nom txt sec)
(join [[%& our.bol nom] ~ ~])
::
++ delete ::< %delete
@ -1027,10 +1027,10 @@
::
|= pas/(set partner) ^+ ..sh-work
=< (sh-fact %mor (murn (sort (~(tap by remotes) ~) aor) .))
|= {pon/partner alt/atlas} ^- (unit sole-effect)
|= {pon/partner gop/group} ^- (unit sole-effect)
?. |(=(~ pas) (~(has in pas) pon)) ~
=- `[%tan rose+[", " `~]^- leaf+~(pr-full pr pon) ~]
=< (murn (sort (~(tap by alt)) aor) .)
=< (murn (sort (~(tap by gop)) aor) .)
|= {a/ship b/presence c/human} ^- (unit tank)
=. c
?. =(han.c `(scot %p a)) c
@ -1231,12 +1231,12 @@
::> arms that calculate differences between datasets.
::+|
::
++ sh-atlas-diff ::< atlas diff parts
++ sh-group-diff ::< group diff parts
::> calculates the difference between two presence
::> lists, producing lists of removed, added and
::> changed presences.
::
|= {one/atlas two/atlas}
|= {one/group two/group}
=| $= ret
$: old/(list (pair ship status))
new/(list (pair ship status))
@ -1274,11 +1274,11 @@
::> presence maps, producing a list of removed,
::> added and changed presences maps.
::
|= {one/(map partner atlas) two/(map partner atlas)}
|= {one/(map partner group) two/(map partner group)}
=| $= ret
$: old/(list (pair partner atlas))
new/(list (pair partner atlas))
cha/(list (pair partner atlas))
$: old/(list (pair partner group))
new/(list (pair partner group))
cha/(list (pair partner group))
==
^+ ret
=. ret
@ -1398,10 +1398,11 @@
%+ sh-fact %txt
(runt [(sub 13 (lent bun)) '-'] "[{bun}]")
::
++ sh-puss ::< readable posture
::> renders a security posture.
++ sh-cure ::< readable security
::> renders a security kind.
::
|= a/posture ^- tape
|= a/security
^- tape
?- a
$black "channel"
$brown "mailbox"
@ -1416,7 +1417,7 @@
^- tape
['%' (trip pec.sat)]
::
++ sh-show-precs ::< print atlas diff
++ sh-show-precs ::< print group diff
::> prints presence changes to the cli.
::
|= $: pre/tape
@ -1449,9 +1450,9 @@
++ sh-show-permits ::< show permits
::> prints invite/banish effects to the cli.
::
|= {pre/tape por/posture old/(list ship) new/(list ship)}
=+ out=?:(?=(?($black $brown) por) "try " "cut ")
=+ inn=?:(?=(?($black $brown) por) "ban " "add ")
|= {pre/tape sec/security old/(list ship) new/(list ship)}
=+ out=?:(?=(?($black $brown) sec) "try " "cut ")
=+ inn=?:(?=(?($black $brown) sec) "ban " "add ")
=. +>.$
|- ^+ +>.^$
?~ old +>.^$
@ -1494,7 +1495,7 @@
(weld (trip inbox) ": ")
(sh-set-diff src.laz src.loc)
?: !=(sec.con.loc sec.con.laz)
=. +>.$ (sh-note :(weld pre "but " (sh-puss sec.con.loc)))
=. +>.$ (sh-note :(weld pre "but " (sh-cure sec.con.loc)))
%^ sh-show-permits
(weld (trip inbox) ": ")
sec.con.loc
@ -1523,7 +1524,7 @@
++ sh-low-rempe ::< show remotes
::> prints remote presence changes to the cli.
::
|= {old/(map partner atlas) new/(map partner atlas)}
|= {old/(map partner group) new/(map partner group)}
?: (~(has in settings.she) %quiet)
+>.$
=+ day=(sh-rempe-diff old new)
@ -1547,15 +1548,15 @@
(sh-note (weld "for " (~(pr-show pr p.i.cha.day) ~)))
=+ yez=(~(got by old) p.i.cha.day)
%+ sh-show-precs "--"
(sh-atlas-diff yez q.i.cha.day)
(sh-group-diff yez q.i.cha.day)
+>.$
::
++ sh-low-precs ::< show presence
::> prints presence changes to the cli.
::
|= {old/atlas new/atlas}
|= {old/group new/group}
^+ +>
=+ dif=(sh-atlas-diff old new)
=+ dif=(sh-group-diff old new)
(sh-show-precs "" dif)
::
++ sh-low-gram ::< show telegram
@ -1924,7 +1925,7 @@
tan+~[leaf+"# {(trip exp.sep)}"]
::
$fat
[%mor $(sep sep.sep) tan+(tr-tors tac.sep) ~]
[%mor $(sep sep.sep) tan+(tr-tach tac.sep) ~]
::
$inv
:- %tan
@ -1953,10 +1954,10 @@
==
==
::
++ tr-tors ::< attachment
++ tr-tach ::< attachment
::> renders an attachment.
::
|= a/torso
|= a/attache
^- tang
?- -.a
$name (welp $(a tac.a) leaf+"={(trip nom.a)}" ~)

50
app/talk-guardian.hoon
View File

@ -47,8 +47,8 @@
++ story ::> wire content
$: count/@ud ::< (lent grams)
grams/(list telegram) ::< all messages
locals/atlas ::< local presence
remotes/(map partner atlas) ::< remote presence
locals/group ::< local presence
remotes/(map partner group) ::< remote presence
shape/config ::< configuration
mirrors/(map circle config) ::< remote config
::TODO never gets updated. ::
@ -234,11 +234,11 @@
::> creates our default mailbox and journal.
::
%+ roll
^- (list {posture knot cord})
^- (list {security knot cord})
:~ [%brown (main our.bol) 'default home']
[%green ~.public 'visible activity']
==
|= {{typ/posture nom/knot des/cord} _ta}
|= {{typ/security nom/knot des/cord} _ta}
%+ ta-action ost.bol
[%create nom des typ]
::
@ -310,7 +310,7 @@
++ action-create ::< create story
::> creates a story with the specified parameters.
::
|= {nom/knot des/cord typ/posture}
|= {nom/knot des/cord typ/security}
^+ ..ta-action
?. (~(has in stories) nom)
(ta-config nom [[%& our.bol nom] ~ ~] des [typ ~])
@ -483,7 +483,7 @@
::TODO? or (so-sauce ost.bol [%quit ~]~) ?
=^ who +>.$ (ta-human her)
:: send current data to bring her up to date.
=. soy (so-report-cabal:soy ost.bol ~ ~)
=. soy (so-report-lobby:soy ost.bol ~ ~)
=. soy (so-report-group:soy ost.bol ~ ~)
=. soy (so-start:soy her t.pax) ::< also adds story sub
=. soy (so-notify:soy her %hear who) ::< add her status
@ -892,13 +892,13 @@
::> send local and remote presences in a report.
::
|= bos/(set bone)
(so-report bos %group locals so-remotes)
(so-report bos %crowd locals so-remotes)
::
++ so-report-cabal ::< config update
++ so-report-lobby ::< config update
::> send local and remote configs in a report.
::
|= bos/(set bone)
(so-report bos %cabal shape mirrors)
(so-report bos %lobby shape mirrors)
::
::> ||
::> || %data
@ -936,11 +936,11 @@
::> stories.
::
%- ~(urn by remotes) :: XX performance
|= {pan/partner atl/atlas}
^- atlas
?. &(?=($& -.pan) =(our.bol hos.p.pan)) atl
|= {pan/partner gop/group}
^- group
?. &(?=($& -.pan) =(our.bol hos.p.pan)) gop
=+ soy=(~(get by stories) nom.p.pan)
?~ soy atl
?~ soy gop
locals.u.soy
::
::> ||
@ -963,12 +963,12 @@
" %" (scow %tas -.ret)
==
?- -.ret
$cabal (so-cabal cir +.ret)
$group (so-remind [%& cir] +.ret)
$lobby (so-lobby cir +.ret)
$crowd (so-remind [%& cir] +.ret)
$grams (so-lesson gaz.ret)
==
::
++ so-cabal ::< update config
++ so-lobby ::< update config
::> add circle's config to our remote config map.
::
::TODO when do we care about rem?
@ -978,14 +978,14 @@
=. mirrors (~(put by mirrors) cir con)
?: =(mirrors old) +>.$
=. +>.$ (so-inform %confs `shape (strap cir `con))
(so-report-cabal so-followers)
(so-report-lobby so-followers)
::
++ so-remind ::< remote presence
::> adds tay's loc to our remote presence map,
::> after merging with rem.
::> adds {tay}'s {loc} to our remote presence map,
::> after merging with {rem}.
::> if this changes anything, send a report.
::
|= {pan/partner loc/atlas rem/(map partner atlas)}
|= {pan/partner loc/group rem/(map partner group)}
=. rem (~(del by rem) %& our.bol nom) ::< superseded by local
=/ buk (~(uni by remotes) rem)
=. buk (~(put by buk) pan loc)
@ -994,7 +994,7 @@
%^ so-inform %precs ~
::> per-partner diff.
%- ~(urn by buk)
|= {p/partner a/atlas}
|= {p/partner a/group}
=+ o=(~(get by remotes) p)
?~(o a (~(dif in a) u.o))
(so-report-group(remotes buk) so-followers)
@ -1006,7 +1006,7 @@
::+|
::
++ so-reform ::< reconfigure
::> changes the config of this story and notify::
::> changes the config of this story and notify
::> our followers.
::> subscribes to new sources, unsubs from removed
::> ones.
@ -1021,7 +1021,7 @@
=. +>.$ (so-acquire p.dif)
=. +>.$ (so-abjure q.dif)
=. shape cof
(so-report-cabal so-followers)
(so-report-lobby so-followers)
::
++ so-reform-gone ::< delete story
::> deletes this story. removes it from {stories}
@ -1029,7 +1029,7 @@
::
=. stories (~(del by stories) nom)
=. . (so-inform %confs ~ ~)
=. . (so-report-cabal so-followers)
=. . (so-report-lobby so-followers)
(so-abjure (~(tap in src.shape)))
::
++ so-notify ::< local presence
@ -1106,7 +1106,7 @@
?. (~(has in src.shape) pan) +>
=. src.shape (~(del in src.shape) pan)
=. +> (so-inform %confs `shape ~)
(so-report-cabal so-followers)
(so-report-lobby so-followers)
::
++ so-start ::< subscribe follower
::> called upon subscribe. deduces the range of

10
mar/talk/report.hoon
View File

@ -19,9 +19,9 @@
=> +
|^ %+ joba -.rep
?- -.rep
$cabal (cabl cab.rep)
$lobby (loby cab.rep)
$grams (jobe num+(jone num.rep) tele+[%a (turn gaz.rep gram)] ~)
$group %^ jobe
$crowd %^ jobe
local+(grop loc.reg.rep)
global+%.(rem.reg.rep (jome parn grop))
~
@ -121,8 +121,8 @@
(jobe first+[%s p] middle+?~(q ~ [%s u.q]) last+[%s r] ~)
~
::
++ cabl
|= cabal
++ loby
|= lobby
%- jobe :~
loc+(conf loc)
ham+((jome circ conf) rem)
@ -137,7 +137,7 @@
%- jobe :~
sources+(sorc src)
caption+[%s cap]
=- cordon+(jobe posture+[%s -.con] list+[%a -] ~)
=- control+(jobe security+[%s -.con] list+[%a -] ~)
(turn (~(tap in ses.con)) jope) :: XX jase
==
--

27
sur/talk.hoon
View File

@ -11,7 +11,7 @@
::
++ action ::> user action
$% :: circle configuration ::
{$create nom/knot des/cord sec/posture} ::< create circle
{$create nom/knot des/cord sec/security} ::< create circle
{$source nom/knot sub/? src/(set partner)} ::< un/sub p to/from r
{$depict nom/knot des/cord} ::< change description
{$permit nom/knot inv/? sis/(set ship)} ::< invite/banish
@ -37,7 +37,7 @@
loc/(unit config) ::< local config
rem/(map circle (unit config)) ::< remote configs
== ::
{$precs reg/register} ::< presences
{$precs reg/crowd} ::< presences
{$grams num/@ud gaz/(list telegram)} ::< messages
:: ui state ::
{$glyph (jug char (set partner))} ::< glyph bindings
@ -54,8 +54,8 @@
$% {$review tos/(list thought)} ::< deliver
== ::
++ report ::> update
$% {$cabal cab/cabal} ::< config neighborhood
{$group reg/register} ::< presence
$% {$lobby cab/lobby} ::< config neighborhood
{$crowd reg/crowd} ::< presence
{$grams num/@ud gaz/(list telegram)} ::< thoughts
== ::
::
@ -71,25 +71,22 @@
$% {$twitter p/@t} ::< twitter handle
== ::
:: circle configurations. ::
++ cabal ::> metaconfiguration
$: loc/config ::< local config
rem/(map circle config) ::< neighborhood configs
== ::
++ lobby {loc/config rem/(map circle config)} ::< our & srcs configs
++ config ::> circle config
$: src/(set partner) ::< pulls from
cap/cord ::< description
con/control ::< restrictions
== ::
++ control {sec/posture ses/(set ship)} ::< access control
++ posture ::> security kind
++ control {sec/security ses/(set ship)} ::< access control
++ security ::> security kind
$? $black ::< channel, blacklist
$white ::< village, whitelist
$green ::< journal, author list
$brown ::< mailbox, our r, bl w
== ::
:: participant metadata. ::
++ register {loc/atlas rem/(map partner atlas)} ::< our & srcs presences
++ atlas (map ship status) ::< presence map
++ crowd {loc/group rem/(map partner group)} ::< our & srcs presences
++ group (map ship status) ::< presence map
++ status {pec/presence man/human} ::< participant
++ presence ::> status type
$? $gone ::< left
@ -117,7 +114,7 @@
{$ire tos/serial sep/speech} ::< in-reply-to
{$url url/purf} ::< parsed url
{$exp exp/@t} ::< hoon line
{$fat tac/torso sep/speech} ::< attachment
{$fat tac/attache sep/speech} ::< attachment
{$lan nom/knot msg/@t} ::< local announce
{$inv inv/? cir/circle} ::< inv/ban for circle
{$mor ses/(list speech)} ::< multiplex
@ -133,8 +130,8 @@
meta/json ::< other data for web
== ::
== ::
++ torso ::> attachment
$% {$name nom/@t tac/torso} ::< named attachment
++ attache ::> attachment
$% {$name nom/@t tac/attache} ::< named attachment
{$text (list @t)} ::< text lines
{$tank (list tank)} ::< tank list
== ::