seedcord 0.13.0 → 0.14.0-next.0

package/dist/index.cjs

@@ -1217,67 +1217,144 @@ var EmojiInjector = class {
 	async init() {
 		this.clearEmojis();
 		if (!this.core.config.bot.emojis || Object.keys(this.core.config.bot.emojis).length === 0) {
-			this.logger.info(chalk.default.bold.yellow("No emojis configured, skipping emoji injection."));
+			this.logger.debug(chalk.default.bold.yellow("No emojis configured, skipping emoji injection."));
 			return;
 		}
 		const configEmojis = this.core.config.bot.emojis;
 		await this.core.bot.client.application?.emojis.fetch();
-		let foundCount = 0;
-		const entries = Object.entries(configEmojis);
-		for (const [key, value] of entries) {
-			if (isEmojiTuple(value)) {
-				foundCount += this.handleTuple(key, value);
-				continue;
-			}
-			if (typeof value === "string") {
-				foundCount += this.handleString(key, value);
-				continue;
-			}
-			this.logger.warn(`${chalk.default.bold.yellow("Invalid")}: ${chalk.default.magenta.bold(String(key))} (expected string or [string, string])`);
-		}
-		this.logger.utils.summary("Loaded emojis", { emojis: foundCount });
-	}
-	/**
-	* Tuple `[emojiName, guildId]`: looks up the emoji in that guild. Returns 1 when found and stored as an emoji object, otherwise 0.
-	*/
-	handleTuple(key, value) {
+		const failures = [];
+		const fetchedGuilds = /* @__PURE__ */ new Set();
+		for (const [key, value] of Object.entries(configEmojis)) if (isEmojiTuple(value)) await this.resolveTuple(key, value, failures, fetchedGuilds);
+		else if (typeof value === "string") this.resolveString(key, value, failures);
+		else failures.push(`  - "${key}" has an invalid value (expected a name or [name, guildId])`);
+		if (failures.length > 0) throw new _seedcord_errors_internal.SeedcordError(_seedcord_errors.SeedcordErrorCode.ConfigEmojiUnresolved, [failures.length, failures.join("\n")]);
+		this.logger.utils.summary("Loaded emojis", { emojis: Object.keys(emojiStorage).length });
+	}
+	async resolveTuple(key, value, failures, fetchedGuilds) {
 		const [emojiName, guildId] = value;
 		const guild = this.core.bot.client.guilds.cache.get(guildId);
 		if (!guild) {
-			emojiStorage[key] = emojiName;
-			this.logger.warn(`${chalk.default.bold.yellow("Missing")}: ${chalk.default.magenta.bold(emojiName)} in guild ${chalk.default.gray(guildId)} (guild not in cache or not found, using provided string)`);
-			return 0;
+			failures.push(`  - "${emojiName}" for "${key}" targets guild ${guildId}, which is not available (check the Guilds intent)`);
+			return;
+		}
+		if (!fetchedGuilds.has(guildId)) {
+			await guild.emojis.fetch();
+			fetchedGuilds.add(guildId);
 		}
 		const guildEmoji = guild.emojis.cache.find((e) => e.name === emojiName);
-		if (guildEmoji) {
-			emojiStorage[key] = guildEmoji;
-			this.logger.debug(`${chalk.default.bold.green("Found")}: ${chalk.default.magenta.bold(emojiName)} (${guildEmoji.id}) in guild ${chalk.default.gray(guildId)}`);
-			return 1;
+		if (!guildEmoji) {
+			failures.push(`  - "${emojiName}" for "${key}" was not found in guild ${guildId}`);
+			return;
 		}
-		emojiStorage[key] = emojiName;
-		this.logger.warn(`${chalk.default.bold.yellow("Missing")}: ${chalk.default.magenta.bold(emojiName)} in guild ${chalk.default.magenta.bold(guildId)} (using provided string)`);
-		return 0;
+		emojiStorage[key] = guildEmoji;
 	}
-	/**
-	* Handle emoji config values provided as a simple string (application emoji lookup).
-	* Returns 1 when the emoji was found and stored as an emoji object, otherwise 0.
-	*/
-	handleString(key, emojiName) {
+	resolveString(key, emojiName, failures) {
 		const appEmoji = this.core.bot.client.application?.emojis.cache.find((e) => e.name === emojiName);
-		if (appEmoji) {
-			emojiStorage[key] = appEmoji;
-			this.logger.debug(`${chalk.default.bold.green("Found")}: ${chalk.default.magenta.bold(emojiName)} (${appEmoji.id})`);
-			return 1;
+		if (!appEmoji) {
+			failures.push(`  - "${emojiName}" for "${key}" was not found among the application emojis`);
+			return;
 		}
-		emojiStorage[key] = emojiName;
-		this.logger.warn(`${chalk.default.bold.yellow("Missing")}: ${chalk.default.magenta.bold(emojiName)} (using provided string)`);
-		return 0;
+		emojiStorage[key] = appEmoji;
 	}
 	clearEmojis() {
 		for (const key of Object.keys(emojiStorage)) Reflect.deleteProperty(emojiStorage, key);
 	}
 };
 
+//#endregion
+//#region src/bot/injectors/CommandMentionInjector.ts
+const mentionStorage = {};
+/**
+* Ready-to-send command mention strings, keyed by {@link SlashOptionRegistry}.
+*
+* A value is a clickable `</name:id>` when the command's id resolved from the deploy, otherwise the plain
+* `/name` text. Populated by {@link CommandMentionInjector} after each deploy.
+*/
+const CommandMentions = mentionStorage;
+const MULTI_GUILD = Symbol("seedcord:commandmentions:multi-guild");
+/**
+* Turns each deployed slash route into a clickable command mention exposed through {@link CommandMentions}.
+*
+* Consumes the ids {@link DeployResult} carries, so it runs after a deploy rather than resolving from a name
+* cache (discord.js offers none for command ids). A global command is clickable everywhere by its app-wide id.
+* A guild command deployed to one guild is clickable by that guild's id. A command deployed to two or more
+* guilds mints a different id per guild, so one accessor key cannot resolve it, and it falls back to plain
+* `/name` text with one warn. On a non-owning shard a guild command also falls back to plain text.
+*
+* @internal
+*/
+var CommandMentionInjector = class {
+	core;
+	logger = new _seedcord_services.Logger("CommandMentions");
+	constructor(core) {
+		this.core = core;
+	}
+	inject(deploy) {
+		this.clear();
+		const globalIds = this.indexByName(deploy.global);
+		const guildIds = this.indexGuilds(deploy.guilds);
+		const warned = /* @__PURE__ */ new Set();
+		let clickable = 0;
+		for (const command of this.allSlashBuilders()) {
+			const id = this.resolveId(command.name, globalIds, guildIds, warned);
+			for (const leaf of (0, _seedcord_utils_internal.routeLeavesOf)(command.toJSON())) {
+				mentionStorage[leaf.route] = id ? this.toMention(leaf.route, id) : this.toPlain(leaf.route);
+				if (id) clickable++;
+			}
+		}
+		this.logger.utils.summary("Linked mentions", {
+			clickable,
+			plain: Object.keys(mentionStorage).length - clickable
+		});
+	}
+	allSlashBuilders() {
+		const registry = this.core.bot.commands;
+		if (!registry) return [];
+		const slash = [...registry.globalCommands, ...registry.guildCommands.values()].flat().filter((command) => command instanceof discord_js.SlashCommandBuilder);
+		return [...new Set(slash)];
+	}
+	indexByName(collection) {
+		const map = /* @__PURE__ */ new Map();
+		for (const command of collection.values()) map.set(command.name, command.id);
+		return map;
+	}
+	indexGuilds(guilds) {
+		const map = /* @__PURE__ */ new Map();
+		for (const collection of guilds.values()) for (const command of collection.values()) {
+			const existing = map.get(command.name);
+			if (existing === void 0) map.set(command.name, command.id);
+			else if (existing !== command.id) map.set(command.name, MULTI_GUILD);
+		}
+		return map;
+	}
+	resolveId(name, globalIds, guildIds, warned) {
+		const global = globalIds.get(name);
+		if (global) return global;
+		const guild = guildIds.get(name);
+		if (guild === void 0) return void 0;
+		if (guild === MULTI_GUILD) {
+			if (!warned.has(name)) {
+				this.logger.warn(`${name} is deployed to multiple guilds, falling back to plain text (not clickable).`);
+				warned.add(name);
+			}
+			return;
+		}
+		return guild;
+	}
+	toMention(route, id) {
+		const [name, middle, sub] = route.split("/");
+		if (name && middle && sub) return (0, discord_js.chatInputApplicationCommandMention)(name, middle, sub, id);
+		if (name && middle) return (0, discord_js.chatInputApplicationCommandMention)(name, middle, id);
+		return (0, discord_js.chatInputApplicationCommandMention)(name ?? route, id);
+	}
+	toPlain(route) {
+		return `/${route.split("/").join(" ")}`;
+	}
+	clear() {
+		for (const key of Object.keys(mentionStorage)) Reflect.deleteProperty(mentionStorage, key);
+	}
+};
+
 //#endregion
 //#region src/bot/utilities/channels/fetchText.ts
 /**
@@ -2597,6 +2674,7 @@ function slashRouteLeaves(commands) {
 */
 var CommandRegistry = class {
 	core;
+	onDeployed;
 	name = "Commands";
 	logger = new _seedcord_services.Logger("Commands");
 	isInitialised = false;
@@ -2605,8 +2683,9 @@ var CommandRegistry = class {
 	ctorToCommand = /* @__PURE__ */ new Map();
 	hmrHandler;
 	pendingEvents = /* @__PURE__ */ new Map();
-	constructor(core) {
+	constructor(core, onDeployed) {
 		this.core = core;
+		this.onDeployed = onDeployed;
 		const commandsDir = this.core.config.bot.commands.path;
 		if (!commandsDir) throw new _seedcord_errors_internal.SeedcordError(_seedcord_errors.SeedcordErrorCode.CoreControllerPathMissing, ["CommandRegistry", "commands"]);
 		if (!envapt.Envapter.isDevelopment && !envapt.Envapter.isTest) return;
@@ -2711,8 +2790,13 @@ var CommandRegistry = class {
 		this.ctorToCommand.delete(ctor);
 	}
 	async setCommands() {
+		const result = {
+			global: new discord_js.Collection(),
+			guilds: new discord_js.Collection()
+		};
 		if (this.globalCommands.length > 0) {
-			await this.core.bot.client.application?.commands.set(this.globalCommands);
+			const deployed = await this.core.bot.client.application?.commands.set(this.globalCommands);
+			if (deployed) result.global = deployed;
 			const tag = this.globalCommands.length === 1 ? "command" : "commands";
 			this.logger.utils.summary("Configured global", { [tag]: this.globalCommands.length });
 			this.logger.utils.item(`${this.globalCommands.map((command) => chalk.default.bold.cyan(command.name)).join(", ")}`);
@@ -2723,11 +2807,14 @@ var CommandRegistry = class {
 				this.logger.warn(`Guild with ID ${guildId} not found, skipping command registration.`);
 				continue;
 			}
-			await guild.commands.set(commands);
+			const deployed = await guild.commands.set(commands);
+			result.guilds.set(guildId, deployed);
 			const tag = commands.length === 1 ? "command" : "commands";
 			this.logger.utils.summary(`Configured commands for ${chalk.default.bold.yellow(guild.name)}`, { [tag]: commands.length });
 			this.logger.utils.item(`${commands.map((command) => chalk.default.bold.cyan(command.name)).join(", ")}`);
 		}
+		this.onDeployed?.(result);
+		return result;
 	}
 	/** The deduplicated slash route keys across every global and guild command. @internal */
 	routeLeaves() {
@@ -3505,22 +3592,6 @@ var InteractionDispatcher = class {
 	}
 };
 
-//#endregion
-//#region src/miscellaneous/validateDiscordToken.ts
-/**
-* Checks if the token is present, is a string, and matches the general format of a Discord token.
-*
-* @internal
-*/
-function validateDiscordToken(raw) {
-	if (raw === null || raw === void 0) throw new _seedcord_errors_internal.SeedcordError(_seedcord_errors.SeedcordErrorCode.ConfigMissingDiscordToken);
-	if (typeof raw !== "string") throw new _seedcord_errors_internal.SeedcordError(_seedcord_errors.SeedcordErrorCode.ConfigIncorrectDiscordToken);
-	const value = raw.trim();
-	if (value === "") throw new _seedcord_errors_internal.SeedcordError(_seedcord_errors.SeedcordErrorCode.ConfigMissingDiscordToken);
-	if (!/^[A-Za-z\d_-]{24,}\.[A-Za-z\d_-]{6,}\.[A-Za-z\d_-]{27,}$/.test(value)) throw new _seedcord_errors_internal.SeedcordError(_seedcord_errors.SeedcordErrorCode.ConfigIncorrectDiscordToken);
-	return value;
-}
-
 //#endregion
 //#region \0@oxc-project+runtime@0.135.0/helpers/esm/decorateMetadata.js
 function __decorateMetadata(k, v) {
@@ -3553,6 +3624,7 @@ var Bot = class extends Plugin {
 	commands;
 	emojiInjector;
 	emojis = Emojis;
+	mentions = CommandMentions;
 	/** @internal For use in dev mode */
 	async onHmr(event) {
 		if (this.interactions) await this.interactions.onHmr(event);
@@ -3565,7 +3637,12 @@ var Bot = class extends Plugin {
 		this._client = new discord_js.Client(core.config.bot.clientOptions);
 		if (core.config.bot.interactions.path) this.interactions = new InteractionDispatcher(core);
 		if (core.config.bot.events.path) this.events = new EventDispatcher(core);
-		if (core.config.bot.commands.path) this.commands = new CommandRegistry(core);
+		if (core.config.bot.commands.path) {
+			const mentionInjector = new CommandMentionInjector(core);
+			this.commands = new CommandRegistry(core, (result) => {
+				mentionInjector.inject(result);
+			});
+		}
 		this.emojiInjector = new EmojiInjector(core);
 		core.shutdown.addTask(_seedcord_services.ShutdownPhase.DiscordCleanup, "stop-bot", async () => await this.stop(), 2e3);
 	}
@@ -3580,13 +3657,13 @@ var Bot = class extends Plugin {
 		if (this.interactions) await this.interactions.init();
 		if (this.events) await this.events.init();
 		await this.login(token);
+		await this.emojiInjector.init();
 		if (this.commands) {
 			await this.commands.init();
 			await this.commands.setCommands();
 			this.interactions?.warnUnhandledRoutes(this.commands.routeLeaves());
 			this.interactions?.warnUnhandledContextMenuRoutes(this.commands.contextMenuLeaves());
 		}
-		await this.emojiInjector.init();
 	}
 	/**
 	* Stops the bot and cleans up connections
@@ -3618,7 +3695,7 @@ var Bot = class extends Plugin {
 		return super.emit(event, ...args);
 	}
 };
-__decorate([(0, envapt.Envapt)("DISCORD_BOT_TOKEN", { converter: (raw) => validateDiscordToken(raw) }), __decorateMetadata("design:type", String)], Bot.prototype, "botToken", void 0);
+__decorate([(0, envapt.Envapt)("DISCORD_BOT_TOKEN", { converter: (raw) => (0, _seedcord_errors_internal.validateDiscordToken)(raw) }), __decorateMetadata("design:type", String)], Bot.prototype, "botToken", void 0);
 
 //#endregion
 //#region src/hmr/HmrManager.ts
@@ -4048,13 +4125,14 @@ var Seedcord = class Seedcord extends Pluggable {
 //#endregion
 //#region src/index.ts
 /** Package version */
-const version = "0.13.0";
+const version = "0.14.0-next.0";
 
 //#endregion
 exports.AutocompleteHandler = AutocompleteHandler;
 exports.AutocompleteRoute = AutocompleteRoute;
 exports.ButtonHandler = ButtonHandler;
 exports.ButtonRoute = ButtonRoute;
+exports.CommandMentions = CommandMentions;
 exports.ContextMenuHandler = ContextMenuHandler;
 exports.ContextMenuRoute = ContextMenuRoute;
 exports.Cooldown = Cooldown;