diff --git a/mar/talk/report.hoon b/mar/talk/report.hoon index f185b852b9..b1377ec798 100644 --- a/mar/talk/report.hoon +++ b/mar/talk/report.hoon @@ -64,14 +64,14 @@ ++ parn |= a/partner ^- cord ?- -.a - $& (stat p.a) + $& (circ p.a) $| %- crip ?- -.p.a $twitter "{(trip -.p.a)}/{(trip p.p.a)}" == == :: - ++ stat + ++ circ |= a/circle ^- cord (crip "{}/{(trip nom.a)}") :: @@ -125,7 +125,7 @@ |= cabal %- jobe :~ loc+(conf loc) - ham+((jome stat conf) rem) + ham+((jome circ conf) rem) == :: ++ sorc diff --git a/mar/talk/telegrams.hoon b/mar/talk/telegrams.hoon index bfc077f9d0..8aafaa8ee8 100644 --- a/mar/talk/telegrams.hoon +++ b/mar/talk/telegrams.hoon @@ -116,12 +116,12 @@ :- %a %+ turn gam |= telegram - (jobe ship+(jope p) thought+(thot q) ~) + (jobe ship+(jope aut) thought+(thot tot) ~) :: ++ jove |= {a/envelope b/delivery} %- jobe :~ - envelope+(jobe visible+[%b p.a] sender+?~(q.a ~ s+(parn u.q.a)) ~) + envelope+(jobe visible+[%b vis.a] sender+?~(sen.a ~ s+(parn u.sen.a)) ~) delivery+[%s b] == :: @@ -131,7 +131,7 @@ :: ++ thot |= thought - (jobe serial+(jape

) audience+(audi q) statement+(stam r) ~) + (jobe serial+(jape ) audience+(audi aud) statement+(stam sam) ~) :: ++ audi (map-to-json parn jove) ++ bouq @@ -141,36 +141,36 @@ ++ parn |= a/partner ^- cord ?- -.a - $& (stat p.a) + $& (circ p.a) $| %- crip ?- -.p.a $twitter "{(trip -.p.a)}/{(trip p.p.a)}" == == :: - ++ stat - |= a/station ^- cord - (crip "{}/{(trip q.a)}") + ++ circ + |= a/circle ^- cord + (crip "{}/{(trip nom.a)}") :: ++ stam |= statement - (jobe date+(jode p) bouquet+(bouq q) speech+(spec r) ~) + (jobe date+(jode wen) bouquet+(bouq boq) speech+(spec sep) ~) :: ++ spec |= a/speech %+ joba -.a ?+ -.a ~|(stub+-.a !!) - $lin (jobe txt+[%s q.a] say+[%b p.a] ~) - $url (joba txt+(jape (earf p.a))) - $exp (joba txt+[%s p.a]) - $app (jobe txt+[%s q.a] src+[%s p.a] ~) - $fat (jobe tor+(tors p.a) taf+$(a q.a) ~) - $ext (jobe nom+[%s p.a] txe+(jape (sifo (jam +.a))) ~) $non ~ + $lin (jobe txt+[%s msg.a] say+[%b pat.a] ~) + $url (joba txt+(jape (earf url.a))) + $exp (joba txt+[%s exp.a]) + $fat (jobe tor+(tors tac.a) taf+$(a sep.a) ~) $mor :- %a |- ^- (list json) - ?~ p.a ~ - [^$(a i.p.a) $(p.a t.p.a)] + ?~ ses.a ~ + [^$(a i.ses.a) $(ses.a t.ses.a)] + $ext (jobe nom+[%s nom.a] txe+(jape (sifo (jam +.a))) ~) + $app (jobe txt+[%s msg.a] src+[%s app.a] ~) :: $inv (jobe ship+(jope p.a) party+[%s q.a] ~) == :: @@ -180,7 +180,7 @@ ?- -.a $text [%s (role +.a)] $tank (jobe txt+[%a (turn +.a joke)] dat+(jape (sifo (jam +.a))) ~) - $name (jobe nom+s+p.a mon+$(a q.a) ~) + $name (jobe nom+s+nom.a mon+$(a tac.a) ~) == :: --