UI: Inbox: For each item, display the result of processing
This commit is contained in:
parent
eef4c3f79a
commit
b519bbe7b9
2 changed files with 17 additions and 6 deletions
|
@ -1,6 +1,7 @@
|
||||||
{- This file is part of Vervis.
|
{- This file is part of Vervis.
|
||||||
-
|
-
|
||||||
- Written in 2019, 2020, 2022, 2023 by fr33domlover <fr33domlover@riseup.net>.
|
- Written in 2019, 2020, 2022, 2023, 2024
|
||||||
|
- by fr33domlover <fr33domlover@riseup.net>.
|
||||||
-
|
-
|
||||||
- ♡ Copying is an act of love. Please copy, reuse and share.
|
- ♡ Copying is an act of love. Please copy, reuse and share.
|
||||||
-
|
-
|
||||||
|
@ -53,6 +54,7 @@ import Data.Traversable
|
||||||
import Database.Persist
|
import Database.Persist
|
||||||
import Database.Persist.Sql
|
import Database.Persist.Sql
|
||||||
import Network.HTTP.Types.Status
|
import Network.HTTP.Types.Status
|
||||||
|
import Optics.Core
|
||||||
import Text.Blaze.Html (Html, preEscapedToHtml)
|
import Text.Blaze.Html (Html, preEscapedToHtml)
|
||||||
import Text.Blaze.Html.Renderer.Text
|
import Text.Blaze.Html.Renderer.Text
|
||||||
import Text.HTML.SanitizeXSS
|
import Text.HTML.SanitizeXSS
|
||||||
|
@ -181,7 +183,7 @@ getInbox here actor hash = do
|
||||||
then Just $ pageUrl $ current + 1
|
then Just $ pageUrl $ current + 1
|
||||||
else Nothing
|
else Nothing
|
||||||
, collectionPageStartIndex = Nothing
|
, collectionPageStartIndex = Nothing
|
||||||
, collectionPageItems = map fst items
|
, collectionPageItems = map (view _1) items
|
||||||
}
|
}
|
||||||
provideRep $ do
|
provideRep $ do
|
||||||
let pageNav = navWidget navModel
|
let pageNav = navWidget navModel
|
||||||
|
@ -215,18 +217,19 @@ getInbox here actor hash = do
|
||||||
, ob E.?. OutboxItemPublished
|
, ob E.?. OutboxItemPublished
|
||||||
, ract E.?. RemoteActivityContent
|
, ract E.?. RemoteActivityContent
|
||||||
, ract E.?. RemoteActivityReceived
|
, ract E.?. RemoteActivityReceived
|
||||||
|
, ib E.^. InboxItemResult
|
||||||
)
|
)
|
||||||
adaptItem
|
adaptItem
|
||||||
(E.Value ibid, E.Value mact, E.Value mpub, E.Value mobj, E.Value mrec) =
|
(E.Value ibid, E.Value mact, E.Value mpub, E.Value mobj, E.Value mrec, E.Value result) =
|
||||||
case (mact, mpub, mobj, mrec) of
|
case (mact, mpub, mobj, mrec) of
|
||||||
(Nothing, Nothing, Nothing, Nothing) ->
|
(Nothing, Nothing, Nothing, Nothing) ->
|
||||||
error $ ibiidString ++ " neither local nor remote"
|
error $ ibiidString ++ " neither local nor remote"
|
||||||
(Just _, Just _, Just _, Just _) ->
|
(Just _, Just _, Just _, Just _) ->
|
||||||
error $ ibiidString ++ " both local and remote"
|
error $ ibiidString ++ " both local and remote"
|
||||||
(Just act, Just pub, Nothing, Nothing) ->
|
(Just act, Just pub, Nothing, Nothing) ->
|
||||||
(persistJSONObject act, (pub, False))
|
(persistJSONObject act, (pub, False), result)
|
||||||
(Nothing, Nothing, Just obj, Just rec) ->
|
(Nothing, Nothing, Just obj, Just rec) ->
|
||||||
(persistJSONObject obj, (rec, True))
|
(persistJSONObject obj, (rec, True), result)
|
||||||
_ -> error $ "Unexpected query result for " ++ ibiidString
|
_ -> error $ "Unexpected query result for " ++ ibiidString
|
||||||
where
|
where
|
||||||
ibiidString = "InboxItem #" ++ show (fromSqlKey ibid)
|
ibiidString = "InboxItem #" ++ show (fromSqlKey ibid)
|
||||||
|
|
|
@ -20,7 +20,7 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
|
||||||
^{pageNav}
|
^{pageNav}
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
$forall (obj, (time, isRemote)) <- items
|
$forall (obj, (time, isRemote), result) <- items
|
||||||
<div>
|
<div>
|
||||||
$if isRemote
|
$if isRemote
|
||||||
Received #
|
Received #
|
||||||
|
@ -29,6 +29,14 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
|
||||||
<a href="#{objectId obj}">
|
<a href="#{objectId obj}">
|
||||||
#{showTime time}
|
#{showTime time}
|
||||||
|
|
||||||
|
<div>
|
||||||
|
Result:
|
||||||
|
<i>
|
||||||
|
$if T.null result
|
||||||
|
[None]
|
||||||
|
$else
|
||||||
|
#{result}
|
||||||
|
|
||||||
$maybe summary <- objectSummary obj
|
$maybe summary <- objectSummary obj
|
||||||
<div>
|
<div>
|
||||||
^{preEscapedToHtml summary}
|
^{preEscapedToHtml summary}
|
||||||
|
|
Loading…
Reference in a new issue