add all time option, 2000 limit

weex · weex · commit 050a565c889f · 2025-07-28T20:35:09.000-07:00
diff --git a/src/App.tsx b/src/App.tsx
@@ -40,6 +40,10 @@ const presetRelays = [
   { url: 'wss://relay.nostr.band', name: 'Nostr.Band' },
   { url: 'wss://relay.damus.io', name: 'Damus' },
   { url: 'wss://relay.primal.net', name: 'Primal' },
+  { url: 'wss://nos.lol', name: 'nos.lol' },
+  { url: 'wss://relay.snort.social', name: 'Snort' },
+  { url: 'wss://nostr.wine', name: 'Nostr Wine' },
+  { url: 'wss://relay.nostr.info', name: 'Nostr.info' },
 ];
 
 export function App() {
diff --git a/src/components/NotesRelaySelector.tsx b/src/components/NotesRelaySelector.tsx
@@ -0,0 +1,224 @@
+import { useState } from 'react';
+import { Check, ChevronsUpDown, Wifi, Plus, RotateCcw } from "lucide-react";
+import { cn } from "@/lib/utils";
+import { Button } from "@/components/ui/button";
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList,
+} from "@/components/ui/command";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { useAppContext } from "@/hooks/useAppContext";
+
+interface NotesRelaySelectorProps {
+  selectedRelay?: string;
+  onSelectionChange: (relay?: string) => void;
+  className?: string;
+  placeholder?: string;
+}
+
+export function NotesRelaySelector(props: NotesRelaySelectorProps) {
+  const { 
+    selectedRelay, 
+    onSelectionChange, 
+    className, 
+    placeholder = "Choose a relay to search..."
+  } = props;
+  
+  const { config, presetRelays = [] } = useAppContext();
+  const [open, setOpen] = useState(false);
+  const [inputValue, setInputValue] = useState("");
+
+  // Function to normalize relay URL by adding wss:// if no protocol is present
+  const normalizeRelayUrl = (url: string): string => {
+    const trimmed = url.trim();
+    if (!trimmed) return trimmed;
+    
+    // Check if it already has a protocol
+    if (trimmed.includes('://')) {
+      return trimmed;
+    }
+    
+    // Add wss:// prefix
+    return `wss://${trimmed}`;
+  };
+
+  // Check if input value looks like a valid relay URL
+  const isValidRelayInput = (value: string): boolean => {
+    const trimmed = value.trim();
+    if (!trimmed) return false;
+    
+    // Basic validation - should contain at least a domain-like structure
+    const normalized = normalizeRelayUrl(trimmed);
+    try {
+      new URL(normalized);
+      return true;
+    } catch {
+      return false;
+    }
+  };
+
+  // Handle selecting a relay
+  const handleSelectRelay = (url: string) => {
+    const normalizedUrl = normalizeRelayUrl(url);
+    onSelectionChange(normalizedUrl);
+    setInputValue("");
+    setOpen(false);
+  };
+
+  // Handle resetting to default (current relay)
+  const handleReset = () => {
+    onSelectionChange(undefined);
+    setOpen(false);
+  };
+
+  // Get available preset relays (including current relay)
+  const availablePresetRelays = presetRelays.filter(relay => 
+    !inputValue || 
+    relay.name.toLowerCase().includes(inputValue.toLowerCase()) ||
+    relay.url.toLowerCase().includes(inputValue.toLowerCase())
+  );
+
+  const getRelayDisplayName = (url: string): string => {
+    const preset = presetRelays.find(relay => relay.url === url);
+    return preset ? preset.name : url.replace(/^wss?:\/\//, '');
+  };
+
+  const currentRelayName = getRelayDisplayName(config.relayUrl);
+  const selectedRelayName = selectedRelay ? getRelayDisplayName(selectedRelay) : currentRelayName;
+  const isUsingCustomRelay = selectedRelay && selectedRelay !== config.relayUrl;
+
+  return (
+    <div className={cn("space-y-3", className)}>
+      {/* Current selection display */}
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          <Wifi className="h-4 w-4 text-muted-foreground" />
+          <span className="text-sm">
+            <span className="font-medium">Searching:</span>{' '}
+            <span className={isUsingCustomRelay ? "text-blue-600 font-medium" : "text-muted-foreground"}>
+              {selectedRelayName}
+            </span>
+            {!isUsingCustomRelay && (
+              <span className="text-xs text-muted-foreground ml-1">(default)</span>
+            )}
+          </span>
+        </div>
+        {isUsingCustomRelay && (
+          <Button
+            variant="ghost"
+            size="sm"
+            onClick={handleReset}
+            className="h-auto p-1"
+            title="Reset to default relay"
+          >
+            <RotateCcw className="h-3 w-3" />
+          </Button>
+        )}
+      </div>
+
+      {/* Relay selector */}
+      <Popover open={open} onOpenChange={setOpen}>
+        <PopoverTrigger asChild>
+          <Button
+            variant="outline"
+            role="combobox"
+            aria-expanded={open}
+            className="w-full justify-between"
+          >
+            <div className="flex items-center gap-2">
+              <Wifi className="h-4 w-4" />
+              <span className="truncate">{placeholder}</span>
+            </div>
+            <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+          </Button>
+        </PopoverTrigger>
+        <PopoverContent className="w-[400px] p-0">
+          <Command>
+            <CommandInput 
+              placeholder="Search relays or type URL..." 
+              value={inputValue}
+              onValueChange={setInputValue}
+            />
+            <CommandList>
+              <CommandEmpty>
+                {inputValue && isValidRelayInput(inputValue) ? (
+                  <CommandItem
+                    onSelect={() => handleSelectRelay(inputValue)}
+                    className="cursor-pointer"
+                  >
+                    <Plus className="mr-2 h-4 w-4" />
+                    <div className="flex flex-col">
+                      <span className="font-medium">Use custom relay</span>
+                      <span className="text-xs text-muted-foreground">
+                        {normalizeRelayUrl(inputValue)}
+                      </span>
+                    </div>
+                  </CommandItem>
+                ) : (
+                  <div className="py-6 text-center text-sm text-muted-foreground">
+                    {inputValue ? "Invalid relay URL" : "No relay found."}
+                  </div>
+                )}
+              </CommandEmpty>
+              
+              {availablePresetRelays.length > 0 && (
+                <CommandGroup heading="Available Relays">
+                  {availablePresetRelays.map((relay) => (
+                    <CommandItem
+                      key={relay.url}
+                      value={relay.url}
+                      onSelect={() => handleSelectRelay(relay.url)}
+                    >
+                      <Check
+                        className={cn(
+                          "mr-2 h-4 w-4",
+                          selectedRelay === relay.url ? "opacity-100" : "opacity-0"
+                        )}
+                      />
+                      <div className="flex flex-col">
+                        <span className="font-medium">{relay.name}</span>
+                        <span className="text-xs text-muted-foreground">{relay.url}</span>
+                        {relay.url === config.relayUrl && (
+                          <span className="text-xs text-blue-600">Current default</span>
+                        )}
+                      </div>
+                    </CommandItem>
+                  ))}
+                </CommandGroup>
+              )}
+
+              {inputValue && isValidRelayInput(inputValue) && (
+                <CommandGroup heading="Custom Relay">
+                  <CommandItem
+                    onSelect={() => handleSelectRelay(inputValue)}
+                    className="cursor-pointer"
+                  >
+                    <Plus className="mr-2 h-4 w-4" />
+                    <div className="flex flex-col">
+                      <span className="font-medium">Use custom relay</span>
+                      <span className="text-xs text-muted-foreground">
+                        {normalizeRelayUrl(inputValue)}
+                      </span>
+                    </div>
+                  </CommandItem>
+                </CommandGroup>
+              )}
+            </CommandList>
+          </Command>
+        </PopoverContent>
+      </Popover>
+
+      <div className="text-xs text-muted-foreground">
+        Choose a specific relay to search for your notes. Different relays may have different historical data.
+      </div>
+    </div>
+  );
+}
diff --git a/src/components/notes/NotesList.tsx b/src/components/notes/NotesList.tsx
@@ -14,13 +14,16 @@ import { useToast } from '@/hooks/useToast';
 import { formatDistanceToNow } from '@/lib/dateUtils';
 import { Clock, CheckCircle, RotateCcw, Repeat2, ChevronDown, Quote, Copy } from 'lucide-react';
 import { nip19 } from 'nostr-tools';
+import type { TimeRange } from '@/hooks/useMyNotes';
 
 interface NotesListProps {
   notes: NostrEvent[];
   isLoading: boolean;
+  timeRange?: TimeRange;
+  isUsingCustomRelay?: boolean;
 }
 
-export function NotesList({ notes, isLoading }: NotesListProps) {
+export function NotesList({ notes, isLoading, timeRange = 'month', isUsingCustomRelay = false }: NotesListProps) {
   const [quotedBoostNote, setQuotedBoostNote] = useState<NostrEvent | null>(null);
   const { getReviewProgress, markReviewed, resetProgress } = useSpacedRepetition();
   const { mutate: createEvent } = useNostrPublish();
@@ -75,8 +78,15 @@ export function NotesList({ notes, isLoading }: NotesListProps) {
   };
 
   if (isLoading) {
+    const loadingMessage = isUsingCustomRelay
+      ? 'Searching selected relay for notes...'
+      : 'Loading notes...';
+
     return (
       <div className="space-y-4">
+        <div className="text-center py-4">
+          <div className="text-sm text-muted-foreground">{loadingMessage}</div>
+        </div>
         {Array.from({ length: 3 }).map((_, i) => (
           <Card key={i}>
             <CardHeader>
@@ -99,12 +109,22 @@ export function NotesList({ notes, isLoading }: NotesListProps) {
   }
 
   if (notes.length === 0) {
+    let emptyMessage = timeRange === 'all-time'
+      ? "No notes found. Write some notes in your favorite Nostr client to start revisiting!"
+      : "No notes found from the last month. Write some notes in your favorite Nostr client to start revisiting!";
+
+    if (timeRange === 'all-time' && !isUsingCustomRelay) {
+      emptyMessage = "No notes found on your default relay. Try selecting a different relay above to search for older notes that might be stored elsewhere.";
+    } else if (timeRange === 'all-time' && isUsingCustomRelay) {
+      emptyMessage = "No notes found on the selected relay. Try choosing a different relay to search for your notes.";
+    }
+
     return (
       <Card className="border-dashed">
         <CardContent className="py-12 px-8 text-center">
           <div className="max-w-sm mx-auto space-y-4">
             <p className="text-muted-foreground">
-              No notes found from the last month. Write some notes in your favorite Nostr client to start revisiting!
+              {emptyMessage}
             </p>
           </div>
         </CardContent>
diff --git a/src/hooks/useMyNotes.ts b/src/hooks/useMyNotes.ts
@@ -1,35 +1,80 @@
 import { useQuery } from '@tanstack/react-query';
 import { useNostr } from '@nostrify/react';
 import { useCurrentUser } from './useCurrentUser';
+import { NPool, NRelay1 } from '@nostrify/nostrify';
 
-export function useMyNotes() {
+export type TimeRange = 'month' | 'all-time';
+
+interface UseMyNotesOptions {
+  timeRange?: TimeRange;
+  specificRelay?: string;
+}
+
+export function useMyNotes(options: UseMyNotesOptions = {}) {
+  const { timeRange = 'month', specificRelay } = options;
   const { nostr } = useNostr();
   const { user } = useCurrentUser();
 
   return useQuery({
-    queryKey: ['my-notes', user?.pubkey],
+    queryKey: ['my-notes', user?.pubkey, timeRange, specificRelay],
     queryFn: async (c) => {
       if (!user?.pubkey) {
         throw new Error('User not logged in');
       }
 
-      const signal = AbortSignal.any([c.signal, AbortSignal.timeout(5000)]);
+      const signal = AbortSignal.any([c.signal, AbortSignal.timeout(15000)]);
 
-      // Calculate timestamp for 1 month ago
-      const oneMonthAgo = Math.floor((Date.now() - (30 * 24 * 60 * 60 * 1000)) / 1000);
+      // Build the filter based on time range
+      const filter: {
+        kinds: number[];
+        authors: string[];
+        limit: number;
+        since?: number;
+      } = {
+        kinds: [1],
+        authors: [user.pubkey],
+        limit: timeRange === 'all-time' ? 2000 : 500,
+      };
 
-      // Query for the user's text notes (kind 1) from the last month
-      const events = await nostr.query([
-        {
-          kinds: [1],
-          authors: [user.pubkey],
-          since: oneMonthAgo,
-          limit: 500,
-        }
-      ], { signal });
+      // Only add 'since' filter for month range
+      if (timeRange === 'month') {
+        // Calculate timestamp for 1 month ago
+        const oneMonthAgo = Math.floor((Date.now() - (30 * 24 * 60 * 60 * 1000)) / 1000);
+        filter.since = oneMonthAgo;
+      }
 
-      // Sort by creation date (newest first)
-      return events.sort((a, b) => b.created_at - a.created_at);
+      // If a specific relay is chosen, query only that relay
+      if (specificRelay) {
+        // Create a temporary pool for the specific relay
+        const specificPool = new NPool({
+          open(url: string) {
+            return new NRelay1(url);
+          },
+          reqRouter(filters) {
+            const relayMap = new Map();
+            relayMap.set(specificRelay, filters);
+            return relayMap;
+          },
+          eventRouter() {
+            return [];
+          },
+        });
+
+        try {
+          // Query the specific relay
+          const events = await specificPool.query([filter], { signal });
+
+          // Sort by creation date (newest first)
+          return events.sort((a, b) => b.created_at - a.created_at);
+        } finally {
+          // Clean up the temporary pool
+          specificPool.close();
+        }
+      } else {
+        // Use the default single relay query (current relay from config)
+        const events = await nostr.query([filter], { signal });
+        return events.sort((a, b) => b.created_at - a.created_at);
+      }
     },
     enabled: !!user?.pubkey,
     staleTime: 1000 * 60 * 5, // 5 minutes
diff --git a/src/pages/NotesPage.tsx b/src/pages/NotesPage.tsx
