nek0/eidolon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

refactoring comments. Why did I even have that maybe in?

Browse source
This commit is contained in:
nek0 2015-09-26 11:14:49 +02:00
parent 47ba729abd
commit 3aad76bfcf
6 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Handler/AdminComments.hs
View file

@ -18,7 +18,6 @@ module Handler.AdminComments where
import Import
import Handler.Commons
import Data.Maybe
import Data.Time
-- import System.Locale

34
Handler/Medium.hs
View file

@ -47,7 +47,7 @@ getMediumR mediumId = do
Nothing ->
return Nothing
let presence = userId == (Just ownerId) || userId == Just (albumOwner album)
(commentWidget, enctype) <- generateFormPost $ commentForm userId userSl mediumId Nothing
(commentWidget, enctype) <- generateFormPost $ commentForm (fromJust userId) (fromJust userSl) mediumId Nothing
comments <- runDB $ selectList
[ CommentOrigin ==. mediumId
, CommentParent ==. Nothing ]
@ -76,18 +76,18 @@ postMediumR mediumId = do
Just tempUserId -> do
let userId = getUserIdFromText tempUserId
u <- runDB $ getJust userId
let userSl = Just $ userSlug u
((res, _), _) <- runFormPost $ commentForm (Just userId) userSl mediumId Nothing
let userSl = userSlug u
((res, _), _) <- runFormPost $ commentForm userId userSl mediumId Nothing
case res of
FormSuccess temp -> do
_ <- runDB $ insert temp
--send mail to medium owner
owner <- runDB $ getJust $ mediumOwner medium
link <- ($ MediumR (commentOrigin temp)) <$> getUrlRender
sendMail (userEmail owner) ((fromJust $ commentAuthorSlug temp) `T.append` " commented on your medium")
sendMail (userEmail owner) ((commentAuthorSlug temp) `T.append` " commented on your medium")
[shamlet|
<h1>Hello #{userSlug owner}
<p>#{fromJust $ commentAuthorSlug temp} commented on your medium:
<p>#{commentAuthorSlug temp} commented on your medium:
<p>#{commentContent temp}
<p>To follow the comment thread follow
<a href=#{link}>
@ -106,7 +106,7 @@ postMediumR mediumId = do
setMessage "This image does not exist"
redirect HomeR
commentForm :: Maybe UserId -> Maybe Text -> MediumId -> Maybe CommentId -> Form Comment
commentForm :: UserId -> Text -> MediumId -> Maybe CommentId -> Form Comment
commentForm authorId authorSlug originId parentId = renderDivs $ Comment
<$> pure authorId
<*> pure authorSlug
@ -125,9 +125,9 @@ getCommentReplyR commentId = do
Just tempUserId -> do
let userId = getUserIdFromText tempUserId
u <- runDB $ getJust userId
let userSl = Just $ userSlug u
let userSl = userSlug u
let mediumId = commentOrigin comment
(replyWidget, enctype) <- generateFormPost $ commentForm (Just userId) userSl mediumId (Just commentId)
(replyWidget, enctype) <- generateFormPost $ commentForm userId userSl mediumId (Just commentId)
formLayout $ do
setTitle "Eidolon :: Reply to comment"
$(widgetFile "commentReply")
@ -148,20 +148,20 @@ postCommentReplyR commentId = do
Just tempUserId -> do
let userId = getUserIdFromText tempUserId
u <- runDB $ getJust userId
let userSl = Just $ userSlug u
let userSl = userSlug u
let mediumId = commentOrigin comment
((res, _), _) <- runFormPost $ commentForm (Just userId) userSl mediumId (Just commentId)
((res, _), _) <- runFormPost $ commentForm userId userSl mediumId (Just commentId)
case res of
FormSuccess temp -> do
_ <- runDB $ insert temp
--send mail to parent author
parent <- runDB $ getJust $ fromJust $ commentParent temp
parAuth <- runDB $ getJust $ fromJust $ commentAuthor parent
parAuth <- runDB $ getJust $ commentAuthor parent
link <- ($ MediumR (commentOrigin temp)) <$> getUrlRender
sendMail (userEmail parAuth) ((fromJust $ commentAuthorSlug temp) `T.append` " replied to your comment")
sendMail (userEmail parAuth) ((commentAuthorSlug temp) `T.append` " replied to your comment")
[shamlet|
<h1>Hello #{userSlug parAuth}
<p>#{fromJust $ commentAuthorSlug temp} replied to your comment:
<p>#{commentAuthorSlug temp} replied to your comment:
#{commentContent temp}
<p>To see the comment thread follow
<a href=#{link}>
@ -171,10 +171,10 @@ postCommentReplyR commentId = do
--send mail to medium owner
medium <- runDB $ getJust mediumId
owner <- runDB $ getJust $ mediumOwner medium
sendMail (userEmail owner) ((fromJust $ commentAuthorSlug temp) `T.append` " commented on your medium")
sendMail (userEmail owner) ((commentAuthorSlug temp) `T.append` " commented on your medium")
[shamlet|
<h1>Hello #{userSlug owner}
<p>#{fromJust $ commentAuthorSlug temp} commented your medium with:
<p>#{commentAuthorSlug temp} commented your medium with:
#{commentContent temp}
<p>To see the comment thread follow
<a href=#{link}>
@ -203,7 +203,7 @@ getCommentDeleteR commentId = do
Just tempUserId -> do
let userId = getUserIdFromText tempUserId
if
Just userId == commentAuthor comment
Just userId == Just (commentAuthor comment)
then do
formLayout $ do
setTitle "Eidolon :: Delete comment"
@ -228,7 +228,7 @@ postCommentDeleteR commentId = do
Just tempUserId -> do
let userId = getUserIdFromText tempUserId
if
Just userId == commentAuthor comment
Just userId == Just (commentAuthor comment)
then do
confirm <- lookupPostParam "confirm"
case confirm of

4
config/models
View file

@ -55,8 +55,8 @@ Medium
album AlbumId
deriving Eq Show
Comment
author UserId Maybe
authorSlug Text Maybe
author UserId
authorSlug Text
origin MediumId
parent CommentId Maybe
time UTCTime

4
templates/adminComments.hamlet
View file

@ -16,7 +16,7 @@ $else
$forall (Entity commentId comment) <- comments
$if commentOrigin comment == mediumId
<article class="comment">
#{fromJust $ commentAuthorSlug comment} wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime comment}:
#{commentAuthorSlug comment} wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime comment}:
<hr>
#{commentContent comment}
<a href=@{AdminCommentDeleteR commentId}>Delete this comment
@ -24,7 +24,7 @@ $else
$if commentParent reply == Just commentId
$if commentOrigin reply == mediumId
<article class="comment reply">
#{fromJust $ commentAuthorSlug comment} wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime comment}:
#{commentAuthorSlug comment} wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime comment}:
<hr>
#{commentContent reply}
<a href=@{AdminCommentDeleteR replyId}>Delete this comment

2
templates/commentReply.hamlet
View file

@ -1,7 +1,7 @@
<div id="header" class="item" data-width="600">
<div class="inner">
<h4>Reply to comment
<strong>#{fromJust $ commentAuthorSlug comment}</strong> posted on #{formatTime defaultTimeLocale "%A %F %H:%M" (commentTime comment)}:
<strong>#{commentAuthorSlug comment}</strong> posted on #{formatTime defaultTimeLocale "%A %F %H:%M" (commentTime comment)}:
<hr>
<p>#{commentContent comment}
<hr>

8
templates/medium.hamlet
View file

@ -38,22 +38,22 @@
$forall (Entity commentId comment) <- comments
<article class="comment" data-width="300">
<a href=@{ProfileR $ fromJust $ commentAuthor comment}>#{fromJust $ commentAuthorSlug comment}</a> wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime comment}:
<a href=@{ProfileR $ commentAuthor comment}>#{commentAuthorSlug comment}</a> wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime comment}:
<hr>
#{commentContent comment}
$if userId /= Nothing
<hr>
<a href=@{CommentReplyR commentId}>Reply to this comment
$if userId == (commentAuthor comment)
$if userId == (Just $ commentAuthor comment)
<a href=@{CommentDeleteR commentId}>Delete this comment
$forall (Entity replyId reply) <- replies
$if commentParent reply == Just commentId
<article class="comment reply">
<a href=@{ProfileR $ fromJust $ commentAuthor reply}>#{fromJust $ commentAuthorSlug reply}</a> replied on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime reply}:
<a href=@{ProfileR $ commentAuthor reply}>#{commentAuthorSlug reply}</a> replied on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime reply}:
<hr>
#{commentContent reply}
<hr>
$if userId == (commentAuthor comment)
$if userId == (Just $ commentAuthor comment)
<a href=@{CommentDeleteR replyId}>Delete this comment
$if userId /= Nothing