ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-13 08:38:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ranges specified in subscriptions now actually do something.

Browse Source 
Does not yet quit ended subscriptions.
This commit is contained in:
Fang 2017-06-26 16:56:03 -07:00
parent ee4883d91b
commit 679ef2a6d3
3 changed files with 140 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/talk-agent.hoon
View File

@ -69,7 +69,7 @@
== ::
++ work ::> interface action
$% :: circle management ::
{$join p/where} ::< subscribe to
{$join p/(map partner range)} ::< subscribe to
{$leave p/where} ::< unsubscribe from
{$create p/security q/knot r/cord} ::< create circle
{$delete p/knot q/(unit cord)} ::< delete circle
@ -77,7 +77,7 @@
{$filter p/knot q/? r/?} ::< change message rules
{$invite p/knot q/(set ship)} ::< give permission
{$banish p/knot q/(set ship)} ::< deny permission
{$source p/knot q/(set partner)} ::< add source
{$source p/knot q/(map partner range)} ::< add source
:: personal metadata
{$status p/knot q/presence} ::TODO better interface ::< set status
:: messaging ::
@ -584,6 +584,34 @@
%+ cook ~(gas in *(set partner))
(most ;~(plug com (star ace)) parn)
::
++ pont ::< point for range
;~ pose
::TODO support entering of @da and @dr,
:: convert all to @da. use sear with crub?
:: also allow "now"?
(stag %ud dem:ag)
==
::
++ rang ::< subscription range
=+ ;~ pose
(cook some ;~(pfix fas pont))
(easy ~)
==
;~ pose
(cook some ;~(plug ;~(pfix fas pont) -))
(easy ~)
==
::
++ sorc ::< partner + range
;~ pose
;~(plug (stag %& circ) rang)
;~(plug (stag %| pasp) (easy ~))
==
::
++ sorz ::< non-empty sources
%+ cook ~(gas by *(map partner range))
(most ;~(plug com (star ace)) sorc)
::
++ nump ::< number reference
;~ pose
;~(pfix hep dem:ag)
@ -638,7 +666,7 @@
::
:: circle management
::
;~((glue ace) (perk %join ~) para)
;~((glue ace) (perk %join ~) sorz)
::
;~((glue ace) (perk %leave ~) para)
::
@ -664,7 +692,7 @@
::
;~((glue ace) (perk %banish ~) cire shiz)
::
;~((glue ace) (perk %source ~) cire parz)
;~((glue ace) (perk %source ~) cire sorz)
::
:: personal metadata
::
@ -918,8 +946,9 @@
::> change local mailbox config to include
::> subscriptions to {pas}.
::
|= pas/(set partner)
|= pos/(map partner range)
^+ ..sh-work
=+ pas=(key-by pos)
=. ..sh-work
=+ (~(get by nik) pas)
?^ - (sh-note "has glyph {<u>}")
@ -927,7 +956,7 @@
(sh-note:(set-glyph cha pas) "new glyph {<cha>}")
=. ..sh-work
sh-prod(active.she pas)
(sh-act %source inbox & pas)
(sh-act %source inbox & pos)
::
++ leave ::< %leave
::> change local mailbox config to exclude
@ -935,7 +964,10 @@
::
|= pas/(set partner)
^+ ..sh-work
(sh-act %source inbox | pas)
=/ pos
%- ~(run in pas)
|=(p/partner [p ~])
(sh-act %source inbox | pos)
::
++ create ::< %create
::> creates circle {nom} with specified config.
@ -944,7 +976,7 @@
^+ ..sh-work
=. ..sh-work
(sh-act %create nom txt sec)
(join [[%& our.bol nom] ~ ~])
(join [[[%& our.bol nom] ~] ~ ~])
::
++ delete ::< %delete
::> deletes our circle {nom}, after optionally
@ -983,9 +1015,9 @@
++ source ::< %source
::> adds {pas} to {nom}'s src.
::
|= {nom/knot pas/(set partner)}
|= {nom/knot pos/(map partner range)}
^+ ..sh-work
(sh-act %source nom & pas)
(sh-act %source nom & pos)
::
::> ||
::> || %personal-metadata

185
app/talk-guardian.hoon
View File

