Merge branch 'master' into claim-command-return

Author: robertt

package.json

@@ -33,7 +33,7 @@
 	"scripts": {
 		"start": "ts-node-dev --respawn src",
 		"build": "tsc",
-		"lint": "prettier --check 'src/**/*.ts'",
-		"lint:fix": "prettier 'src/**/*.ts' --write "
+		"lint": "prettier --check \"src/**/*.ts\"",
+		"lint:fix": "prettier \"src/**/*.ts\" --write "
 	}
 }

src/modules/helpchan.ts

@@ -60,7 +60,7 @@ export class HelpChanModule extends Module {
 
 	private getChannelName(guild: Guild) {
 		const takenChannelNames = guild.channels.cache
-			.filter(channel => channel.name.startsWith('help-'))
+			.filter(channel => channel.name.startsWith(this.CHANNEL_PREFIX))
 			.map(channel => channel.name.replace(this.CHANNEL_PREFIX, ''));
 		let decidedChannel = channelNames[0];
 
@@ -174,10 +174,16 @@ export class HelpChanModule extends Module {
 			if (dormant && dormant instanceof TextChannel) {
 				await this.moveChannel(dormant, categories.ask);
 
-				const lastMessage = dormant.messages.cache
+				let lastMessage = dormant.messages.cache
 					.array()
 					.reverse()
 					.find(m => m.author.id === this.client.user?.id);
+
+				if (!lastMessage)
+					lastMessage = (await dormant.messages.fetch({ limit: 5 }))
+						.array()
+						.find(m => m.author.id === this.client.user?.id);
+
 				if (lastMessage) {
 					// If there is a last message (the dormant message) by the bot, just edit it
 					await lastMessage.edit(this.AVAILABLE_EMBED);

src/modules/rep.ts

@@ -19,8 +19,7 @@ export class RepModule extends Module {
 
 	MAX_REP = 3;
 
-	// all messages have to be fully lowercase
-	THANKS_REGEX = /\b(?:thanks|thx|cheers|thanx|ty|tks|tkx)\b/i;
+	THANKS_REGEX = /\b(?:thanks|thx|cheers|thanx|thnks|ty|tks|tkx)\b/i;
 
 	async getOrMakeUser(user: User) {
 		let ru = await RepUser.findOne(
@@ -158,6 +157,7 @@ export class RepModule extends Module {
 		description: 'See who has the most reputation',
 	})
 	async leaderboard(msg: Message) {
+		const topEmojis = [':first_place:', ':second_place:', ':third_place:'];
 		const data = ((await RepGive.createQueryBuilder('give')
 			.select(['give.to', 'COUNT(*)'])
 			.groupBy('give.to')
@@ -173,8 +173,10 @@ export class RepModule extends Module {
 			.setDescription(
 				data
 					.map(
-						x =>
-							`:white_small_square: **<@${x.id}>** with **${x.count}** points.`,
+						(x, index) =>
+							`${
+								topEmojis[index] || ':white_small_square:'
+							} **<@${x.id}>** with **${x.count}** points.`,
 					)
 					.join('\n'),
 			);