urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-05 19:46:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes and improvements.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-04-01 13:56:43 -07:00
parent 7a939c247a
commit e52327a083
10 changed files with 84 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arvo/dill.hoon
View File

@ -51,6 +51,7 @@
[%hop p=@ud] :: set cursor position
[%mor p=(list dill-blit)] :: multiple blits
[%pro p=(list ,@c)] :: show as cursor/line
[%qit ~] :: close console
[%out p=(list ,@c)] :: send output line
[%sag p=path q=*] :: save to jamfile
[%sav p=path q=@] :: save to file
@ -252,6 +253,8 @@
(done(see p.bit) %blit [[%lin p.bit] [%hop pos] ~])
?: ?=(%hop -.bit)
(done(pos p.bit) %blit [bit ~])
?: ?=(%qit -.bit)
(dump %logo ~)
(done %blit [bit ~])
::
++ init :: initialize
@ -318,7 +321,8 @@
:: (send %cru p.+.sih q.+.sih)
::
[%g %mean *]
+>(moz [[hen %give %logo ~] moz])
~& %dill-take-mean
+>
::
[%g %nice *]
:: ~& [%take-nice sih]

4
main/app/sole/core.hook
View File

@ -271,7 +271,7 @@
=. liv.maz mav
?: mav
?. liv
(se-emit ost %give %mean ~)
(se-blit `dill-blit`[%qit ~])
+>(tar.maz +<+)
?. liv
=. ..ta (se-nuke gyl)
@ -615,6 +615,7 @@
++ poke-dill-belt
|= [ost=bone her=ship bet=dill-belt]
^- [(list move) _+>]
:: ~& [%sole-poke ost her bet]
=+ yog=(~(get by bin) ost)
?~ yog
~& [%sole-poke-stale ost]
@ -640,6 +641,7 @@
++ pull
|= ost=bone
^- [(list move) _+>]
:: ~& [%sole-pull ost]
=^ moz +>
=< se-abet
=< se-view

104
main/app/radio/core.hook → main/app/talk/core.hook
View File