@ -63,11 +63,6 @@
known/(map serial @ud) ::< messages heard
burden/? ::< from parent?
== ::
++ river (pair point point) ::< stream definition
++ point ::> stream endpoint
$% {$ud p/@ud} ::< by number
{$da p/@da} ::< by date
== ::
++ move (pair bone card) ::< all actions
++ lime ::> diff fruit
$% {$talk-prize prize} ::
@ -356,8 +351,11 @@
++ action-source ::< un/sub p to/from r
::> add/remove {pas} as sources for story {nom}.
::
|= {nom/knot sub/? pas/(set partner)}
(affect nom %follow sub pas)
|= {nom/knot sub/? pos/(map partner range)}
=+ soy=(~(get by stories) nom)
?~ soy
(react %fail (crip "no story {(trip nom)}"))
so-done:(~(so-sources so nom ~ u.soy) sub pos)
::
::> || %messaging
::+|
@ -817,13 +815,18 @@
++ so-sources ::< change source
::> adds or removes {pas} from our sources.
::
|= {add/? pas/(set partner)}
::TODO should ++action-source make use of this,
:: because of the {sus} logic?
|= {add/? pos/(map partner range)}
^+ +>
=/ sus/(set partner)
%. src.shape
?:(add ~(dif in pas) ~(int in pas))
?~ sus +>.$
(so-delta-our %follow & sus)
::TODO for new sources, follow.
:: for existing sources, unfollow and refollow
:: with new range?
::=/ sus/(set partner)
:: %. src.shape
:: ?:(add ~(dif in pas) ~(int in pas))
::?~ sus +>.$
(so-delta-our %follow & pos)
::
++ so-depict ::< change description
::> modifies our caption.
@ -885,65 +888,58 @@
?. (~(has in src.shape) pan) +>
(so-delta-our %config so-cir %source | [pan ~ ~])
::
++ so-start ::< subscribe follower
::> called upon subscribe. deduces the range of
::> {her} subscription from {pax}, then sends
::> the currently available part of it.
::
|= {her/ship pax/path}
^+ +>
:: read permissions
?. (so-visible her)
=. +> (so-delta %quit ost.bol)
%- so-note %- crip
"so-start permission denied {(scow %p her)}"
:: find grams range
=/ ruv/(unit river)
:: collapse unit list
%+ biff
%- zl:jo
%+ turn pax
;~(biff slay |=(a/coin `(unit dime)`?~(-.a a ~)))
|= paf/(list dime)
?~ paf
$(paf [%ud (sub (max 64 count) 64)]~)
?~ t.paf
$(t.paf [%da (dec (bex 128))]~)
?. ?=({{?($ud $da) @} {?($ud $da) @} $~} paf)
~
`[[?+(- . $ud .)]:i.paf [?+(- . $ud .)]:i.t.paf] ::XX arvo issue #366
?~ ruv
=. +>.$ (so-delta %quit ost.bol)
%- so-note %- crip
"so-start malformed path {~(ram re >pax<)}"
(so-first-grams u.ruv)
::
++ so-first-grams ::< beginning of stream
::> find all grams that fall within the river and
::> send them in a grams report to {ost.bol}.
::> find all grams that fall within the range.
::
|= riv/river
^+ +>
=; lab/{dun/? end/@u zeg/(list telegram)}
?. dun.lab +>.$
(so-delta %quit ost.bol)
=+ [end=count gaz=grams dun=| zeg=*(list telegram)]
|- ^- (trel ? @ud (list telegram))
?~ gaz [dun end zeg]
?: ?- -.q.riv :: after the end
$ud (lte p.q.riv end)
$da (lte p.q.riv wen.sam.tot.i.gaz)
::TODO strip unused vars.
|= ran/range
^- (list telegram)
=+ [num=0 gaz=grams zeg=*(list telegram)]
:: fill in empty ranges to select all grams.
=. ran
?~ ran `[[%ud 0] `[%ud count]]
?~ tal.u.ran `[hed.u.ran `[%ud count]]
ran
:: never fails, but compiler needs it.
?> &(?=(^ ran) ?=(^ tal.u.ran))
%- flop
|- ^- (list telegram)
?~ gaz zeg
?: ?- -.u.tal.u.ran :: after the end
$ud (lth +.u.tal.u.ran num)
$da (lth +.u.tal.u.ran wen.sam.tot.i.gaz)
==
:: if past the river, continue back, mark as done.
$(end (dec end), gaz t.gaz, dun &)
?: ?- -.p.riv :: before the start
$ud (lth end p.p.riv)
$da (lth wen.sam.tot.i.gaz p.p.riv)
:: if past the river, we're done searching.
zeg
?: ?- -.hed.u.ran :: before the start
$ud (lth num +.hed.u.ran)
$da (lth wen.sam.tot.i.gaz +.hed.u.ran)
==
:: if before the river, we're done searching.
[dun end zeg]
:: if before the river, continue onward.
$(num +(num), gaz t.gaz)
:: if in the river, add this gram and continue.
$(end (dec end), gaz t.gaz, zeg [i.gaz zeg])
$(num +(num), gaz t.gaz, zeg [i.gaz zeg])
::
++ so-in-range ::< place in range?
::> produces two booleans: whether we're
::> currently in the range, and whether the range
::> has passed.
::
|= ran/range
^- {in/? done/?}
?~ ran [& |]
=/ min
?- -.hed.u.ran
$ud (gth count +.hed.u.ran)
$da (gth now.bol +.hed.u.ran)
==
?~ tal.u.ran
[min |]
=- [&(min -) !-]
?- -.u.tal.u.ran
$ud (gte +(+.u.tal.u.ran) count)
$da (gte +.u.tal.u.ran now.bol)
==
::
::> ||
::> || %messaging
@ -1445,13 +1441,11 @@
::> apply side-effects for a %follow delta,
::> un/subscribing this story to/from {pas}.
::
|= {sub/? pas/(set partner)}
|= {sub/? pos/(map partner range)}
^- (list move)
=/ sus/(set partner)
%. src.shape
?:(sub ~(dif in pas) ~(int in pas))
%. (~(tap in sus))
?:(sub sa-acquire sa-abjure)
?: sub
(sa-acquire (~(tap by pos)))
(sa-abjure (~(tap in (key-by pos))))
::
++ sa-permit-effects ::< notify permitted
::> apply side-effects for a %permit delta,
@ -1477,25 +1471,26 @@
++ sa-acquire ::< subscribe us
::> subscribes this story to each partner.
::
|= pas/(list partner)
|= pas/(list (pair partner range))
%+ sa-sauce 0 :: subscription is caused by this app
%- zing
%+ turn pas
|= pan/partner
|= {pan/partner ran/range}
^- (list card)
?: =(pan [%& our.bol nom]) ~ :: ignore self-subs
::> subscribe starting at the last message we got,
::> or if we haven't gotten any yet, messages
::> from up to a day ago.
=+ num=(~(get by sequence) pan)
=+ old=(sub now.bol ~d1) ::TODO? full backlog
=+ ini=?^(num [%ud u.num] [%da old])
:: unless otherwise specified, subscribe starting
:: at the last message we heard.
=. ran ::TODO =?
?^ ran ran
=+ num=(~(get by sequence) pan)
?~ num `[[%ud 0] ~]
`[[%ud u.num] ~]
?- -.pan
$| !! ::< passport partner
::
$& ::< circle partner
:_ ~
(circle-peer nom p.pan `[ini ~])
(circle-peer nom p.pan ran)
==
::
++ sa-abjure ::< unsubscribe us
@ -1603,15 +1598,16 @@
::
|= {nom/cord cir/circle wen/range}
^- card
=/ ran
?~ wen ~
%+ welp
/(scot -.hed.u.wen +.hed.u.wen)
?~ tal.u.wen ~
/(scot -.u.tal.u.wen +.u.tal.u.wen)
:* %peer
/circle/[nom]/(scot %p hos.cir)/[nom.cir]
(welp /circle/[nom]/(scot %p hos.cir)/[nom.cir] ran)
[hos.cir %talk-guardian]
%+ welp /circle/[nom.cir]
?~ wen ~
%+ welp
/(scot -.hed.u.wen +.hed.u.wen)
?~ tal.u.wen ~
/(scot -.u.tal.u.wen +.u.tal.u.wen)
(welp /circle/[nom.cir] ran)
==
::
::> ||
@ -1679,12 +1675,16 @@
$report
~ ::TODO? we just don't have a prize. or do we need [%report ~] ?
::
$circle
$circle ::REVIEW should we send precs & config to out of range subs?
:: we can either be:
:: - before range: send precs, config
:: - in range: send precs, config, msgs
:: - after range: send msgs
=+ soy=(~(get by stories) nom.qer)
?~ soy ~
:+ ~ ~
:- %circle
:+ grams.u.soy ::TODO get using specified range.
:+ (~(so-first-grams so:ta nom.qer ~ u.soy) ran.qer)
[shape.u.soy mirrors.u.soy]
[locals.u.soy remotes.u.soy]
==
@ -1757,6 +1757,9 @@
?. ?=($story -.dif) ~
?. =(nom.qer nom.dif) ~
?: ?=($follow -.dif.dif) ~ :: internal-only delta
=+ ren=(~(so-in-range so:ta nom.qer ~ (~(got by stories) nom.qer)) ran.qer)
::TODO if done.ren, %quit bone
?. in.ren ~
`[%circle dif.dif]
==
::

7
sur/talk.hoon
View File

@ -16,8 +16,8 @@
{$report $~} ::< duty reports
{$circle nom/knot ran/range} ::< story query
== ::
++ range (unit {hed/place tal/(unit place)}) ::< msg range, @ud/@da
++ place $%({$da @da} {$ud @ud}) ::< point for range
++ range (unit {hed/place tal/(unit place)}) ::< inclusive msg range
++ place $%({$da @da} {$ud @ud}) ::< @ud/@da for range
++ prize ::> query result
$% $: $reader ::< /reader
gys/(jug char (set partner)) ::< glyph bindings
@ -68,7 +68,7 @@
{$grams gaz/(list telegram)} ::< new/changed msgs
{$config cir/circle dif/diff-config} ::< new/changed config
{$status pan/partner who/ship dif/diff-status} ::< new/changed status
{$follow sub/? pas/(set partner)} ::TODO range ::< un/subscribe
{$follow sub/? pas/(map partner range)} ::< un/subscribe
{$remove $~} ::< removed story
== ::
++ diff-config ::> config change
@ -149,6 +149,7 @@
++ lobby {loc/config rem/(map circle config)} ::< our & srcs configs
++ config ::> circle config
$: src/(set partner) ::< active sources
::TODO ^ include range?
cap/cord ::< description
fit/filter ::< message rules
con/control ::< restrictions