Simplify ActivityStream query

web/lib/api.js

 import {sanityClient, previewClient} from './sanity.server'
-import {flatten} from 'lodash'
 import {
   actorsQuery,
   alertQuery,
@@ -60,10 +59,8 @@ export async function getEvents(preview) {
   )
 
   const {items, objects, siteSettings} = data  
-  const mergedFlatActivityStream = getUniques([...items, ...flatten(objects.map(o => { return o.activityStream}))]) 
-
   const result = {
-    items: [...mergedFlatActivityStream],
+    items: getUniques([...items, ...objects]),
     siteSettings
   }
   return result

web/lib/queries/fragments/activityStreamFields.js

 import groq from "groq";
 
 export const activityStreamFields = groq`
-{
   ...,
   timespan[]{
     ...,
@@ -49,5 +48,4 @@ export const activityStreamFields = groq`
       label
     }
   }
-}
 `

web/lib/queries/fragments/groupFields.js

@@ -13,8 +13,9 @@ export const groupFields = `
   referredToBy[] {
     ...
   },
-  activityStream[]
-    ${activityStreamFields},
+  activityStream[]{
+    ${activityStreamFields}
+  },
   "hasMember": *[_type in ["Actor", "Group"] && references(^._id)]{ 
     _id,
     _type,

web/lib/queries/index.js

@@ -309,9 +309,8 @@ export const eventsQuery = groq`{
       label
     },
   },
-  "objects": *[defined(activityStream) && _type != "HumanMadeObject"]{
-    activityStream[featured == true]
-      ${activityStreamFields}
+  "objects": *[defined(activityStream) && _type != "HumanMadeObject"].activityStream[featured == true]{
+    ${activityStreamFields}
   },
   ${siteSettings}
 }`