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

Merge pull request #603 from Fang-/hall-talk-0-bone

Browse Source 
Hall and talk no longer use bone 0
This commit is contained in:
Fang 2018-01-25 19:09:49 +01:00 committed by GitHub
commit 6ca8e039b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/hall.hoon
View File

@ -1931,7 +1931,7 @@
%^ circle-wire nom %^ circle-wire nom
~[%grams %config-l %group-l] ~[%grams %config-l %group-l]
[cir ran] [cir ran]
[0 %pull wir [hos.cir dap.bol] ~] [ost.bol %pull wir [hos.cir dap.bol] ~]
:: ::
++ sa-eject ++ sa-eject
:> removes ships {sis} from {followers}. :> removes ships {sis} from {followers}.
@ -1996,7 +1996,7 @@
|= wir/wire |= wir/wire
^- move ^- move
=+ tar=(wire-to-target wir) =+ tar=(wire-to-target wir)
[0 %peer wir [p.tar dap.bol] q.tar] [ost.bol %peer wir [p.tar dap.bol] q.tar]
:: ::
++ wire-to-target ++ wire-to-target
:> ship+path from wire :> ship+path from wire
@ -2091,12 +2091,12 @@
%+ turn ~(tap in ~(key by stories)) %+ turn ~(tap in ~(key by stories))
|= n/name |= n/name
^- (list move) ^- (list move)
:~ :^ 0 %poke / :~ :^ ost.bol %poke /
:+ [our.bol dap.bol] %hall-action :+ [our.bol dap.bol] %hall-action
:^ %source n | :^ %source n |
[[[our.bol nom.qer] ran.qer] ~ ~] [[[our.bol nom.qer] ran.qer] ~ ~]
:: ::
:^ 0 %pull :^ ost.bol %pull
%^ circle-wire n ~(tap in wat.qer) %^ circle-wire n ~(tap in wat.qer)
[[our.bol nom.qer] ran.qer] [[our.bol nom.qer] ran.qer]
[[our.bol dap.bol] ~] [[our.bol dap.bol] ~]
@ -2867,7 +2867,7 @@
:_ +> :_ +>
=+ bov=(above our.bol) =+ bov=(above our.bol)
?: =(bov our.bol) ~ ?: =(bov our.bol) ~
:~ [0 %pull /burden [bov dap.bol] ~] :~ [ost.bol %pull /burden [bov dap.bol] ~]
(wire-to-peer /burden) (wire-to-peer /burden)
== ==
?: =(a 'incoming') ?: =(a 'incoming')

12
app/talk.hoon
View File

@ -203,7 +203,7 @@
++ peer-client ++ peer-client
:> ui state peer move :> ui state peer move
^- move ^- move
:* 0 :* ost.bol
%peer %peer
/server/client /server/client
server server
@ -212,7 +212,7 @@
:: ::
++ peer-inbox ++ peer-inbox
^- move ^- move
:* 0 :* ost.bol
%peer %peer
/server/inbox /server/inbox
server server
@ -2438,16 +2438,16 @@
?: =(a 'reconnect') ?: =(a 'reconnect')
~& 'disconnecting and reconnecting to hall...' ~& 'disconnecting and reconnecting to hall...'
:_ +> :_ +>
:~ [0 %pull /server/client server ~] :~ [ost.bol %pull /server/client server ~]
[0 %pull /server/inbox server ~] [ost.bol %pull /server/inbox server ~]
peer-client peer-client
peer-inbox peer-inbox
== ==
?: =(a 'reset') ?: =(a 'reset')
~& 'full reset incoming, hold on to your cli...' ~& 'full reset incoming, hold on to your cli...'
:_ +>(grams ~, known ~, count 0) :_ +>(grams ~, known ~, count 0)
:~ [0 %pull /server/client server ~] :~ [ost.bol %pull /server/client server ~]
[0 %pull /server/inbox server ~] [ost.bol %pull /server/inbox server ~]
peer-client peer-client
peer-inbox peer-inbox
== ==