feat: update profile reports feed

apps/api/src/lib/feeds/providers/hey/algorithms/heyReports.ts

@@ -2,20 +2,25 @@ import { Errors } from '@hey/data/errors';
 import logger from '@hey/lib/logger';
 import createClickhouseClient from 'src/lib/createClickhouseClient';
 
-const heyReports = async (limit: number, offset: number): Promise<any[]> => {
+const heyReports = async (
+  limit: number,
+  offset: number,
+  isTrusted = false
+): Promise<any[]> => {
   if (limit > 500) {
     throw new Error(Errors.Limit500);
   }
 
   try {
     const client = createClickhouseClient();
+    const table = isTrusted ? 'trusted_reports' : 'reports';
     const rows = await client.query({
       format: 'JSONEachRow',
       query: `
         SELECT
           publication_id AS id,
           count(*) as count
-        FROM reports
+        FROM ${table}
         WHERE resolved = 0
         GROUP BY publication_id
         ORDER BY count DESC

apps/api/src/routes/trusted/removeReport.ts → apps/api/src/routes/gardener/removeReport.ts

@@ -10,11 +10,13 @@ import { boolean, object, string } from 'zod';
 type ExtensionRequest = {
   id: string;
   looksGood: boolean;
+  trusted: boolean;
 };
 
 const validationSchema = object({
   id: string(),
-  looksGood: boolean()
+  looksGood: boolean(),
+  trusted: boolean()
 });
 
 export const post: Handler = async (req, res) => {
@@ -34,25 +36,24 @@ export const post: Handler = async (req, res) => {
     return notAllowed(res);
   }
 
-  const { id, looksGood } = body as ExtensionRequest;
+  const { id, looksGood, trusted } = body as ExtensionRequest;
+  const table = trusted ? 'trusted_reports' : 'reports';
 
   try {
     const client = createClickhouseClient();
 
     if (looksGood) {
       await client.command({
-        query: `DELETE FROM trusted_reports WHERE publication_id = '${id}';`
+        query: `DELETE FROM ${table} WHERE publication_id = '${id}';`
       });
-      logger.info('Deleted report from trusted reports');
+
+      logger.info('Deleted report from reports');
     } else {
       await client.command({
-        query: `
-          ALTER TABLE trusted_reports
-          UPDATE resolved = 1
-          WHERE publication_id = '${id}';
-        `
+        query: `ALTER TABLE ${table} UPDATE resolved = 1 WHERE publication_id = '${id}';`
       });
-      logger.info('Marked trusted report as resolved');
+
+      logger.info('Marked report as resolved');
     }
 
     return res.status(200).json({ success: true });

apps/api/src/routes/trusted/reportDetails.ts → apps/api/src/routes/gardener/reportDetails.ts

@@ -6,34 +6,29 @@ import createClickhouseClient from 'src/lib/createClickhouseClient';
 import { noBody } from 'src/lib/responses';
 
 export const get: Handler = async (req, res) => {
-  const { id } = req.query;
+  const { id, trusted } = req.query;
 
   if (!id) {
     return noBody(res);
   }
 
+  const table = trusted === 'true' ? 'trusted_reports' : 'reports';
+
   try {
     const client = createClickhouseClient();
     const rows = await client.query({
       format: 'JSONEachRow',
       query: `
-        SELECT 
-          reason,
-          count(*) as count
-        FROM trusted_reports
+        SELECT reason, count(*) as count
+        FROM ${table}
         WHERE publication_id = '${id}'
         GROUP BY reason
         ORDER BY count DESC;
       `
     });
 
-    const result = await rows.json<
-      Array<{
-        count: string;
-        reason: string;
-      }>
-    >();
-    logger.info(`Trusted report details fetched for ${id}`);
+    const result = await rows.json<Array<{ count: string; reason: string }>>();
+    logger.info(`Report details fetched for ${id}`);
 
     return res.status(200).json({
       result: result.map((row) => ({

apps/api/src/routes/mod/reports.ts → apps/api/src/routes/gardener/reports.ts

@@ -6,11 +6,15 @@ import heyReports from 'src/lib/feeds/providers/hey/algorithms/heyReports';
 export const get: Handler = async (req, res) => {
   const limit = (parseInt(req.query?.limit as string) || 50) as number;
   const offset = (parseInt(req.query?.offset as string) || 0) as number;
+  const trusted = req.query?.trusted as string;
+
+  const isTrusted = trusted === 'true';
 
   try {
-    return res
-      .status(200)
-      .json({ ids: await heyReports(limit, offset), success: true });
+    return res.status(200).json({
+      ids: await heyReports(limit, offset, isTrusted),
+      success: true
+    });
   } catch (error) {
     return catchedError(res, error);
   }

apps/web/src/components/Mod/Actions.tsx

@@ -1,23 +1,24 @@
 import GardenerActions from '@components/Publication/Actions/GardenerActions';
 import TrustedProfilesActions from '@components/Publication/Actions/TrustedProfilesActions';
+import { ModFeedType } from '@hey/data/enums';
 import { type FC, useState } from 'react';
 import { useFeatureFlagsStore } from 'src/store/persisted/useFeatureFlagsStore';
 
-import TrustedReportDetails from './TrustedReportDetails';
+import ReportDetails from './ReportDetails';
 
 interface ActionsProps {
-  hideTrustedReport?: boolean;
   publicationId: string;
+  type?: ModFeedType.REPORTS | ModFeedType.TRUSTED_REPORTS;
 }
 
-const Actions: FC<ActionsProps> = ({
-  hideTrustedReport = false,
-  publicationId
-}) => {
+const Actions: FC<ActionsProps> = ({ publicationId, type }) => {
   const [expanded, setExpanded] = useState(true);
   const trusted = useFeatureFlagsStore((state) => state.trusted);
   const gardenerMode = useFeatureFlagsStore((state) => state.gardenerMode);
 
+  const isTrustedReport = type === ModFeedType.TRUSTED_REPORTS;
+  const isNormalReport = type === ModFeedType.REPORTS;
+
   if (!expanded) {
     return null;
   }
@@ -30,18 +31,21 @@ const Actions: FC<ActionsProps> = ({
           <div className="m-5 space-y-2">
             <b>Gardener actions</b>
             <GardenerActions
-              ableToRemoveReport={hideTrustedReport}
               className="mt-3 max-w-md"
               publicationId={publicationId}
               setExpanded={setExpanded}
+              type={type}
             />
           </div>
-          {hideTrustedReport && (
-            <TrustedReportDetails publicationId={publicationId} />
+          {(isTrustedReport || isNormalReport) && (
+            <ReportDetails
+              isTrustedReport={isTrustedReport}
+              publicationId={publicationId}
+            />
           )}
         </>
       )}
-      {trusted && !hideTrustedReport && (
+      {trusted && !isTrustedReport && !isNormalReport && (
         <>
           <div className="divider" />
           <div className="m-5">

apps/web/src/components/Mod/TrustedReportDetails.tsx → apps/web/src/components/Mod/ReportDetails.tsx

@@ -4,23 +4,23 @@ import { HEY_API_URL } from '@hey/data/constants';
 import { useQuery } from '@tanstack/react-query';
 import axios from 'axios';
 
-interface TrustedReportDetailsProps {
+interface ReportDetailsProps {
+  isTrustedReport: boolean;
   publicationId: string;
 }
 
-const TrustedReportDetails: FC<TrustedReportDetailsProps> = ({
+const ReportDetails: FC<ReportDetailsProps> = ({
+  isTrustedReport,
   publicationId
 }) => {
   const fetchTrustedReportDetails = async (): Promise<
-    {
-      count: number;
-      reason: string;
-    }[]
+    { count: number; reason: string }[]
   > => {
     try {
-      const response = await axios.get(`${HEY_API_URL}/trusted/reportDetails`, {
-        params: { id: publicationId }
-      });
+      const response = await axios.get(
+        `${HEY_API_URL}/gardener/reportDetails`,
+        { params: { id: publicationId, trusted: isTrustedReport } }
+      );
 
       return response.data.result;
     } catch {
@@ -51,4 +51,4 @@ const TrustedReportDetails: FC<TrustedReportDetailsProps> = ({
   );
 };
 
-export default TrustedReportDetails;
+export default ReportDetails;

apps/web/src/components/Mod/ReportsFeed.tsx

@@ -5,6 +5,7 @@ import SinglePublication from '@components/Publication/SinglePublication';
 import PublicationsShimmer from '@components/Shared/Shimmer/PublicationsShimmer';
 import { SparklesIcon } from '@heroicons/react/24/outline';
 import { HEY_API_URL } from '@hey/data/constants';
+import { ModFeedType } from '@hey/data/enums';
 import { LimitType, usePublicationsQuery } from '@hey/lens';
 import { Card, EmptyState, ErrorMessage } from '@hey/ui';
 import { useQuery } from '@tanstack/react-query';
@@ -20,12 +21,9 @@ const ReportsFeed: FC = () => {
   const limit = LimitType.TwentyFive;
   const offset = displayedPublications.length;
 
-  const getTrustedReportFeed = async (
-    limit: null | number,
-    offset: null | number
-  ) => {
+  const getReportFeed = async (limit: null | number, offset: null | number) => {
     try {
-      const response = await axios.get(`${HEY_API_URL}/mod/reports`, {
+      const response = await axios.get(`${HEY_API_URL}/gardener/reports`, {
         params: { limit, offset }
       });
 
@@ -40,8 +38,8 @@ const ReportsFeed: FC = () => {
     error: algoError,
     isLoading: algoLoading
   } = useQuery({
-    queryFn: async () => await getTrustedReportFeed(25, offset),
-    queryKey: ['getTrustedReportFeed', 25, offset]
+    queryFn: async () => await getReportFeed(25, offset),
+    queryKey: ['getReportFeed', 25, offset]
   });
 
   const request: PublicationsRequest = {
@@ -100,7 +98,7 @@ const ReportsFeed: FC = () => {
             showActions={false}
             showThread={false}
           />
-          <Actions hideTrustedReport publicationId={publication.id} />
+          <Actions publicationId={publication.id} type={ModFeedType.REPORTS} />
         </Card>
       ))}
       <span ref={observe} />

apps/web/src/components/Mod/TrustedReportsFeed.tsx

@@ -5,6 +5,7 @@ import SinglePublication from '@components/Publication/SinglePublication';
 import PublicationsShimmer from '@components/Shared/Shimmer/PublicationsShimmer';
 import { SparklesIcon } from '@heroicons/react/24/outline';
 import { HEY_API_URL } from '@hey/data/constants';
+import { ModFeedType } from '@hey/data/enums';
 import { LimitType, usePublicationsQuery } from '@hey/lens';
 import { Card, EmptyState, ErrorMessage } from '@hey/ui';
 import { useQuery } from '@tanstack/react-query';
@@ -25,8 +26,8 @@ const TrustedReportsFeed: FC = () => {
     offset: null | number
   ) => {
     try {
-      const response = await axios.get(`${HEY_API_URL}/trusted/publications`, {
-        params: { limit, offset }
+      const response = await axios.get(`${HEY_API_URL}/gardener/reports`, {
+        params: { limit, offset, trusted: true }
       });
 
       return response.data.success ? response.data.ids : [];
@@ -100,7 +101,10 @@ const TrustedReportsFeed: FC = () => {
             showActions={false}
             showThread={false}
           />
-          <Actions hideTrustedReport publicationId={publication.id} />
+          <Actions
+            publicationId={publication.id}
+            type={ModFeedType.TRUSTED_REPORTS}
+          />
         </Card>
       ))}
       <span ref={observe} />