Enable all commands except /locale for user installation in preview (#…

…506)

Server-specific emojis do not work in the user-install context

#432

.github/workflows/docker.yml

@@ -122,3 +122,4 @@ jobs:
         run: |
           docker context use default
           docker run -e DISCORD_TOKEN -e BOT_NO_DIRECT_MESSAGE_SEARCH=1 ${{ fromJSON(needs.build.outputs.json).tags[0] }} --deploy-slash 381294999729340417
+          docker run -e DISCORD_TOKEN -e BOT_NO_DIRECT_MESSAGE_SEARCH=1 ${{ fromJSON(needs.build.outputs.json).tags[0] }} --deploy-slash user-install

src/commands/art.ts

@@ -1,4 +1,3 @@
-import { SlashCommandBuilder } from "@discordjs/builders";
 import { RESTPostAPIApplicationCommandsJSONBody } from "discord-api-types/v10";
 import { ChatInputCommandInteraction } from "discord.js";
 import { Got } from "got";
@@ -10,6 +9,7 @@ import { getCard, getCardSearchOptions, getRubylessCardName, masterDuelIllustrat
 import {
 	LocaleProvider,
 	buildLocalisedCommand,
+	everywhereCommand,
 	getKonamiIdSubcommand,
 	getNameSubcommand,
 	getPasswordSubcommand
@@ -32,7 +32,7 @@ export class ArtCommand extends Command {
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
 		const builder = buildLocalisedCommand(
-			new SlashCommandBuilder(),
+			everywhereCommand(),
 			() => c("command-name").t`art`,
 			() => c("command-description").t`Display the art for a card!`
 		);

src/commands/deck.ts

@@ -1,7 +1,6 @@
 import {
 	SlashCommandAttachmentOption,
 	SlashCommandBooleanOption,
-	SlashCommandBuilder,
 	SlashCommandStringOption,
 	SlashCommandSubcommandBuilder
 } from "@discordjs/builders";
@@ -30,7 +29,7 @@ import { TypedDeck, parseURL, toURL } from "ydke";
 import { Command } from "../Command";
 import { getRubylessCardName } from "../card";
 import { CardSchema } from "../definitions";
-import { COMMAND_LOCALIZATIONS, Locale, LocaleProvider } from "../locale";
+import { COMMAND_LOCALIZATIONS, Locale, LocaleProvider, everywhereCommand } from "../locale";
 import { Logger, getLogger } from "../logger";
 import { Metrics } from "../metrics";
 import { addNotice, serialiseInteraction, splitText } from "../utils";
@@ -83,7 +82,7 @@ export class DeckCommand extends Command {
 	}
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
-		const builder = new SlashCommandBuilder()
+		const builder = everywhereCommand()
 			.setName("deck")
 			.setDescription(
 				"Display a deck list from ydke:// or .ydk format, exported from a number of deck building programs."

src/commands/help.ts

@@ -1,10 +1,10 @@
-import { SlashCommandBuilder, SlashCommandStringOption } from "@discordjs/builders";
+import { SlashCommandStringOption } from "@discordjs/builders";
 import { RESTPostAPIApplicationCommandsJSONBody } from "discord-api-types/v10";
 import { ChatInputCommandInteraction } from "discord.js";
 import { inject, injectable } from "tsyringe";
 import { c, useLocale } from "ttag";
 import { Command } from "../Command";
-import { COMMAND_LOCALIZATIONS, LocaleProvider } from "../locale";
+import { COMMAND_LOCALIZATIONS, everywhereCommand, LocaleProvider } from "../locale";
 import { getLogger, Logger } from "../logger";
 import { Metrics } from "../metrics";
 import { replyLatency } from "../utils";
@@ -13,12 +13,15 @@ import { replyLatency } from "../utils";
 export class HelpCommand extends Command {
 	#logger = getLogger("command:help");
 
-	constructor(metrics: Metrics, @inject("LocaleProvider") private locales: LocaleProvider) {
+	constructor(
+		metrics: Metrics,
+		@inject("LocaleProvider") private locales: LocaleProvider
+	) {
 		super(metrics);
 	}
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
-		const builder = new SlashCommandBuilder().setName("help").setDescription("Get help with a Slash Command.");
+		const builder = everywhereCommand().setName("help").setDescription("Get help with a Slash Command.");
 
 		// update this when documentation is added for new commands!
 		const documentedCommands = [

src/commands/id.ts

@@ -1,10 +1,11 @@
-import { SlashCommandBuilder, SlashCommandStringOption } from "@discordjs/builders";
+import { SlashCommandStringOption } from "@discordjs/builders";
 import { RESTPostAPIApplicationCommandsJSONBody } from "discord-api-types/v10";
 import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js";
 import { Got } from "got";
 import { inject, injectable } from "tsyringe";
 import { getCard, inferInputType } from "../card";
 import { Command } from "../Command";
+import { everywhereCommand } from "../locale";
 import { getLogger, Logger } from "../logger";
 import { Metrics } from "../metrics";
 import { addNotice, searchQueryTypeStringOption } from "../utils";
@@ -13,12 +14,15 @@ import { addNotice, searchQueryTypeStringOption } from "../utils";
 export class IdCommand extends Command {
 	#logger = getLogger("command:id");
 
-	constructor(metrics: Metrics, @inject("got") private got: Got) {
+	constructor(
+		metrics: Metrics,
+		@inject("got") private got: Got
+	) {
 		super(metrics);
 	}
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
-		return new SlashCommandBuilder()
+		return everywhereCommand()
 			.setName("id")
 			.setDescription("Identify a card by password, Konami ID, or name.")
 			.addStringOption(

src/commands/index.ts

@@ -1,5 +1,6 @@
 import { REST } from "@discordjs/rest";
 import { APIUser, Routes } from "discord-api-types/v10";
+import { ApplicationIntegrationType } from "discord.js";
 import { ArtCommand } from "./art";
 import { DeckCommand } from "./deck";
 import { HelpCommand } from "./help";
@@ -61,9 +62,16 @@ export {
 // Register Slash Commands on CI
 // Specify the guild snowflake to instantly deploy commands on the specified server.
 // Otherwise, global commands can take up to an hour to roll out.
-export async function registerSlashCommands(guild?: `${bigint}`): Promise<void> {
-	// Duplicate command metadata if they register any aliases
-	const commands = classes.map(command => command.meta);
+export async function registerSlashCommands(guild?: `${bigint}` | "user-install"): Promise<void> {
+	const commands =
+		guild === "user-install"
+			? classes
+					.filter(command => command.meta.integration_types)
+					.map(command => ({
+						...command.meta,
+						integration_types: [ApplicationIntegrationType.UserInstall]
+					}))
+			: classes.map(command => command.meta);
 	console.log("Generated command metadata:");
 	console.log(JSON.stringify(commands, null, 4));
 
@@ -75,7 +83,7 @@ export async function registerSlashCommands(guild?: `${bigint}`): Promise<void>
 	console.log(`${botUser.username}#${botUser.discriminator}`);
 
 	const created = await api.put(
-		guild === undefined
+		guild === undefined || guild === "user-install"
 			? Routes.applicationCommands(botUser.id)
 			: Routes.applicationGuildCommands(botUser.id, guild),
 		{ body: commands }

src/commands/link.ts

@@ -1,7 +1,8 @@
 import { RESTPostAPIApplicationCommandsJSONBody } from "discord-api-types/v10";
-import { ApplicationCommandOptionType, ChatInputCommandInteraction } from "discord.js";
+import { ChatInputCommandInteraction } from "discord.js";
 import { inject, injectable } from "tsyringe";
 import { Command } from "../Command";
+import { everywhereCommand } from "../locale";
 import { Logger, getLogger } from "../logger";
 import { Metrics } from "../metrics";
 import { replyLatency } from "../utils";
@@ -74,24 +75,22 @@ export class LinkCommand extends Command {
 	};
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
-		return {
-			name: "link",
-			description: "Display one of several links with useful information.",
-			options: [
-				{
-					type: ApplicationCommandOptionType.String.valueOf(),
-					name: "key",
-					description: "The name of the link you want to display.",
-					required: true,
-					choices: Object.keys(LinkCommand.links).map(k => {
-						return {
+		return everywhereCommand()
+			.setName("link")
+			.setDescription("Display one of several links with useful information.")
+			.addStringOption(option =>
+				option
+					.setName("key")
+					.setDescription("The name of the link you want to display.")
+					.setRequired(true)
+					.setChoices(
+						Object.keys(LinkCommand.links).map(k => ({
 							name: LinkCommand.links[k].name,
 							value: k
-						};
-					})
-				}
-			]
-		};
+						}))
+					)
+			)
+			.toJSON();
 	}
 
 	protected override get logger(): Logger {

src/commands/metagame.ts

@@ -3,15 +3,14 @@ import {
 	ChatInputCommandInteraction,
 	EmbedBuilder,
 	RESTPostAPIApplicationCommandsJSONBody,
-	SlashCommandBuilder,
 	SlashCommandStringOption,
 	SlashCommandSubcommandBuilder
 } from "discord.js";
 import { Got } from "got";
 import { inject, injectable } from "tsyringe";
 import { c } from "ttag";
 import { Command } from "../Command";
-import { buildLocalisedChoice, buildLocalisedCommand } from "../locale";
+import { buildLocalisedChoice, buildLocalisedCommand, everywhereCommand } from "../locale";
 import { Logger, getLogger } from "../logger";
 import { Metrics } from "../metrics";
 import { replyLatency } from "../utils";
@@ -201,7 +200,7 @@ export class MetagameCommand extends Command {
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
 		const builder = buildLocalisedCommand(
-			new SlashCommandBuilder(),
+			everywhereCommand(),
 			() => c("command-name").t`metagame`,
 			() => c("command-description").t`Show statistics on the current competitive state of play.`
 		);

src/commands/ping.ts

@@ -1,10 +1,9 @@
-import { SlashCommandBuilder } from "@discordjs/builders";
 import { RESTPostAPIApplicationCommandsJSONBody } from "discord-api-types/v10";
 import { ChatInputCommandInteraction } from "discord.js";
 import { inject, injectable } from "tsyringe";
 import { c, t, useLocale } from "ttag";
 import { Command } from "../Command";
-import { buildLocalisedCommand, LocaleProvider } from "../locale";
+import { buildLocalisedCommand, everywhereCommand, LocaleProvider } from "../locale";
 import { getLogger, Logger } from "../logger";
 import { Metrics } from "../metrics";
 import { replyLatency } from "../utils";
@@ -13,13 +12,16 @@ import { replyLatency } from "../utils";
 export class PingCommand extends Command {
 	#logger = getLogger("command:ping");
 
-	constructor(metrics: Metrics, @inject("LocaleProvider") private locales: LocaleProvider) {
+	constructor(
+		metrics: Metrics,
+		@inject("LocaleProvider") private locales: LocaleProvider
+	) {
 		super(metrics);
 	}
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
 		return buildLocalisedCommand(
-			new SlashCommandBuilder(),
+			everywhereCommand(),
 			() => c("command-name").t`ping`,
 			() => c("command-description").t`Test latency to the new bot instance.`
 		).toJSON();

src/commands/price.ts

@@ -1,4 +1,4 @@
-import { SlashCommandBuilder, SlashCommandStringOption } from "@discordjs/builders";
+import { SlashCommandStringOption } from "@discordjs/builders";
 import { Static } from "@sinclair/typebox";
 import { RESTPostAPIApplicationCommandsJSONBody } from "discord-api-types/v10";
 import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js";
@@ -13,6 +13,7 @@ import {
 	LocaleProvider,
 	buildLocalisedChoice,
 	buildLocalisedCommand,
+	everywhereCommand,
 	getKonamiIdSubcommand,
 	getNameSubcommand,
 	getPasswordSubcommand
@@ -85,7 +86,7 @@ export class PriceCommand extends Command {
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
 		const builder = buildLocalisedCommand(
-			new SlashCommandBuilder(),
+			everywhereCommand(),
 			() => c("command-name").t`price`,
 			() => c("command-description").t`Display the price for a card!`
 		);

src/commands/query.ts

@@ -1,4 +1,3 @@
-import { SlashCommandBuilder } from "@discordjs/builders";
 import { Static } from "@sinclair/typebox";
 import { RESTPostAPIApplicationCommandsJSONBody } from "discord-api-types/v10";
 import { ChatInputCommandInteraction, SlashCommandStringOption } from "discord.js";
@@ -7,7 +6,7 @@ import { inject, injectable } from "tsyringe";
 import { c } from "ttag";
 import { Command } from "../Command";
 import { CardSchema } from "../definitions";
-import { LocaleProvider, buildLocalisedCommand } from "../locale";
+import { LocaleProvider, buildLocalisedCommand, everywhereCommand } from "../locale";
 import { Logger, getLogger } from "../logger";
 import { Metrics } from "../metrics";
 
@@ -26,7 +25,7 @@ export class QueryCommand extends Command {
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
 		return buildLocalisedCommand(
-			new SlashCommandBuilder(),
+			everywhereCommand(),
 			() => c("command-name").t`query`,
 			() => c("command-description").t`Advanced search prototype`
 		)

src/commands/random.ts

@@ -1,4 +1,3 @@
-import { SlashCommandBuilder } from "@discordjs/builders";
 import { Static } from "@sinclair/typebox";
 import { RESTPostAPIApplicationCommandsJSONBody } from "discord-api-types/v10";
 import { ChatInputCommandInteraction } from "discord.js";
@@ -9,7 +8,7 @@ import { Command } from "../Command";
 import { createCardEmbed } from "../card";
 import { CardSchema } from "../definitions";
 import { UpdatingLimitRegulationVector } from "../limit-regulation";
-import { LocaleProvider, buildLocalisedCommand, getResultLangStringOption } from "../locale";
+import { LocaleProvider, buildLocalisedCommand, everywhereCommand, getResultLangStringOption } from "../locale";
 import { Logger, getLogger } from "../logger";
 import { Metrics } from "../metrics";
 
@@ -40,7 +39,7 @@ export class RandomCommand extends Command {
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
 		return buildLocalisedCommand(
-			new SlashCommandBuilder(),
+			everywhereCommand(),
 			() => c("command-name").t`random`,
 			() => c("command-description").t`Get a random Yu-Gi-Oh! card.`
 		)

src/commands/rush-duel.ts

@@ -3,7 +3,6 @@ import {
 	AutocompleteInteraction,
 	ChatInputCommandInteraction,
 	RESTPostAPIApplicationCommandsJSONBody,
-	SlashCommandBuilder,
 	SlashCommandIntegerOption,
 	SlashCommandStringOption,
 	SlashCommandSubcommandBuilder
@@ -21,6 +20,7 @@ import {
 	Locale,
 	LocaleProvider,
 	buildLocalisedCommand,
+	everywhereCommand,
 	getInputLangStringOption,
 	getResultLangStringOption
 } from "../locale";
@@ -54,7 +54,7 @@ export class RushDuelCommand extends AutocompletableCommand {
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
 		const builder = buildLocalisedCommand(
-			new SlashCommandBuilder(),
+			everywhereCommand(),
 			() => c("command-name").t`rush-duel`,
 			() => c("command-description").t`Find information on Rush Duel cards.`
 		);

src/commands/search.ts

@@ -1,4 +1,3 @@
-import { SlashCommandBuilder } from "@discordjs/builders";
 import { RESTPostAPIApplicationCommandsJSONBody } from "discord-api-types/v10";
 import { ChatInputCommandInteraction } from "discord.js";
 import { Got } from "got";
@@ -10,6 +9,7 @@ import { UpdatingLimitRegulationVector } from "../limit-regulation";
 import {
 	LocaleProvider,
 	buildLocalisedCommand,
+	everywhereCommand,
 	getKonamiIdSubcommand,
 	getNameSubcommand,
 	getPasswordSubcommand,
@@ -34,7 +34,7 @@ export class SearchCommand extends Command {
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
 		const builder = buildLocalisedCommand(
-			new SlashCommandBuilder(),
+			everywhereCommand(),
 			() => c("command-name").t`search`,
 			() => c("command-description").t`Find all information on a card!`
 		);

src/commands/ygoprodeck.ts

@@ -1,4 +1,4 @@
-import { SlashCommandBuilder, SlashCommandStringOption } from "@discordjs/builders";
+import { SlashCommandStringOption } from "@discordjs/builders";
 import { RESTPostAPIApplicationCommandsJSONBody } from "discord-api-types/v10";
 import { AutocompleteInteraction, ChatInputCommandInteraction, escapeMarkdown } from "discord.js";
 import { Got } from "got";
@@ -7,7 +7,7 @@ import { inject, injectable } from "tsyringe";
 import { c, t, useLocale } from "ttag";
 import { ygoprodeckCard } from "../card";
 import { AutocompletableCommand } from "../Command";
-import { buildLocalisedCommand, LocaleProvider } from "../locale";
+import { buildLocalisedCommand, everywhereCommand, LocaleProvider } from "../locale";
 import { getLogger, Logger } from "../logger";
 import { Metrics } from "../metrics";
 import { replyLatency, serialiseInteraction } from "../utils";
@@ -30,7 +30,7 @@ export class YGOPRODECKCommand extends AutocompletableCommand {
 
 	static override get meta(): RESTPostAPIApplicationCommandsJSONBody {
 		const builder = buildLocalisedCommand(
-			new SlashCommandBuilder(),
+			everywhereCommand(),
 			() => c("command-name").t`ygoprodeck`,
 			() => c("command-description").t`Search the YGOPRODECK card database.`
 		);