rhythia-api 233.0.0 → 235.0.0

package/queries/enhanced_search.sql

@@ -1,217 +1,217 @@
-CREATE OR REPLACE FUNCTION public.enhanced_search(search_text text, result_limit integer DEFAULT 10)
- RETURNS TABLE(result_type text, relevance double precision, user_id integer, user_username text, user_avatar_url text, user_about_me text, user_flag text, beatmap_page_id integer, beatmap_map_id text, beatmap_title text, beatmap_description text, beatmap_image text, beatmap_star_rating double precision, beatmap_length double precision, beatmap_status text, beatmap_tags text, beatmap_owner integer, beatmap_owner_username text, beatmap_owner_avatar text)
- LANGUAGE sql
- STABLE
-AS $function$
-  WITH raw_params AS (
-    SELECT
-      NULLIF(BTRIM(search_text), '') AS raw_search,
-      GREATEST(COALESCE(result_limit, 10), 1) AS limited_result_count
-  ),
-  params AS (
-    SELECT
-      raw_search,
-      LOWER(raw_search) AS lower_search,
-      raw_search || '%' AS prefix_search,
-      '%' || raw_search || '%' AS contains_search,
-      CASE
-        WHEN raw_search IS NULL THEN NULL
-        ELSE plainto_tsquery('simple', raw_search)
-      END AS ts_query,
-      limited_result_count
-    FROM raw_params
-  ),
-  user_base AS (
-    SELECT
-      p.id,
-      p.username,
-      p."computedUsername" AS computed_username,
-      p.avatar_url,
-      p.about_me,
-      p.flag,
-      COALESCE(p.badges::text, '') AS badges_text,
-      setweight(to_tsvector('simple', COALESCE(p.username, '')), 'A') ||
-      setweight(to_tsvector('simple', COALESCE(p."computedUsername", '')), 'A') ||
-      setweight(to_tsvector('simple', COALESCE(p.about_me, '')), 'B') ||
-      setweight(to_tsvector('simple', COALESCE(p.flag, '')), 'C') ||
-      setweight(to_tsvector('simple', COALESCE(p.badges::text, '')), 'C') AS search_vector
-    FROM public.profiles p
-    WHERE p.ban IS DISTINCT FROM 'excluded'
-  ),
-  user_scored AS (
-    SELECT
-      'user'::text AS result_type,
-      (
-        CASE WHEN u.id::text = params.raw_search THEN 250 ELSE 0 END +
-        CASE WHEN COALESCE(u.username, '') = params.raw_search THEN 220 ELSE 0 END +
-        CASE WHEN COALESCE(u.computed_username, '') = params.lower_search THEN 215 ELSE 0 END +
-        CASE WHEN LOWER(COALESCE(u.username, '')) = params.lower_search THEN 210 ELSE 0 END +
-        CASE WHEN COALESCE(u.username, '') ILIKE params.prefix_search THEN 160 ELSE 0 END +
-        CASE WHEN COALESCE(u.computed_username, '') ILIKE params.prefix_search THEN 150 ELSE 0 END +
-        CASE WHEN COALESCE(u.username, '') ILIKE params.contains_search THEN 90 ELSE 0 END +
-        CASE WHEN COALESCE(u.computed_username, '') ILIKE params.contains_search THEN 85 ELSE 0 END +
-        CASE WHEN COALESCE(u.about_me, '') ILIKE params.contains_search THEN 25 ELSE 0 END +
-        CASE WHEN COALESCE(u.flag, '') ILIKE params.prefix_search THEN 20 ELSE 0 END +
-        CASE WHEN u.badges_text ILIKE params.contains_search THEN 15 ELSE 0 END +
-        CASE
-          WHEN params.ts_query IS NULL THEN 0
-          ELSE ts_rank_cd(u.search_vector, params.ts_query) * 100
-        END
-      )::double precision AS relevance,
-      u.id AS user_id,
-      u.username AS user_username,
-      u.avatar_url AS user_avatar_url,
-      u.about_me AS user_about_me,
-      u.flag AS user_flag,
-      NULL::integer AS beatmap_page_id,
-      NULL::text AS beatmap_map_id,
-      NULL::text AS beatmap_title,
-      NULL::text AS beatmap_description,
-      NULL::text AS beatmap_image,
-      NULL::double precision AS beatmap_star_rating,
-      NULL::double precision AS beatmap_length,
-      NULL::text AS beatmap_status,
-      NULL::text AS beatmap_tags,
-      NULL::integer AS beatmap_owner,
-      NULL::text AS beatmap_owner_username,
-      NULL::text AS beatmap_owner_avatar
-    FROM user_base u
-    CROSS JOIN params
-    WHERE params.raw_search IS NOT NULL
-      AND (
-        u.id::text = params.raw_search
-        OR COALESCE(u.username, '') ILIKE params.contains_search
-        OR COALESCE(u.computed_username, '') ILIKE params.contains_search
-        OR COALESCE(u.about_me, '') ILIKE params.contains_search
-        OR COALESCE(u.flag, '') ILIKE params.contains_search
-        OR u.badges_text ILIKE params.contains_search
-        OR (params.ts_query IS NOT NULL AND u.search_vector @@ params.ts_query)
-      )
-  ),
-  limited_users AS (
-    SELECT *
-    FROM user_scored
-    WHERE relevance > 0
-    ORDER BY relevance DESC, user_username NULLS LAST, user_id
-    LIMIT (SELECT limited_result_count FROM params)
-  ),
-  beatmap_base AS (
-    SELECT
-      bp.id,
-      bp."latestBeatmapHash" AS map_id,
-      COALESCE(b.title, bp.title) AS display_title,
-      bp.description,
-      bp.tags,
-      bp.genre,
-      bp.status,
-      bp.owner,
-      p.username AS owner_username,
-      p.avatar_url AS owner_avatar_url,
-      b.image,
-      b."starRating"::double precision AS star_rating,
-      b.length::double precision AS beatmap_length,
-      COALESCE(b."beatmapFile", '') AS beatmap_file,
-      COALESCE(b."beatmapHash", '') AS beatmap_hash,
-      COALESCE(b.difficulty::text, '') AS difficulty_text,
-      COALESCE(b."noteCount"::text, '') AS note_count_text,
-      COALESCE(b.playcount::text, '') AS playcount_text,
-      setweight(to_tsvector('simple', COALESCE(COALESCE(b.title, bp.title), '')), 'A') ||
-      setweight(to_tsvector('simple', COALESCE(bp.title, '')), 'A') ||
-      setweight(to_tsvector('simple', COALESCE(p.username, '')), 'A') ||
-      setweight(to_tsvector('simple', COALESCE(bp.description, '')), 'B') ||
-      setweight(to_tsvector('simple', COALESCE(bp.tags, '')), 'B') ||
-      setweight(to_tsvector('simple', COALESCE(bp.genre, '')), 'C') ||
-      setweight(to_tsvector('simple', COALESCE(bp.status, '')), 'C') ||
-      setweight(to_tsvector('simple', COALESCE(b."beatmapFile", '')), 'C') ||
-      setweight(to_tsvector('simple', COALESCE(b."beatmapHash", '')), 'A') AS search_vector
-    FROM public."beatmapPages" bp
-    LEFT JOIN public.beatmaps b ON b."beatmapHash" = bp."latestBeatmapHash"
-    LEFT JOIN public.profiles p ON p.id = bp.owner
-  ),
-  beatmap_scored AS (
-    SELECT
-      'beatmap'::text AS result_type,
-      (
-        CASE WHEN bb.id::text = params.raw_search THEN 260 ELSE 0 END +
-        CASE WHEN COALESCE(bb.map_id, '') = params.raw_search THEN 240 ELSE 0 END +
-        CASE WHEN COALESCE(bb.display_title, '') = params.raw_search THEN 220 ELSE 0 END +
-        CASE WHEN LOWER(COALESCE(bb.display_title, '')) = params.lower_search THEN 215 ELSE 0 END +
-        CASE WHEN COALESCE(bb.display_title, '') ILIKE params.prefix_search THEN 160 ELSE 0 END +
-        CASE WHEN COALESCE(bb.display_title, '') ILIKE params.contains_search THEN 90 ELSE 0 END +
-        CASE WHEN COALESCE(bb.owner_username, '') = params.raw_search THEN 80 ELSE 0 END +
-        CASE WHEN COALESCE(bb.owner_username, '') ILIKE params.prefix_search THEN 70 ELSE 0 END +
-        CASE WHEN COALESCE(bb.owner_username, '') ILIKE params.contains_search THEN 50 ELSE 0 END +
-        CASE WHEN COALESCE(bb.tags, '') ILIKE params.contains_search THEN 35 ELSE 0 END +
-        CASE WHEN COALESCE(bb.description, '') ILIKE params.contains_search THEN 25 ELSE 0 END +
-        CASE WHEN COALESCE(bb.genre, '') ILIKE params.contains_search THEN 15 ELSE 0 END +
-        CASE WHEN COALESCE(bb.status, '') ILIKE params.contains_search THEN 15 ELSE 0 END +
-        CASE WHEN COALESCE(bb.beatmap_file, '') ILIKE params.contains_search THEN 15 ELSE 0 END +
-        CASE WHEN COALESCE(bb.beatmap_hash, '') ILIKE params.contains_search THEN 30 ELSE 0 END +
-        CASE WHEN COALESCE(bb.owner::text, '') = params.raw_search THEN 40 ELSE 0 END +
-        CASE WHEN COALESCE(bb.star_rating::text, '') = params.raw_search THEN 20 ELSE 0 END +
-        CASE WHEN COALESCE(bb.beatmap_length::text, '') = params.raw_search THEN 15 ELSE 0 END +
-        CASE WHEN COALESCE(bb.difficulty_text, '') = params.raw_search THEN 10 ELSE 0 END +
-        CASE WHEN COALESCE(bb.note_count_text, '') = params.raw_search THEN 10 ELSE 0 END +
-        CASE WHEN COALESCE(bb.playcount_text, '') = params.raw_search THEN 10 ELSE 0 END +
-        CASE
-          WHEN params.ts_query IS NULL THEN 0
-          ELSE ts_rank_cd(bb.search_vector, params.ts_query) * 110
-        END
-      )::double precision AS relevance,
-      NULL::integer AS user_id,
-      NULL::text AS user_username,
-      NULL::text AS user_avatar_url,
-      NULL::text AS user_about_me,
-      NULL::text AS user_flag,
-      bb.id AS beatmap_page_id,
-      bb.map_id AS beatmap_map_id,
-      bb.display_title AS beatmap_title,
-      bb.description AS beatmap_description,
-      bb.image AS beatmap_image,
-      bb.star_rating AS beatmap_star_rating,
-      bb.beatmap_length AS beatmap_length,
-      bb.status AS beatmap_status,
-      bb.tags AS beatmap_tags,
-      bb.owner AS beatmap_owner,
-      bb.owner_username AS beatmap_owner_username,
-      bb.owner_avatar_url AS beatmap_owner_avatar
-    FROM beatmap_base bb
-    CROSS JOIN params
-    WHERE params.raw_search IS NOT NULL
-      AND (
-        bb.id::text = params.raw_search
-        OR COALESCE(bb.map_id, '') ILIKE params.contains_search
-        OR COALESCE(bb.display_title, '') ILIKE params.contains_search
-        OR COALESCE(bb.description, '') ILIKE params.contains_search
-        OR COALESCE(bb.tags, '') ILIKE params.contains_search
-        OR COALESCE(bb.genre, '') ILIKE params.contains_search
-        OR COALESCE(bb.status, '') ILIKE params.contains_search
-        OR COALESCE(bb.owner_username, '') ILIKE params.contains_search
-        OR COALESCE(bb.beatmap_file, '') ILIKE params.contains_search
-        OR COALESCE(bb.beatmap_hash, '') ILIKE params.contains_search
-        OR COALESCE(bb.owner::text, '') = params.raw_search
-        OR COALESCE(bb.star_rating::text, '') = params.raw_search
-        OR COALESCE(bb.beatmap_length::text, '') = params.raw_search
-        OR COALESCE(bb.difficulty_text, '') = params.raw_search
-        OR COALESCE(bb.note_count_text, '') = params.raw_search
-        OR COALESCE(bb.playcount_text, '') = params.raw_search
-        OR (params.ts_query IS NOT NULL AND bb.search_vector @@ params.ts_query)
-      )
-  ),
-  limited_beatmaps AS (
-    SELECT *
-    FROM beatmap_scored
-    WHERE relevance > 0
-    ORDER BY relevance DESC, beatmap_title NULLS LAST, beatmap_page_id
-    LIMIT (SELECT limited_result_count FROM params)
-  )
-  SELECT *
-  FROM (
-    SELECT *
-    FROM limited_users
-    UNION ALL
-    SELECT *
-    FROM limited_beatmaps
-  ) AS combined_results
-  ORDER BY result_type DESC, relevance DESC, COALESCE(user_username, beatmap_title) NULLS LAST, COALESCE(user_id, beatmap_page_id);
-$function$;
+CREATE OR REPLACE FUNCTION public.enhanced_search(search_text text, result_limit integer DEFAULT 10)
+ RETURNS TABLE(result_type text, relevance double precision, user_id integer, user_username text, user_avatar_url text, user_about_me text, user_flag text, beatmap_page_id integer, beatmap_map_id text, beatmap_title text, beatmap_description text, beatmap_image text, beatmap_star_rating double precision, beatmap_length double precision, beatmap_status text, beatmap_tags text, beatmap_owner integer, beatmap_owner_username text, beatmap_owner_avatar text)
+ LANGUAGE sql
+ STABLE
+AS $function$
+  WITH raw_params AS (
+    SELECT
+      NULLIF(BTRIM(search_text), '') AS raw_search,
+      GREATEST(COALESCE(result_limit, 10), 1) AS limited_result_count
+  ),
+  params AS (
+    SELECT
+      raw_search,
+      LOWER(raw_search) AS lower_search,
+      raw_search || '%' AS prefix_search,
+      '%' || raw_search || '%' AS contains_search,
+      CASE
+        WHEN raw_search IS NULL THEN NULL
+        ELSE plainto_tsquery('simple', raw_search)
+      END AS ts_query,
+      limited_result_count
+    FROM raw_params
+  ),
+  user_base AS (
+    SELECT
+      p.id,
+      p.username,
+      p."computedUsername" AS computed_username,
+      p.avatar_url,
+      p.about_me,
+      p.flag,
+      COALESCE(p.badges::text, '') AS badges_text,
+      setweight(to_tsvector('simple', COALESCE(p.username, '')), 'A') ||
+      setweight(to_tsvector('simple', COALESCE(p."computedUsername", '')), 'A') ||
+      setweight(to_tsvector('simple', COALESCE(p.about_me, '')), 'B') ||
+      setweight(to_tsvector('simple', COALESCE(p.flag, '')), 'C') ||
+      setweight(to_tsvector('simple', COALESCE(p.badges::text, '')), 'C') AS search_vector
+    FROM public.profiles p
+    WHERE p.ban IS DISTINCT FROM 'excluded'
+  ),
+  user_scored AS (
+    SELECT
+      'user'::text AS result_type,
+      (
+        CASE WHEN u.id::text = params.raw_search THEN 250 ELSE 0 END +
+        CASE WHEN COALESCE(u.username, '') = params.raw_search THEN 220 ELSE 0 END +
+        CASE WHEN COALESCE(u.computed_username, '') = params.lower_search THEN 215 ELSE 0 END +
+        CASE WHEN LOWER(COALESCE(u.username, '')) = params.lower_search THEN 210 ELSE 0 END +
+        CASE WHEN COALESCE(u.username, '') ILIKE params.prefix_search THEN 160 ELSE 0 END +
+        CASE WHEN COALESCE(u.computed_username, '') ILIKE params.prefix_search THEN 150 ELSE 0 END +
+        CASE WHEN COALESCE(u.username, '') ILIKE params.contains_search THEN 90 ELSE 0 END +
+        CASE WHEN COALESCE(u.computed_username, '') ILIKE params.contains_search THEN 85 ELSE 0 END +
+        CASE WHEN COALESCE(u.about_me, '') ILIKE params.contains_search THEN 25 ELSE 0 END +
+        CASE WHEN COALESCE(u.flag, '') ILIKE params.prefix_search THEN 20 ELSE 0 END +
+        CASE WHEN u.badges_text ILIKE params.contains_search THEN 15 ELSE 0 END +
+        CASE
+          WHEN params.ts_query IS NULL THEN 0
+          ELSE ts_rank_cd(u.search_vector, params.ts_query) * 100
+        END
+      )::double precision AS relevance,
+      u.id AS user_id,
+      u.username AS user_username,
+      u.avatar_url AS user_avatar_url,
+      u.about_me AS user_about_me,
+      u.flag AS user_flag,
+      NULL::integer AS beatmap_page_id,
+      NULL::text AS beatmap_map_id,
+      NULL::text AS beatmap_title,
+      NULL::text AS beatmap_description,
+      NULL::text AS beatmap_image,
+      NULL::double precision AS beatmap_star_rating,
+      NULL::double precision AS beatmap_length,
+      NULL::text AS beatmap_status,
+      NULL::text AS beatmap_tags,
+      NULL::integer AS beatmap_owner,
+      NULL::text AS beatmap_owner_username,
+      NULL::text AS beatmap_owner_avatar
+    FROM user_base u
+    CROSS JOIN params
+    WHERE params.raw_search IS NOT NULL
+      AND (
+        u.id::text = params.raw_search
+        OR COALESCE(u.username, '') ILIKE params.contains_search
+        OR COALESCE(u.computed_username, '') ILIKE params.contains_search
+        OR COALESCE(u.about_me, '') ILIKE params.contains_search
+        OR COALESCE(u.flag, '') ILIKE params.contains_search
+        OR u.badges_text ILIKE params.contains_search
+        OR (params.ts_query IS NOT NULL AND u.search_vector @@ params.ts_query)
+      )
+  ),
+  limited_users AS (
+    SELECT *
+    FROM user_scored
+    WHERE relevance > 0
+    ORDER BY relevance DESC, user_username NULLS LAST, user_id
+    LIMIT (SELECT limited_result_count FROM params)
+  ),
+  beatmap_base AS (
+    SELECT
+      bp.id,
+      bp."latestBeatmapHash" AS map_id,
+      COALESCE(b.title, bp.title) AS display_title,
+      bp.description,
+      bp.tags,
+      bp.genre,
+      bp.status,
+      bp.owner,
+      p.username AS owner_username,
+      p.avatar_url AS owner_avatar_url,
+      b.image,
+      b."starRating"::double precision AS star_rating,
+      b.length::double precision AS beatmap_length,
+      COALESCE(b."beatmapFile", '') AS beatmap_file,
+      COALESCE(b."beatmapHash", '') AS beatmap_hash,
+      COALESCE(b.difficulty::text, '') AS difficulty_text,
+      COALESCE(b."noteCount"::text, '') AS note_count_text,
+      COALESCE(b.playcount::text, '') AS playcount_text,
+      setweight(to_tsvector('simple', COALESCE(COALESCE(b.title, bp.title), '')), 'A') ||
+      setweight(to_tsvector('simple', COALESCE(bp.title, '')), 'A') ||
+      setweight(to_tsvector('simple', COALESCE(p.username, '')), 'A') ||
+      setweight(to_tsvector('simple', COALESCE(bp.description, '')), 'B') ||
+      setweight(to_tsvector('simple', COALESCE(bp.tags, '')), 'B') ||
+      setweight(to_tsvector('simple', COALESCE(bp.genre, '')), 'C') ||
+      setweight(to_tsvector('simple', COALESCE(bp.status, '')), 'C') ||
+      setweight(to_tsvector('simple', COALESCE(b."beatmapFile", '')), 'C') ||
+      setweight(to_tsvector('simple', COALESCE(b."beatmapHash", '')), 'A') AS search_vector
+    FROM public."beatmapPages" bp
+    LEFT JOIN public.beatmaps b ON b."beatmapHash" = bp."latestBeatmapHash"
+    LEFT JOIN public.profiles p ON p.id = bp.owner
+  ),
+  beatmap_scored AS (
+    SELECT
+      'beatmap'::text AS result_type,
+      (
+        CASE WHEN bb.id::text = params.raw_search THEN 260 ELSE 0 END +
+        CASE WHEN COALESCE(bb.map_id, '') = params.raw_search THEN 240 ELSE 0 END +
+        CASE WHEN COALESCE(bb.display_title, '') = params.raw_search THEN 220 ELSE 0 END +
+        CASE WHEN LOWER(COALESCE(bb.display_title, '')) = params.lower_search THEN 215 ELSE 0 END +
+        CASE WHEN COALESCE(bb.display_title, '') ILIKE params.prefix_search THEN 160 ELSE 0 END +
+        CASE WHEN COALESCE(bb.display_title, '') ILIKE params.contains_search THEN 90 ELSE 0 END +
+        CASE WHEN COALESCE(bb.owner_username, '') = params.raw_search THEN 80 ELSE 0 END +
+        CASE WHEN COALESCE(bb.owner_username, '') ILIKE params.prefix_search THEN 70 ELSE 0 END +
+        CASE WHEN COALESCE(bb.owner_username, '') ILIKE params.contains_search THEN 50 ELSE 0 END +
+        CASE WHEN COALESCE(bb.tags, '') ILIKE params.contains_search THEN 35 ELSE 0 END +
+        CASE WHEN COALESCE(bb.description, '') ILIKE params.contains_search THEN 25 ELSE 0 END +
+        CASE WHEN COALESCE(bb.genre, '') ILIKE params.contains_search THEN 15 ELSE 0 END +
+        CASE WHEN COALESCE(bb.status, '') ILIKE params.contains_search THEN 15 ELSE 0 END +
+        CASE WHEN COALESCE(bb.beatmap_file, '') ILIKE params.contains_search THEN 15 ELSE 0 END +
+        CASE WHEN COALESCE(bb.beatmap_hash, '') ILIKE params.contains_search THEN 30 ELSE 0 END +
+        CASE WHEN COALESCE(bb.owner::text, '') = params.raw_search THEN 40 ELSE 0 END +
+        CASE WHEN COALESCE(bb.star_rating::text, '') = params.raw_search THEN 20 ELSE 0 END +
+        CASE WHEN COALESCE(bb.beatmap_length::text, '') = params.raw_search THEN 15 ELSE 0 END +
+        CASE WHEN COALESCE(bb.difficulty_text, '') = params.raw_search THEN 10 ELSE 0 END +
+        CASE WHEN COALESCE(bb.note_count_text, '') = params.raw_search THEN 10 ELSE 0 END +
+        CASE WHEN COALESCE(bb.playcount_text, '') = params.raw_search THEN 10 ELSE 0 END +
+        CASE
+          WHEN params.ts_query IS NULL THEN 0
+          ELSE ts_rank_cd(bb.search_vector, params.ts_query) * 110
+        END
+      )::double precision AS relevance,
+      NULL::integer AS user_id,
+      NULL::text AS user_username,
+      NULL::text AS user_avatar_url,
+      NULL::text AS user_about_me,
+      NULL::text AS user_flag,
+      bb.id AS beatmap_page_id,
+      bb.map_id AS beatmap_map_id,
+      bb.display_title AS beatmap_title,
+      bb.description AS beatmap_description,
+      bb.image AS beatmap_image,
+      bb.star_rating AS beatmap_star_rating,
+      bb.beatmap_length AS beatmap_length,
+      bb.status AS beatmap_status,
+      bb.tags AS beatmap_tags,
+      bb.owner AS beatmap_owner,
+      bb.owner_username AS beatmap_owner_username,
+      bb.owner_avatar_url AS beatmap_owner_avatar
+    FROM beatmap_base bb
+    CROSS JOIN params
+    WHERE params.raw_search IS NOT NULL
+      AND (
+        bb.id::text = params.raw_search
+        OR COALESCE(bb.map_id, '') ILIKE params.contains_search
+        OR COALESCE(bb.display_title, '') ILIKE params.contains_search
+        OR COALESCE(bb.description, '') ILIKE params.contains_search
+        OR COALESCE(bb.tags, '') ILIKE params.contains_search
+        OR COALESCE(bb.genre, '') ILIKE params.contains_search
+        OR COALESCE(bb.status, '') ILIKE params.contains_search
+        OR COALESCE(bb.owner_username, '') ILIKE params.contains_search
+        OR COALESCE(bb.beatmap_file, '') ILIKE params.contains_search
+        OR COALESCE(bb.beatmap_hash, '') ILIKE params.contains_search
+        OR COALESCE(bb.owner::text, '') = params.raw_search
+        OR COALESCE(bb.star_rating::text, '') = params.raw_search
+        OR COALESCE(bb.beatmap_length::text, '') = params.raw_search
+        OR COALESCE(bb.difficulty_text, '') = params.raw_search
+        OR COALESCE(bb.note_count_text, '') = params.raw_search
+        OR COALESCE(bb.playcount_text, '') = params.raw_search
+        OR (params.ts_query IS NOT NULL AND bb.search_vector @@ params.ts_query)
+      )
+  ),
+  limited_beatmaps AS (
+    SELECT *
+    FROM beatmap_scored
+    WHERE relevance > 0
+    ORDER BY relevance DESC, beatmap_title NULLS LAST, beatmap_page_id
+    LIMIT (SELECT limited_result_count FROM params)
+  )
+  SELECT *
+  FROM (
+    SELECT *
+    FROM limited_users
+    UNION ALL
+    SELECT *
+    FROM limited_beatmaps
+  ) AS combined_results
+  ORDER BY result_type DESC, relevance DESC, COALESCE(user_username, beatmap_title) NULLS LAST, COALESCE(user_id, beatmap_page_id);
+$function$;

