Better autocomplete

Author: robotzurg

src/commands/moderation/cancelMatch.ts

@@ -6,11 +6,8 @@ import {
   PermissionFlagsBits,
 } from 'discord.js'
 import { COMMAND_HANDLERS } from '../../command-handlers'
-import {
-  getActiveMatches,
-  getQueueIdFromMatch,
-  getQueueSettings,
-} from '../../utils/queryDB'
+import { getQueueIdFromMatch, getQueueSettings } from '../../utils/queryDB'
+import { getMatchesForAutocomplete } from '../../utils/Autocompletions'
 
 export default {
   data: new SlashCommandBuilder()
@@ -71,11 +68,11 @@ export default {
 
   async autocomplete(interaction: AutocompleteInteraction) {
     try {
-      const focusedValue = interaction.options.getFocused().toLowerCase()
-      const activeMatches = await getActiveMatches()
+      const focusedValue = interaction.options.getFocused()
+      const matches = await getMatchesForAutocomplete(focusedValue)
 
       const choices = await Promise.all(
-        activeMatches.map(async (match) => {
+        matches.map(async (match) => {
           const queueId = await getQueueIdFromMatch(match.id)
           const queueSettings = await getQueueSettings(queueId, ['queue_name'])
           return {
@@ -85,11 +82,7 @@ export default {
         }),
       )
 
-      const filtered = choices.filter((choice) =>
-        choice.name.toLowerCase().includes(focusedValue),
-      )
-
-      await interaction.respond(filtered.slice(0, 25))
+      await interaction.respond(choices)
     } catch (err) {
       console.error('Error in cancel-match autocomplete:', err)
       await interaction.respond([])

src/commands/moderation/giveWin.ts

@@ -6,8 +6,9 @@ import {
   SlashCommandBuilder,
 } from 'discord.js'
 import { getUsersInMatch, getUserTeam } from '../../utils/queryDB'
-import { pool } from '../../db'
 import { endMatch } from '../../utils/matchHelpers'
+import { getMatchesForAutocomplete } from '../../utils/Autocompletions'
+import { pool } from '../../db'
 
 export default {
   data: new SlashCommandBuilder()
@@ -92,22 +93,20 @@ export default {
       )
       await interaction.respond(filtered.slice(0, 25))
     } else if (currentValue.name === 'match-id') {
-      const input = currentValue.value
-      const matches = await pool.query(
-        'SELECT id FROM matches ORDER BY id DESC',
-      )
-      if (!matches.rows || matches.rows.length === 0) {
+      const input = currentValue.value ?? ''
+      const matches = await getMatchesForAutocomplete(input)
+
+      if (!matches || matches.length === 0) {
         await interaction.respond([])
         return
       }
-      const matchIds = matches.rows.map((match: any) => ({
-        name: (interaction.channelId = match.id.toString())
-          ? `${match.id.toString()}`
-          : match.id.toString(),
+
+      const matchIds = matches.map((match) => ({
+        name: match.id.toString(),
         value: match.id.toString(),
       }))
-      const filtered = matchIds.filter((match) => match.name.includes(input))
-      await interaction.respond(filtered.slice(0, 25))
+
+      await interaction.respond(matchIds)
     }
   },
 }

src/utils/Autocompletions.ts

@@ -1,6 +1,7 @@
 import { AutocompleteInteraction, User } from 'discord.js'
 import { getAllOpenRooms, strikeUtils } from './queryDB'
 import { client } from '../client'
+import { pool } from '../db'
 
 const userCache = new Map<string, User>()
 
@@ -186,3 +187,34 @@ export async function roomDeleteAutoCompletion(
   await interaction.respond(choices)
   return
 }
+
+// Show all active matches for autocomplete using prefix
+export async function getMatchesForAutocomplete(
+  input: string,
+): Promise<{ id: number }[]> {
+  let query: string
+  let params: any[]
+
+  if (input.length > 0) {
+    query = `
+      SELECT id FROM matches
+      WHERE open = true
+        AND id::text ILIKE $1
+      ORDER BY id DESC
+      LIMIT 25
+    `
+    params = [`${input}%`]
+  } else {
+    // Show 25 matches with no input
+    query = `
+      SELECT id FROM matches
+      WHERE open = true
+      ORDER BY id DESC
+      LIMIT 25
+    `
+    params = []
+  }
+
+  const result = await pool.query(query, params)
+  return result.rows
+}