fix: defer, formatting, debug mode (#61)

* fix defer problem and moved the debug mode switch to .env

* fix editReply

* formatting

Author: StrangeGirlMurph

.env_sample

@@ -1,2 +1,5 @@
 TOKEN=[ENTER_YOUR_TOKEN_HERE]
-DEFAULT_GUILD=[GUILD_ID]
+DEFAULT_GUILD=[GUILD_ID]
+
+# "1" or "0" (true or false). In debug mode no config validation will be made.
+DEBUG_MODE=0

README.md

@@ -16,8 +16,6 @@ We're all part of a game jam/hackothon server with monthly events and wanted to
 We won't host the bot for you. If you want to use it on your own server you have to do that yourself :)  
 To see how to use this bot on your own visit our [wiki](https://github.com/Cowoding-Jams/Jambo/wiki). It's really good! We promise. It can help you a lot.
 
-
-
 ## License
 
 This project is licensed under the [Anti-Capitalist Software License](https://anticapitalist.software/). See [LICENSE](LICENSE).

src/config.ts

@@ -12,7 +12,6 @@ export const config: BotConfig = {
 
 	// --- Development ---
 	logLevel: "debug",
-	debugMode: false,
 
 	// --- Management ---
 	adminRoleId: "855348792025939988", // cowoding-jams/roles: admin
@@ -73,8 +72,6 @@ interface BotConfig {
 	// --- Development ---
 	/** Also available: error, warn, info, http, verbose, debug, silly. */
 	logLevel: "debug" | "info" | "warn" | "error" | "verbose";
-	/** In debug mode no config validation will be made. */
-	debugMode: boolean;
 
 	// --- Management ---
 	/** Moderators of the server (to manage proposals) */

src/ctx.ts

@@ -4,6 +4,7 @@ import { config } from "./config";
 
 class Context {
 	public readonly defaultGuild;
+	public readonly debugMode;
 	public readonly commands: Collection<string, Command> = new Collection<string, Command>();
 	public readonly buttons: Collection<string, Button> = new Collection<string, Button>();
 	public readonly selectMenus: Collection<string, SelectMenu> = new Collection<string, SelectMenu>();
@@ -15,6 +16,7 @@ class Context {
 		if (!process.env.DEFAULT_GUILD) throw new Error("Default guild not defined!");
 
 		this.defaultGuild = process.env.DEFAULT_GUILD;
+		this.debugMode = process.env.DEBUG_MODE === "1";
 		this.logLevel = config.logLevel || "error";
 	}
 

src/events/ready.ts

@@ -5,7 +5,6 @@ import { logger } from "../logger";
 import CodingJamsCommand from "../commands/CodingJamsCommand";
 import { validateConfigParameters } from "../config-validate";
 import BirthdayCommand from "../commands/BirthdayCommand";
-import { config } from "../config";
 
 export default async function ready(client: Client) {
 	const guild = client.guilds.cache.get(ctx.defaultGuild)!;
@@ -46,7 +45,7 @@ export default async function ready(client: Client) {
 
 	logger.info("Setup successful!");
 
-	if (!config.debugMode) {
+	if (!ctx.debugMode) {
 		logger.debug("Validating config parameters...");
 		await validateConfigParameters(guild);
 		logger.debug("Config parameters validated!");

src/util/proposal/listProposals.ts

@@ -16,6 +16,9 @@ export async function listProposals(
 	page = 0,
 	proposalsPerPage = 6
 ): Promise<void> {
+	if (interaction instanceof ChatInputCommandInteraction) await interaction.deferReply();
+	else await interaction.deferUpdate();
+
 	const pages = Math.ceil(proposalDb.size / proposalsPerPage);
 
 	if (page < 0) page = pages - 1;
@@ -26,7 +29,7 @@ export async function listProposals(
 	let embed = addEmbedFooter(new EmbedBuilder().setTitle(`${proposalDb.size} Proposals`));
 
 	const list = numberedList(
-		proposals.map((p) => p.title),
+		proposals.map((p) => `${p.title} (${p.abbreviation})`),
 		proposals.map((p) => durationToReadable(p.duration)),
 		page * proposalsPerPage
 	);
@@ -63,9 +66,7 @@ export async function listProposals(
 			.setStyle(ButtonStyle.Secondary)
 	);
 
-	if (interaction instanceof ChatInputCommandInteraction)
-		await interaction.reply({ embeds: [embed], components: proposalDb.size != 0 ? [row] : [] });
-	else await interaction.update({ embeds: [embed], components: proposalDb.size != 0 ? [row] : [] });
+	await interaction.editReply({ embeds: [embed], components: proposalDb.size != 0 ? [row] : [] });
 }
 
 export async function viewProposal(interaction: ChatInputCommandInteraction): Promise<void> {