Implement reviewed flag for reports instead of deletion and revert upload.tsx changes

Co-authored-by: v0l <[email protected]>

Author: Copilot

migrations/20250610140000_add_reviewed_flag.sql

@@ -0,0 +1,5 @@
+-- Add reviewed flag to reports table
+alter table reports add column reviewed boolean not null default false;
+
+-- Index for efficient filtering of non-reviewed reports
+create index ix_reports_reviewed on reports (reviewed);

src/db.rs

@@ -116,6 +116,7 @@ pub struct Report {
     pub reporter_id: u64,
     pub event_json: String,
     pub created: DateTime<Utc>,
+    pub reviewed: bool,
 }
 
 #[derive(Clone)]
@@ -394,14 +395,14 @@ impl Database {
     /// List reports with pagination for admin view
     pub async fn list_reports(&self, offset: u32, limit: u32) -> Result<(Vec<Report>, i64), Error> {
         let reports: Vec<Report> = sqlx::query_as(
-            "select id, file_id, reporter_id, event_json, created from reports order by created desc limit ? offset ?"
+            "select id, file_id, reporter_id, event_json, created, reviewed from reports where reviewed = false order by created desc limit ? offset ?"
         )
             .bind(limit)
             .bind(offset)
             .fetch_all(&self.pool)
             .await?;
 
-        let count: i64 = sqlx::query("select count(id) from reports")
+        let count: i64 = sqlx::query("select count(id) from reports where reviewed = false")
             .fetch_one(&self.pool)
             .await?
             .try_get(0)?;
@@ -412,16 +413,16 @@ impl Database {
     /// Get reports for a specific file
     pub async fn get_file_reports(&self, file_id: &[u8]) -> Result<Vec<Report>, Error> {
         sqlx::query_as(
-            "select id, file_id, reporter_id, event_json, created from reports where file_id = ? order by created desc"
+            "select id, file_id, reporter_id, event_json, created, reviewed from reports where file_id = ? order by created desc"
         )
             .bind(file_id)
             .fetch_all(&self.pool)
             .await
     }
 
-    /// Delete a report (used for acknowledging)
-    pub async fn delete_report(&self, report_id: u64) -> Result<(), Error> {
-        sqlx::query("delete from reports where id = ?")
+    /// Mark a report as reviewed (used for acknowledging)
+    pub async fn mark_report_reviewed(&self, report_id: u64) -> Result<(), Error> {
+        sqlx::query("update reports set reviewed = true where id = ?")
             .bind(report_id)
             .execute(&self.pool)
             .await?;

src/routes/admin.rs

@@ -208,7 +208,7 @@ async fn admin_acknowledge_report(
         return AdminResponse::error("User is not an admin");
     }
 
-    match db.delete_report(report_id).await {
+    match db.mark_report_reviewed(report_id).await {
         Ok(()) => AdminResponse::success(()),
         Err(e) => AdminResponse::error(&format!("Could not acknowledge report: {}", e)),
     }

ui_src/src/upload/admin.ts

@@ -18,6 +18,7 @@ export interface Report {
   reporter_id: number;
   event_json: string;
   created: string;
+  reviewed: boolean;
 }
 
 export class Route96 {

ui_src/src/views/upload.tsx

@@ -6,10 +6,9 @@ import { Blossom } from "../upload/blossom";
 import useLogin from "../hooks/login";
 import usePublisher from "../hooks/publisher";
 import { Nip96, Nip96FileList } from "../upload/nip96";
-import { AdminSelf, Route96, Report } from "../upload/admin";
+import { AdminSelf, Route96 } from "../upload/admin";
 import { FormatBytes } from "../const";
-import ReportJson from "../report.json";
-import ReportList from "./reports";
+import Report from "../report.json";
 
 export default function Upload() {
   const [type, setType] = useState<"blossom" | "nip96">("blossom");
@@ -22,21 +21,14 @@ export default function Upload() {
   const [results, setResults] = useState<Array<object>>([]);
   const [listedFiles, setListedFiles] = useState<Nip96FileList>();
   const [adminListedFiles, setAdminListedFiles] = useState<Nip96FileList>();
-  const [adminListedReports, setAdminListedReports] = useState<{
-    total: number;
-    page: number;
-    count: number;
-    files: Array<Report>;
-  }>();
   const [listedPage, setListedPage] = useState(0);
   const [adminListedPage, setAdminListedPage] = useState(0);
-  const [adminReportsPage, setAdminReportsPage] = useState(0);
   const [mimeFilter, setMimeFilter] = useState<string>();
 
   const login = useLogin();
   const pub = usePublisher();
 
-  const legacyFiles = ReportJson as Record<string, Array<string>>;
+  const legacyFiles = Report as Record<string, Array<string>>;
   const myLegacyFiles = login ? (legacyFiles[login.pubkey] ?? []) : [];
 
   const url =
@@ -107,43 +99,6 @@ export default function Upload() {
     }
   }
 
-  async function listReports(n: number) {
-    if (!pub) return;
-    try {
-      setError(undefined);
-      const uploader = new Route96(url, pub);
-      const result = await uploader.listReports(n, 50);
-      setAdminListedReports(result);
-    } catch (e) {
-      if (e instanceof Error) {
-        setError(e.message.length > 0 ? e.message : "List reports failed");
-      } else if (typeof e === "string") {
-        setError(e);
-      } else {
-        setError("List reports failed");
-      }
-    }
-  }
-
-  async function acknowledgeReport(reportId: number) {
-    if (!pub) return;
-    try {
-      setError(undefined);
-      const uploader = new Route96(url, pub);
-      await uploader.acknowledgeReport(reportId);
-      // Refresh the reports list
-      await listReports(adminReportsPage);
-    } catch (e) {
-      if (e instanceof Error) {
-        setError(e.message.length > 0 ? e.message : "Acknowledge failed");
-      } else if (typeof e === "string") {
-        setError(e);
-      } else {
-        setError("Acknowledge failed");
-      }
-    }
-  }
-
   async function deleteFile(id: string) {
     if (!pub) return;
     try {
@@ -183,10 +138,6 @@ export default function Upload() {
     listAllUploads(adminListedPage);
   }, [adminListedPage, mimeFilter]);
 
-  useEffect(() => {
-    listReports(adminReportsPage);
-  }, [adminReportsPage]);
-
   useEffect(() => {
     if (pub && !self) {
       const r96 = new Route96(url, pub);
@@ -323,23 +274,6 @@ export default function Upload() {
               }}
             />
           )}
-          
-          <hr />
-          <h3>Admin Reports:</h3>
-          <Button onClick={() => listReports(0)}>List Reports</Button>
-          {adminListedReports && (
-            <ReportList
-              reports={adminListedReports.files}
-              pages={Math.ceil(adminListedReports.total / adminListedReports.count)}
-              page={adminListedReports.page}
-              onPage={(x) => setAdminReportsPage(x)}
-              onAcknowledge={acknowledgeReport}
-              onDeleteFile={async (fileId) => {
-                await deleteFile(fileId);
-                await listReports(adminReportsPage);
-              }}
-            />
-          )}
         </>
       )}
       {error && <b className="text-red-500">{error}</b>}