package/queries/get_badge_leaderboard.sql

@@ -1,50 +1,50 @@
-CREATE OR REPLACE FUNCTION public.get_badge_leaderboard(p_limit integer DEFAULT 100)
- RETURNS TABLE(id integer, display_name text, avatar_url text, special_badge_count integer)
- LANGUAGE plpgsql
- SECURITY DEFINER
-AS $function$
-BEGIN
-  RETURN QUERY
-  WITH special_badges AS (
-    SELECT unnest(ARRAY[
-      'The Start of an Era',
-      'New Farm', 
-      'Spinnin',
-      'Old Farm',
-      'Birb',
-      'Flamingos',
-      'Cats!'
-    ]) AS badge_name
-  ),
-  user_badge_data AS (
-    SELECT 
-      p.id::INTEGER as id,
-      p.username,
-      p.avatar_url,
-      p."computedUsername",
-      json_array_elements_text(COALESCE(p.badges, '[]'::json)) as user_badge
-    FROM profiles p
-    WHERE p.username IS NOT NULL 
-      AND (p.ban IS NULL OR p.ban != 'excluded')
-  ),
-  user_special_badge_counts AS (
-    SELECT 
-      ubd.id,
-      ubd.username,
-      ubd.avatar_url,
-      ubd."computedUsername",
-      COUNT(DISTINCT sb.badge_name)::INTEGER as special_badge_count
-    FROM user_badge_data ubd
-    INNER JOIN special_badges sb ON ubd.user_badge = sb.badge_name
-    GROUP BY ubd.id, ubd.username, ubd.avatar_url, ubd."computedUsername"
-  )
-  SELECT 
-    usbc.id,
-    COALESCE(usbc."computedUsername", usbc.username) as display_name,
-    usbc.avatar_url,
-    usbc.special_badge_count
-  FROM user_special_badge_counts usbc
-  ORDER BY usbc.special_badge_count DESC, display_name ASC
-  LIMIT p_limit;
-END;
-$function$
+CREATE OR REPLACE FUNCTION public.get_badge_leaderboard(p_limit integer DEFAULT 100)
+ RETURNS TABLE(id integer, display_name text, avatar_url text, special_badge_count integer)
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+AS $function$
+BEGIN
+  RETURN QUERY
+  WITH special_badges AS (
+    SELECT unnest(ARRAY[
+      'The Start of an Era',
+      'New Farm', 
+      'Spinnin',
+      'Old Farm',
+      'Birb',
+      'Flamingos',
+      'Cats!'
+    ]) AS badge_name
+  ),
+  user_badge_data AS (
+    SELECT 
+      p.id::INTEGER as id,
+      p.username,
+      p.avatar_url,
+      p."computedUsername",
+      json_array_elements_text(COALESCE(p.badges, '[]'::json)) as user_badge
+    FROM profiles p
+    WHERE p.username IS NOT NULL 
+      AND (p.ban IS NULL OR p.ban != 'excluded')
+  ),
+  user_special_badge_counts AS (
+    SELECT 
+      ubd.id,
+      ubd.username,
+      ubd.avatar_url,
+      ubd."computedUsername",
+      COUNT(DISTINCT sb.badge_name)::INTEGER as special_badge_count
+    FROM user_badge_data ubd
+    INNER JOIN special_badges sb ON ubd.user_badge = sb.badge_name
+    GROUP BY ubd.id, ubd.username, ubd.avatar_url, ubd."computedUsername"
+  )
+  SELECT 
+    usbc.id,
+    COALESCE(usbc."computedUsername", usbc.username) as display_name,
+    usbc.avatar_url,
+    usbc.special_badge_count
+  FROM user_special_badge_counts usbc
+  ORDER BY usbc.special_badge_count DESC, display_name ASC
+  LIMIT p_limit;
+END;
+$function$