Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Working on the moderation UI

Matt Roberts26c57e5a6167
diff --git a/app/services/sqlstore/postgres/moderation.go b/app/services/sqlstore/postgres/moderation.go
index 888f8acca..8afcf77fb 100644
--- a/app/services/sqlstore/postgres/moderation.go
+++ b/app/services/sqlstore/postgres/moderation.go
@@ -180,8 +180,8 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) error
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
- ORDER BY p.created_at DESC`, tenant.ID)
+ WHERE p.tenant_id = $1 AND p.is_approved = false and p.status <> $2
+ ORDER BY p.created_at DESC`, tenant.ID, enum.PostDeleted)
if err != nil {
return errors.Wrap(err, "failed to get unmoderated posts")
}
@@ -219,8 +219,8 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) error
FROM comments c
INNER JOIN users u ON u.id = c.user_id AND u.tenant_id = c.tenant_id
INNER JOIN posts p ON p.id = c.post_id AND p.tenant_id = c.tenant_id
- WHERE c.tenant_id = $1 AND c.is_approved = false
- ORDER BY c.created_at DESC`, tenant.ID)
+ WHERE c.tenant_id = $1 AND c.is_approved = false and p.status <> $2
+ ORDER BY c.created_at DESC`, tenant.ID, enum.PostDeleted)
if err != nil {
return errors.Wrap(err, "failed to get unmoderated comments")
}
@@ -254,9 +254,9 @@ func getModerationCount(ctx context.Context, q *query.GetModerationCount) error
err := trx.Get(&count, `
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)
+ (SELECT COUNT(*) FROM posts WHERE tenant_id = $1 AND is_approved = false and status <> $2) +
+ (SELECT COUNT(*) FROM comments c JOIN posts p on c.post_id = p.id WHERE p.tenant_id = $1 AND c.is_approved = false AND p.status <> $2)
+ `, tenant.ID, enum.PostDeleted)
if err != nil {
return errors.Wrap(err, "failed to get moderation count")
diff --git a/public/assets/styles/utility/text.scss b/public/assets/styles/utility/text.scss
index 7225d322a..8d9eda0ee 100644
--- a/public/assets/styles/utility/text.scss
+++ b/public/assets/styles/utility/text.scss
@@ -117,6 +117,10 @@ pre:last-child {
text-align: left;
}
+.text-normal {
+ font-weight: get("font.weight.normal");
+}
+
.text-medium {
font-weight: get("font.weight.medium");
}
diff --git a/public/components/ModerationIndicator.tsx b/public/components/ModerationIndicator.tsx
index 4f54d056a..8190d8d9c 100644
--- a/public/components/ModerationIndicator.tsx
+++ b/public/components/ModerationIndicator.tsx
@@ -48,11 +48,13 @@ export const ModerationIndicator = () => {
if (count > 0) {
return (
- <HStack className="bg-green-200 rounded-full px-4">
- <Icon width="18" height="18" sprite={ThumbsUp} />
- <Icon width="18" height="18" sprite={ThumbsDown} />
- <span className="py-2">New ideas and comments waiting</span>
- </HStack>
+ <a href="/admin/moderation">
+ <HStack className="bg-green-200 rounded-full px-4">
+ <Icon width="18" height="18" sprite={ThumbsUp} />
+ <Icon width="18" height="18" sprite={ThumbsDown} />
+ <span className="py-2">New ideas and comments waiting</span>
+ </HStack>
+ </a>
)
} else {
return <></>
diff --git a/public/pages/Administration/pages/ContentModeration.page.tsx b/public/pages/Administration/pages/ContentModeration.page.tsx
index a667906a6..83124c939 100644
--- a/public/pages/Administration/pages/ContentModeration.page.tsx
+++ b/public/pages/Administration/pages/ContentModeration.page.tsx
@@ -1,7 +1,7 @@
import "./ContentModeration.page.scss"
import React, { useState, useEffect } from "react"
-import { Button, Avatar, Loader, Icon } from "@fider/components/common"
+import { Button, Avatar, Loader, Icon, Markdown } from "@fider/components/common"
import { Header } from "@fider/components"
import { HStack, VStack } from "@fider/components/layout"
import { actions, chopString, http, notify } from "@fider/services"
@@ -183,14 +183,17 @@ const ContentModerationPage = () => {
<div key={`${item.type}-${item.id}`} className={containerClasses} onClick={isPost ? () => handlePostClick(item) : undefined}>
<div className="c-moderation-item__content">
<HStack spacing={4} className="mb-2 flex-items-start" justify="between">
- <HStack spacing={4} className="flex-items-start">
+ <HStack spacing={4} align="start">
<Avatar user={item.user} size="normal" />
{item.type === "post" ? (
<VStack spacing={1}>
<span className="text-medium">
- {item.user.name} &lt;{item.user.email}&gt;
+ {item.user.name} <span className="text-normal">&lt;{item.user.email}&gt;</span>
</span>
<h3 className="text-title m-0">{item.title}</h3>
+ <p className="m-0 text-body text-break">
+ <Markdown text={chopString(item.content, 200)} style="plainText" />
+ </p>
</VStack>
) : (
<span className="text-medium">{item.user.name}</span>
@@ -199,11 +202,11 @@ const ContentModerationPage = () => {
<Moment date={item.createdAt} locale={fider.currentLocale} />
</HStack>
- {item.type === "post" && (
+ {/* {item.type === "post" && (
<div>
<p className="m-0 text-body text-break">{chopString(item.content, 200)}</p>
</div>
- )}
+ )} */}
{item.type === "comment" && (
<VStack spacing={2}>
@@ -212,12 +215,14 @@ const ContentModerationPage = () => {
On post: <a href={`/posts/${item.postNumber}/${item.postSlug}`}>{item.postTitle}</a>
</Trans>
</span>
- <p className="m-0 text-body text-break">{item.content}</p>
+ <p className="m-0 text-body text-break">
+ <Markdown className="description" text={item.content} style="plainText" />
+ </p>
</VStack>
)}
</div>
- <div className="c-moderation-item__actions invisible mt-4" onClick={(e) => e.stopPropagation()}>
+ <div className="c-moderation-item__actions invisible mt-3" onClick={(e) => e.stopPropagation()}>
<HStack spacing={2}>
{item.type === "post" && (
<>