add RSS for a challenge timeline
This commit is contained in:
parent
264f53eaf3
commit
9ee12c3751
@ -114,6 +114,7 @@ instance Yesod App where
|
|||||||
isAuthorized (ChallengeAllSubmissionsR _) _ = return Authorized
|
isAuthorized (ChallengeAllSubmissionsR _) _ = return Authorized
|
||||||
isAuthorized (ChallengeGraphDataR _) _ = return Authorized
|
isAuthorized (ChallengeGraphDataR _) _ = return Authorized
|
||||||
isAuthorized (ChallengeDiscussionR _) _ = return Authorized
|
isAuthorized (ChallengeDiscussionR _) _ = return Authorized
|
||||||
|
isAuthorized (ChallengeDiscussionFeedR _) _ = return Authorized
|
||||||
|
|
||||||
isAuthorized (AvatarR _) _ = return Authorized
|
isAuthorized (AvatarR _) _ = return Authorized
|
||||||
|
|
||||||
|
@ -10,12 +10,18 @@ import Text.Blaze.Html4.Strict (i)
|
|||||||
import Handler.ShowChallenge
|
import Handler.ShowChallenge
|
||||||
|
|
||||||
import Yesod.Form.Bootstrap3
|
import Yesod.Form.Bootstrap3
|
||||||
|
import Yesod.RssFeed
|
||||||
|
|
||||||
data TimelineItem = TimelineItem UTCTime (Entity User) Markup
|
import Data.Text as T (pack)
|
||||||
|
import Database.Persist.Sql
|
||||||
|
|
||||||
getTime (TimelineItem stamp _ _) = stamp
|
data TimelineItem = TimelineItem Text UTCTime (Entity User) Markup
|
||||||
|
|
||||||
|
getTime (TimelineItem _ stamp _ _) = stamp
|
||||||
|
|
||||||
class ToTimelineItem a where
|
class ToTimelineItem a where
|
||||||
|
getTimelineItemId :: a -> Text
|
||||||
|
|
||||||
timelineWhen :: a -> UTCTime
|
timelineWhen :: a -> UTCTime
|
||||||
|
|
||||||
timelineWhoId :: a -> UserId
|
timelineWhoId :: a -> UserId
|
||||||
@ -29,17 +35,20 @@ class ToTimelineItem a where
|
|||||||
toTimelineItem :: a -> Handler TimelineItem
|
toTimelineItem :: a -> Handler TimelineItem
|
||||||
|
|
||||||
toTimelineItem sItem = do
|
toTimelineItem sItem = do
|
||||||
|
let itemIdentifier = getTimelineItemId sItem
|
||||||
let when = timelineWhen sItem
|
let when = timelineWhen sItem
|
||||||
who <- timelineWho sItem
|
who <- timelineWho sItem
|
||||||
what <- timelineWhat sItem
|
what <- timelineWhat sItem
|
||||||
return $ TimelineItem when who what
|
return $ TimelineItem itemIdentifier when who what
|
||||||
|
|
||||||
instance ToTimelineItem (Entity Comment) where
|
instance ToTimelineItem (Entity Comment) where
|
||||||
|
getTimelineItemId (Entity commentId comment) = "comment-" ++ (T.pack $ show $ fromSqlKey $ commentId)
|
||||||
timelineWhoId (Entity _ comment) = commentAuthor comment
|
timelineWhoId (Entity _ comment) = commentAuthor comment
|
||||||
timelineWhen (Entity _ comment) = commentPosted comment
|
timelineWhen (Entity _ comment) = commentPosted comment
|
||||||
timelineWhat (Entity _ comment) = return $ toMarkup $ commentText comment
|
timelineWhat (Entity _ comment) = return $ toMarkup $ commentText comment
|
||||||
|
|
||||||
instance ToTimelineItem (Entity Submission) where
|
instance ToTimelineItem (Entity Submission) where
|
||||||
|
getTimelineItemId (Entity commentId comment) = "submission-" ++ (T.pack $ show $ fromSqlKey $ commentId)
|
||||||
timelineWhoId (Entity _ submission) = submissionSubmitter submission
|
timelineWhoId (Entity _ submission) = submissionSubmitter submission
|
||||||
timelineWhen (Entity _ submission) = submissionStamp submission
|
timelineWhen (Entity _ submission) = submissionStamp submission
|
||||||
timelineWhat (Entity _ submission) = return $ i $ toMarkup (
|
timelineWhat (Entity _ submission) = return $ i $ toMarkup (
|
||||||
@ -88,3 +97,36 @@ commentForm :: Key Challenge -> AForm Handler (ChallengeId, Textarea)
|
|||||||
commentForm challengeId = (,)
|
commentForm challengeId = (,)
|
||||||
<$> pure challengeId
|
<$> pure challengeId
|
||||||
<*> areq textareaField (bfs MsgCommentText) Nothing
|
<*> areq textareaField (bfs MsgCommentText) Nothing
|
||||||
|
|
||||||
|
|
||||||
|
numberOfItemsInFeed :: Int
|
||||||
|
numberOfItemsInFeed = 20
|
||||||
|
|
||||||
|
|
||||||
|
getChallengeDiscussionFeedR :: Text -> Handler RepRss
|
||||||
|
getChallengeDiscussionFeedR name = do
|
||||||
|
(Entity challengeId challenge) <- runDB $ getBy404 $ UniqueName name
|
||||||
|
items <- getTimelineItems challengeId
|
||||||
|
now <- liftIO getCurrentTime
|
||||||
|
render <- getUrlRender
|
||||||
|
rssFeedText Feed {
|
||||||
|
feedTitle = "gonito.net / " ++ (challengeTitle challenge),
|
||||||
|
feedLinkSelf = render HomeR,
|
||||||
|
feedLinkHome = render (ChallengeDiscussionFeedR name),
|
||||||
|
feedAuthor = "gonito.net",
|
||||||
|
feedDescription = toMarkup $ "Comments and submission for a gonito.net challenge — " ++ (challengeTitle challenge),
|
||||||
|
feedLanguage = "en",
|
||||||
|
feedUpdated = case items of
|
||||||
|
(latestItem : _) -> getTime latestItem
|
||||||
|
_ -> now,
|
||||||
|
feedLogo = Nothing,
|
||||||
|
feedEntries = map (getFeedEntry render challenge) (take numberOfItemsInFeed items) }
|
||||||
|
|
||||||
|
|
||||||
|
getFeedEntry :: (Route App -> Text) -> Challenge -> TimelineItem -> FeedEntry Text
|
||||||
|
getFeedEntry render challenge (TimelineItem identifier stamp (Entity userId user) contents) = FeedEntry {
|
||||||
|
feedEntryLink = (render (ChallengeDiscussionR (challengeName challenge))) <> "#" <> identifier,
|
||||||
|
feedEntryUpdated = stamp,
|
||||||
|
feedEntryTitle = (challengeTitle challenge) ++ " / " ++ (formatSubmitter user),
|
||||||
|
feedEntryContent = contents,
|
||||||
|
feedEntryEnclosure = Nothing }
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
/challenge-how-to/#Text ChallengeHowToR GET
|
/challenge-how-to/#Text ChallengeHowToR GET
|
||||||
/challenge-graph-data/#Text ChallengeGraphDataR GET
|
/challenge-graph-data/#Text ChallengeGraphDataR GET
|
||||||
/challenge-discussion/#Text ChallengeDiscussionR GET POST
|
/challenge-discussion/#Text ChallengeDiscussionR GET POST
|
||||||
|
/challenge-discussion-rss/#Text ChallengeDiscussionFeedR GET
|
||||||
|
|
||||||
/q QueryFormR GET POST
|
/q QueryFormR GET POST
|
||||||
/q/#Text QueryResultsR GET
|
/q/#Text QueryResultsR GET
|
||||||
|
@ -125,6 +125,7 @@ library
|
|||||||
, blaze-html
|
, blaze-html
|
||||||
, conduit-extra
|
, conduit-extra
|
||||||
, resourcet
|
, resourcet
|
||||||
|
, yesod-newsfeed
|
||||||
|
|
||||||
executable gonito
|
executable gonito
|
||||||
if flag(library-only)
|
if flag(library-only)
|
||||||
|
BIN
static/images/rss-icon.jpg
Normal file
BIN
static/images/rss-icon.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.4 KiB |
@ -8,6 +8,10 @@
|
|||||||
$nothing
|
$nothing
|
||||||
<b>Log in to write a comment
|
<b>Log in to write a comment
|
||||||
|
|
||||||
|
<p>
|
||||||
|
<a href=@{ChallengeDiscussionFeedR name}>
|
||||||
|
<img src="/static/images/rss-icon.jpg">
|
||||||
|
|
||||||
<div .timeline-box>
|
<div .timeline-box>
|
||||||
$forall item <- sortedTimelineItems
|
$forall item <- sortedTimelineItems
|
||||||
^{timelineItemWidget item}
|
^{timelineItemWidget item}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
$case item
|
$case item
|
||||||
$of TimelineItem when (Entity whoId who) what
|
$of TimelineItem identifier when (Entity whoId who) what
|
||||||
|
<a name="#{identifier}">
|
||||||
<div class="row timeline-item">
|
<div class="row timeline-item">
|
||||||
<div class="col-sm-1">
|
<div class="col-sm-1">
|
||||||
<div class="timeline-item-thumbnail">
|
<div class="timeline-item-thumbnail">
|
||||||
|
Loading…
Reference in New Issue
Block a user