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

Updated /sur/talk.hoon to be more clear and consistent.

Browse Source
This commit is contained in:
Fang 2017-10-31 19:56:56 +01:00
parent 926b8a1f69
commit 140c847271
4 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/talk-agent.hoon
View File

@ -615,12 +615,7 @@
==
::
++ pore ::< security
;~ pose
(cold %black (jest %channel))
(cold %white (jest %village))
(cold %green (jest %journal))
(cold %brown (jest %mailbox))
==
(perk %channel %village %journal %mailbox ~)
::
++ lobe ::< y/n loob
;~ pose
@ -1116,7 +1111,7 @@
=< (sh-fact %mor (murn (sort ~(tap by remotes) aor) .))
|= {cir/circle gop/group} ^- (unit sole-effect)
?. |(=(~ cis) (~(has in cis) cir)) ~
?: =(%brown sec.con:(fall (~(get by mirrors) cir) *config)) ~
?: =(%mailbox sec.con:(fall (~(get by mirrors) cir) *config)) ~
?. (~(has in sources) cir) ~
=- `[%tan rose+[", " `~]^- leaf+~(pr-full pr cir) ~]
=< (murn (sort ~(tap by gop) aor) .)
@ -1491,12 +1486,7 @@
::
|= a/security
^- tape
?- a
$black "channel"
$brown "mailbox"
$white "village"
$green "journal"
==
(scow %tas a)
::
++ sh-scis ::< render status
::> gets the presence of {saz} as a tape.
@ -1539,8 +1529,8 @@
::> prints invite/banish effects to the cli.
::
|= {pre/tape sec/security old/(list ship) new/(list ship)}
=+ out=?:(?=(?($black $brown) sec) "try " "cut ")
=+ inn=?:(?=(?($black $brown) sec) "ban " "add ")
=+ out=?:(?=(?($channel $mailbox) sec) "try " "cut ")
=+ inn=?:(?=(?($channel $mailbox) sec) "ban " "add ")
=. +>.$
|- ^+ +>.^$
?~ old +>.^$
@ -1583,7 +1573,7 @@
(weld (trip inbox) ": ")
(sh-set-diff src.laz src.loc)
?: !=(sec.con.loc sec.con.laz)
=. +>.$ (sh-note :(weld pre "but " (sh-cure sec.con.loc)))
=. +>.$ (sh-note :(weld pre "but " (scow %tas sec.con.loc)))
%^ sh-show-permits
(weld (trip inbox) ": ")
sec.con.loc
@ -1834,7 +1824,7 @@
|= cir/circle ^- ?
?& =(hos.cir our.bol)
=+ sot=(~(get by mirrors) cir)
&(?=(^ sot) ?=($brown sec.con.u.sot))
&(?=(^ sot) ?=($mailbox sec.con.u.sot))
==
::
++ ar-pref ::< audience glyph

44
app/talk-guardian.hoon
View File