@ -1,9 +1,9 @@
::
:::: /hook/core/radio/app
:::: /hook/core/talk/app
::
/? 314
/- *radio, *twitter, *sole
/+ radio, sole
/- *talk, *twitter, *sole
/+ talk, sole
::
::::
::
@ -11,7 +11,7 @@
=> |% :: data structures
++ house ,[%1 house-1] :: full state
++ house-any :: app history
$% [%1 house-1] :: 1: radio
$% [%1 house-1] :: 1: talk
[%0 house-0] :: 0: initial version
== ::
++ house-1 ::
@ -75,11 +75,11 @@
$% [%wake ~] :: timer wakeup
== == == ::
++ salt :: output rush
$% [%radio-report p=report] ::
$% [%talk-report p=report] ::
[%sole-effect p=sole-effect] ::
== ::
++ silt :: input rush
$% [%radio-report p=report] :: refresh
$% [%talk-report p=report] :: refresh
[%twit-stat p=twit-stat] :: tweet receipt
[%twit-feed p=(list twit-stat)] :: tweet receipt
== ::
@ -137,7 +137,7 @@
++ ra :: transaction core
|_ [ost=bone moves=(list move)]
++ sh :: console interface
|_ $: coz=(list command) :: radio actions
|_ $: coz=(list command) :: talk actions
she=shell
==
++ sh-abet
@ -177,7 +177,7 @@
++ sh-prod :: show prompt
^+ .
%+ sh-fact %pro
:+ & %radio-line
:+ & %talk-line
^- tape
=+ ^= rew ^- (pair (pair ,@t ,@t) (set partner))
?~ active.she
@ -186,9 +186,17 @@
=+ por=~(te-prom te man.she q.rew)
(weld `tape`[p.p.rew por] `tape`[q.p.rew ' ' ~])
::
++ sh-pass :: update passive aud
|= aud=audience
%_ +>
passive.she
%- ~(gas in *(set partner))
(turn (~(tap by aud)) |=([a=partner *] a))
==
::
++ sh-rend :: print on one line
|= gam=telegram
(sh-fact %txt ~(tr-line tr man.she gam))
(sh-pass:(sh-fact %txt ~(tr-line tr man.she gam)) q.q.gam)
::
++ sh-numb :: print msg number
|= num=@ud
@ -256,13 +264,13 @@
((sh-sane-rule work:cp) inv (tufa buf))
(sh-sane-chat buf)
::
++ sh-slug :: edit with beep
++ sh-slug :: edit to sanity
|= lit=(list sole-edit)
^+ +>
?~ lit +>
=^ lic say.she
(~(transmit cs say.she) `sole-edit`?~(t.lit i.lit [%mor lit]))
(sh-fact [%mor [%det lic] [%bel ~] ~])
(sh-fact [%mor [%det lic] ~])
::
++ sh-stir :: apply edit
|= cal=sole-change
@ -301,7 +309,7 @@
|= job=work
^+ +>
?+ -.job
~& [%radio-work job]
~& [%talk-work job]
+>
::
%say
@ -349,7 +357,7 @@
[~ ~]
=+ mor=$(moves t.moves)
?. ?& (~(has by shells) `bone`p.i.moves)
?=([%give %rush %radio-report *] q.i.moves)
?=([%give %rush %talk-report *] q.i.moves)
==
[[i.moves p.mor] q.mor]
[p.mor [[p.i.moves +>+.q.i.moves] q.mor]]
@ -389,7 +397,7 @@
++ ra-house :: emit partners
|= ost=bone
%+ ra-emit ost
:^ %give %rush %radio-report
:^ %give %rush %talk-report
:- %house
%- ~(gas in *(map span (pair posture cord)))
%+ turn (~(tap by stories))
@ -403,7 +411,7 @@
=. +> $(gel r.gel)
(ra-house n.gel)
::
++ ra-init :: initialize radio
++ ra-init :: initialize talk
=+ sir=(sein our.hid)
%+ ra-apply our.hid
:+ %design (main our.hid)
@ -417,10 +425,10 @@
?- -.cod
%design
?. =(her our.hid)
(ra-evil %radio-no-owner)
(ra-evil %talk-no-owner)
?~ q.cod
?. (~(has by stories) p.cod)
(ra-evil %radio-no-story)
(ra-evil %talk-no-story)
=. +>.$ (ra-config p.cod *config)
ra-ever(stories (~(del by stories) p.cod))
=. +>.$ (ra-config p.cod u.q.cod)
@ -448,7 +456,7 @@
++ ra-twitter :: %twitter response
|= [[num=@ud man=span] sih=sign]
^+ +>
?+ sih ~|([%radio-bad-twitter sih] !!)
?+ sih ~|([%talk-bad-twitter sih] !!)
[%g ?(%nice %mean) ~]
+>
[%g %mean ^]
@ -467,7 +475,7 @@
%+ ~(put by q.u.oot) pan
:- -.olg
?+ sih !!
[%g %mean *] ~&([%radio-repeat-rejected num pan sih] %rejected)
[%g %mean *] ~&([%talk-repeat-rejected num pan sih] %rejected)
[%g %nice ~] %received
==
(ra-think | our.hid u.oot ~)
@ -506,7 +514,7 @@
?: ?=(~ pax)
(ra-house(general (~(put in general) ost)) ost)
?. ?=([@ @ *] pax)
(ra-evil %radio-bad-path)
(ra-evil %talk-bad-path)
=+ ^= vab ^- (set ,@tas)
=| vab=(set ,@tas)
|- ^+ vab
@ -515,7 +523,7 @@
=+ pur=(~(get by stories) i.t.pax)
?~ pur
~& [%bad-subscribe-story-c i.t.pax]
(ra-evil %radio-no-story)
(ra-evil %talk-no-story)
=+ soy=~(. pa i.t.pax u.pur)
=. soy ?.((~(has in vab) %a) soy (pa-watch:soy her))
=. soy ?.((~(has in vab) %x) soy (pa-master:soy her))
@ -573,9 +581,9 @@
/repeat/(scot %ud p.outbox)/(scot %p p.cuz)/[q.cuz]
%g
%mess
[p.cuz /radio]
[p.cuz /talk]
our.hid
[%radio-command !>(`command`[%review tip ~])]
[%talk-command !>(`command`[%review tip ~])]
==
+>(p.outbox +(p.outbox), q.outbox (~(put by q.outbox) p.outbox tip))
::
@ -616,17 +624,17 @@
++ pa-watch :: watch presence
|= her=ship
?. (pa-admire her)
(pa-sauce ost [[%mean ~ %radio-watch-unauthorized ~] ~])
(pa-sauce ost [[%mean ~ %talk-watch-unauthorized ~] ~])
=. viewers (~(put in viewers) ost)
(pa-display ost ~ ~)
::
++ pa-master :: hear config
|= her=ship
?. (pa-admire her)
(pa-sauce ost [[%mean ~ %radio-master-unauthorized ~] ~])
(pa-sauce ost [[%mean ~ %talk-master-unauthorized ~] ~])
=. owners (~(put in owners) ost)
:: ~& [%pa-master her man shape]
(pa-sauce ost [[%rush %radio-report %config shape] ~])
(pa-sauce ost [[%rush %talk-report %config shape] ~])
::
++ pa-display :: update presence
|= vew=(set bone)
@ -640,7 +648,7 @@
?~ vew +>.^$
=. +>.^$ $(vew l.vew)
=. +>.^$ $(vew r.vew)
(pa-sauce n.vew [[%rush %radio-report %group reg] ~])
(pa-sauce n.vew [[%rush %talk-report %group reg] ~])
::
++ pa-monitor :: update config
=+ owe=owners
@ -649,12 +657,12 @@
=. +> $(owe l.owe)
=. +> $(owe r.owe)
:: ~& [%pa-monitor man shape]
(pa-sauce n.owe [[%rush %radio-report %config shape] ~])
(pa-sauce n.owe [[%rush %talk-report %config shape] ~])
::
++ pa-friend :: subscribed update
|= [tay=partner sih=sign]
^+ +>
?+ sih ~|([%radio-bad-friend sih] !!)
?+ sih ~|([%talk-bad-friend sih] !!)
[%g %nice ~]
+>.$
::
@ -676,14 +684,14 @@
~ :: XX hashtags
[%lin & txt]
::
[%g %rush %radio-report *]
[%g %rush %talk-report *]
:: ~& [%pa-friend-report +>+.sih]
?> ?=(& -.tay)
=. +> %+ pa-scrub ost
:_ ~
:- /friend/show/[man]/(scot %p p.p.tay)/[q.p.tay]
[%g %took [p.p.tay /radio] our.hid]
?+ -.p.p.sih ~|([%radio-odd-friend sih] !!)
[%g %took [p.p.tay /talk] our.hid]
?+ -.p.p.sih ~|([%talk-odd-friend sih] !!)
%config +>.$
%group (pa-remind tay +.p.p.sih)
%grams (pa-lesson q.+.p.p.sih)
@ -719,7 +727,7 @@
::
%& ~& [%pa-abjure [our.hid man] [p.p.tay q.p.tay]]
:~ :- /friend/nuke/[man]/(scot %p p.p.tay)/[q.p.tay]
[%g %nuke [p.p.tay /radio] our.hid]
[%g %nuke [p.p.tay /talk] our.hid]
==
==
::
@ -739,7 +747,7 @@
::
%& :: ~& [%pa-acquire [our.hid man] [p.p.tay q.p.tay]]
:~ :- /friend/show/[man]/(scot %p p.p.tay)/[q.p.tay]
[%g %show [p.p.tay /radio] our.hid /af/[q.p.tay]/(scot %ud num)]
[%g %show [p.p.tay /talk] our.hid /af/[q.p.tay]/(scot %ud num)]
==
==
::
@ -804,7 +812,7 @@
|= riv=river
^+ +>
=- :: ~& [%pa-start riv lab]
=. +>.$ (pa-sauce ost [[%rush %radio-report %grams q.lab r.lab] ~])
=. +>.$ (pa-sauce ost [[%rush %talk-report %grams q.lab r.lab] ~])
?: p.lab
(pa-sauce ost [[%mean ~] ~])
+>.$(guests (~(put by guests) ost riv))
@ -828,7 +836,7 @@
|= [her=ship pax=path]
^+ +>
?. (pa-admire her)
(pa-sauce ost [[%mean ~ %radio-listen-unauthorized ~] ~])
(pa-sauce ost [[%mean ~ %talk-listen-unauthorized ~] ~])
=+ ^= ruv ^- (unit river)
?: ?=(~ pax)
`[[%ud count] [%da (dec (bex 128))]]
@ -843,7 +851,7 @@
`[(point +>.say) (point +>.den)]
:: ~& [%pa-listen her pax ruv]
?~ ruv
(pa-sauce ost [[%mean ~ %radio-malformed ~] ~])
(pa-sauce ost [[%mean ~ %talk-malformed ~] ~])
(pa-start u.ruv)
::
++ pa-refresh :: update to guests
@ -867,7 +875,7 @@
==
old
:- p.old
[[p.n.guests %give %rush %radio-report %grams num gam ~] q.old]
[[p.n.guests %give %rush %talk-report %grams num gam ~] q.old]
=. moves (welp q.moy moves)
|- ^+ +>.^$
?~ p.moy +>.^$
@ -1174,13 +1182,13 @@
?> =(our.hid her)
?< (~(has by shells) ost)
ra-abet:(~(ra-console ra ost ~) her t.pax)
:: ~& [%radio-peer-data ost her pax]
:: ~& [%talk-peer-data ost her pax]
ra-abet:(~(ra-subscribe ra ost ~) her pax)
::
++ poke-radio-command
++ poke-talk-command
|= [ost=bone her=ship cod=command]
^- [(list move) _+>]
:: ~& [%radio-poke-command her cod]
:: ~& [%talk-poke-command her cod]
ra-abet:(~(ra-apply ra ost ~) her cod)
::
++ poke-sole-action
@ -1192,13 +1200,13 @@
^- [(list move) _+>]
:: ~& sih=sih
=+ sih=((hard sign) sih)
:: ~& [%radio-pour ost pax sih]
?+ pax ~& [%radio-strange-path pax] !!
:: ~& [%talk-pour ost pax sih]
?+ pax ~& [%talk-strange-path pax] !!
::
[%twitter *]
=- ra-abet:(~(ra-twitter ra ost ~) met sih)
^= met
?+ t.pax ~| [%radio-twitter-strange-path pax] !!
?+ t.pax ~| [%talk-twitter-strange-path pax] !!
:: [%mine @ @ ~]
:: [i.t.pax i.t.t.t.pax]
[%stat @ @ ~]
@ -1225,7 +1233,7 @@
++ pull
|= ost=bone
^- [(list move) _+>]
:: ~& [%radio-pull `*`ost]
:: ~& [%talk-pull `*`ost]
=. shells (~(del by shells) ost)
ra-abet:ra-ever:~(ra-cancel ra ost ~)
::
@ -1233,7 +1241,7 @@
|= [ost=bone you=ship ~]
^- [(list move) _+>]
:_ +>.$
=+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/radio/backlog/jam
=+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/talk/backlog/jam
[ost %pass /jamfile %c %info our.hid (foal paf (jam +<+.+>.$))]~
::
++ prep
@ -1243,9 +1251,9 @@
=| moz=(list move)
|-
?~ u.old
=+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/radio/backlog/jam
=+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/talk/backlog/jam
?. ?=([%0 %0 %0] [.^(%cy paf)])
~& %radio-prep-restore
~& %talk-prep-restore
$(u.old (some ((hard house-any) (cue ((hard ,@) .^(%cx paf))))))
ra-abet:~(ra-init ra 0 moz)
:- moz

