Now using ++circle-peer for the creation of /circle peer moves,

to ensure consistency.
This commit is contained in:
Fang 2017-06-23 16:29:45 -07:00
parent 4aed59fd14
commit e3eeb10f53

View File

@ -1488,18 +1488,14 @@
::> or if we haven't gotten any yet, messages ::> or if we haven't gotten any yet, messages
::> from up to a day ago. ::> from up to a day ago.
=+ num=(~(get by sequence) pan) =+ num=(~(get by sequence) pan)
=+ old=(sub now.bol ~d1) :: XX full backlog =+ old=(sub now.bol ~d1) ::TODO? full backlog
=+ ini=?^(num (scot %ud u.num) (scot %da old)) =+ ini=?^(num [%ud u.num] [%da old])
?- -.pan ?- -.pan
$| !! ::< passport partner $| !! ::< passport partner
:: ::
$& ::< circle partner $& ::< circle partner
:_ ~ :_ ~
:* %peer (circle-peer nom p.pan `[ini ~])
/circle/[nom]/(scot %p hos.p.pan)/[nom.p.pan]
[hos.p.pan %talk-guardian]
/circle/[nom.p.pan]/[ini]
==
== ==
:: ::
++ sa-abjure ::< unsubscribe us ++ sa-abjure ::< unsubscribe us
@ -1601,6 +1597,23 @@
=+ wer=(etch wir) =+ wer=(etch wir)
?>(?=($repeat -.wer) (fun num.wer cir.wer)) ?>(?=($repeat -.wer) (fun num.wer cir.wer))
:: ::
++ circle-peer ::< /circle peer card
::> constructs a %peer move to subscribe {nom} to
::> {cir}.
::
|= {nom/cord cir/circle wen/range}
^- card
:* %peer
/circle/[nom]/(scot %p hos.cir)/[nom.cir]
[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)
==
::
::> || ::> ||
::> || %new-events ::> || %new-events
::> || ::> ||
@ -1941,14 +1954,8 @@
^- (quip move +>) ^- (quip move +>)
%+ etch-circle [%circle wir] %+ etch-circle [%circle wir]
|= {nom/knot cir/circle} |= {nom/knot cir/circle}
::TODO do better
:_ +>.^$ :_ ~ :_ +>.^$ :_ ~
:* 0 [0 (circle-peer nom cir `[[%da (sub now.bol ~m5)] ~])]
%peer
/circle/[nom]/(scot %p hos.cir)/[nom.cir]
[hos.cir %hall]
/circle/[nom.cir]/(sub now.bol ~h1)
==
:: ::
++ coup-repeat ::< message n/ack ++ coup-repeat ::< message n/ack
::> ack from ++ta-transmit. mark the message as ::> ack from ++ta-transmit. mark the message as