Fixed a bug where moderators cannot delete their own content (#370)

Author: e32wong

services/agora/src/utils/actions/core/permissions.ts

@@ -15,25 +15,21 @@ export function useActionPermissions(): ContentActionPermissionCheckers {
   const canDelete = (context: ContentActionContext): boolean => {
     if (context.targetType === "post") {
       // For posts, can only delete if owner and not in embedded mode
-      return context.userRole === "owner" && !context.isEmbeddedMode;
+      return context.isOwner && !context.isEmbeddedMode;
     } else {
       // For comments, can delete if owner (regardless of embed mode)
-      return context.userRole === "owner";
+      return context.isOwner;
     }
   };
 
   const canModerate = (context: ContentActionContext): boolean => {
     // Can moderate if user is a moderator and not in embedded mode
-    return context.userRole === "moderator" && !context.isEmbeddedMode;
+    return context.isModerator && !context.isEmbeddedMode;
   };
 
   const canMute = (context: ContentActionContext): boolean => {
     // Can mute if not the owner, user is logged in, and not in embedded mode
-    return (
-      context.userRole !== "owner" &&
-      context.isLoggedIn &&
-      !context.isEmbeddedMode
-    );
+    return !context.isOwner && context.isLoggedIn && !context.isEmbeddedMode;
   };
 
   const canReport = (): boolean => {
@@ -48,7 +44,7 @@ export function useActionPermissions(): ContentActionPermissionCheckers {
 
   const canViewUserReports = (context: ContentActionContext): boolean => {
     // Only moderators can view user reports, and not in embedded mode
-    return context.userRole === "moderator" && !context.isEmbeddedMode;
+    return context.isModerator && !context.isEmbeddedMode;
   };
 
   const canViewModerationHistory = (): boolean => {
@@ -73,20 +69,6 @@ export function useActionPermissions(): ContentActionPermissionCheckers {
   };
 }
 
-/**
- * Helper function to determine user role based on context
- */
-export function determineUserRole(
-  isOwner: boolean,
-  isModerator: boolean,
-  isLoggedIn: boolean
-): ContentActionContext["userRole"] {
-  if (isModerator) return "moderator";
-  if (isOwner) return "owner";
-  if (isLoggedIn) return "user";
-  return "anonymous";
-}
-
 /**
  * Helper function to create action context
  */
@@ -100,12 +82,12 @@ export function createActionContext(
   isEmbeddedMode: boolean
 ): ContentActionContext {
   const isOwner = currentUser === targetAuthor;
-  const userRole = determineUserRole(isOwner, isModerator, isLoggedIn);
 
   return {
-    userRole,
-    isEmbeddedMode,
+    isOwner,
+    isModerator,
     isLoggedIn,
+    isEmbeddedMode,
     targetType,
     targetId,
     targetAuthor,

services/agora/src/utils/actions/core/types.ts

@@ -14,9 +14,10 @@ export interface BaseContentAction {
 
 // Context for determining available content actions
 export interface ContentActionContext {
-  userRole: "owner" | "moderator" | "user" | "anonymous";
-  isEmbeddedMode: boolean;
+  isOwner: boolean;
+  isModerator: boolean;
   isLoggedIn: boolean;
+  isEmbeddedMode: boolean;
   targetType: "post" | "comment";
   targetId: string;
   targetAuthor: string;

services/agora/src/utils/actions/definitions/comments.ts

@@ -45,18 +45,15 @@ export function getCommentActions(
       variant: "warning",
       handler: muteUserCallback,
       isVisible: (context: ContentActionContext) =>
-        context.userRole !== "owner" &&
-        context.isLoggedIn &&
-        !context.isEmbeddedMode,
+        !context.isOwner && context.isLoggedIn && !context.isEmbeddedMode,
     },
     {
       id: "delete",
       label: translations.delete,
       icon: "mdi-delete",
       variant: "destructive",
       handler: deleteCommentCallback,
-      isVisible: (context: ContentActionContext) =>
-        context.userRole === "owner",
+      isVisible: (context: ContentActionContext) => context.isOwner,
     },
     {
       id: "moderate",
@@ -65,15 +62,15 @@ export function getCommentActions(
       variant: "warning",
       handler: moderateCommentCallback,
       isVisible: (context: ContentActionContext) =>
-        context.userRole === "moderator" && !context.isEmbeddedMode,
+        context.isModerator && !context.isEmbeddedMode,
     },
     {
       id: "userReports",
       label: translations.userReports,
       icon: "mdi-account-alert",
       handler: openUserReportsCallback,
       isVisible: (context: ContentActionContext) =>
-        context.userRole === "moderator" && !context.isEmbeddedMode,
+        context.isModerator && !context.isEmbeddedMode,
     },
     {
       id: "share",

services/agora/src/utils/actions/definitions/posts.ts

@@ -47,9 +47,7 @@ export function getPostActions(
       variant: "warning",
       handler: muteUserCallback,
       isVisible: (context: ContentActionContext) =>
-        context.userRole !== "owner" &&
-        context.isLoggedIn &&
-        !context.isEmbeddedMode,
+        !context.isOwner && context.isLoggedIn && !context.isEmbeddedMode,
     },
     {
       id: "delete",
@@ -58,7 +56,7 @@ export function getPostActions(
       variant: "destructive",
       handler: deletePostCallback,
       isVisible: (context: ContentActionContext) =>
-        context.userRole === "owner" && !context.isEmbeddedMode,
+        context.isOwner && !context.isEmbeddedMode,
     },
     {
       id: "moderationHistory",
@@ -81,15 +79,15 @@ export function getPostActions(
       variant: "warning",
       handler: moderatePostCallback,
       isVisible: (context: ContentActionContext) =>
-        context.userRole === "moderator" && !context.isEmbeddedMode,
+        context.isModerator && !context.isEmbeddedMode,
     },
     {
       id: "userReports",
       label: translations.userReports,
       icon: "mdi-account-alert",
       handler: openUserReportsCallback,
       isVisible: (context: ContentActionContext) =>
-        context.userRole === "moderator" && !context.isEmbeddedMode,
+        context.isModerator && !context.isEmbeddedMode,
     },
   ];
 }