18
main/gun/helm/begin/gate.hook
View File

@ -2,7 +2,7 @@
:::: /hook/gate/begin/helm/gun
::
/? 314
/- *console
/- *sole
::
::::
!:
@ -12,20 +12,20 @@
|= $: [now=@da eny=@uvI bec=beak]
[~ ~]
==
^- (console-result (cask begs))
%+ console-lo
^- (sole-result (cask begs))
%+ sole-lo
[%& %helm-begin "your ship: ~"]
%+ console-go fed:ag
%+ sole-go fed:ag
|= his=@p
%+ console-lo
%+ sole-lo
[%& %helm-ticket "your ticket: ~"]
%+ console-go fed:ag
%+ sole-go fed:ag
|= tic=@p
%+ console-lo
%+ sole-lo
[%& %helm-entropy "some entropy: "]
%+ console-go (boss 256 (more gon qit))
%+ sole-go (boss 256 (more gon qit))
|= yen=@t
%+ console-so %helm-begin
%+ sole-so %helm-begin
:* his
tic
yen

4
main/gun/ticket/gate.hook
View File

@ -2,12 +2,12 @@
:::: /hook/gate/ticket/gun
::
/? 314
/- *console
/- *sole
::
::::
!:
|= $: [now=@da eny=@uvI bec=beak]
[[her=@p ~] ~]
==
%+ console-so %noun
%+ sole-so %noun
((hard ,@p) .^(/a/(scot %p p.bec)/tick/(scot %da now)/(scot %p her)))

