urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-12 10:29:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

All default mailboxes are now called %inbox, regardless of ship class.

Browse Source
This commit is contained in:
Fang 2017-11-01 18:35:06 +01:00
parent 4506f4ca5c
commit a284e31a4f
3 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/talk-agent.hoon
View File

@ -137,7 +137,7 @@
::> produces the name of the circle used by this
::> reader for all its operations
^- naem
(main our.bol)
%inbox
::
++ incir ::< reader's circle
::> ++inbox, except a full circle.
@ -558,7 +558,7 @@
::
%+ cook
|= {a/@p b/(unit term)}
[a ?^(b u.b (main a))]
[a ?^(b u.b %inbox)]
;~ plug
ship
(punt ;~(pfix fas urs:ab))
@ -1651,8 +1651,8 @@
?. =(our.bol hos.two) %&
?< =(nom.one nom.two)
:: if both circles are ours, the main story is better.
?: =((main hos.one) nom.one) %&
?: =((main hos.two) nom.two) %|
?: =(%inbox nom.one) %&
?: =(%inbox nom.two) %|
:: if neither are, pick the "larger" one.
(lth nom.one nom.two)
:: if one isn't ours but two is, two is better.
@ -1698,7 +1698,7 @@
":"
['%' (trip nom.one)]
=+ wun=(cite:title hos.one)
?: =(nom.one (main hos.one))
?: =(nom.one %inbox)
wun
?: =(hos.one (sein:title our.bol))
['/' (trip nom.one)]
@ -1888,8 +1888,8 @@
:: render the author.
=/ nom/tape
?: (~(has in sef) %nicks)
(~(cr-nick cr [who (main who)]))
(~(cr-curt cr [who (main who)]) |)
(~(cr-nick cr [who %inbox]))
(~(cr-curt cr [who %inbox]) |)
:: regular indent.
=/ den/tape
(reap (lent nom) ' ')
@ -2054,7 +2054,7 @@
?: pat.sep " "
%~ ar-pref ar
?: =(who our.bol) aud
(~(del in aud) [%& who (main who)])
(~(del in aud) [%& who %inbox])
==
=. wyd (sub wyd (lent pef))
=/ txt (tuba (trip msg.sep))

9
app/talk-guardian.hoon
View File

@ -17,7 +17,6 @@
:: lists of moons (or just ships in general?) that we define as "standalone"
:: so that the "convert to true identity" doesn't happen for them.
::
::TODO/REVIEW rename porch/floor/court to inbox?
::
/? 151 ::< hoon version
/- talk ::< structures
@ -180,7 +179,7 @@
::
|= msg/cord
%^ ta-action 0 %phrase
:- [[our.bol (main our.bol)] ~ ~]
:- [[our.bol %inbox] ~ ~]
[%app dap.bol msg]~
::
++ ta-evil ::< emit error
@ -223,7 +222,7 @@
:: create default circles.
=> %+ roll
^- (list {security naem cord})
:~ [%mailbox (main our.bol) 'default home'] ::TODO %inbox?
:~ [%mailbox %inbox 'default home']
[%journal %public 'visible activity']
==
|= {{typ/security nom/naem des/cord} _ta}
@ -695,7 +694,7 @@
|= msg/cord
^+ +>
%+ so-act %phrase
:- [[our.bol (main our.bol)] ~ ~]
:- [[our.bol %inbox] ~ ~]
[%app dap.bol msg]~
::
++ so-delta ::< send delta
@ -1131,7 +1130,7 @@
:- %phrase
%- ~(rep in sus)
|= {s/ship a/audience t/(list speech)}
:- (~(put in a) [s (main s)])
:- (~(put in a) [s %inbox])
[[%inv inv so-cir] t]
(so-delta-our %config so-cir %permit [add sus])
::

12
lib/talk.hoon
View File

@ -10,14 +10,6 @@
::
[. ^talk]
|_ bol/bowl:gall
++ main :: main story
|= who/ship
^- cord
=+ can=(clan:title who)
?+ can %porch
$czar %court
$king %floor
==
::
::TODO add to zuse?
++ true-self
@ -36,7 +28,7 @@
:+ [our.bol %talk] %talk-action
^- action
:+ %phrase
[[our.bol (main our.bol)] ~ ~]
[[our.bol %inbox] ~ ~]
[%app dap.bol (crip (en-purl:html url))]~ :: XX
::
++ said :: app message
@ -49,7 +41,7 @@
:_ $(mes t.mes, eny (sham eny mes))
^- thought
:+ (shaf %thot eny)
[[our (main our)] ~ ~]
[[our %inbox] ~ ~]
[now [%app dap (crip ~(ram re i.mes))]]
::
++ uniq