Fix .env file

.env

@@ -1,22 +1,10 @@
-VITE_SUPABASE_PROJECT_ID="ydvtmnrszybqnbcqbdcy"
+VITE_ALLOW_CAPTCHA_BYPASS="true"
-VITE_SUPABASE_PUBLISHABLE_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InlkdnRtbnJzenlicW5iY3FiZGN5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTgzMjYzNTYsImV4cCI6MjA3MzkwMjM1Nn0.DM3oyapd_omP5ZzIlrT0H9qBsiQBxBRgw2tYuqgXKX4"
-VITE_SUPABASE_URL="https://ydvtmnrszybqnbcqbdcy.supabase.co"
 VITE_BASE_URL="https://www.thrillwiki.com"
-
+VITE_CLOUDFLARE_ACCOUNT_HASH="X-2-mmiWukWxvAQQ2_o-7Q"
-# Cloudflare Turnstile CAPTCHA
+VITE_NOVU_API_URL="https://api.novu.co"
-# Get your site key from: https://dash.cloudflare.com/turnstile
-# For development, you can use test keys:
-# - Always passes: 1x00000000000000000000AA
-# - Always fails: 3x00000000000000000000FF
-VITE_TURNSTILE_SITE_KEY=1x00000000000000000000AA
-
-# Cloudflare Images
-VITE_CLOUDFLARE_ACCOUNT_HASH=X-2-mmiWukWxvAQQ2_o-7Q
-
-# Novu Configuration
 VITE_NOVU_APPLICATION_IDENTIFIER=""
 VITE_NOVU_SOCKET_URL="wss://ws.novu.co"
-VITE_NOVU_API_URL="https://api.novu.co"
+VITE_SUPABASE_PROJECT_ID="ydvtmnrszybqnbcqbdcy"
-
+VITE_SUPABASE_PUBLISHABLE_KEY="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InlkdnRtbnJzenlicW5iY3FiZGN5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTgzMjYzNTYsImV4cCI6MjA3MzkwMjM1Nn0.DM3oyapd_omP5ZzIlrT0H9qBsiQBxBRgw2tYuqgXKX4"
-# CAPTCHA Bypass (Development/Preview Only)
+VITE_SUPABASE_URL="https://api.thrillwiki.com"
-VITE_ALLOW_CAPTCHA_BYPASS=true
+VITE_TURNSTILE_SITE_KEY="1x00000000000000000000AA"

.env.example

@@ -1,7 +1,10 @@
 # Supabase Configuration
 VITE_SUPABASE_PROJECT_ID=your-project-id
 VITE_SUPABASE_PUBLISHABLE_KEY=your-publishable-key
-VITE_SUPABASE_URL=https://your-project-id.supabase.co
+# Custom domain pointing to Supabase project (use your actual domain)
+# For production: https://api.thrillwiki.com
+# For development: https://ydvtmnrszybqnbcqbdcy.supabase.co (or your custom domain)
+VITE_SUPABASE_URL=https://api.thrillwiki.com
 
 # Cloudflare Turnstile CAPTCHA (optional)
 # Get your site key from: https://dash.cloudflare.com/turnstile

src/components/admin/NovuMigrationUtility.tsx

@@ -35,8 +35,9 @@ export function NovuMigrationUtility() {
         throw new Error('You must be logged in to run the migration');
       }
 
