Merge pull request #4246 from tloncorp/lb/staging-12-4

ops: latest staging onto develop

desk/app/activity.hoon

@@ -590,7 +590,7 @@
   ::  we only care about posts/replies events that are notified, and we
   ::  don't want to include events from sources whose latest event is
   ::  after the start so we always get "new" sources when paging
-  ?.  ?&  notified.event
+  ?.  ?&  ?|(notified.event ?=(%contact -<.event))
           (lth latest.src-info start)
           ?=  $?  %post  %reply  %dm-post  %dm-reply
                   %flag-post  %flag-reply  %group-ask
@@ -613,6 +613,13 @@
   ?^  mention
     :-  sources.acc
     [(sub limit.acc 1) (snoc happenings.acc u.mention) collapsed.acc]
+  =/  contact-bundle=(unit activity-bundle:a)
+    ?.  ?=(%all type)  ~
+    ?.  ?=(%contact -<.event)  ~
+    `[source time ~[[time event]]]
+  ?^  contact-bundle
+    :-  sources.acc
+    [(sub limit.acc 1) (snoc happenings.acc u.contact-bundle) collapsed.acc]
   =/  care
     ?|  ?=(%all type)
         &(?=(%replies type) ?=(?(%reply %dm-reply) -<.event))

desk/desk.docket-0

@@ -4,7 +4,7 @@
     image+'https://bootstrap.urbit.org/tlon.svg?v=1'
     glob-http+['https://bootstrap.urbit.org/glob-0v6.88lmm.hdoo6.b26b4.d75rp.9r46j.glob' 0v6.88lmm.hdoo6.b26b4.d75rp.9r46j]
     base+'groups'
-    version+[6 4 2]
+    version+[6 5 0]
     website+'https://tlon.io'
     license+'MIT'
 ==