me/fedi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

include items in ordered collection

Browse source
This commit is contained in:
me 2024-10-30 23:55:59 +02:00
parent b04d4999e3
commit fca5407505
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Fedi/Helpers.hs
View file

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

4
src/Fedi/Routes.hs
View file

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

11
src/Fedi/Types.hs
View file

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