Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Plumbing in the moderation stuff.

Matt Robertsd7bb9a35a6fd
diff --git a/public/models/identity.ts b/public/models/identity.ts
index 27ac0860c..088f42422 100644
--- a/public/models/identity.ts
+++ b/public/models/identity.ts
@@ -59,6 +59,10 @@ export const isCollaborator = (role: UserRole): boolean => {
return role === UserRole.Collaborator || role === UserRole.Administrator
}
+export const requiresModeration = (user: User): boolean => {
+ return user.role === UserRole.Visitor && !user.isVerified
+}
+
export interface CurrentUser {
id: number
name: string
@@ -70,4 +74,5 @@ export interface CurrentUser {
status: UserStatus
isAdministrator: boolean
isCollaborator: boolean
+ isVerified: boolean
}
diff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsx
index a4d64803e..cd82b1dff 100644
--- a/public/pages/Administration/pages/ManageMembers.page.tsx
+++ b/public/pages/Administration/pages/ManageMembers.page.tsx
@@ -64,6 +64,8 @@ const UserListItem = (props: UserListItemExtendedProps) => {
)}
{!blocked && (!!admin || isVisitor) && <Dropdown.ListItem onClick={actionSelected("to-collaborator")}>Promote to Collaborator</Dropdown.ListItem>}
{!blocked && (!!collaborator || !!admin) && <Dropdown.ListItem onClick={actionSelected("to-visitor")}>Demote to Visitor</Dropdown.ListItem>}
+ {isVisitor && !blocked && !props.user.isVerified && <Dropdown.ListItem onClick={actionSelected("approve")}>Verify User</Dropdown.ListItem>}
+ {isVisitor && !blocked && props.user.isVerified && <Dropdown.ListItem onClick={actionSelected("unapprove")}>Unverify User</Dropdown.ListItem>}
{isVisitor && !blocked && <Dropdown.ListItem onClick={actionSelected("block")}>Block User</Dropdown.ListItem>}
{isVisitor && !!blocked && <Dropdown.ListItem onClick={actionSelected("unblock")}>Unblock User</Dropdown.ListItem>}
</Dropdown>
@@ -182,6 +184,17 @@ export default function ManageMembersPage(props: ManageMembersPageProps) {
}
}
+ const changeVerification = async (isVerified: boolean) => {
+ const action = isVerified ? actions.verifyUser : actions.unverifyUser
+ const result = await action(user.id)
+ if (result.ok) {
+ user.isVerified = isVerified
+ // Update the user in current state without full reload
+ const updatedUsers = users.map((u) => (u.id === user.id ? user : u))
+ setUsers(updatedUsers)
+ }
+ }
+
if (actionName === "to-collaborator") {
await changeRole(UserRole.Collaborator)
} else if (actionName === "to-visitor") {
@@ -192,6 +205,10 @@ export default function ManageMembersPage(props: ManageMembersPageProps) {
await changeStatus(UserStatus.Blocked)
} else if (actionName === "unblock") {
await changeStatus(UserStatus.Active)
+ } else if (actionName === "approve") {
+ await changeVerification(true)
+ } else if (actionName === "unapprove") {
+ await changeVerification(false)
}
},
[users]
diff --git a/public/pages/Home/components/ShareFeedback.tsx b/public/pages/Home/components/ShareFeedback.tsx
index 41b38e623..4679e3151 100644
--- a/public/pages/Home/components/ShareFeedback.tsx
+++ b/public/pages/Home/components/ShareFeedback.tsx
@@ -182,7 +182,7 @@ export const ShareFeedback: React.FC<ShareFeedbackProps> = (props) => {
clearError()
clearCache()
clearAttachments()
- if (fider.session.tenant.isModerationEnabled && !fider.session.user.isCollaborator) {
+ if (fider.session.isModerationRequired) {
cache.session.set("POST_CREATED_MODERATION", "true")
} else {
cache.session.set("POST_CREATED_SUCCESS", "true")
@@ -256,7 +256,7 @@ export const ShareFeedback: React.FC<ShareFeedbackProps> = (props) => {
</div>
)}
</Form>
- {fider.session.tenant.isModerationEnabled && fider.session.isAuthenticated && !fider.session.user.isCollaborator && (
+ {fider.session.isModerationRequired && (
<div className="c-form-field">
<div className="text-muted text-sm p-2 bg-gray-100 rounded border-l-4 border-yellow-500">
<Trans id="newpost.moderation.notice">Your post will be reviewed by an administrator before being visible to other users.</Trans>
diff --git a/public/services/actions/tenant.ts b/public/services/actions/tenant.ts
index 7fb4979fc..cc44cb556 100644
--- a/public/services/actions/tenant.ts
+++ b/public/services/actions/tenant.ts
@@ -83,6 +83,14 @@ export const unblockUser = async (userID: number): Promise<Result> => {
return await http.delete(`/_api/admin/users/${userID}/block`)
}
+export const verifyUser = async (userID: number): Promise<Result> => {
+ return await http.put(`/_api/admin/users/${userID}/verify`)
+}
+
+export const unverifyUser = async (userID: number): Promise<Result> => {
+ return await http.delete(`/_api/admin/users/${userID}/verify`)
+}
+
export const getOAuthConfig = async (provider: string): Promise<Result<OAuthConfig>> => {
return await http.get<OAuthConfig>(`/_api/admin/oauth/${provider}`)
}
diff --git a/public/services/fider.ts b/public/services/fider.ts
index 5db8cd1b6..cbbcdfe60 100644
--- a/public/services/fider.ts
+++ b/public/services/fider.ts
@@ -40,6 +40,10 @@ export class FiderSession {
public get isAuthenticated(): boolean {
return !!this.pUser
}
+
+ public get isModerationRequired(): boolean {
+ return this.pTenant.isModerationEnabled && this.isAuthenticated && this.pUser!.role === "visitor" && !this.pUser!.isVerified
+ }
}
export class FiderImpl {