diff --git a/app/talk.hoon b/app/talk.hoon index 5983323da..3efe4c161 100644 --- a/app/talk.hoon +++ b/app/talk.hoon @@ -132,12 +132,12 @@ ::> small utility functions. ::+| :: -++ our +++ self (true-self our.bol) :: ++ server ::< our hall instance ^- dock - [our %hall] + [self %hall] :: ++ inbox ::< client's circle name ::> produces the name of the circle used by this @@ -148,7 +148,7 @@ ++ incir ::< client's circle ::> ++inbox, except a full circle. ^- circle - [our inbox] + [self inbox] :: ++ renum ::< gram i# by serial ::> find the grams list index for gram with serial. @@ -600,8 +600,8 @@ ++ circ ::< circle ;~ pose (cold incir col) - ;~(pfix cen (stag our sym)) - ;~(pfix fas (stag (sein:title our) sym)) + ;~(pfix cen (stag self sym)) + ;~(pfix fas (stag (sein:title self) sym)) :: %+ cook |= {a/@p b/(unit term)} @@ -1036,7 +1036,7 @@ :: ^- vase !> ^- {our/@p now/@da eny/@uvI} - [our now.bol (shas %eny eny.bol)] + [self now.bol (shas %eny eny.bol)] :: ::> || ::> || %circle-management @@ -1074,7 +1074,7 @@ ^+ ..sh-work =. ..sh-work (sh-act %create nom txt sec) - (join [[[our nom] ~] ~ ~]) + (join [[[self nom] ~] ~ ~]) :: ++ delete ::< %delete ::> deletes our circle {nom}, after optionally @@ -1576,7 +1576,7 @@ ?~ lis +>.$ %+ sh-fact %mor %+ turn `(list tape)`lis - =+ nom=(scag 7 (cite:title our)) + =+ nom=(scag 7 (cite:title self)) |= t/tape ?. ?& (~(has in settings.she) %notify) ?=(^ (find nom (slag 15 t))) @@ -1733,8 +1733,8 @@ |= two/circle ^- ? :: the circle that's ours is better. - ?: =(our hos.one) - ?. =(our hos.two) & + ?: =(self hos.one) + ?. =(self hos.two) & ?< =(nom.one nom.two) :: if both circles are ours, the main story is better. ?: =(%inbox nom.one) & @@ -1742,7 +1742,7 @@ :: if neither are, pick the "larger" one. (lth nom.one nom.two) :: if one isn't ours but two is, two is better. - ?: =(our hos.two) | + ?: =(self hos.two) | ?: =(hos.one hos.two) :: if they're from the same ship, pick the "larger" one. (lth nom.one nom.two) @@ -1793,14 +1793,14 @@ ::> "/channel" for parent circle. :: ^- tape - ?: =(hos.one our) + ?: =(hos.one self) ?: =(nom.one inbox) ":" ['%' (trip nom.one)] =+ wun=(cite:title hos.one) ?: =(nom.one %inbox) wun - ?: =(hos.one (sein:title our)) + ?: =(hos.one (sein:title self)) ['/' (trip nom.one)] :(welp wun "/" (trip nom.one)) :: @@ -1892,7 +1892,7 @@ ::> returns true if circle is a mailbox of ours. :: |= cir/circle ^- ? - ?& =(hos.cir our) + ?& =(hos.cir self) =+ sot=(~(get by mirrors) cir) &(?=(^ sot) ?=($mailbox sec.con.u.sot)) == @@ -2132,7 +2132,7 @@ ?: pat.sep " " =- (weld - q:(fall pre [p=| q=" "])) %~ ar-glyf ar - ?: =(who our) aud + ?: =(who self) aud (~(del in aud) [who %inbox]) == =. wyd (sub wyd (min (div wyd 2) (lent pef)))