include items in ordered collection

src/Fedi/Helpers.hs

@@ -125,7 +125,7 @@ emptyOrderedCollection =
         CollectionType
           { ctype =
               OrderedCollectionType
-                { totalItems = 0
+                { orderedItems = []
                 }
           , first = Nothing
           , last = Nothing
@@ -144,7 +144,7 @@ emptyOrderedCollectionPage url =
                 { partOf = url
                 , prev = Nothing
                 , next = Nothing
-                , orderedItems = []
+                , porderedItems = []
                 }
           , first = Nothing
           , last = Nothing

src/Fedi/Routes.hs

@@ -135,7 +135,7 @@ handleOutbox details items = do
                       { ctype =
                           empty.otype.ctype
                             { partOf = outboxUrl
-                            , orderedItems = items
+                            , porderedItems = items
                             }
                       }
                 }
@@ -152,7 +152,7 @@ handleOutbox details items = do
                     emptyOrderedCollection.otype
                       { ctype =
                           emptyOrderedCollection.otype.ctype
-                            { totalItems = fromIntegral $ length items
+                            { orderedItems = items
                             }
                       , first = Just $ outboxUrl <> "?page=true"
                       , last = Just $ outboxUrl <> "?page=true"

src/Fedi/Types.hs

@@ -350,14 +350,15 @@ instance (A.ToJSON e) => ToObject (Unordered e) where
 
 data Ordered e
   = OrderedCollectionType
-  { totalItems :: Integer
+  { orderedItems :: [e]
   }
   deriving (Show)
 
 instance (A.ToJSON e) => ToObject (Ordered e) where
   toObject collection =
     [ "type" A..= ("OrderedCollection" :: String)
-    , "totalItems" A..= collection.totalItems
+    , "totalItems" A..= length collection.orderedItems
+    , "orderedItems" A..= collection.orderedItems
     ]
 
 data OrderedPage e
@@ -365,15 +366,15 @@ data OrderedPage e
   { partOf :: Url
   , prev :: Maybe Url
   , next :: Maybe Url
-  , orderedItems :: [e]
+  , porderedItems :: [e]
   }
   deriving (Show)
 
 instance (A.ToJSON e) => ToObject (OrderedPage e) where
   toObject page =
     [ "type" A..= ("OrderedCollectionPage" :: String)
-    , "totalItems" A..= length page.orderedItems
-    , "orderedItems" A..= page.orderedItems
+    , "totalItems" A..= length page.porderedItems
+    , "orderedItems" A..= page.porderedItems
     , "partOf" A..= page.partOf
     , "prev" A..= page.prev
     , "next" A..= page.next