Open platform to collect and prioritize feedback
WIP content moderation
Matt Roberts2069c3b70147
diff --git a/CLAUDE.md b/CLAUDE.mdindex 055e41378..f83c3ca37 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -180,7 +180,7 @@ Fider uses BEM methodology combined with utility classes:- **`c-<component_name>__<element>`** - Element classes (e.g., `c-toggle__label`)- **`c-<component_name>--<state>`** - State modifiers (e.g., `c-toggle--checked`)- **`is-<state>`, `has-<state>`** - Global state modifiers-- **Utility classes** - No prefix, used for common styling patterns. All utility classes are defined in public/assets/styles/utility/+- **Utility classes** - No prefix, used for common styling patterns. All utility classes are defined in public/assets/styles/utility### General Principlesdiff --git a/app/models/query/moderation.go b/app/models/query/moderation.goindex 9fc7d38f8..5e3a90001 100644--- a/app/models/query/moderation.go+++ b/app/models/query/moderation.go@@ -7,16 +7,16 @@ import ()type ModerationItem struct {- Type string `json:"type"` // "post" or "comment"- ID int `json:"id"`- PostID int `json:"postId,omitempty"`- PostNumber int `json:"postNumber,omitempty"`- PostSlug string `json:"postSlug,omitempty"`- Title string `json:"title,omitempty"`- Content string `json:"content"`- User *entity.User `json:"user"`- CreatedAt time.Time `json:"createdAt"`- PostTitle string `json:"postTitle,omitempty"`+ Type string `json:"type"` // "post" or "comment"+ ID int `json:"id"`+ PostID int `json:"postId,omitempty"`+ PostNumber int `json:"postNumber,omitempty"`+ PostSlug string `json:"postSlug,omitempty"`+ Title string `json:"title,omitempty"`+ Content string `json:"content"`+ User *entity.UserWithEmail `json:"user"`+ CreatedAt time.Time `json:"createdAt"`+ PostTitle string `json:"postTitle,omitempty"`}type GetModerationItems struct {diff --git a/app/services/sqlstore/postgres/moderation.go b/app/services/sqlstore/postgres/moderation.goindex db44e78dd..888f8acca 100644--- a/app/services/sqlstore/postgres/moderation.go+++ b/app/services/sqlstore/postgres/moderation.go@@ -187,6 +187,10 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) error}for _, post := range posts {+ userWithEmail := &entity.UserWithEmail{+ User: post.User.toModel(ctx),+ }+q.Result = append(q.Result, &query.ModerationItem{Type: "post",ID: post.ID,@@ -195,7 +199,7 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) errorTitle: post.Title,Content: post.Description,CreatedAt: post.CreatedAt,- User: post.User.toModel(ctx),+ User: userWithEmail,})}@@ -222,6 +226,11 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) error}for _, comment := range comments {++ userWithEmail := &entity.UserWithEmail{+ User: comment.User.toModel(ctx),+ }+q.Result = append(q.Result, &query.ModerationItem{Type: "comment",ID: comment.ID,@@ -231,7 +240,7 @@ func getModerationItems(ctx context.Context, q *query.GetModerationItems) errorContent: comment.Content,CreatedAt: comment.CreatedAt,PostTitle: comment.PostTitle,- User: comment.User.toModel(ctx),+ User: userWithEmail,})}diff --git a/public/components/Header.tsx b/public/components/Header.tsxindex 8ddeaffba..ec9f9f164 100644--- a/public/components/Header.tsx+++ b/public/components/Header.tsx@@ -37,17 +37,19 @@ export const Header = () => {<h1 className="text-header">{fider.session.tenant.name}</h1></a>{fider.session.isAuthenticated && (- <HStack spacing={2}>- {fider.session.tenant.isFeedEnabled && (- <button title={atomFeedTitle} className="c-themeswitcher" onClick={showRSSModal}>- <Icon sprite={IconRss} className="h-6 text-gray-500" />- </button>- )}- <ThemeSwitcher />+ <><ModerationIndicator />- <NotificationIndicator />- <UserMenu />- </HStack>+ <HStack spacing={2}>+ {fider.session.tenant.isFeedEnabled && (+ <button title={atomFeedTitle} className="c-themeswitcher" onClick={showRSSModal}>+ <Icon sprite={IconRss} className="h-6 text-gray-500" />+ </button>+ )}+ <ThemeSwitcher />+ <NotificationIndicator />+ <UserMenu />+ </HStack>+ </>)}{!fider.session.isAuthenticated && (<HStack spacing={2}>diff --git a/public/components/ModerationIndicator.tsx b/public/components/ModerationIndicator.tsxindex 3f7760dd5..4f54d056a 100644--- a/public/components/ModerationIndicator.tsx+++ b/public/components/ModerationIndicator.tsx@@ -1,7 +1,9 @@import React, { useState, useEffect } from "react"import { Icon } from "@fider/components"import { useFider } from "@fider/hooks"-import IconShield from "@fider/assets/images/heroicons-shieldcheck.svg"+import ThumbsUp from "@fider/assets/images/heroicons-thumbsup.svg"+import ThumbsDown from "@fider/assets/images/heroicons-thumbsdown.svg"+import { HStack } from "./layout/Stack"export const ModerationIndicator = () => {const fider = useFider()@@ -24,8 +26,7 @@ export const ModerationIndicator = () => {}// Only fetch if user is admin/collaborator and moderation is enabled- if ((fider.session.user.isAdministrator || fider.session.user.isCollaborator) &&- fider.session.tenant.isModerationEnabled) {+ if ((fider.session.user.isAdministrator || fider.session.user.isCollaborator) && fider.session.tenant.isModerationEnabled) {fetchCount()} else {setLoading(false)@@ -45,18 +46,15 @@ export const ModerationIndicator = () => {return null}- return (- <a- href="/admin/moderation"- className="relative c-themeswitcher"- title={`${count} item(s) awaiting moderation`}- >- <Icon sprite={IconShield} className="h-6 text-gray-500 hover:text-gray-700" />- {count > 0 && (- <span className="absolute -top-1 -right-1 bg-red-500 text-white text-xs rounded-full h-4 w-4 flex items-center justify-center">- {count > 99 ? "99+" : count}- </span>- )}- </a>- )-}\ No newline at end of file+ 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>+ )+ } else {+ return <></>+ }+}diff --git a/public/pages/Administration/pages/ContentModeration.page.scss b/public/pages/Administration/pages/ContentModeration.page.scssindex 01cb60e87..56796c134 100644--- a/public/pages/Administration/pages/ContentModeration.page.scss+++ b/public/pages/Administration/pages/ContentModeration.page.scss@@ -20,12 +20,11 @@width: 100%;}-.c-moderation-item {- transition: all 0.2s ease;+ transition: all 0.3s ease;&:hover {- background-color: var(--colors-blue-50);+ background-color: var(--colors-blue-100);}&__actions {diff --git a/public/pages/Administration/pages/ContentModeration.page.tsx b/public/pages/Administration/pages/ContentModeration.page.tsxindex f81f61b09..a667906a6 100644--- a/public/pages/Administration/pages/ContentModeration.page.tsx+++ b/public/pages/Administration/pages/ContentModeration.page.tsx@@ -4,7 +4,7 @@ import React, { useState, useEffect } from "react"import { Button, Avatar, Loader, Icon } from "@fider/components/common"import { Header } from "@fider/components"import { HStack, VStack } from "@fider/components/layout"-import { actions, http, notify } from "@fider/services"+import { actions, chopString, http, notify } from "@fider/services"import { User } from "@fider/models"import { useFider } from "@fider/hooks"import { Trans } from "@lingui/react/macro"@@ -169,27 +169,44 @@ const ContentModerationPage = () => {)}+ const handlePostClick = (item: ModerationItem) => {+ if (item.type === "post" && item.postNumber && item.postSlug) {+ window.location.href = `/posts/${item.postNumber}/${item.postSlug}`+ }+ }+const renderModerationItem = (item: ModerationItem) => {+ const isPost = item.type === "post"+ const containerClasses = `c-moderation-item flex flex-y p-4 rounded-md hover ${isPost ? "clickable" : ""}`+return (- <div key={`${item.type}-${item.id}`} className="c-moderation-item flex flex-y p-6 mb-4 rounded-md hover">+ <div key={`${item.type}-${item.id}`} className={containerClasses} onClick={isPost ? () => handlePostClick(item) : undefined}><div className="c-moderation-item__content">- <HStack spacing={4} className="mb-4" justify="between">- <HStack spacing={4}>- <Avatar user={item.user} />- <span className="text-medium">{item.user.name}</span>+ <HStack spacing={4} className="mb-2 flex-items-start" justify="between">+ <HStack spacing={4} className="flex-items-start">+ <Avatar user={item.user} size="normal" />+ {item.type === "post" ? (+ <VStack spacing={1}>+ <span className="text-medium">+ {item.user.name} <{item.user.email}>+ </span>+ <h3 className="text-title m-0">{item.title}</h3>+ </VStack>+ ) : (+ <span className="text-medium">{item.user.name}</span>+ )}</HStack><Moment date={item.createdAt} locale={fider.currentLocale} /></HStack>{item.type === "post" && (- <VStack spacing={2} className="ml-14">- <h3 className="text-title m-0">{item.title}</h3>- <p className="m-0 text-body text-break">{item.content}</p>- </VStack>+ <div>+ <p className="m-0 text-body text-break">{chopString(item.content, 200)}</p>+ </div>)}{item.type === "comment" && (- <VStack spacing={2} className="ml-14">+ <VStack spacing={2}><span className="text-sm"><Trans id="moderation.comment.on">On post: <a href={`/posts/${item.postNumber}/${item.postSlug}`}>{item.postTitle}</a>@@ -200,17 +217,17 @@ const ContentModerationPage = () => {)}</div>- <div className="c-moderation-item__actions invisible pt-4 mt-4">+ <div className="c-moderation-item__actions invisible mt-4" onClick={(e) => e.stopPropagation()}><HStack spacing={2}>{item.type === "post" && (<>- <Button size="small" variant="primary" onClick={() => handleApprovePost(item.id)}>+ <Button size="small" variant="secondary" onClick={() => handleApprovePost(item.id)}><Icon sprite={IconCheck} /><span><Trans id="action.approve">Approve</Trans></span></Button>- <Button size="small" variant="danger" onClick={() => handleDeclinePost(item.id)}>+ <Button size="small" variant="secondary" onClick={() => handleDeclinePost(item.id)}><Icon sprite={IconX} /><span><Trans id="action.decline">Decline</Trans>@@ -222,7 +239,7 @@ const ContentModerationPage = () => {<Trans id="action.approve.verify">Approve & Verify</Trans></span></Button>- <Button size="small" variant="danger" onClick={() => handleDeclinePostAndBlock(item.id)}>+ <Button size="small" variant="secondary" onClick={() => handleDeclinePostAndBlock(item.id)}><Icon sprite={IconBan} /><span><Trans id="action.decline.block">Decline & Block</Trans>@@ -293,7 +310,7 @@ const ContentModerationPage = () => {{posts.length > 0 && (<>{renderDivider("New ideas", posts.length)}- <div className="mb-8">+ <div className="mb-2"><div className="flex flex-y">{posts.map(renderModerationItem)}</div></div></>@@ -302,7 +319,7 @@ const ContentModerationPage = () => {{comments.length > 0 && (<>{renderDivider("New comments", comments.length)}- <div className="mb-8">+ <div className="mb-2"><div className="flex flex-y">{comments.map(renderModerationItem)}</div></div></>diff --git a/public/services/utils.ts b/public/services/utils.tsindex cb19d5061..97aa44aad 100644--- a/public/services/utils.ts+++ b/public/services/utils.ts@@ -163,3 +163,18 @@ export const sortTags = (tags: Tag[]) => {return a.name.localeCompare(b.name)})}++export const chopString = (input: string, length: number): string => {+ if (!input || input.length <= length) {+ return input+ }++ const truncated = input.substring(0, length)+ const lastSpaceIndex = truncated.lastIndexOf(" ")++ if (lastSpaceIndex === -1) {+ return truncated + "..."+ }++ return truncated.substring(0, lastSpaceIndex) + "..."+}