diff --git a/index.html b/index.html index 6305e28..85ceb31 100644 --- a/index.html +++ b/index.html @@ -40,6 +40,9 @@ + + +
diff --git a/package-lock.json b/package-lock.json index cc1fdb6..249cbcb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,6 +74,7 @@ "idb": "^8.0.3", "input-otp": "^1.2.4", "leaflet": "^1.9.4", + "leaflet.markercluster": "^1.5.3", "lucide-react": "^0.462.0", "ngeohash": "^0.6.3", "nostr-tools": "^2.13.0", @@ -102,6 +103,7 @@ "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.3.0", "@types/leaflet": "^1.9.21", + "@types/leaflet.markercluster": "^1.5.6", "@types/ngeohash": "^0.6.8", "@types/node": "^22.5.5", "@types/qrcode": "^1.5.5", @@ -3701,6 +3703,13 @@ "license": "MIT", "dev": true }, + "node_modules/@types/leaflet.markercluster": { + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.5.6.tgz", + "integrity": "sha512-I7hZjO2+isVXGYWzKxBp8PsCzAYCJBc29qBdFpquOCkS7zFDqUsUvkEOyQHedsk/Cy5tocQzf+Ndorm5W9YKTQ==", + "license": "MIT", + "dev": true + }, "node_modules/@types/ngeohash": { "version": "0.6.8", "resolved": "https://registry.npmjs.org/@types/ngeohash/-/ngeohash-0.6.8.tgz", @@ -6252,6 +6261,12 @@ "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==", "license": "BSD-2-Clause" }, + "node_modules/leaflet.markercluster": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz", + "integrity": "sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA==", + "license": "MIT" + }, "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", diff --git a/package.json b/package.json index dc450f5..b8ca946 100644 --- a/package.json +++ b/package.json @@ -79,6 +79,7 @@ "idb": "^8.0.3", "input-otp": "^1.2.4", "leaflet": "^1.9.4", + "leaflet.markercluster": "^1.5.3", "lucide-react": "^0.462.0", "ngeohash": "^0.6.3", "nostr-tools": "^2.13.0", @@ -106,6 +107,7 @@ "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.3.0", "@types/leaflet": "^1.9.21", + "@types/leaflet.markercluster": "^1.5.6", "@types/ngeohash": "^0.6.8", "@types/node": "^22.5.5", "@types/qrcode": "^1.5.5", diff --git a/src/components/EventCard.tsx b/src/components/EventCard.tsx index 8f21cd4..1a1da2f 100644 --- a/src/components/EventCard.tsx +++ b/src/components/EventCard.tsx @@ -17,6 +17,7 @@ import { useCurrentUser } from '@/hooks/useCurrentUser'; import { genUserName } from '@/lib/genUserName'; import { ZapButton } from '@/components/ZapButton'; import { TrustBadge } from '@/components/TrustBadge'; +import { OfficialBadge } from '@/components/OfficialBadge'; import { ReportDialog } from '@/components/ReportDialog'; import type { SkateEvent } from '@/lib/types'; import { EVENT_TYPE_LABELS } from '@/lib/types'; @@ -176,10 +177,11 @@ export function EventCard({ event, compact = false }: EventCardProps) { {displayName.slice(0, 2).toUpperCase()} -
+

{displayName}

+
{metadata?.nip05 && (
diff --git a/src/components/OfficialBadge.tsx b/src/components/OfficialBadge.tsx new file mode 100644 index 0000000..5235b1b --- /dev/null +++ b/src/components/OfficialBadge.tsx @@ -0,0 +1,48 @@ +import { Crown } from 'lucide-react'; +import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'; + +// The verified founder/admin pubkey — hard-coded so it cannot be spoofed +export const FOUNDER_PUBKEY = '20e7c953439e66f3882ab96fe0faa8ba246d6fb12c03b0cb4e2dc4623b8bcb21'; + +interface OfficialBadgeProps { + pubkey: string; + size?: 'sm' | 'md'; +} + +/** + * Shows a "⚡ Official" badge on content published by the verified founder pubkey. + * Makes impersonation immediately visible — a fake account won't have this badge. + */ +export function OfficialBadge({ pubkey, size = 'sm' }: OfficialBadgeProps) { + if (pubkey !== FOUNDER_PUBKEY) return null; + + if (size === 'sm') { + return ( + + + + + Official + + + + Published by the verified SkateSpots founder + + + ); + } + + return ( + + + + + Official SkateSpots + + + + Published by the verified SkateSpots founder + + + ); +} diff --git a/src/components/SpotCard.tsx b/src/components/SpotCard.tsx index a91aff6..877c07d 100644 --- a/src/components/SpotCard.tsx +++ b/src/components/SpotCard.tsx @@ -17,6 +17,7 @@ import { useCurrentUser } from '@/hooks/useCurrentUser'; import { genUserName } from '@/lib/genUserName'; import { ZapButton } from '@/components/ZapButton'; import { TrustBadge } from '@/components/TrustBadge'; +import { OfficialBadge } from '@/components/OfficialBadge'; import { AddToCollectionDialog } from '@/components/AddToCollectionDialog'; import { ReportDialog } from '@/components/ReportDialog'; import type { SkateSpot } from '@/lib/types'; @@ -148,6 +149,8 @@ export function SpotCard({ spot }: SpotCardProps) { {/* Trust Badge */} + {/* Official badge — only shown for verified founder */} +
e.preventDefault()}> diff --git a/src/components/SpotMap.tsx b/src/components/SpotMap.tsx index bc67c0f..13d8027 100644 --- a/src/components/SpotMap.tsx +++ b/src/components/SpotMap.tsx @@ -1,5 +1,6 @@ import { useEffect, useRef, useMemo, useCallback } from 'react'; import L from 'leaflet'; +import 'leaflet.markercluster'; import ngeohash from 'ngeohash'; import { useNavigate } from 'react-router-dom'; import { Badge } from '@/components/ui/badge'; @@ -566,6 +567,9 @@ export function SpotMap({ const mapInstanceRef = useRef(null); const markersRef = useRef([]); const btcMapMarkersRef = useRef([]); + // MarkerClusterGroup for spot/shop/gear/tour markers + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const clusterGroupRef = useRef(null); const onMapMoveRef = useRef(onMapMove); const navigate = useNavigate(); @@ -681,6 +685,45 @@ export function SpotMap({ mapInstanceRef.current = map; + // Create and add the marker cluster group for spot/shop/gear/tour markers. + // Clusters break apart naturally as the user zooms in, keeping the map + // clean even when hundreds of spots are close together. + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const clusterGroup = (L as any).markerClusterGroup({ + maxClusterRadius: 60, // px — tighter clustering for dense cities + showCoverageOnHover: false, // don't draw polygons on hover + spiderfyOnMaxZoom: true, // spread out overlapping pins at max zoom + removeOutsideVisibleBounds: true, + iconCreateFunction: (cluster: any) => { + const count = cluster.getChildCount(); + return L.divIcon({ + html: ` +
${count}
+ `, + className: 'skate-cluster-icon', + iconSize: [42, 42], + iconAnchor: [21, 21], + }); + }, + }); + clusterGroup.addTo(map); + clusterGroupRef.current = clusterGroup; + // Fix map size after initialization and ensure tiles are loaded setTimeout(() => { map.invalidateSize(); @@ -735,7 +778,10 @@ export function SpotMap({ // Wait for map to be fully loaded before adding markers if (!map.getContainer()) return; - // Clear existing markers + // Clear existing markers from cluster group and array + if (clusterGroupRef.current) { + clusterGroupRef.current.clearLayers(); + } markersRef.current.forEach((marker) => marker.remove()); markersRef.current = []; @@ -858,7 +904,12 @@ export function SpotMap({ }); } - marker.addTo(map); + // Add to cluster group (enables auto-clustering at high densities) + if (clusterGroupRef.current) { + clusterGroupRef.current.addLayer(marker); + } else { + marker.addTo(map); + } markersRef.current.push(marker); }); @@ -953,7 +1004,12 @@ export function SpotMap({ className: 'custom-popup tour-popup', }); - tourMarker.addTo(map); + // Add tour markers to cluster group as well + if (clusterGroupRef.current) { + clusterGroupRef.current.addLayer(tourMarker); + } else { + tourMarker.addTo(map); + } markersRef.current.push(tourMarker); }); } diff --git a/src/hooks/useGrowthStats.ts b/src/hooks/useGrowthStats.ts index 1f19f15..94e657e 100644 --- a/src/hooks/useGrowthStats.ts +++ b/src/hooks/useGrowthStats.ts @@ -48,6 +48,12 @@ export interface GrowthStats { /** All unique pubkeys that have published any content */ totalMappers: number; + // ── Trusted counts (pubkeys with ≥2 published items — organic community members) ── + /** Spots from pubkeys with ≥2 total published items (low-effort spam filter) */ + trustedSpots: number; + /** Unique pubkeys with ≥2 total published items */ + trustedMappers: number; + // ── Time series ───────────────────────────────────────────────────────── /** Monthly buckets oldest → newest */ monthly: MonthBucket[]; @@ -218,6 +224,21 @@ export function useGrowthStats() { const allPubkeys = new Set(allContent.map(e => e.pubkey)); + // ── Trusted counts ─────────────────────────────────────────────────── + // "Trusted" = pubkey that has published ≥2 distinct items. + // This is a lightweight heuristic: spam accounts typically publish 1 fake + // event and stop, while real community members publish multiple items over time. + // No extra relay queries needed — we already have all the content above. + + const pubkeyItemCount = new Map(); + for (const e of allContent) { + pubkeyItemCount.set(e.pubkey, (pubkeyItemCount.get(e.pubkey) ?? 0) + 1); + } + const isTrustedPubkey = (pk: string) => (pubkeyItemCount.get(pk) ?? 0) >= 2; + + const trustedSpots = spots.filter(e => isTrustedPubkey(e.pubkey)).length; + const trustedMappers = Array.from(allPubkeys).filter(isTrustedPubkey).length; + return { totalSpots: spots.length, totalShops: shops.length, @@ -227,6 +248,8 @@ export function useGrowthStats() { totalEditors: editors.length, totalTours: tours.length, totalMappers: allPubkeys.size, + trustedSpots, + trustedMappers, monthly, cumulativeSpots, topMappers, diff --git a/src/lib/sanitizeUrl.ts b/src/lib/sanitizeUrl.ts new file mode 100644 index 0000000..3d28d3b --- /dev/null +++ b/src/lib/sanitizeUrl.ts @@ -0,0 +1,62 @@ +/** + * Sanitizes a user-supplied URL to prevent phishing and script injection. + * + * Rules: + * - Only allows https:// and http:// schemes + * - Blocks javascript:, data:, vbscript:, and all other schemes + * - Returns null for invalid / unsafe URLs (caller should hide the link) + * + * VPN/Tor users are unaffected — this validates the URL scheme & structure, + * not the user's network origin. + */ +export function sanitizeUrl(url: string | undefined | null): string | null { + if (!url) return null; + + const trimmed = url.trim(); + if (!trimmed) return null; + + try { + const parsed = new URL(trimmed); + // Only allow safe schemes + if (parsed.protocol !== 'https:' && parsed.protocol !== 'http:') { + return null; + } + return parsed.href; + } catch { + // Not a valid URL + return null; + } +} + +/** + * Extracts just the hostname for display (e.g. "Opens: example.com") + */ +export function urlDomain(url: string): string { + try { + return new URL(url).hostname.replace(/^www\./, ''); + } catch { + return url; + } +} + +/** + * Sanitizes a tel: or mailto: href. + * Only allows the specific scheme, strips anything else. + */ +export function sanitizeTel(value: string | undefined | null): string | null { + if (!value) return null; + const trimmed = value.trim(); + // Allow digits, +, -, spaces, parentheses only + const digits = trimmed.replace(/[^0-9+\-\s().]/g, ''); + return digits.length >= 5 ? `tel:${digits}` : null; +} + +export function sanitizeEmail(value: string | undefined | null): string | null { + if (!value) return null; + const trimmed = value.trim(); + // Basic email pattern + if (/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(trimmed)) { + return `mailto:${trimmed}`; + } + return null; +} diff --git a/src/lib/types.ts b/src/lib/types.ts index 6ed0de8..46c69a1 100644 --- a/src/lib/types.ts +++ b/src/lib/types.ts @@ -1,9 +1,47 @@ import type { NostrEvent } from '@nostrify/nostrify'; +import ngeohash from 'ngeohash'; // Community relay for all skate-specific content (spots, events, coaches, shops, etc.) // This ensures all users see the same content regardless of their personal relay settings export const SKATE_RELAY = 'wss://goskatespots.nostr1.com'; +// ─── Validation helpers ─────────────────────────────────────────────────────── + +/** Max lengths for user-supplied text fields */ +const MAX_TITLE_LEN = 100; +const MAX_DESCRIPTION_LEN = 3000; +const MAX_LOCATION_LEN = 200; +const MIN_TITLE_LEN = 2; +const MIN_GEOHASH_LEN = 4; // below 4 chars = ~2500km precision, useless for a spot +const MAX_GEOHASH_LEN = 12; + +/** + * Validates a geohash string. + * - Must be 4–12 characters + * - Must decode to real Earth coordinates (lat ±90, lng ±180) + * - Must not be exactly 0,0 (null island — common bot artifact) + * VPN/Tor users are unaffected: the geohash comes from the map pin, not the user's IP. + */ +function isValidGeohash(geohash: string | undefined): boolean { + if (!geohash) return false; + if (geohash.length < MIN_GEOHASH_LEN || geohash.length > MAX_GEOHASH_LEN) return false; + try { + const { latitude, longitude } = ngeohash.decode(geohash); + if (latitude < -90 || latitude > 90) return false; + if (longitude < -180 || longitude > 180) return false; + // Reject "null island" (0°N 0°E — classic bot/placeholder artifact) + if (latitude === 0 && longitude === 0) return false; + return true; + } catch { + return false; + } +} + +function clampStr(s: string | undefined, max: number): string | undefined { + if (!s) return s; + return s.slice(0, max); +} + export const SKATE_SPOT_KIND = 30818; // Addressable event - editable per pubkey+kind+d-tag export const SKATE_SHOP_KIND = 30017; // NIP-15 Stall (marketplace) export const CALENDAR_EVENT_KIND = 31923; @@ -93,7 +131,13 @@ export function parseSkateSpot(event: NostrEvent): SkateSpot | null { if (!d || !title || !geohash) return null; - const location = event.tags.find(([name]) => name === 'location')?.[1]; + // Validate title length + if (title.trim().length < MIN_TITLE_LEN || title.length > MAX_TITLE_LEN) return null; + + // Validate geohash — rejects fake/ocean/bot coords, VPN/Tor unaffected + if (!isValidGeohash(geohash)) return null; + + const location = clampStr(event.tags.find(([name]) => name === 'location')?.[1], MAX_LOCATION_LEN); // Support both 'image' (old) and 'imeta' (new, NIP-92) tags const imageTags = event.tags.filter(([name]) => name === 'image').map(([, url]) => url); @@ -132,16 +176,16 @@ export function parseSkateSpot(event: NostrEvent): SkateSpot | null { id: event.id, pubkey: event.pubkey, identifier: d, - title, - description: event.content, + title: title.slice(0, MAX_TITLE_LEN), + description: event.content.slice(0, MAX_DESCRIPTION_LEN), geohash, location, images, - category: category || legacyCategory, // Prefer new format, fallback to legacy + category: category || legacyCategory, tags, types, accessType, - contactInfo, + contactInfo: clampStr(contactInfo, 200), createdAt: event.created_at, event, }; @@ -160,7 +204,13 @@ export function parseSkateShop(event: NostrEvent): SkateShop | null { if (!d || !name || !geohash) return null; - const location = event.tags.find(([name]) => name === 'location')?.[1]; + // Validate name length + if (name.trim().length < MIN_TITLE_LEN || name.length > MAX_TITLE_LEN) return null; + + // Validate geohash + if (!isValidGeohash(geohash)) return null; + + const location = clampStr(event.tags.find(([name]) => name === 'location')?.[1], MAX_LOCATION_LEN); // Support both 'image' and 'imeta' tags const imageTags = event.tags.filter(([name]) => name === 'image').map(([, url]) => url); @@ -184,8 +234,8 @@ export function parseSkateShop(event: NostrEvent): SkateShop | null { id: event.id, pubkey: event.pubkey, identifier: d, - name, - description: event.content, + name: name.slice(0, MAX_TITLE_LEN), + description: event.content.slice(0, MAX_DESCRIPTION_LEN), geohash, location, images, @@ -213,9 +263,12 @@ export function parseSkateEvent(event: NostrEvent): SkateEvent | null { if (!d || !title || !start || !hasSkateboardingTag) return null; + // Validate title length + if (title.trim().length < MIN_TITLE_LEN || title.length > MAX_TITLE_LEN) return null; + const end = event.tags.find(([name]) => name === 'end')?.[1]; const geohash = event.tags.find(([name]) => name === 'g')?.[1]; - const location = event.tags.find(([name]) => name === 'location')?.[1]; + const location = clampStr(event.tags.find(([name]) => name === 'location')?.[1], MAX_LOCATION_LEN); const image = event.tags.find(([name]) => name === 'image')?.[1]; const types = event.tags @@ -227,8 +280,8 @@ export function parseSkateEvent(event: NostrEvent): SkateEvent | null { id: event.id, pubkey: event.pubkey, identifier: d, - title, - description: event.content, + title: title.slice(0, MAX_TITLE_LEN), + description: event.content.slice(0, MAX_DESCRIPTION_LEN), start: parseInt(start), end: end ? parseInt(end) : undefined, geohash, @@ -636,8 +689,9 @@ export function parseSkateCoach(event: NostrEvent): SkateCoach | null { const title = event.tags.find(([name]) => name === 'title')?.[1]; if (!d || !title) return null; + if (title.trim().length < MIN_TITLE_LEN || title.length > MAX_TITLE_LEN) return null; - const location = event.tags.find(([name]) => name === 'location')?.[1]; + const location = clampStr(event.tags.find(([name]) => name === 'location')?.[1], MAX_LOCATION_LEN); const geohash = event.tags.find(([name]) => name === 'g')?.[1]; const image = event.tags.find(([name]) => name === 'image')?.[1]; const skills = event.tags.filter(([name, value]) => name === 't' && value !== 'skatecoach').map(([, value]) => value); @@ -656,8 +710,8 @@ export function parseSkateCoach(event: NostrEvent): SkateCoach | null { id: event.id, pubkey: event.pubkey, identifier: d, - title, - bio: event.content, + title: title.slice(0, MAX_TITLE_LEN), + bio: event.content.slice(0, MAX_DESCRIPTION_LEN), location, geohash, image, @@ -681,8 +735,9 @@ export function parseSkateFilmer(event: NostrEvent): SkateFilmer | null { const title = event.tags.find(([name]) => name === 'title')?.[1]; if (!d || !title) return null; + if (title.trim().length < MIN_TITLE_LEN || title.length > MAX_TITLE_LEN) return null; - const location = event.tags.find(([name]) => name === 'location')?.[1]; + const location = clampStr(event.tags.find(([name]) => name === 'location')?.[1], MAX_LOCATION_LEN); const geohash = event.tags.find(([name]) => name === 'g')?.[1]; const image = event.tags.find(([name]) => name === 'image')?.[1]; const skills = event.tags.filter(([name, value]) => name === 't' && value !== 'skatefilmer').map(([, value]) => value); @@ -701,8 +756,8 @@ export function parseSkateFilmer(event: NostrEvent): SkateFilmer | null { id: event.id, pubkey: event.pubkey, identifier: d, - title, - bio: event.content, + title: title.slice(0, MAX_TITLE_LEN), + bio: event.content.slice(0, MAX_DESCRIPTION_LEN), location, geohash, image, @@ -726,8 +781,9 @@ export function parseSkateEditor(event: NostrEvent): SkateEditor | null { const title = event.tags.find(([name]) => name === 'title')?.[1]; if (!d || !title) return null; + if (title.trim().length < MIN_TITLE_LEN || title.length > MAX_TITLE_LEN) return null; - const location = event.tags.find(([name]) => name === 'location')?.[1]; + const location = clampStr(event.tags.find(([name]) => name === 'location')?.[1], MAX_LOCATION_LEN); const geohash = event.tags.find(([name]) => name === 'g')?.[1]; const image = event.tags.find(([name]) => name === 'image')?.[1]; const skills = event.tags.filter(([name, value]) => name === 't' && value !== 'skateeditor').map(([, value]) => value); @@ -745,8 +801,8 @@ export function parseSkateEditor(event: NostrEvent): SkateEditor | null { id: event.id, pubkey: event.pubkey, identifier: d, - title, - bio: event.content, + title: title.slice(0, MAX_TITLE_LEN), + bio: event.content.slice(0, MAX_DESCRIPTION_LEN), location, geohash, image, diff --git a/src/pages/CoachDetailPage.tsx b/src/pages/CoachDetailPage.tsx index 2c012c8..719e810 100644 --- a/src/pages/CoachDetailPage.tsx +++ b/src/pages/CoachDetailPage.tsx @@ -12,6 +12,8 @@ import { useLabProfile } from '@/hooks/useLabProfiles'; import { useAuthor } from '@/hooks/useAuthor'; import { genUserName } from '@/lib/genUserName'; import { COACH_SKILL_LABELS, COACH_SKILL_DESCRIPTIONS, FILMING_SERVICE_LABELS, FILMING_SERVICE_DESCRIPTIONS, FILMING_SKILL_LABELS, FILMING_SKILL_DESCRIPTIONS } from '@/lib/types'; +import { sanitizeUrl, sanitizeTel, sanitizeEmail, urlDomain } from '@/lib/sanitizeUrl'; +import { OfficialBadge } from '@/components/OfficialBadge'; import NotFound from './NotFound'; import { GraduationCap, @@ -130,6 +132,7 @@ export default function CoachDetailPage() { {isCoach && } {isFilmer &&

@@ -212,24 +215,24 @@ export default function CoachDetailPage() { {/* Contact Info from Profile */} - {profile.phone && ( - + {sanitizeTel(profile.phone) && ( + {profile.phone} )} - {profile.email && ( - + {sanitizeEmail(profile.email) && ( + {profile.email} )} - {profile.website && ( - + {sanitizeUrl(profile.website) && ( + - {profile.website.replace(/^https?:\/\//, '')} + {urlDomain(profile.website!)} )} @@ -240,10 +243,10 @@ export default function CoachDetailPage() { )} - {isFilmer && profile.social && ( - + {isFilmer && sanitizeUrl(profile.social) && ( + - {profile.social.replace(/^https?:\/\//, '')} + {urlDomain(profile.social!)} )} diff --git a/src/pages/CommunityStatsPage.tsx b/src/pages/CommunityStatsPage.tsx index b6b15e5..e107b13 100644 --- a/src/pages/CommunityStatsPage.tsx +++ b/src/pages/CommunityStatsPage.tsx @@ -47,6 +47,7 @@ function StatCard({ value, label, sub, + trustedValue, color, loading, }: { @@ -54,6 +55,8 @@ function StatCard({ value: number; label: string; sub?: string; + /** If set, shows a secondary "X trusted" line below the main count */ + trustedValue?: number; color: string; loading: boolean; }) { @@ -68,6 +71,13 @@ function StatCard({ ) : (

{value.toLocaleString()}

)} + {!loading && trustedValue !== undefined && ( +

+ + 🛡 {trustedValue.toLocaleString()} from active accounts + +

+ )} {sub &&

{sub}

}
@@ -183,10 +193,10 @@ export default function CommunityStatsPage() { Community at a Glance
- - - - + + + +
diff --git a/src/pages/DirectMessagesPage.tsx b/src/pages/DirectMessagesPage.tsx index f9b28bb..076098a 100644 --- a/src/pages/DirectMessagesPage.tsx +++ b/src/pages/DirectMessagesPage.tsx @@ -20,6 +20,7 @@ import { useCurrentUser } from '@/hooks/useCurrentUser'; import { useConversations, formatPubkeyShort } from '@/hooks/useDirectMessages'; import { useAuthor } from '@/hooks/useAuthor'; import { genUserName } from '@/lib/genUserName'; +import { useLocalStorage } from '@/hooks/useLocalStorage'; import { formatDistanceToNow } from 'date-fns'; import { MessageCircle, @@ -27,9 +28,44 @@ import { Search, Lock, AlertCircle, + ShieldCheck, + X, } from 'lucide-react'; import { cn } from '@/lib/utils'; +/** + * Dismissible phishing-warning banner shown once at the top of the DM page. + * Standard practice (Alby, Metamask, Muun) — protects users from social-engineering + * attacks where a bad actor pretends to be "SkateSpots Support" via DM. + */ +function PhishingWarningBanner() { + const [dismissed, setDismissed] = useLocalStorage('dm-phishing-warning-dismissed', false); + + if (dismissed) return null; + + return ( +
+ +
+

+ Security reminder +

+

+ SkateSpots will never DM you asking to verify your account, + share your keys, or send payments. If someone claims to be SkateSpots support via DM — it's a scam. +

+
+ +
+ ); +} + // Conversation preview component function ConversationPreview({ pubkey, lastMessage }: { pubkey: string; @@ -209,6 +245,9 @@ export default function DirectMessagesPage() { return (
+ {/* Phishing warning — shown once, dismissible */} + + {/* Header */}
diff --git a/src/pages/EventsPage.tsx b/src/pages/EventsPage.tsx index 3310261..bbdf4a5 100644 --- a/src/pages/EventsPage.tsx +++ b/src/pages/EventsPage.tsx @@ -15,6 +15,7 @@ import { SortDropdown, type SortOption } from '@/components/SortDropdown'; import { useSkateEvents } from '@/hooks/useSkateEvents'; import { useTours } from '@/hooks/useTours'; import { useCurrentUser } from '@/hooks/useCurrentUser'; +import { useFollowing } from '@/hooks/useFollowing'; import { useBatchTrustScores } from '@/hooks/useBatchTrustScores'; import { useComments } from '@/hooks/useComments'; import { useTranslation } from '@/contexts/LanguageContext'; @@ -37,6 +38,9 @@ export default function EventsPage() { }); const { user } = useCurrentUser(); + const { data: followingList } = useFollowing(user?.pubkey); + const followCount = followingList?.length ?? 0; + const smartDefault: TrustFilterLevel = (user && followCount >= 5) ? 'trusted' : 'all'; const { data: events, isLoading: eventsLoading } = useSkateEvents(100); const { data: tours, isLoading: toursLoading } = useTours(100); @@ -47,7 +51,7 @@ export default function EventsPage() { const [searchQuery, setSearchQuery] = useState(''); const [selectedTypes, setSelectedTypes] = useState([]); const [activeTab, setActiveTab] = useState<'upcoming' | 'past'>('upcoming'); - const [trustFilter, setTrustFilter] = useState('all'); + const [trustFilter, setTrustFilter] = useState(smartDefault); const [sortBy, setSortBy] = useState('recent'); // Tour filters @@ -55,7 +59,7 @@ export default function EventsPage() { const [tourCategory, setTourCategory] = useState('all'); const [tourSkillLevel, setTourSkillLevel] = useState('all'); const [tourVerifiedOnly, setTourVerifiedOnly] = useState(false); - const [tourTrustFilter, setTourTrustFilter] = useState('all'); + const [tourTrustFilter, setTourTrustFilter] = useState(smartDefault); const [tourSortBy, setTourSortBy] = useState('recent'); const now = Math.floor(Date.now() / 1000); @@ -116,9 +120,17 @@ export default function EventsPage() { return true; }); - // Apply trust filter + // Apply trust filter (soft for 'trusted', strict for 'verified'/'following') if (trustScores && tourTrustFilter !== 'all') { - filtered = filterByTrustLevel(filtered, tourTrustFilter, getTrustScore); + if (tourTrustFilter === 'trusted') { + filtered.sort((a, b) => { + const tA = (getTrustScore(a.pubkey) ?? -1) >= 60 ? 1 : 0; + const tB = (getTrustScore(b.pubkey) ?? -1) >= 60 ? 1 : 0; + return tB - tA; + }); + } else { + filtered = filterByTrustLevel(filtered, tourTrustFilter, getTrustScore); + } } // Apply sorting @@ -172,9 +184,17 @@ export default function EventsPage() { return true; }); - // Apply trust filter + // Apply trust filter (soft for 'trusted', strict for 'verified'/'following') if (trustScores && trustFilter !== 'all') { - filtered = filterByTrustLevel(filtered, trustFilter, getTrustScore); + if (trustFilter === 'trusted') { + filtered.sort((a, b) => { + const tA = (getTrustScore(a.pubkey) ?? -1) >= 60 ? 1 : 0; + const tB = (getTrustScore(b.pubkey) ?? -1) >= 60 ? 1 : 0; + return tB - tA; + }); + } else { + filtered = filterByTrustLevel(filtered, trustFilter, getTrustScore); + } } // Split into upcoming and past diff --git a/src/pages/MapPage.tsx b/src/pages/MapPage.tsx index 951dd5a..304bc6f 100644 --- a/src/pages/MapPage.tsx +++ b/src/pages/MapPage.tsx @@ -26,6 +26,7 @@ import { useMarketplaceItems } from '@/hooks/useMarketplace'; import { useTours } from '@/hooks/useTours'; import { useBtcMapPlaces } from '@/hooks/useBtcMapPlaces'; import { useCurrentUser } from '@/hooks/useCurrentUser'; +import { useFollowing } from '@/hooks/useFollowing'; import { useBatchTrustScores } from '@/hooks/useBatchTrustScores'; import { useMultipleSpotWeather } from '@/hooks/useSpotWeather'; import { useComments } from '@/hooks/useComments'; @@ -333,6 +334,8 @@ export default function MapPage() { const navigate = useNavigate(); const [searchParams] = useSearchParams(); const { user } = useCurrentUser(); + const { data: followingList } = useFollowing(user?.pubkey); + const followCount = followingList?.length ?? 0; const { data: spots, isLoading: spotsLoading } = useSkateSpots(200); const { data: shops, isLoading: shopsLoading } = useShops(200); const { data: marketplaceItems, isLoading: marketplaceLoading } = useMarketplaceItems(200); @@ -348,7 +351,12 @@ export default function MapPage() { const [selectedSpot, setSelectedSpot] = useState(null); const [weatherEnabled, setWeatherEnabled] = useState(false); const [weatherFilter, setWeatherFilter] = useState<'all' | 'good' | 'perfect'>('all'); - const [trustFilter, setTrustFilter] = useState('all'); + // Smart WoT default: + // - Logged out or <5 follows → 'all' (show everything, don't punish new/anon users) + // - Logged in with ≥5 follows → 'trusted' (sort trusted first, badge unverified) + // User can always override with the TrustFilter dropdown + const smartDefault: TrustFilterLevel = (user && followCount >= 5) ? 'trusted' : 'all'; + const [trustFilter, setTrustFilter] = useState(smartDefault); const [sortBy, setSortBy] = useState('recent'); const [userLocation, setUserLocation] = useState<{lat: number; lon: number} | null>(null); @@ -540,9 +548,23 @@ export default function MapPage() { return true; }); - // Apply trust filter + // Apply trust filter — when 'trusted', sort trusted content to the top + // rather than hiding untrusted content (avoids penalising new users/anon browsers) + // Strict filtering (verified/following) still hides low-trust content as expected if (trustScores && trustFilter !== 'all') { - filtered = filterByTrustLevel(filtered, trustFilter, getTrustScore); + if (trustFilter === 'trusted') { + // Soft mode: sort trusted first, keep everything visible + filtered.sort((a, b) => { + const scoreA = getTrustScore(a.pubkey) ?? -1; + const scoreB = getTrustScore(b.pubkey) ?? -1; + const trustedA = scoreA >= 60 ? 1 : 0; + const trustedB = scoreB >= 60 ? 1 : 0; + return trustedB - trustedA; + }); + } else { + // Strict modes (verified, following) — actually filter + filtered = filterByTrustLevel(filtered, trustFilter, getTrustScore); + } } // Apply sorting diff --git a/src/pages/ShopDetailPage.tsx b/src/pages/ShopDetailPage.tsx index 56aed29..5a5dd54 100644 --- a/src/pages/ShopDetailPage.tsx +++ b/src/pages/ShopDetailPage.tsx @@ -12,6 +12,8 @@ import { Skeleton } from '@/components/ui/skeleton'; import { Button } from '@/components/ui/button'; import { ZapButton } from '@/components/ZapButton'; import { CommentsSection } from '@/components/comments/CommentsSection'; +import { sanitizeUrl, sanitizeTel, sanitizeEmail, urlDomain } from '@/lib/sanitizeUrl'; +import { OfficialBadge } from '@/components/OfficialBadge'; import { useShop } from '@/hooks/useShops'; import { useAuthor } from '@/hooks/useAuthor'; import { useNostrPublish } from '@/hooks/useNostrPublish'; @@ -243,6 +245,7 @@ export default function ShopDetailPage() { Verified )} +
{shop.location && (

@@ -360,22 +363,22 @@ export default function ShopDetailPage() { - {shop.phone && ( - + {sanitizeTel(shop.phone) && ( + {shop.phone} )} - {shop.email && ( - + {sanitizeEmail(shop.email) && ( + {shop.email} )} - {shop.website && ( - + {sanitizeUrl(shop.website) && ( + - {shop.website.replace(/^https?:\/\//, '')} + {urlDomain(shop.website!)} )} {shop.instagram && (