Remove payments feature gate and implement mirror suggestions entirely in frontend

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

Author: Copilot

src/routes/admin.rs

@@ -8,20 +8,12 @@ use rocket::{routes, Responder, Route, State};
 use sqlx::{Error, QueryBuilder, Row};
 
 pub fn admin_routes() -> Vec<Route> {
-    let mut routes = routes![
+    routes![
         admin_list_files,
         admin_get_self,
-    ];
-    
-    #[cfg(feature = "payments")]
-    {
-        routes.extend(routes![
-            admin_list_reports,
-            admin_acknowledge_report
-        ]);
-    }
-    
-    routes
+        admin_list_reports,
+        admin_acknowledge_report,
+    ]
 }
 
 #[derive(Serialize, Default)]
@@ -180,7 +172,6 @@ async fn admin_list_files(
     }
 }
 
-#[cfg(feature = "payments")]
 #[rocket::get("/reports?<page>&<count>")]
 async fn admin_list_reports(
     auth: Nip98Auth,
@@ -211,7 +202,6 @@ async fn admin_list_reports(
     }
 }
 
-#[cfg(feature = "payments")]
 #[rocket::delete("/reports/<report_id>")]
 async fn admin_acknowledge_report(
     auth: Nip98Auth,

src/routes/blossom.rs

@@ -13,7 +13,6 @@ use rocket::response::Responder;
 use rocket::serde::json::Json;
 use rocket::{routes, Data, Request, Response, Route, State};
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 use tokio::io::AsyncRead;
 use tokio_util::io::StreamReader;
 
@@ -56,29 +55,6 @@ struct MirrorRequest {
     pub url: String,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(crate = "rocket::serde")]
-pub struct MirrorSuggestionsRequest {
-    pub servers: Vec<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(crate = "rocket::serde")]
-pub struct FileMirrorSuggestion {
-    pub sha256: String,
-    pub url: String,
-    pub size: u64,
-    pub mime_type: Option<String>,
-    pub available_on: Vec<String>,
-    pub missing_from: Vec<String>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(crate = "rocket::serde")]
-pub struct MirrorSuggestionsResponse {
-    pub suggestions: Vec<FileMirrorSuggestion>,
-}
-
 #[cfg(feature = "media-compression")]
 pub fn blossom_routes() -> Vec<Route> {
     let mut routes = routes![
@@ -89,7 +65,6 @@ pub fn blossom_routes() -> Vec<Route> {
         upload_media,
         head_media,
         mirror,
-        mirror_suggestions,
     ];
 
     #[cfg(feature = "payments")]
@@ -108,7 +83,6 @@ pub fn blossom_routes() -> Vec<Route> {
         list_files,
         upload_head,
         mirror,
-        mirror_suggestions,
     ];
 
     #[cfg(feature = "payments")]
@@ -144,9 +118,6 @@ enum BlossomResponse {
 
     #[response(status = 200)]
     BlobDescriptorList(Json<Vec<BlobDescriptor>>),
-
-    #[response(status = 200)]
-    MirrorSuggestions(Json<MirrorSuggestionsResponse>),
 }
 
 impl BlossomResponse {
@@ -306,77 +277,6 @@ async fn mirror(
     .await
 }
 
-#[rocket::post("/mirror-suggestions", data = "<req>", format = "json")]
-async fn mirror_suggestions(
-    auth: BlossomAuth,
-    req: Json<MirrorSuggestionsRequest>,
-) -> BlossomResponse {
-    if !check_method(&auth.event, "mirror-suggestions") {
-        return BlossomResponse::error("Invalid request method tag");
-    }
-
-    let pubkey_hex = auth.event.pubkey.to_hex();
-    let mut file_map: HashMap<String, FileMirrorSuggestion> = HashMap::new();
-
-    // Fetch files from each server
-    for server_url in &req.servers {
-        if let Ok(_server_url_parsed) = url::Url::parse(server_url) {
-            let list_url = format!("{}/list/{}", server_url, pubkey_hex);
-            
-            match reqwest::get(&list_url).await {
-                Ok(response) => {
-                    if response.status().is_success() {
-                        match response.json::<Vec<BlobDescriptor>>().await {
-                            Ok(files) => {
-                                for file in files {
-                                    file_map
-                                        .entry(file.sha256.clone())
-                                        .and_modify(|suggestion| {
-                                            suggestion.available_on.push(server_url.clone());
-                                        })
-                                        .or_insert_with(|| FileMirrorSuggestion {
-                                            sha256: file.sha256.clone(),
-                                            url: file.url.clone(),
-                                            size: file.size,
-                                            mime_type: file.mime_type.clone(),
-                                            available_on: vec![server_url.clone()],
-                                            missing_from: Vec::new(),
-                                        });
-                                }
-                            }
-                            Err(e) => {
-                                error!("Failed to parse file list from {}: {}", server_url, e);
-                            }
-                        }
-                    }
-                }
-                Err(e) => {
-                    error!("Failed to fetch file list from {}: {}", server_url, e);
-                }
-            }
-        }
-    }
-
-    // Determine missing servers for each file
-    for suggestion in file_map.values_mut() {
-        for server_url in &req.servers {
-            if !suggestion.available_on.contains(server_url) {
-                suggestion.missing_from.push(server_url.clone());
-            }
-        }
-    }
-
-    // Filter to only files that are missing from at least one server and available on at least one
-    let filtered_suggestions: Vec<FileMirrorSuggestion> = file_map
-        .into_values()
-        .filter(|s| !s.missing_from.is_empty() && !s.available_on.is_empty())
-        .collect();
-
-    BlossomResponse::MirrorSuggestions(Json(MirrorSuggestionsResponse {
-        suggestions: filtered_suggestions,
-    }))
-}
-
 #[cfg(feature = "media-compression")]
 #[rocket::head("/media")]
 fn head_media(auth: BlossomAuth, settings: &State<Settings>) -> BlossomHead {

ui_src/src/components/mirror-suggestions.tsx

@@ -1,38 +1,89 @@
 import { useState, useEffect } from "react";
-import { FileMirrorSuggestion, Blossom } from "../upload/blossom";
+import { BlobDescriptor, Blossom } from "../upload/blossom";
 import { FormatBytes } from "../const";
 import Button from "./button";
 import usePublisher from "../hooks/publisher";
+import useLogin from "../hooks/login";
+
+interface FileMirrorSuggestion {
+  sha256: string;
+  url: string;
+  size: number;
+  mime_type?: string;
+  available_on: string[];
+  missing_from: string[];
+}
 
 interface MirrorSuggestionsProps {
   servers: string[];
-  currentServer: string;
 }
 
-export default function MirrorSuggestions({ servers, currentServer }: MirrorSuggestionsProps) {
+export default function MirrorSuggestions({ servers }: MirrorSuggestionsProps) {
   const [suggestions, setSuggestions] = useState<FileMirrorSuggestion[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string>();
   const [mirroring, setMirroring] = useState<Set<string>>(new Set());
 
   const pub = usePublisher();
+  const login = useLogin();
 
   useEffect(() => {
-    if (servers.length > 1 && pub) {
+    if (servers.length > 1 && pub && login?.pubkey) {
       fetchSuggestions();
     }
-  }, [servers, pub]);
+  }, [servers, pub, login?.pubkey]);
 
   async function fetchSuggestions() {
-    if (!pub) return;
+    if (!pub || !login?.pubkey) return;
 
     try {
       setLoading(true);
       setError(undefined);
 
-      const blossom = new Blossom(currentServer, pub);
-      const result = await blossom.getMirrorSuggestions(servers);
-      setSuggestions(result.suggestions);
+      const fileMap: Map<string, FileMirrorSuggestion> = new Map();
+      
+      // Fetch files from each server
+      for (const serverUrl of servers) {
+        try {
+          const blossom = new Blossom(serverUrl, pub);
+          const files = await blossom.list(login.pubkey);
+          
+          for (const file of files) {
+            const suggestion = fileMap.get(file.sha256);
+            if (suggestion) {
+              suggestion.available_on.push(serverUrl);
+            } else {
+              fileMap.set(file.sha256, {
+                sha256: file.sha256,
+                url: file.url || "",
+                size: file.size,
+                mime_type: file.type,
+                available_on: [serverUrl],
+                missing_from: [],
+              });
+            }
+          }
+        } catch (e) {
+          console.error(`Failed to fetch files from ${serverUrl}:`, e);
+          // Continue with other servers instead of failing completely
+        }
+      }
+      
+      // Determine missing servers for each file
+      for (const suggestion of fileMap.values()) {
+        for (const serverUrl of servers) {
+          if (!suggestion.available_on.includes(serverUrl)) {
+            suggestion.missing_from.push(serverUrl);
+          }
+        }
+      }
+      
+      // Filter to only files that are missing from at least one server and available on at least one
+      const filteredSuggestions = Array.from(fileMap.values()).filter(
+        s => s.missing_from.length > 0 && s.available_on.length > 0
+      );
+      
+      setSuggestions(filteredSuggestions);
     } catch (e) {
       if (e instanceof Error) {
         setError(e.message);
@@ -52,7 +103,7 @@ export default function MirrorSuggestions({ servers, currentServer }: MirrorSugg
 
     try {
       const blossom = new Blossom(targetServer, pub);
-      await blossom.mirror(suggestion.url);
+      await blossom.mirror(suggestion.sha256, suggestion.url);
 
       // Update suggestions by removing this server from missing_from
       setSuggestions(prev => 

ui_src/src/upload/blossom.ts

@@ -11,19 +11,6 @@ export interface BlobDescriptor {
   uploaded?: number;
 }
 
-export interface FileMirrorSuggestion {
-  sha256: string;
-  url: string;
-  size: number;
-  mime_type?: string;
-  available_on: string[];
-  missing_from: string[];
-}
-
-export interface MirrorSuggestionsResponse {
-  suggestions: FileMirrorSuggestion[];
-}
-
 export class Blossom {
   constructor(
     readonly url: string,
@@ -113,25 +100,6 @@ export class Blossom {
     }
   }
 
-  async getMirrorSuggestions(servers: string[]): Promise<MirrorSuggestionsResponse> {
-    const rsp = await this.#req(
-      "mirror-suggestions",
-      "POST",
-      "mirror-suggestions",
-      JSON.stringify({ servers }),
-      undefined,
-      {
-        "content-type": "application/json",
-      },
-    );
-    if (rsp.ok) {
-      return (await rsp.json()) as MirrorSuggestionsResponse;
-    } else {
-      await this.#handleError(rsp);
-      throw new Error("Should not reach here");
-    }
-  }
-
   async #req(
     path: string,
     method: "GET" | "POST" | "DELETE" | "PUT",

ui_src/src/views/upload.tsx

@@ -359,7 +359,6 @@ export default function Upload() {
       {blossomServers.length > 1 && (
         <MirrorSuggestions 
           servers={blossomServers} 
-          currentServer={url}
         />
       )}
 

ui_src/tsconfig.app.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/App.tsx","./src/const.ts","./src/login.ts","./src/main.tsx","./src/vite-env.d.ts","./src/components/button.tsx","./src/components/mirror-suggestions.tsx","./src/components/payment.tsx","./src/components/profile.tsx","./src/components/progress-bar.tsx","./src/components/server-config.tsx","./src/hooks/login.ts","./src/hooks/publisher.ts","./src/upload/admin.ts","./src/upload/blossom.ts","./src/upload/index.ts","./src/upload/nip96.ts","./src/upload/progress.ts","./src/views/admin.tsx","./src/views/files.tsx","./src/views/header.tsx","./src/views/reports.tsx","./src/views/upload.tsx"],"version":"5.6.2"}
+{"root":["./src/App.tsx","./src/const.ts","./src/login.ts","./src/main.tsx","./src/vite-env.d.ts","./src/components/button.tsx","./src/components/mirror-suggestions.tsx","./src/components/payment.tsx","./src/components/profile.tsx","./src/components/progress-bar.tsx","./src/components/server-config.tsx","./src/hooks/login.ts","./src/hooks/publisher.ts","./src/upload/admin.ts","./src/upload/blossom.ts","./src/upload/index.ts","./src/upload/nip96.ts","./src/upload/progress.ts","./src/views/admin.tsx","./src/views/files.tsx","./src/views/header.tsx","./src/views/reports.tsx","./src/views/upload.tsx"],"errors":true,"version":"5.8.3"}

ui_src/tsconfig.node.tsbuildinfo

@@ -1 +1 @@
-{"root":["./vite.config.ts"],"version":"5.6.2"}
+{"root":["./vite.config.ts"],"errors":true,"version":"5.8.3"}