@ -223,8 +223,8 @@
:: create default circles.
=> %+ roll
^- (list {security naem cord})
:~ [%brown (main our.bol) 'default home']
[%green %public 'visible activity']
:~ [%mailbox (main our.bol) 'default home'] ::TODO %inbox?
[%journal %public 'visible activity']
==
|= {{typ/security nom/naem des/cord} _ta}
%+ ta-action ost.bol
@ -356,7 +356,7 @@
des
*filter
:- typ
?. ?=(?($white $green) typ) ~
?. ?=(?($village $journal) typ) ~
[our.bol ~ ~]
==
(ta-evil (crip "{(trip nom)}: already exists"))
@ -623,7 +623,7 @@
=. aut our.bol
?: =(aut hos.cir)
?: (~(has by stories) nom.cir)
(ta-record nom.cir hos.cir tot)
(ta-record nom.cir hos.cir tot)
%- ta-note ::TODO avenue for abuse?
(crip "have no story {(scow %tas nom.cir)}")
(ta-transmit cir tot)
@ -861,14 +861,14 @@
?~ old ~
::TODO? what to do about src?
:~ ::[%follow | src.u.old]
[%config so-cir %permit | ses.con.u.old]
[%config so-cir %permit | sis.con.u.old]
==
^- (list delta-story)
:~ ::[%follow & src.cof]
[%config so-cir %caption cap.cof]
[%config so-cir %filter fit.cof]
[%config so-cir %secure sec.con.cof]
[%config so-cir %permit & ses.con.cof]
[%config so-cir %permit & sis.con.cof]
==
|= d/delta-story
[%story nom d]
@ -1121,10 +1121,10 @@
^+ +>
::> wyt: whitelist?
::> add: add to list?
=/ wyt/? ?=(?($white $green) sec.con.shape)
=/ wyt/? ?=(?($village $journal) sec.con.shape)
=/ add/? =(inv wyt)
=/ sus/(set ship)
%. ses.con.shape
%. sis.con.shape
?:(add ~(dif in sis) ~(int in sis))
=. +>.$
%- so-act
@ -1141,10 +1141,10 @@
|= her/ship
^- ?
?- sec.con.shape
$black !(~(has in ses.con.shape) her) ::< channel, blacklist
$white (~(has in ses.con.shape) her) ::< village, whitelist
$green (~(has in ses.con.shape) her) ::< journal, whitelist
$brown !(~(has in ses.con.shape) her) ::< mailbox, blacklist
$channel !(~(has in sis.con.shape) her) ::< blacklist
$village (~(has in sis.con.shape) her) ::< whitelist
$journal (~(has in sis.con.shape) her) ::< author whitelist
$mailbox !(~(has in sis.con.shape) her) ::< author blacklist
==
::
++ so-visible ::< display to
@ -1153,10 +1153,10 @@
|= her/ship
^- ?
?- sec.con.shape
$black !(~(has in ses.con.shape) her) ::< channel, blacklist
$white (~(has in ses.con.shape) her) ::< village, whitelist
$green & ::< journal, all
$brown (team:title our.bol her) ::< mailbox, our team
$channel !(~(has in sis.con.shape) her) ::< blacklist
$village (~(has in sis.con.shape) her) ::< whitelist
$journal & ::< all
$mailbox (team:title our.bol her) ::< our team
==
--
--
@ -1540,7 +1540,7 @@
|= {old/config dif/diff-config}
^- (list move)
?+ -.dif ~
$permit (sa-permit-effects sec.con.old ses.con.old +.dif)
$permit (sa-permit-effects sec.con.old sis.con.old +.dif)
::NOTE when doing a lone %secure, calculate the
:: necessary %permit deltas alongside it.
==
@ -1561,11 +1561,11 @@
::
|= {sec/security old/(set ship) add/? sis/(set ship)}
^- (list move)
=/ wyt ?=(?($white $green) sec)
=/ wyt ?=(?($village $journal) sec)
=/ inv =(wyt add)
?: inv ~
=/ sus/(set ship)
%. ses.con.shape
%. sis.con.shape
?:(add ~(dif in sis) ~(int in sis))
(sa-eject sus)
::
@ -1743,7 +1743,7 @@
|= {n/naem s/story}
^- (unit (pair naem burden))
:: only auto-federate channels for now.
?. ?=($black sec.con.shape.s) ~
?. ?=($channel sec.con.shape.s) ~
:+ ~ n
:+ grams.s
[shape.s mirrors.s]
@ -1834,7 +1834,7 @@
?. ?=($story -.det) ~
?: ?=(?($follow $inherited $sequent) -.det.det) ~
:: only burden channels for now.
?. =(%black sec.con.shape:(~(got by stories) nom.det)) ~
?. =(%channel sec.con.shape:(~(got by stories) nom.det)) ~
`[%burden nom.det (dedicate who.qer nom.det det.det)]
::
$report
@ -1847,7 +1847,7 @@
:: and only if the story is inherited.
?. inherited.soy ~
:: only burden channels for now.
?. =(%black sec.con.shape.soy) ~
?. =(%channel sec.con.shape.soy) ~
`[%burden nom.det (dedicate (above our.bol) nom.det det.det)]
::
$circle

6
lib/talk-json.hoon
View File

@ -274,7 +274,7 @@
++ cont ::> control
|= a/control
^- json
(pairs sec+s+sec.a ses+(sa ses.a ship) ~)
(pairs sec+s+sec.a sis+(sa ses.a ship) ~)
::
++ crow ::> crowd
|= a/crowd
@ -513,11 +513,11 @@
::
++ cont ::> control
^- $-(json (unit control))
(ot sec+secu ses+(as (su fed:ag)) ~)
(ot sec+secu sis+(as (su fed:ag)) ~)
::
++ secu ::> security
^- $-(json (unit security))
(su (perk %black %white %green %brown ~))
(su (perk %channel %village %journal %mailbox ~))
::
++ crow ::> crowd
^- $-(json (unit crowd))

22
sur/talk.hoon
View File

@ -90,15 +90,17 @@
$% {$glyph diff-glyph} ::< un/bound glyph
{$nick diff-nick} ::< changed nickname
== ::
++ burden ::< full story state
$: gaz/(list telegram) ::< all messages
cos/lobby ::< loc & rem configs
++ shipment ::> standard payload
$: cos/lobby ::< loc & rem configs
pes/crowd ::< loc & rem presences
== ::
++ burden ::< full story state
$: gaz/(list telegram) ::TODO envelope? ::< all messages
shipment
== ::
++ package ::< story state
$: nes/(list envelope) ::< messages
cos/lobby ::< loc & rem configs
pes/crowd ::< loc & rem presences
shipment
== ::
++ diff-glyph {bin/? gyf/char aud/audience} ::< un/bound glyph
++ diff-nick {who/ship nic/nick} ::< changed nickname
@ -193,12 +195,12 @@
utf/? ::< dis/allow non-ascii
::TODO maybe message length
== ::
++ control {sec/security ses/(set ship)} ::< access control
++ control {sec/security sis/(set ship)} ::< access control
++ security ::> security mode
$? $black ::< channel, blacklist
$white ::< village, whitelist
$green ::< journal, author list
$brown ::< mailbox, our r, bl w
$? $channel ::< channel, blacklist
$village ::< village, whitelist
$journal ::< journal, author list
$mailbox ::< mailbox, our r, bl w
== ::
:: participant metadata. ::
::TODO think about naming more