strapi-plugin-comments 2.0.0-beta.5 → 2.0.0-rc.2

package/admin/src/pages/Details/index.js

@@ -50,13 +50,16 @@ const Details = ({ config }) => {
   const trackUsageRef = useRef(trackUsage);
   const toggleNotification = useNotification();
 
-  const viewPermissions = useMemo(() => {
-    return { view: pluginPermissions.view };
-  }, []);
+  const viewPermissions = useMemo(() => ({ 
+    access: pluginPermissions.access,
+    moderate: pluginPermissions.moderate,
+    accessReports:  pluginPermissions.reports,
+    reviewReports: pluginPermissions.reportsReview,
+  }), []);
 
   const {
     isLoading: isLoadingForPermissions,
-    allowedActions: { canView },
+    allowedActions: { canAccess, canModerate, canAccessReports, canReviewReports },
   } = useRBAC(viewPermissions);
 
   const [filters, setFilters] = useState({});
@@ -64,7 +67,7 @@ const Details = ({ config }) => {
   const regexUID = new RegExp(config.regex.uid);
 
   const { isLoading: isLoadingForData, data, isFetching } = useQuery(
-    ['get-details-data', id, filters],
+    ['get-details-data', id, filters, canAccess],
     () => fetchDetailsData(id, filters, toggleNotification),
     {
       initialData: { },
@@ -75,7 +78,7 @@ const Details = ({ config }) => {
   const entityUidValid = entity?.uid && regexUID.test(entity.uid);
 
   const { data: contentTypeData } = useQuery(
-    ['get-additional-data', entity?.uid],
+    ['get-additional-data', entity?.uid, canAccess],
     () => fetchContentTypeData(entity?.uid, toggleNotification),
     {
       enabled: !!entity?.uid, 
@@ -87,37 +90,40 @@ const Details = ({ config }) => {
 
   const isLoading = isLoadingForData || isFetching;
 
-  return <Box background="neutral100">
-          <Layout>
-            {(isLoading || isLoadingForPermissions) && isEmpty(data) ? (<LoadingIndicatorPage />) : (
-            <>
-              <HeaderLayout 
-                navigationAction={
-                <Link startIcon={<ArrowLeft />} to={getUrl(`discover`)}>
-                  { getMessage('HeaderLayout.link.go-back', 'Back', false) }
-                </Link>}
-                title={ getMessage('page.details.header') } 
-                subtitle={ getMessage('page.details.header.description') } 
-                primaryAction={<DetailsFilters data={filters} onChange={handleChangeFilters} />}
-                secondaryAction={<Box as={Flex}>&nbsp;</Box>}
-                as="h2" />
-              <ContentLayout>
-                <TwoColsLayout 
-                  startCol={<DiscussionThread level={level} selected={selected} isReloading={isLoading} />} 
-                  endCol={ <Stack size={2}>
-                    <DiscussionStatus item={selected} />
-                    { !contentTypeData?.schema ? (<Box padding={4}>
-                        <Loader small>{ getMessage('page.details.panel.loading', 'Loading...') }</Loader>
-                      </Box>) : 
-                      (<DetailsEntity data={entity} schema={contentTypeData?.schema} config={config} />)
-                    }
-                  </Stack>
-                  } 
-                />
-              </ContentLayout>
-            </>) }
-          </Layout>
-        </Box>;
+  if (canAccess) {
+    return <Box background="neutral100">
+            <Layout>
+              {(isLoading || isLoadingForPermissions) && isEmpty(data) ? (<LoadingIndicatorPage />) : (
+              <>
+                <HeaderLayout 
+                  navigationAction={
+                  <Link startIcon={<ArrowLeft />} to={getUrl(`discover`)}>
+                    { getMessage('HeaderLayout.link.go-back', 'Back', false) }
+                  </Link>}
+                  title={ getMessage('page.details.header') } 
+                  subtitle={ getMessage('page.details.header.description') } 
+                  primaryAction={<DetailsFilters data={filters} onChange={handleChangeFilters} />}
+                  secondaryAction={<Box as={Flex}>&nbsp;</Box>}
+                  as="h2" />
+                <ContentLayout>
+                  <TwoColsLayout 
+                    startCol={<DiscussionThread level={level} selected={selected} isReloading={isLoading} allowedActions={{ canModerate, canAccessReports, canReviewReports }} />} 
+                    endCol={ <Stack size={2}>
+                      <DiscussionStatus item={selected} />
+                      { !contentTypeData?.schema ? (<Box padding={4}>
+                          <Loader small>{ getMessage('page.details.panel.loading', 'Loading...') }</Loader>
+                        </Box>) : 
+                        (<DetailsEntity data={entity} schema={contentTypeData?.schema} config={config} />)
+                      }
+                    </Stack>
+                    } 
+                  />
+                </ContentLayout>
+              </>) }
+            </Layout>
+          </Box>;
+  }
+  return null;
 }
 
 const mapStateToProps = makeAppView();

package/admin/src/pages/Discover/components/DiscoverTableRow/index.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import { useMutation, useQueryClient } from 'react-query';
 import { isNil, isEmpty, orderBy } from 'lodash';
+import { Avatar, Initials } from '@strapi/design-system/Avatar';
 import { Badge } from '@strapi/design-system/Badge';
 import { Box } from '@strapi/design-system/Box'; 
 import { Button } from '@strapi/design-system/Button'; 
@@ -15,7 +16,7 @@ import { Tr, Td } from '@strapi/design-system/Table';
 import { Typography } from '@strapi/design-system/Typography'; 
 import { Eye } from '@strapi/icons';
 import { useNotification, useOverlayBlocker } from '@strapi/helper-plugin';
-import { getMessage, getUrl, handleAPIError, resolveCommentStatus, resolveCommentStatusColor } from '../../../../utils';
+import { getMessage, getUrl, handleAPIError, renderInitials, resolveCommentStatus, resolveCommentStatusColor } from '../../../../utils';
 import ReportsReviewModal from '../../../../components/ReportsReviewModal';
 import ReportsReviewTable from '../../../../components/ReportsReviewTable';
 import { blockItem, blockItemThread, resolveReport } from '../../../utils/api';
@@ -25,7 +26,7 @@ import { TableLink } from './styles';
 import renderEntryTitle from '../../../../utils/renderEntryTitle';
 import DiscussionThreadItemApprovalFlowActions from '../../../../components/DiscussionThreadItemApprovalFlowActions';
 
-const DiscoverTableRow = ({ config, item, onClick }) => {
+const DiscoverTableRow = ({ config, item, allowedActions: { canModerate, canAccessReports, canReviewReports }, onClick }) => {
 
     const { id, reports } = item;
 
@@ -74,14 +75,22 @@ const DiscoverTableRow = ({ config, item, onClick }) => {
         refetchActive: false,
     });
 
-    const handleReportsReviewClick = () => setReportsReviewVisible(true);
+    const handleReportsReviewClick = () => {
+        if (canAccessReports) {
+            setReportsReviewVisible(true);
+        }
+    };
     const handleBlockItemClick = async () => {
-        lockApp();
-        blockItemMutation.mutate(id);
+        if (canModerate) {
+            lockApp();
+            blockItemMutation.mutate(id);
+        }
     };
     const handleBlockItemThreadClick = async () => {
-        lockApp();
-        blockItemThreadMutation.mutate(id);
+        if (canModerate) {
+            lockApp();
+            blockItemThreadMutation.mutate(id);
+        }
     };
     const handleReportsReviewClose = async () => {
         await queryClient.invalidateQueries('get-data');
@@ -91,7 +100,7 @@ const DiscoverTableRow = ({ config, item, onClick }) => {
     const isLoading = blockItemMutation.isLoading || blockItemThreadMutation.isLoading || resolveReportMutation.isLoading;
     const openReports = reports?.filter(_ => !_.resolved);
     const hasReports = !isEmpty(openReports);
-    const reviewFlowEnabled = hasReports && !(item.blocked || item.blockedThread);
+    const reviewFlowEnabled = (canAccessReports && hasReports) && !(item.blocked || item.blockedThread);
 
     const handleClick = () => onClick();
     const handleBlockButtonsStateChange = disabled => setBlockButtonsDisabled(disabled);
@@ -124,6 +133,12 @@ const DiscoverTableRow = ({ config, item, onClick }) => {
             <Td>
                 <Typography textColor="neutral800" fontWeight="bold">#{ item.id }</Typography>
             </Td>
+            <Td>
+                <Stack size={2} horizontal>
+                    { item.author?.avatar ? <Avatar src={item.author?.avatar} alt={item.author.name} /> : <Initials>{ renderInitials(item.author.name) }</Initials> }
+                    <Typography textColor="neutral800" variant="pi">{ item.author.name }</Typography>
+                </Stack>
+            </Td>
             <Td style={{ maxWidth: '30vw' }}>
                 <Typography textColor="neutral800" ellipsis>{item.content}</Typography>
             </Td>
@@ -146,22 +161,28 @@ const DiscoverTableRow = ({ config, item, onClick }) => {
                 <Flex direction="column" alignItems="flex-end">
                     <Stack size={actionItemsCount} horizontal>
                         { reviewFlowEnabled && (<IconButton onClick={handleReportsReviewClick} label={ getMessage('page.discover.table.reports.review') } icon={<ReviewIcon />} />)}
-                        { needsApproval &&  (<DiscussionThreadItemApprovalFlowActions id={item.id} queryToInvalidate="get-data" />)}
+                        { (canModerate && needsApproval) &&  (
+                        <DiscussionThreadItemApprovalFlowActions 
+                            id={item.id} 
+                            allowedActions={{ canModerate }}
+                            queryToInvalidate="get-data" />
+                        )}
                         <IconButton onClick={handleClick} label={ getMessage('page.discover.table.action.display') } icon={<Eye />} />
                     </Stack>
                 </Flex>
                 { reviewFlowEnabled && (<ReportsReviewModal 
                     isVisible={reportsReviewVisible}
                     isActionAsync={isLoading}
+                    allowedActions={{ canModerate, canAccessReports, canReviewReports }}
                     onClose={handleReportsReviewClose}
-                    startActions={<>
+                    startActions={canModerate && (<>
                         <Button onClick={handleBlockItemClick} variant="danger-light" startIcon={<LockIcon />} disabled={blockButtonsDisabled}>
                             { getMessage(`page.details.actions.comment.block`, 'Block comment') }
                         </Button>
                         { item.gotThread && (<Button onClick={handleBlockItemThreadClick} variant="danger" startIcon={<LockIcon />} disabled={blockButtonsDisabled}>
                             { getMessage(`page.details.actions.thread.block`, 'Block thread') }
                         </Button>) }
-                    </>}
+                    </>)}
                     item={item}>
                         <Typography variant="sigma" textColor="neutral600" id="reports-list">
                             { getMessage('page.details.panel.discussion.warnings.reports.list', 'List') }
@@ -173,6 +194,7 @@ const DiscoverTableRow = ({ config, item, onClick }) => {
                                 commentId={item.id} 
                                 items={orderBy(reports, ['resolved', 'createdAt'], ['DESC', 'DESC'])} 
                                 mutation={resolveReportMutation}
+                                allowedActions={{ canAccessReports, canReviewReports }}
                                 onBlockButtonsStateChange={handleBlockButtonsStateChange}
                             />
                 </ReportsReviewModal>) }
@@ -184,6 +206,11 @@ const DiscoverTableRow = ({ config, item, onClick }) => {
 DiscoverTableRow.propTypes = {
     config: PropTypes.object.isRequired,
     item: PropTypes.object.isRequired,
+    allowedActions: PropTypes.shape({
+        canModerate: PropTypes.bool, 
+        canAccessReports: PropTypes.bool,
+        canReviewReports: PropTypes.bool, 
+    }),
     onClick: PropTypes.func.isRequired,
 };
 

package/admin/src/pages/Discover/index.js

@@ -51,17 +51,20 @@ const Discover = ({ config }) => {
   const [{ query: queryParams }] = useQueryParams();
   const _q = queryParams?._q || '';
 
-  const viewPermissions = useMemo(() => {
-    return { view: pluginPermissions.view };
-  }, []);
+  const viewPermissions = useMemo(() => ({ 
+    access: pluginPermissions.access,
+    moderate: pluginPermissions.moderate,
+    accessReports:  pluginPermissions.reports,
+    reviewReports: pluginPermissions.reportsReview,
+  }), []);
 
   const {
     isLoading: isLoadingForPermissions,
-    allowedActions: { canView },
+    allowedActions: { canAccess, canModerate, canAccessReports, canReviewReports },
   } = useRBAC(viewPermissions);
 
   const { isLoading: isLoadingForData, data: { result, pagination = {} }, isFetching } = useQuery(
-    ['get-data', queryParams],
+    ['get-data', queryParams, canAccess],
     () => fetchData(queryParams, toggleNotification),
     {
       initialData: { },
@@ -86,62 +89,72 @@ const Discover = ({ config }) => {
     },
   };
 
-
-
   const emptyContent = _q ? 'search' : 'comments';
   
-  const COL_COUNT = 7;
-
-  return <Box background="neutral100">
-          <Layout>
-            {isLoading || isLoadingForPermissions ? (<LoadingIndicatorPage />) : (
-            <>
-              <HeaderLayout title={ getMessage('page.discover.header') } subtitle={ `${total} ${ getMessage('page.discover.header.count')}` } as="h2" />
-              <ActionLayout 
-                    startActions={<>
-                      <SearchURLQuery
-                        label={ getMessage('search.label', 'Search', false) }
-                      />
-                      <TableFilters displayedFilters={filtersSchema} />
-                    </>} />
-              <ContentLayout>
-                { !isEmpty(result) ? (<>
-                <Table colCount={COL_COUNT} rowCount={result.length}>
-                  <Thead>
-                    <Tr>
-                      <Th>
-                        <Typography variant="sigma">{ getMessage('page.discover.table.header.id') }</Typography>
-                      </Th>
-                      <Th>
-                        <Typography variant="sigma">{ getMessage('page.discover.table.header.message') }</Typography>
-                      </Th>
-                      <Th>
-                        <Typography variant="sigma">{ getMessage('page.discover.table.header.thread') }</Typography>
-                      </Th>
-                      <Th>
-                        <Typography variant="sigma">{ getMessage('page.discover.table.header.entry') }</Typography>
-                      </Th>
-                      <Th>
-                        <Typography variant="sigma">{ getMessage('page.discover.table.header.lastUpdate') }</Typography>
-                      </Th>
-                      <Th>
-                        <Typography variant="sigma">{ getMessage('page.discover.table.header.status') }</Typography>
-                      </Th>
-                      <Th>
-                        <VisuallyHidden>{ getMessage('page.discover.table.header.actions') }</VisuallyHidden>
-                      </Th>
-                    </Tr>
-                  </Thead>
-                  <Tbody>
-                    {result.map(entry => (<DiscoverTableRow key={`comment-${entry.id}`} config={config} item={entry} onClick={() => handleClickDisplay(entry.id)}/>))}
-                  </Tbody>
-                </Table>
-                <TablePagination pagination={{ pageCount: pagination?.pageCount || 1 }} />
-                </>) : (<EmptyStateLayout content={emptyLayout[emptyContent]} />) }
-              </ContentLayout>
-            </>) }
-          </Layout>
-        </Box>;
+  const COL_COUNT = 8;
+
+  if (canAccess) {
+    return <Box background="neutral100">
+            <Layout>
+              {isLoading || isLoadingForPermissions ? (<LoadingIndicatorPage />) : (
+              <>
+                <HeaderLayout title={ getMessage('page.discover.header') } subtitle={ `${total} ${ getMessage('page.discover.header.count')}` } as="h2" />
+                <ActionLayout 
+                      startActions={<>
+                        <SearchURLQuery
+                          label={ getMessage('search.label', 'Search', false) }
+                        />
+                        <TableFilters displayedFilters={filtersSchema} />
+                      </>} />
+                <ContentLayout>
+                  { !isEmpty(result) ? (<>
+                  <Table colCount={COL_COUNT} rowCount={result.length}>
+                    <Thead>
+                      <Tr>
+                        <Th>
+                          <Typography variant="sigma">{ getMessage('page.discover.table.header.id') }</Typography>
+                        </Th>
+                        <Th>
+                          <Typography variant="sigma">{ getMessage('page.discover.table.header.author') }</Typography>
+                        </Th>
+                        <Th>
+                          <Typography variant="sigma">{ getMessage('page.discover.table.header.message') }</Typography>
+                        </Th>
+                        <Th>
+                          <Typography variant="sigma">{ getMessage('page.discover.table.header.thread') }</Typography>
+                        </Th>
+                        <Th>
+                          <Typography variant="sigma">{ getMessage('page.discover.table.header.entry') }</Typography>
+                        </Th>
+                        <Th>
+                          <Typography variant="sigma">{ getMessage('page.discover.table.header.lastUpdate') }</Typography>
+                        </Th>
+                        <Th>
+                          <Typography variant="sigma">{ getMessage('page.discover.table.header.status') }</Typography>
+                        </Th>
+                        <Th>
+                          <VisuallyHidden>{ getMessage('page.discover.table.header.actions') }</VisuallyHidden>
+                        </Th>
+                      </Tr>
+                    </Thead>
+                    <Tbody>
+                      {result.map(entry => (<DiscoverTableRow 
+                        key={`comment-${entry.id}`} 
+                        config={config} 
+                        item={entry} 
+                        allowedActions={{ canModerate, canAccessReports, canReviewReports }}
+                        onClick={() => handleClickDisplay(entry.id)}
+                        />))}
+                    </Tbody>
+                  </Table>
+                  <TablePagination pagination={{ pageCount: pagination?.pageCount || 1 }} />
+                  </>) : (<EmptyStateLayout content={emptyLayout[emptyContent]} />) }
+                </ContentLayout>
+              </>) }
+            </Layout>
+          </Box>;
+  }
+  return null;
 }
 
 const mapStateToProps = makeAppView();

package/admin/src/permissions.js

@@ -1,14 +1,16 @@
+const permissions = require('./../../permissions');
+
 const pluginPermissions = {
     access: [
-      { action: 'plugin::comments.read', subject: null },
-      { action: 'plugin::comments.reports.read', subject: null },
-      { action: 'plugin::comments.discovery.read', subject: null },
-      { action: 'plugin::comments.settings.read', subject: null },
+      { action: permissions.render(permissions.comments.read), subject: null },
+      { action: permissions.render(permissions.reports.read), subject: null },
+      // { action: 'plugin::comments.discover.read', subject: null },
+      { action: permissions.render(permissions.settings.read), subject: null },
     ],
-    discover: [{ action: 'plugin::comments.read', subject: null }],
-    moderate: [{ action: 'plugin::comments.moderate', subject: null }],
-    reports: [{ action: 'plugin::comments.reports.read', subject: null }],
-    reportsReview: [{ action: 'plugin::comments.reports.action', subject: null }],
+    // discover: [{ action: 'plugin::comments.discover.read', subject: null }],
+    moderate: [{ action: permissions.render(permissions.comments.moderate), subject: null }],
+    reports: [{ action: permissions.render(permissions.reports.read), subject: null }],
+    reportsReview: [{ action: permissions.render(permissions.reports.action), subject: null }],
   };
   
   export default pluginPermissions;

package/admin/src/translations/en.json

@@ -17,6 +17,7 @@
     "page.discover.header": "Discover threads",
     "page.discover.header.count": "entries found",
     "page.discover.table.header.id": "ID",
+    "page.discover.table.header.author": "Author",
     "page.discover.table.header.message": "Message",
     "page.discover.table.header.thread": "Thread of",
     "page.discover.table.header.entry": "Entry",
@@ -76,6 +77,7 @@
     "page.details.actions.comment.approve.confirmation.success": "Comment has been approved",
     "page.details.actions.comment.reject.confirmation.success": "Comment has been rejected",
     "page.details.filters.label": "View",
+    "page.details.filters.removed.visibility": "Comments visibility",
     "page.details.filters.removed.show": "Show removed",
     "page.details.filters.removed.hide": "Hide removed",
     "page.coming.soon": "Wait for what is coming soon...",

package/admin/src/utils/index.js

@@ -4,5 +4,7 @@ export { default as getUrl } from './getUrl';
 export { default as getMessage } from './getMessage';
 export { default as handleAPIError } from './handleAPIError';
 export { default as getRelatedGroups } from './getRelatedGroups';
+export { default as renderEntryTitle } from './renderEntryTitle';
+export { default as renderInitials } from './renderInitials';
 export { default as resolveCommentStatus } from './resolveCommentStatus';
 export { default as resolveCommentStatusColor } from './resolveCommentStatusColor';

package/admin/src/utils/renderInitials.js

@@ -0,0 +1,5 @@
+import { first } from 'lodash';
+
+const renderInitials = (value = '') => value.split(' ').map(_ => first(_)).join('').toUpperCase();
+
+export default renderInitials;

package/content-types/comment.js

@@ -48,10 +48,6 @@ module.exports = {
       target: 'plugin::users-permissions.user',
       configurable: false,
     },
-    authorType: {
-      type: 'string',
-      configurable: false
-    },
     authorId: {
       type: 'string',
       configurable: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-rc.2",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -8,6 +8,7 @@
     "kind": "plugin"
   },
   "scripts": {
+    "publish": "npm publish --tag latest",
     "test:unit": "jest --verbose --coverage"
   },
   "repository": {
@@ -15,7 +16,8 @@
     "url": "https://github.com/VirtusLab-Open-Source/strapi-plugin-comments"
   },
   "dependencies": {
-    "@strapi/utils": "^4.0.5",
+    "@strapi/utils": "^4.0.6",
+    "@strapi/plugin-graphql": "^4.0.6",
     "bad-words": "^3.0.4"
   },
   "devDependencies": {

package/permissions.js

@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports = {
+    render: function(uid) {
+        return `plugin::comments.${uid}`;
+    },
+    comments: {
+        read: 'read',
+        moderate: 'moderate',
+    },
+    reports: {
+        read: 'reports.read',
+        action: 'reports.action',
+    },
+    settings: {
+        read: 'settings.read',
+        change: 'settings.change',
+    },
+};

package/server/bootstrap.js

@@ -1,5 +1,41 @@
 'use strict';
 
-module.exports = ({ strapi }) => {
-  // bootstrap phase
+const permissions = require('./../permissions');
+
+module.exports = async ({ strapi }) => {
+  // Check if the plugin users-permissions is installed because the navigation needs it
+  if (Object.keys(strapi.plugins).indexOf("users-permissions") === -1) {
+    throw new Error(
+      "In order to make the comments plugin work the users-permissions plugin is required",
+    );
+  }
+  // Add permissions
+  const actions = [
+    {
+      section: "plugins",
+      displayName: "Comments: Read",
+      uid: permissions.comments.read,
+      pluginName: "comments",
+    },
+    {
+      section: "plugins",
+      displayName: "Comments: Moderate",
+      uid: permissions.comments.moderate,
+      pluginName: "comments",
+    },
+    {
+      section: "plugins",
+      displayName: "Reports: Read",
+      uid: permissions.reports.read,
+      pluginName: "comments",
+    },
+    {
+      section: "plugins",
+      displayName: "Reports: Moderate",
+      uid: permissions.reports.action,
+      pluginName: "comments",
+    },
+  ];
+
+  await strapi.admin.services.permission.actionProvider.registerMany(actions);
 };

package/server/config/index.js

@@ -2,10 +2,15 @@
 
 module.exports = {
   default: {
+    moderatorRoles: [],
     approvalFlow: [],
     entryLabel: {
       '*': ['Title', 'title', 'Name', 'name', 'Subject', 'subject']
     },
-  },
-  validator() {},
+    reportReasons: {
+      'BAD_LANGUAGE': 'BAD_LANGUAGE',
+      'DISCRIMINATION': 'DISCRIMINATION',
+      'OTHER': 'OTHER',
+    },
+  }
 };

package/server/controllers/client.js

@@ -2,7 +2,7 @@
 
 const { getPluginService } = require('./../utils/functions');
 const { parseParams, throwError } = require('./utils/functions');
-const _ = require('lodash');
+const { flatInput } = require('./utils/parsers');
 
 module.exports = {
 
@@ -15,16 +15,7 @@ module.exports = {
     const { relation } = parseParams(params);
     try {
       return this.getService('common')
-        .findAllFlat({
-          query: {
-            ...query,
-            $or: [{ removed: { $null: true } }, { removed: false }],
-            related: relation,
-          },
-          populate: {
-            threadOf: true,
-          },
-        });
+        .findAllFlat(flatInput(relation, query));
     } catch (e) {
       throwError(ctx, e);
     }
@@ -36,13 +27,7 @@ module.exports = {
     try {
       return await this.getService('common')
         .findAllInHierarchy({
-          query: {
-            ...query,
-            related: relation,
-          },
-          populate: {
-            threadOf: true,
-          },
+          ...flatInput(relation, query),
           dropBlockedThreads: true,
         });
     } catch (e) {
@@ -97,14 +82,19 @@ module.exports = {
   },
 
   async removeComment(ctx) {
-    const { params: { relationId, commentId }, query: { authorId } } = ctx;
-    if (authorId) {
+    const { 
+      params: { relationId, commentId }, 
+      query: { authorId },
+      state: { user },
+    } = ctx;
+    if (authorId || user?.id) {
       try {
         return await this.getService()
           .markAsRemoved(
-            relationId,
             commentId,
+            relationId,
             authorId,
+            user
           );
       } catch (e) {
         if (!e.isBoom) {