4
main/lib/radio/core.hook → main/lib/talk/core.hook
View File

@ -1,10 +1,10 @@
::
:::: /hook/core/radio/lib
:::: /hook/core/talk/lib
::
:: This file is in the public domain.
::
/? 314
/- *radio
/- *talk
::
::::
::

4
main/mar/radio-command/door.hook → main/mar/talk-command/door.hook
View File

@ -1,8 +1,8 @@
::
:::: /hook/door/radio-command/mar
:::: /hook/door/talk-command/mar
::
/? 314
/- *radio
/- *talk
!:
|_ cod=command
::

4
main/mar/radio-report/door.hook → main/mar/talk-report/door.hook
View File

@ -1,8 +1,8 @@
::
:::: /hook/door/radio-report/mar
:::: /hook/door/talk-report/mar
::
/? 314
/- *radio
/- *talk
!:
|_ rep=report
::

1
main/sur/sole/core.hook
View File

@ -107,6 +107,7 @@
[%hop p=@ud] :: set cursor position
[%mor p=(list dill-blit)] :: multiple blits
[%pro p=(list ,@c)] :: show as cursor/line
[%qit ~] :: close console
[%out p=(list ,@c)] :: send output line
[%sag p=path q=*] :: save to jamfile
[%sav p=path q=@] :: save to file

4
main/sur/radio/core.hook → main/sur/talk/core.hook
View File

@ -1,5 +1,5 @@
::
:::: /hook/core/radio/sur
:::: /hook/core/talk/sur
!:
|%
++ ache |*([a=$+(* *) b=$+(* *)] $%([| p=b] [& p=a])) :: PM 314
@ -41,7 +41,7 @@
== ::
++ presence ?(%gone %hear %talk) :: status type
++ register (pair atlas (map partner atlas)) :: ping me, ping srcs
++ report :: radio update
++ report :: talk update
$% [%config config] :: reconfigure
:: [%folder (list report)] :: multiple
[%grams (pair ,@ud (list telegram))] :: beginning, thoughts