Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

More work on the admin moderation page.

Matt Robertsb45b8216e994
diff --git a/app/models/query/moderation.go b/app/models/query/moderation.go
index f69cd47ed..9fc7d38f8 100644
--- a/app/models/query/moderation.go
+++ b/app/models/query/moderation.go
@@ -1,6 +1,8 @@
package query
import (
+ "time"
+
"github.com/getfider/fider/app/models/entity"
)
@@ -13,7 +15,7 @@ type ModerationItem struct {
Title string `json:"title,omitempty"`
Content string `json:"content"`
User *entity.User `json:"user"`
- CreatedAt string `json:"createdAt"`
+ CreatedAt time.Time `json:"createdAt"`
PostTitle string `json:"postTitle,omitempty"`
}
@@ -23,4 +25,4 @@ type GetModerationItems struct {
type GetModerationCount struct {
Result int
-}
\ No newline at end of file
+}
diff --git a/app/services/sqlstore/postgres/moderation.go b/app/services/sqlstore/postgres/moderation.go
index 0a80c1052..db44e78dd 100644
--- a/app/services/sqlstore/postgres/moderation.go
+++ b/app/services/sqlstore/postgres/moderation.go
@@ -17,7 +17,7 @@ import (
func approvePost(ctx context.Context, c *cmd.ApprovePost) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
_, err := trx.Execute(`
- UPDATE posts SET is_approved = true
+ UPDATE posts SET is_approved = true
WHERE id = $1 AND tenant_id = $2`, c.PostID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to approve post")
@@ -33,14 +33,14 @@ func declinePost(ctx context.Context, c *cmd.DeclinePost) error {
if err := bus.Dispatch(ctx, getPost); err != nil {
return err
}
-
+
// Use SetPostResponse to properly delete the post
setResponse := &cmd.SetPostResponse{
Post: getPost.Result,
Text: "Post declined during moderation",
Status: enum.PostDeleted,
}
-
+
return bus.Dispatch(ctx, setResponse)
})
}
@@ -48,7 +48,7 @@ func declinePost(ctx context.Context, c *cmd.DeclinePost) error {
func approveComment(ctx context.Context, c *cmd.ApproveComment) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
_, err := trx.Execute(`
- UPDATE comments SET is_approved = true
+ UPDATE comments SET is_approved = true
WHERE id = $1 AND tenant_id = $2`, c.CommentID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to approve comment")
@@ -76,7 +76,7 @@ func bulkApproveItems(ctx context.Context, c *cmd.BulkApproveItems) error {
postIDsStr += fmt.Sprintf("%d", id)
}
_, err := trx.Execute(fmt.Sprintf(`
- UPDATE posts SET is_approved = true
+ UPDATE posts SET is_approved = true
WHERE id IN (%s) AND tenant_id = $1`, postIDsStr), tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to bulk approve posts")
@@ -92,7 +92,7 @@ func bulkApproveItems(ctx context.Context, c *cmd.BulkApproveItems) error {
commentIDsStr += fmt.Sprintf("%d", id)
}
_, err := trx.Execute(fmt.Sprintf(`
- UPDATE comments SET is_approved = true
+ UPDATE comments SET is_approved = true
WHERE id IN (%s) AND tenant_id = $1`, commentIDsStr), tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to bulk approve comments")
@@ -113,14 +113,14 @@ func bulkDeclineItems(ctx context.Context, c *cmd.BulkDeclineItems) error {
if err := bus.Dispatch(ctx, getPost); err != nil {
return errors.Wrap(err, "failed to get post for bulk decline")
}
-
+
// Use SetPostResponse to properly delete the post
setResponse := &cmd.SetPostResponse{
Post: getPost.Result,
Text: "Post declined during bulk moderation",
Status: enum.PostDeleted,
}
-
+
if err := bus.Dispatch(ctx, setResponse); err != nil {
return errors.Wrap(err, "failed to bulk decline post")
}
@@ -148,9 +148,7 @@ type dbModerationPost struct {
Slug string `db:"slug"`
Description string `db:"description"`
CreatedAt time.Time `db:"created_at"`
- UserID int `db:"user_id"`
- UserName string `db:"user_name"`
- UserEmail string `db:"user_email"`
+ User *dbUser `db:"user"`
}
type dbModerationComment struct {
@@ -160,9 +158,7 @@ type dbModerationComment struct {
PostSlug string `db:"post_slug"`
Content string `db:"content"`
CreatedAt time.Time `db:"created_at"`
- UserID int `db:"user_id"`
- UserName string `db:"user_name"`
- UserEmail string `db:"user_email"`
+ User *dbUser `db:"user"`
PostTitle string `db:"post_title"`
}
@@ -175,7 +171,13 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) error
err := trx.Select(&posts, `
SELECT p.id, p.number, p.title, p.slug, p.description, p.created_at,
- u.id as user_id, u.name as user_name, u.email as user_email
+ u.id AS user_id,
+ u.name AS user_name,
+ u.email AS user_email,
+ u.role AS user_role,
+ u.status AS user_status,
+ u.avatar_type AS user_avatar_type,
+ u.avatar_bkey AS user_avatar_bkey
FROM posts p
INNER JOIN users u ON u.id = p.user_id AND u.tenant_id = p.tenant_id
WHERE p.tenant_id = $1 AND p.is_approved = false
@@ -186,18 +188,14 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) error
for _, post := range posts {
q.Result = append(q.Result, &query.ModerationItem{
- Type: "post",
- ID: post.ID,
+ Type: "post",
+ ID: post.ID,
PostNumber: post.Number,
- PostSlug: post.Slug,
- Title: post.Title,
- Content: post.Description,
- CreatedAt: post.CreatedAt.Format("January 2, 2006 at 3:04 PM"),
- User: &entity.User{
- ID: post.UserID,
- Name: post.UserName,
- Email: post.UserEmail,
- },
+ PostSlug: post.Slug,
+ Title: post.Title,
+ Content: post.Description,
+ CreatedAt: post.CreatedAt,
+ User: post.User.toModel(ctx),
})
}
@@ -206,7 +204,13 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) error
err = trx.Select(&comments, `
SELECT c.id, c.post_id, p.number as post_number, p.slug as post_slug, c.content, c.created_at,
- u.id as user_id, u.name as user_name, u.email as user_email,
+ u.id AS user_id,
+ u.name AS user_name,
+ u.email AS user_email,
+ u.role AS user_role,
+ u.status AS user_status,
+ u.avatar_type AS user_avatar_type,
+ u.avatar_bkey AS user_avatar_bkey,
p.title as post_title
FROM comments c
INNER JOIN users u ON u.id = c.user_id AND u.tenant_id = c.tenant_id
@@ -225,13 +229,9 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) error
PostNumber: comment.PostNumber,
PostSlug: comment.PostSlug,
Content: comment.Content,
- CreatedAt: comment.CreatedAt.Format("January 2, 2006 at 3:04 PM"),
+ CreatedAt: comment.CreatedAt,
PostTitle: comment.PostTitle,
- User: &entity.User{
- ID: comment.UserID,
- Name: comment.UserName,
- Email: comment.UserEmail,
- },
+ User: comment.User.toModel(ctx),
})
}
@@ -242,17 +242,17 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) error
func getModerationCount(ctx context.Context, q *query.GetModerationCount) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
var count int
-
+
err := trx.Get(&count, `
- SELECT
+ SELECT
(SELECT COUNT(*) FROM posts WHERE tenant_id = $1 AND is_approved = false) +
(SELECT COUNT(*) FROM comments WHERE tenant_id = $1 AND is_approved = false)
`, tenant.ID)
-
+
if err != nil {
return errors.Wrap(err, "failed to get moderation count")
}
-
+
q.Result = count
return nil
})
@@ -263,7 +263,7 @@ func declinePostAndBlock(ctx context.Context, c *cmd.DeclinePostAndBlock) error
// Get the post and user info first
var postUserID int
err := trx.Get(&postUserID, `
- SELECT user_id FROM posts
+ SELECT user_id FROM posts
WHERE id = $1 AND tenant_id = $2`, c.PostID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to get post user")
@@ -271,7 +271,7 @@ func declinePostAndBlock(ctx context.Context, c *cmd.DeclinePostAndBlock) error
// Block the user
_, err = trx.Execute(`
- UPDATE users SET status = $1
+ UPDATE users SET status = $1
WHERE id = $2 AND tenant_id = $3`, enum.UserBlocked, postUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to block user")
@@ -280,7 +280,7 @@ func declinePostAndBlock(ctx context.Context, c *cmd.DeclinePostAndBlock) error
// Get all unmoderated posts by this user
var postIDs []int
err = trx.Select(&postIDs, `
- SELECT id FROM posts
+ SELECT id FROM posts
WHERE user_id = $1 AND tenant_id = $2 AND is_approved = false`, postUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to get user posts")
@@ -293,14 +293,14 @@ func declinePostAndBlock(ctx context.Context, c *cmd.DeclinePostAndBlock) error
if err := bus.Dispatch(ctx, getPost); err != nil {
return errors.Wrap(err, "failed to get user post")
}
-
+
// Use SetPostResponse to properly delete the post
setResponse := &cmd.SetPostResponse{
Post: getPost.Result,
Text: "Post removed due to user block during moderation",
Status: enum.PostDeleted,
}
-
+
if err := bus.Dispatch(ctx, setResponse); err != nil {
return errors.Wrap(err, "failed to delete user post")
}
@@ -309,7 +309,7 @@ func declinePostAndBlock(ctx context.Context, c *cmd.DeclinePostAndBlock) error
// Get all unmoderated comments by this user and use proper delete command
var commentIDs []int
err = trx.Select(&commentIDs, `
- SELECT id FROM comments
+ SELECT id FROM comments
WHERE user_id = $1 AND tenant_id = $2 AND is_approved = false`, postUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to get user comments")
@@ -332,7 +332,7 @@ func declineCommentAndBlock(ctx context.Context, c *cmd.DeclineCommentAndBlock)
// Get the comment and user info first
var commentUserID int
err := trx.Get(&commentUserID, `
- SELECT user_id FROM comments
+ SELECT user_id FROM comments
WHERE id = $1 AND tenant_id = $2`, c.CommentID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to get comment user")
@@ -340,7 +340,7 @@ func declineCommentAndBlock(ctx context.Context, c *cmd.DeclineCommentAndBlock)
// Block the user
_, err = trx.Execute(`
- UPDATE users SET status = $1
+ UPDATE users SET status = $1
WHERE id = $2 AND tenant_id = $3`, enum.UserBlocked, commentUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to block user")
@@ -349,7 +349,7 @@ func declineCommentAndBlock(ctx context.Context, c *cmd.DeclineCommentAndBlock)
// Get all unmoderated posts by this user
var postIDs []int
err = trx.Select(&postIDs, `
- SELECT id FROM posts
+ SELECT id FROM posts
WHERE user_id = $1 AND tenant_id = $2 AND is_approved = false`, commentUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to get user posts")
@@ -362,14 +362,14 @@ func declineCommentAndBlock(ctx context.Context, c *cmd.DeclineCommentAndBlock)
if err := bus.Dispatch(ctx, getPost); err != nil {
return errors.Wrap(err, "failed to get user post")
}
-
+
// Use SetPostResponse to properly delete the post
setResponse := &cmd.SetPostResponse{
Post: getPost.Result,
Text: "Post removed due to user block during moderation",
Status: enum.PostDeleted,
}
-
+
if err := bus.Dispatch(ctx, setResponse); err != nil {
return errors.Wrap(err, "failed to delete user post")
}
@@ -378,7 +378,7 @@ func declineCommentAndBlock(ctx context.Context, c *cmd.DeclineCommentAndBlock)
// Get all unmoderated comments by this user
var commentIDs []int
err = trx.Select(&commentIDs, `
- SELECT id FROM comments
+ SELECT id FROM comments
WHERE user_id = $1 AND tenant_id = $2 AND is_approved = false`, commentUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to get user comments")
@@ -401,7 +401,7 @@ func approvePostAndVerify(ctx context.Context, c *cmd.ApprovePostAndVerify) erro
// Get the post and user info first
var postUserID int
err := trx.Get(&postUserID, `
- SELECT user_id FROM posts
+ SELECT user_id FROM posts
WHERE id = $1 AND tenant_id = $2`, c.PostID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to get post user")
@@ -409,7 +409,7 @@ func approvePostAndVerify(ctx context.Context, c *cmd.ApprovePostAndVerify) erro
// Verify and unblock the user (can't be both blocked and verified)
_, err = trx.Execute(`
- UPDATE users SET is_verified = true, status = $1
+ UPDATE users SET is_verified = true, status = $1
WHERE id = $2 AND tenant_id = $3`, enum.UserActive, postUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to verify user")
@@ -417,7 +417,7 @@ func approvePostAndVerify(ctx context.Context, c *cmd.ApprovePostAndVerify) erro
// Approve all unmoderated posts by this user
_, err = trx.Execute(`
- UPDATE posts SET is_approved = true
+ UPDATE posts SET is_approved = true
WHERE user_id = $1 AND tenant_id = $2 AND is_approved = false`, postUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to approve user posts")
@@ -425,7 +425,7 @@ func approvePostAndVerify(ctx context.Context, c *cmd.ApprovePostAndVerify) erro
// Approve all unmoderated comments by this user
_, err = trx.Execute(`
- UPDATE comments SET is_approved = true
+ UPDATE comments SET is_approved = true
WHERE user_id = $1 AND tenant_id = $2 AND is_approved = false`, postUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to approve user comments")
@@ -440,7 +440,7 @@ func approveCommentAndVerify(ctx context.Context, c *cmd.ApproveCommentAndVerify
// Get the comment and user info first
var commentUserID int
err := trx.Get(&commentUserID, `
- SELECT user_id FROM comments
+ SELECT user_id FROM comments
WHERE id = $1 AND tenant_id = $2`, c.CommentID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to get comment user")
@@ -448,7 +448,7 @@ func approveCommentAndVerify(ctx context.Context, c *cmd.ApproveCommentAndVerify
// Verify and unblock the user (can't be both blocked and verified)
_, err = trx.Execute(`
- UPDATE users SET is_verified = true, status = $1
+ UPDATE users SET is_verified = true, status = $1
WHERE id = $2 AND tenant_id = $3`, enum.UserActive, commentUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to verify user")
@@ -456,7 +456,7 @@ func approveCommentAndVerify(ctx context.Context, c *cmd.ApproveCommentAndVerify
// Approve all unmoderated posts by this user
_, err = trx.Execute(`
- UPDATE posts SET is_approved = true
+ UPDATE posts SET is_approved = true
WHERE user_id = $1 AND tenant_id = $2 AND is_approved = false`, commentUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to approve user posts")
@@ -464,7 +464,7 @@ func approveCommentAndVerify(ctx context.Context, c *cmd.ApproveCommentAndVerify
// Approve all unmoderated comments by this user
_, err = trx.Execute(`
- UPDATE comments SET is_approved = true
+ UPDATE comments SET is_approved = true
WHERE user_id = $1 AND tenant_id = $2 AND is_approved = false`, commentUserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to approve user comments")
@@ -478,7 +478,7 @@ func verifyUser(ctx context.Context, c *cmd.VerifyUser) error {
return using(ctx, func(trx *dbx.Trx, tenant *entity.Tenant, user *entity.User) error {
// Verify and unblock the user (can't be both blocked and verified)
_, err := trx.Execute(`
- UPDATE users SET is_verified = true, status = $1
+ UPDATE users SET is_verified = true, status = $1
WHERE id = $2 AND tenant_id = $3`, enum.UserActive, c.UserID, tenant.ID)
if err != nil {
return errors.Wrap(err, "failed to verify user")
@@ -486,4 +486,4 @@ func verifyUser(ctx context.Context, c *cmd.VerifyUser) error {
return nil
})
-}
\ No newline at end of file
+}