fix: AI slop

src/routes/blossom.rs

@@ -5,7 +5,7 @@ use crate::routes::{delete_file, Nip94Event};
 use crate::settings::Settings;
 use log::error;
 use nostr::prelude::hex;
-use nostr::{Alphabet, SingleLetterTag, TagKind};
+use nostr::{Alphabet, JsonUtil, SingleLetterTag, TagKind};
 use rocket::data::ByteUnit;
 use rocket::futures::StreamExt;
 use rocket::http::{Header, Status};
@@ -15,6 +15,7 @@ use rocket::{routes, Data, Request, Response, Route, State};
 use serde::{Deserialize, Serialize};
 use tokio::io::AsyncRead;
 use tokio_util::io::StreamReader;
+use url::Url;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(crate = "rocket::serde")]
@@ -225,15 +226,25 @@ async fn mirror(
     settings: &State<Settings>,
     req: Json<MirrorRequest>,
 ) -> BlossomResponse {
-    if !check_method(&auth.event, "mirror") {
+    if !check_method(&auth.event, "upload") {
         return BlossomResponse::error("Invalid request method tag");
     }
     if let Some(e) = check_whitelist(&auth, settings) {
         return e;
     }
 
+    let url = match Url::parse(&req.url) {
+        Ok(u) => u,
+        Err(e) => return BlossomResponse::error(format!("Invalid URL: {}", e)),
+    };
+
+    let hash = url
+        .path_segments()
+        .and_then(|mut c| c.next_back())
+        .and_then(|s| s.split(".").next());
+
     // download file
-    let rsp = match reqwest::get(&req.url).await {
+    let rsp = match reqwest::get(url.clone()).await {
         Err(e) => {
             error!("Error downloading file: {}", e);
             return BlossomResponse::error("Failed to mirror file");
@@ -250,9 +261,10 @@ async fn mirror(
     let pubkey = auth.event.pubkey.to_bytes().to_vec();
 
     process_stream(
-        StreamReader::new(rsp.bytes_stream().map(|result| {
+        StreamReader::new(
-            result.map_err(std::io::Error::other)
+            rsp.bytes_stream()
-        })),
+                .map(|result| result.map_err(std::io::Error::other)),
+        ),
         &mime_type,
         &None,
         &pubkey,
@@ -261,6 +273,7 @@ async fn mirror(
         fs,
         db,
         settings,
+        hash.and_then(|h| hex::decode(h).ok()),
     )
     .await
 }
@@ -367,15 +380,11 @@ async fn process_upload(
     // check quota (only if payments are configured)
     #[cfg(feature = "payments")]
     if let Some(payment_config) = &settings.payments {
-        let free_quota = payment_config.free_quota_bytes
+        let free_quota = payment_config.free_quota_bytes.unwrap_or(104857600); // Default to 100MB
-            .unwrap_or(104857600); // Default to 100MB
         let pubkey_vec = auth.event.pubkey.to_bytes().to_vec();
 
         if size > 0 {
-            match db
+            match db.check_user_quota(&pubkey_vec, size, free_quota).await {
-                .check_user_quota(&pubkey_vec, size, free_quota)
-                .await
-            {
                 Ok(false) => return BlossomResponse::error("Upload would exceed quota"),
                 Err(_) => return BlossomResponse::error("Failed to check quota"),
                 Ok(true) => {} // Quota check passed
@@ -395,6 +404,7 @@ async fn process_upload(
         fs,
         db,
         settings,
+        None,
     )
     .await
 }
@@ -409,6 +419,7 @@ async fn process_stream<'p, S>(
     fs: &State<FileStore>,
     db: &State<Database>,
     settings: &State<Settings>,
+    expect_hash: Option<Vec<u8>>,
 ) -> BlossomResponse
 where
     S: AsyncRead + Unpin + 'p,
@@ -417,6 +428,15 @@ where
         Ok(FileSystemResult::NewFile(blob)) => {
             let mut ret: FileUpload = (&blob).into();
 
+            // check expected hash (mirroring)
+            if let Some(h) = expect_hash {
+                if h != ret.id {
+                    if let Err(e) = tokio::fs::remove_file(fs.get(&ret.id)).await {
+                        log::warn!("Failed to cleanup file: {}", e);
+                    }
+                    return BlossomResponse::error("Mirror request failed, server responses with invalid file content (hash mismatch)");
+                }
+            }
             // update file data before inserting
             ret.name = name.map(|s| s.to_string());
 
@@ -443,8 +463,7 @@ where
     #[cfg(feature = "payments")]
     if size == 0 {
         if let Some(payment_config) = &settings.payments {
-            let free_quota = payment_config.free_quota_bytes
+            let free_quota = payment_config.free_quota_bytes.unwrap_or(104857600); // Default to 100MB
-                .unwrap_or(104857600); // Default to 100MB
 
             match db.check_user_quota(pubkey, upload.size, free_quota).await {
                 Ok(false) => {

ui_src/src/components/mirror-suggestions.tsx

@@ -35,6 +35,7 @@ export default function MirrorSuggestions({ servers }: MirrorSuggestionsProps) {
 
   async function fetchSuggestions() {
     if (!pub || !login?.pubkey) return;
+    if (loading) return;
 
     try {
       setLoading(true);
@@ -181,7 +182,7 @@ export default function MirrorSuggestions({ servers }: MirrorSuggestionsProps) {
             <div className="flex items-start justify-between mb-3">
               <div className="flex-1">
                 <p className="text-sm font-medium text-gray-300 mb-1">
-                  File: {suggestion.sha256.substring(0, 16)}...
+                  File: {suggestion.sha256}
                 </p>
                 <p className="text-xs text-gray-400">
                   Size: {FormatBytes(suggestion.size)}

ui_src/src/const.ts

@@ -43,3 +43,6 @@ export function FormatBytes(b: number, f?: number) {
   if (b >= kiB) return (b / kiB).toFixed(f) + " KiB";
   return b.toFixed(f) + " B";
 }
+
+export const ServerUrl =
+    import.meta.env.VITE_API_URL || `${location.protocol}//${location.host}`;

ui_src/src/hooks/use-blossom-servers.ts

@@ -1,26 +1,22 @@
-import { useMemo } from "react";
 import useLogin from "./login";
+import { useRequestBuilder } from "@snort/system-react";
+import { EventKind, RequestBuilder } from "@snort/system";
+import { appendDedupe, dedupe, removeUndefined, sanitizeRelayUrl } from "@snort/shared";
+import { ServerUrl } from "../const";
 
-const DefaultMediaServers = ["https://cdn.satellite.earth/", "https://cdn.self.hosted/"];
+const DefaultMediaServers = ["https://blossom.band/", "https://blossom.primal.net", ServerUrl];
 
 export function useBlossomServers() {
   const login = useLogin();
 
-  return useMemo(() => {
+  const rb = new RequestBuilder("media-servers");
-    // For now, just return default servers
+  if (login?.pubkey) {
-    // TODO: Implement proper nostr event kind 10063 querying when system supports it
+    rb.withFilter()
-    const servers = DefaultMediaServers;
+      .kinds([10_063 as EventKind])
+      .authors([login.pubkey]);
+  }
+  const req = useRequestBuilder(rb);
 
-    return {
+  const servers = req === undefined ? undefined : dedupe(removeUndefined(req.flatMap((e) => e.tags.filter(t => t[0] === "server").map((t) => sanitizeRelayUrl(t[1])))));
-      servers,
+  return appendDedupe(DefaultMediaServers, servers);
-      addServer: async (serverUrl: string) => {
-        // TODO: Implement adding server to event kind 10063
-        console.log("Adding server not implemented yet:", serverUrl);
-      },
-      removeServer: async (serverUrl: string) => {
-        // TODO: Implement removing server from event kind 10063
-        console.log("Removing server not implemented yet:", serverUrl);
-      },
-    };
-  }, [login?.pubkey]);
 }

ui_src/src/upload/blossom.ts

@@ -65,7 +65,7 @@ export class Blossom {
     const rsp = await this.#req(
       "mirror",
       "PUT",
-      "mirror",
+      "upload",
       JSON.stringify({ url }),
       undefined,
       {

ui_src/src/views/upload.tsx

@@ -11,7 +11,7 @@ import useLogin from "../hooks/login";
 import usePublisher from "../hooks/publisher";
 import { Nip96, Nip96FileList } from "../upload/nip96";
 import { AdminSelf, Route96 } from "../upload/admin";
-import { FormatBytes } from "../const";
+import { FormatBytes, ServerUrl } from "../const";
 import { UploadProgress } from "../upload/progress";
 
 export default function Upload() {
@@ -25,14 +25,11 @@ export default function Upload() {
   const [isUploading, setIsUploading] = useState(false);
   const [uploadProgress, setUploadProgress] = useState<UploadProgress>();
 
-  const { servers: blossomServers } = useBlossomServers();
+  const blossomServers = useBlossomServers();
 
   const login = useLogin();
   const pub = usePublisher();
 
-  const url =
-    import.meta.env.VITE_API_URL || `${location.protocol}//${location.host}`;
-  
   // Check if file should have compression enabled by default
   const shouldCompress = (file: File) => {
     return file.type.startsWith('video/') || file.type.startsWith('image/');
@@ -52,7 +49,7 @@ export default function Upload() {
         setUploadProgress(progress);
       };
 
-      const uploader = new Blossom(url, pub);
+      const uploader = new Blossom(ServerUrl, pub);
       // Use compression by default for video and image files, unless explicitly disabled
       const useCompression = shouldCompress(file) && !noCompress;
       const result = useCompression
@@ -99,7 +96,7 @@ export default function Upload() {
       if (!pub) return;
       try {
         setError(undefined);
-        const uploader = new Nip96(url, pub);
+        const uploader = new Nip96(ServerUrl, pub);
         await uploader.loadInfo();
         const result = await uploader.listFiles(n, 50);
         setListedFiles(result);
@@ -115,14 +112,14 @@ export default function Upload() {
         }
       }
     },
-    [pub, url],
+    [pub],
   );
 
   async function deleteFile(id: string) {
     if (!pub) return;
     try {
       setError(undefined);
-      const uploader = new Blossom(url, pub);
+      const uploader = new Blossom(ServerUrl, pub);
       await uploader.delete(id);
     } catch (e) {
       if (e instanceof Error) {
@@ -143,10 +140,10 @@ export default function Upload() {
 
   useEffect(() => {
     if (pub && !self) {
-      const r96 = new Route96(url, pub);
+      const r96 = new Route96(ServerUrl, pub);
       r96.getSelf().then((v) => setSelf(v.data));
     }
-  }, [pub, self, url]);
+  }, [pub, self]);
 
   if (!login) {
     return (
@@ -240,8 +237,7 @@ export default function Upload() {
                   </div>
                   <div className="w-full bg-gray-700 rounded-full h-2.5">
                     <div
-                      className={`h-2.5 rounded-full transition-all duration-300 ${
+                      className={`h-2.5 rounded-full transition-all duration-300 ${self.total_size / self.total_available_quota > 0.8
-                        self.total_size / self.total_available_quota > 0.8
                           ? "bg-red-500"
                           : self.total_size / self.total_available_quota > 0.6
                             ? "bg-yellow-500"
@@ -261,8 +257,7 @@ export default function Upload() {
                       % used
                     </span>
                     <span
-                      className={`${
+                      className={`${self.total_size / self.total_available_quota > 0.8
-                        self.total_size / self.total_available_quota > 0.8
                           ? "text-red-400"
                           : self.total_size / self.total_available_quota > 0.6
                             ? "text-yellow-400"
@@ -332,7 +327,7 @@ export default function Upload() {
       {showPaymentFlow && pub && (
         <div className="card">
           <PaymentFlow
-            route96={new Route96(url, pub)}
+            route96={new Route96(ServerUrl, pub)}
             onPaymentRequested={(pr) => {
               console.log("Payment requested:", pr);
             }}
@@ -342,7 +337,7 @@ export default function Upload() {
       )}
 
       {/* Mirror Suggestions */}
-      {blossomServers.length > 1 && (
+      {blossomServers && blossomServers.length > 1 && (
         <MirrorSuggestions
           servers={blossomServers}
         />