+      const supabaseUrl = import.meta.env.VITE_SUPABASE_URL || 'https://api.thrillwiki.com';
       const response = await fetch(
-        'https://ydvtmnrszybqnbcqbdcy.supabase.co/functions/v1/migrate-novu-users',
+        `${supabaseUrl}/functions/v1/migrate-novu-users`,
         {
           method: 'POST',
           headers: {

src/components/upload/PhotoUpload.tsx

@@ -164,7 +164,7 @@ export function PhotoUpload({
 
       const maxAttempts = 60;
       let attempts = 0;
-      const supabaseUrl = import.meta.env.VITE_SUPABASE_URL || 'https://ydvtmnrszybqnbcqbdcy.supabase.co';
+      const supabaseUrl = import.meta.env.VITE_SUPABASE_URL || 'https://api.thrillwiki.com';
       
       while (attempts < maxAttempts) {
         try {

src/components/upload/UppyPhotoSubmissionUpload.tsx

@@ -129,12 +129,13 @@ export function UppyPhotoSubmissionUpload({
 
             while (attempts < maxAttempts) {
               const { data: { session } } = await supabase.auth.getSession();
+              const supabaseUrl = import.meta.env.VITE_SUPABASE_URL || 'https://api.thrillwiki.com';
               const statusResponse = await fetch(
-                `https://ydvtmnrszybqnbcqbdcy.supabase.co/functions/v1/upload-image?id=${cloudflareId}`,
+                `${supabaseUrl}/functions/v1/upload-image?id=${cloudflareId}`,
                 {
                   headers: {
                     'Authorization': `Bearer ${session?.access_token || ''}`,
-                    'apikey': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InlkdnRtbnJzenlicW5iY3FiZGN5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTgzMjYzNTYsImV4cCI6MjA3MzkwMjM1Nn0.DM3oyapd_omP5ZzIlrT0H9qBsiQBxBRgw2tYuqgXKX4',
+                    'apikey': import.meta.env.VITE_SUPABASE_PUBLISHABLE_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InlkdnRtbnJzenlicW5iY3FiZGN5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTgzMjYzNTYsImV4cCI6MjA3MzkwMjM1Nn0.DM3oyapd_omP5ZzIlrT0H9qBsiQBxBRgw2tYuqgXKX4',
                   }
                 }
               );

src/components/upload/UppyPhotoUpload.tsx

@@ -130,12 +130,13 @@ export function UppyPhotoUpload({
 
     while (attempts < maxAttempts) {
       const { data: { session } } = await supabase.auth.getSession();
+      const supabaseUrl = import.meta.env.VITE_SUPABASE_URL || 'https://api.thrillwiki.com';
       const statusResponse = await fetch(
-        `https://ydvtmnrszybqnbcqbdcy.supabase.co/functions/v1/upload-image?id=${cloudflareId}`,
+        `${supabaseUrl}/functions/v1/upload-image?id=${cloudflareId}`,
         {
           headers: {
             'Authorization': `Bearer ${session?.access_token || ''}`,
-            'apikey': 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InlkdnRtbnJzenlicW5iY3FiZGN5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTgzMjYzNTYsImV4cCI6MjA3MzkwMjM1Nn0.DM3oyapd_omP5ZzIlrT0H9qBsiQBxBRgw2tYuqgXKX4',
+            'apikey': import.meta.env.VITE_SUPABASE_PUBLISHABLE_KEY || 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InlkdnRtbnJzenlicW5iY3FiZGN5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTgzMjYzNTYsImV4cCI6MjA3MzkwMjM1Nn0.DM3oyapd_omP5ZzIlrT0H9qBsiQBxBRgw2tYuqgXKX4',
           }
         }
       );

src/integrations/supabase/client.ts

@@ -1,10 +1,10 @@
-// This file is automatically generated. Do not edit it directly.
+// Note: This file uses environment variables for Supabase URL configuration.
 import { createClient } from '@supabase/supabase-js';
 import type { Database } from './types';
 import { authStorage } from '@/lib/authStorage';
 
-const SUPABASE_URL = "https://ydvtmnrszybqnbcqbdcy.supabase.co";
+const SUPABASE_URL = import.meta.env.VITE_SUPABASE_URL || "https://api.thrillwiki.com";
-const SUPABASE_PUBLISHABLE_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InlkdnRtbnJzenlicW5iY3FiZGN5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTgzMjYzNTYsImV4cCI6MjA3MzkwMjM1Nn0.DM3oyapd_omP5ZzIlrT0H9qBsiQBxBRgw2tYuqgXKX4";
+const SUPABASE_PUBLISHABLE_KEY = import.meta.env.VITE_SUPABASE_PUBLISHABLE_KEY || "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InlkdnRtbnJzenlicW5iY3FiZGN5Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NTgzMjYzNTYsImV4cCI6MjA3MzkwMjM1Nn0.DM3oyapd_omP5ZzIlrT0H9qBsiQBxBRgw2tYuqgXKX4";
 
 // Import the supabase client like this:
 // import { supabase } from "@/integrations/supabase/client";

supabase/migrations/20251029121347_72334d9e-394b-4c55-9d61-71e6c07bca13.sql

@@ -0,0 +1,329 @@
+-- Phase 3: Update Database Functions to Use Dynamic Supabase URL
+-- This migration updates database functions to fetch the Supabase URL from admin_settings
+-- instead of hardcoding it, allowing for easier environment management.
+
+-- Add Supabase API URL to admin settings for dynamic lookup
+INSERT INTO admin_settings (setting_key, setting_value, category, description, updated_by)
+VALUES (
+  'supabase_api_url',
+  '"https://api.thrillwiki.com"'::jsonb,
+  'system',
+  'Base URL for Supabase API calls (used by database functions)',
+  NULL
+)
+ON CONFLICT (setting_key) DO UPDATE 
+SET setting_value = EXCLUDED.setting_value,
+    description = EXCLUDED.description,
+    updated_at = NOW();
+
+-- Update Function 1: notify_discord_via_edge()
+CREATE OR REPLACE FUNCTION public.notify_discord_via_edge()
+RETURNS trigger
+LANGUAGE plpgsql
+SET search_path = 'public'
+AS $function$
+DECLARE
+  url text;
+  base_url text;
+  payload jsonb;
+BEGIN
+  -- Get base URL from settings table
+  SELECT setting_value::text INTO base_url 
+  FROM admin_settings 
+  WHERE setting_key = 'supabase_api_url';
+  
+  -- Remove quotes from JSONB string
+  base_url := trim(both '"' from base_url);
+  
+  -- Fallback to custom domain if setting not found
+  IF base_url IS NULL THEN
+    base_url := 'https://api.thrillwiki.com';
+  END IF;
+  
+  url := base_url || '/functions/v1/discord-webhook-poster';
+  
+  payload := jsonb_build_object(
+    'table', TG_TABLE_SCHEMA || '.' || TG_TABLE_NAME,
+    'row', to_jsonb(NEW)
+  );
+
+  PERFORM public.pg_net.http_post(
+    url,
+    payload::text,
+    'application/json'
+  );
+
+  RETURN NEW;
+EXCEPTION WHEN OTHERS THEN
+  RAISE NOTICE 'Failed to call discord edge function: %', SQLERRM;
+  RETURN NEW;
+END;
+$function$;
+
+-- Update Function 2: notify_moderators_submission_new()
+CREATE OR REPLACE FUNCTION public.notify_moderators_submission_new()
+RETURNS trigger
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = 'public'
+AS $function$
+DECLARE
+  base_url text;
+  edge_function_url text;
+  payload jsonb;
+BEGIN
+  -- Get base URL from settings
+  SELECT setting_value::text INTO base_url 
+  FROM admin_settings 
+  WHERE setting_key = 'supabase_api_url';
+  
+  base_url := trim(both '"' from base_url);
+  
+  IF base_url IS NULL THEN
+    base_url := 'https://api.thrillwiki.com';
+  END IF;
+  
+  edge_function_url := base_url || '/functions/v1/notify-moderators';
+  
+  payload := jsonb_build_object(
+    'event_type', 'new_submission',
+    'submission_id', NEW.id,
+    'submission_type', NEW.submission_type,
+    'user_id', NEW.user_id
+  );
+
+  PERFORM public.pg_net.http_post(
+    edge_function_url,
+    payload::text,
+    'application/json'
+  );
+
+  RETURN NEW;
+EXCEPTION WHEN OTHERS THEN
+  RAISE NOTICE 'Failed to notify moderators: %', SQLERRM;
+  RETURN NEW;
+END;
+$function$;
+
+-- Update Function 3: notify_moderators_report_new()
+CREATE OR REPLACE FUNCTION public.notify_moderators_report_new()
+RETURNS trigger
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = 'public'
+AS $function$
+DECLARE
+  base_url text;
+  edge_function_url text;
+  payload jsonb;
+BEGIN
+  -- Get base URL from settings
+  SELECT setting_value::text INTO base_url 
+  FROM admin_settings 
+  WHERE setting_key = 'supabase_api_url';
+  
+  base_url := trim(both '"' from base_url);
+  
+  IF base_url IS NULL THEN
+    base_url := 'https://api.thrillwiki.com';
+  END IF;
+  
+  edge_function_url := base_url || '/functions/v1/notify-moderators';
+  
+  payload := jsonb_build_object(
+    'event_type', 'new_report',
+    'report_id', NEW.id,
+    'reported_content_type', NEW.content_type,
+    'reporter_id', NEW.reporter_id
+  );
+
+  PERFORM public.pg_net.http_post(
+    edge_function_url,
+    payload::text,
+    'application/json'
+  );
+
+  RETURN NEW;
+EXCEPTION WHEN OTHERS THEN
+  RAISE NOTICE 'Failed to notify moderators: %', SQLERRM;
+  RETURN NEW;
+END;
+$function$;
+
+-- Update Function 4: notify_user_submission_status_change()
+CREATE OR REPLACE FUNCTION public.notify_user_submission_status_change()
+RETURNS trigger
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = 'public'
+AS $function$
+DECLARE
+  base_url text;
+  edge_function_url text;
+  payload jsonb;
+BEGIN
+  -- Only notify on status changes
+  IF OLD.status IS NOT DISTINCT FROM NEW.status THEN
+    RETURN NEW;
+  END IF;
+
+  -- Get base URL from settings
+  SELECT setting_value::text INTO base_url 
+  FROM admin_settings 
+  WHERE setting_key = 'supabase_api_url';
+  
+  base_url := trim(both '"' from base_url);
+  
+  IF base_url IS NULL THEN
+    base_url := 'https://api.thrillwiki.com';
+  END IF;
+  
+  edge_function_url := base_url || '/functions/v1/notify-user';
+  
+  payload := jsonb_build_object(
+    'event_type', 'submission_status_change',
+    'submission_id', NEW.id,
+    'user_id', NEW.user_id,
+    'old_status', OLD.status,
+    'new_status', NEW.status
+  );
+
+  PERFORM public.pg_net.http_post(
+    edge_function_url,
+    payload::text,
+    'application/json'
+  );
+
+  RETURN NEW;
+EXCEPTION WHEN OTHERS THEN
+  RAISE NOTICE 'Failed to notify user: %', SQLERRM;
+  RETURN NEW;
+END;
+$function$;
+
+-- Update Function 5: manage_moderator_topic_trigger()
+CREATE OR REPLACE FUNCTION public.manage_moderator_topic_trigger()
+RETURNS trigger
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = 'public'
+AS $function$
+DECLARE
+  base_url text;
+  edge_function_url text;
+  payload jsonb;
+  operation_type text;
+BEGIN
+  -- Get base URL from settings
+  SELECT setting_value::text INTO base_url 
+  FROM admin_settings 
+  WHERE setting_key = 'supabase_api_url';
+  
+  base_url := trim(both '"' from base_url);
+  
+  IF base_url IS NULL THEN
+    base_url := 'https://api.thrillwiki.com';
+  END IF;
+  
+  edge_function_url := base_url || '/functions/v1/manage-moderator-topics';
+  
+  IF TG_OP = 'INSERT' THEN
+    operation_type := 'subscribe';
+  ELSIF TG_OP = 'DELETE' THEN
+    operation_type := 'unsubscribe';
+  ELSE
+    RETURN NEW;
+  END IF;
+  
+  payload := jsonb_build_object(
+    'operation', operation_type,
+    'user_id', COALESCE(NEW.user_id, OLD.user_id),
+    'role', COALESCE(NEW.role, OLD.role)
+  );
+
+  PERFORM public.pg_net.http_post(
+    edge_function_url,
+    payload::text,
+    'application/json'
+  );
+
+  RETURN COALESCE(NEW, OLD);
+EXCEPTION WHEN OTHERS THEN
+  RAISE NOTICE 'Failed to manage moderator topics: %', SQLERRM;
+  RETURN COALESCE(NEW, OLD);
+END;
+$function$;
+
+-- Update Function 6: create_novu_subscriber_trigger()
+CREATE OR REPLACE FUNCTION public.create_novu_subscriber_trigger()
+RETURNS trigger
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = 'public'
+AS $function$
+DECLARE
+  base_url text;
+  edge_function_url text;
+  payload jsonb;
+  user_email text;
+BEGIN
+  -- Get user email from auth.users
+  SELECT email INTO user_email
+  FROM auth.users
+  WHERE id = NEW.user_id;
+  
+  IF user_email IS NULL THEN
+    RAISE NOTICE 'No email found for user %', NEW.user_id;
+    RETURN NEW;
+  END IF;
+
+  -- Get base URL from settings
+  SELECT setting_value::text INTO base_url 
+  FROM admin_settings 
+  WHERE setting_key = 'supabase_api_url';
+  
+  base_url := trim(both '"' from base_url);
+  
+  IF base_url IS NULL THEN
+    base_url := 'https://api.thrillwiki.com';
+  END IF;
+  
+  edge_function_url := base_url || '/functions/v1/create-novu-subscriber';
+  
+  payload := jsonb_build_object(
+    'user_id', NEW.user_id,
+    'email', user_email,
+    'username', NEW.username
+  );
+
+  PERFORM public.pg_net.http_post(
+    edge_function_url,
+    payload::text,
+    'application/json'
+  );
+
+  RETURN NEW;
+EXCEPTION WHEN OTHERS THEN
+  RAISE NOTICE 'Failed to create Novu subscriber: %', SQLERRM;
+  RETURN NEW;
+END;
+$function$;
+
+-- Add comments for documentation
+COMMENT ON FUNCTION public.notify_discord_via_edge() IS 
+  'Trigger function to notify Discord via edge function - uses dynamic URL from admin_settings';
+
+COMMENT ON FUNCTION public.notify_moderators_submission_new() IS 
+  'Trigger function to notify moderators of new submissions - uses dynamic URL from admin_settings';
+
+COMMENT ON FUNCTION public.notify_moderators_report_new() IS 
+  'Trigger function to notify moderators of new reports - uses dynamic URL from admin_settings';
+
+COMMENT ON FUNCTION public.notify_user_submission_status_change() IS 
+  'Trigger function to notify users of submission status changes - uses dynamic URL from admin_settings';
+
+COMMENT ON FUNCTION public.manage_moderator_topic_trigger() IS 
+  'Trigger function to manage Novu moderator topic subscriptions - uses dynamic URL from admin_settings';
+
+COMMENT ON FUNCTION public.create_novu_subscriber_trigger() IS 
+  'Trigger function to create Novu subscriber on profile creation - uses dynamic URL from admin_settings';