potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Comment fixes

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2020-06-18 16:50:47 +02:00
parent e030eab93d
commit 5759f2bc32
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
js/src/components/Comment/Comment.vue
View file

@ -409,6 +409,10 @@ article {
} }
} }
.comment-replies {
flex-grow: 1;
}
.comment-replies-enter-active, .comment-replies-enter-active,
.comment-replies-leave-active, .comment-replies-leave-active,
.comment-replies-move { .comment-replies-move {

4
lib/mobilizon/conversations/conversations.ex
View file

@ -68,7 +68,9 @@ defmodule Mobilizon.Conversations do
Comment Comment
|> join(:left, [c], r in Comment, on: r.origin_comment_id == c.id) |> join(:left, [c], r in Comment, on: r.origin_comment_id == c.id)
|> where([c, _], is_nil(c.in_reply_to_comment_id)) |> where([c, _], is_nil(c.in_reply_to_comment_id))
|> where([_, r], is_nil(r.deleted_at)) # TODO: This was added because we don't want to count deleted comments in total_replies.
# However, it also excludes all top-level comments with deleted replies from being selected
# |> where([_, r], is_nil(r.deleted_at))
|> group_by([c], c.id) |> group_by([c], c.id)
|> select([c, r], %{c | total_replies: count(r.id)}) |> select([c, r], %{c | total_replies: count(r.id)})
end end