Merge branch 'master' into master

Author: ckiee

src/index.ts

@@ -7,7 +7,6 @@ import { AutoroleModule } from './modules/autorole';
 import { EtcModule } from './modules/etc';
 import { HelpChanModule } from './modules/helpchan';
 import { PlaygroundModule } from './modules/playground';
-import { PollModule } from './modules/poll';
 import { ReminderModule } from './modules/reminders';
 import { RepModule } from './modules/rep';
 import { TwoslashModule } from './modules/twoslash';
@@ -29,7 +28,6 @@ for (const mod of [
 	EtcModule,
 	HelpChanModule,
 	PlaygroundModule,
-	PollModule,
 	ReminderModule,
 	RepModule,
 	TwoslashModule,

src/modules/etc.ts

@@ -1,4 +1,9 @@
-import { command, default as CookiecordClient, Module } from 'cookiecord';
+import {
+	command,
+	default as CookiecordClient,
+	Module,
+	listener,
+} from 'cookiecord';
 import { Message } from 'discord.js';
 
 export class EtcModule extends Module {
@@ -25,4 +30,13 @@ export class EtcModule extends Module {
 			'https://github.com/facebook/create-react-app/pull/8177#issue-353062710',
 		);
 	}
+
+	@listener({ event: 'message' })
+	async onMessage(msg: Message) {
+		if (msg.author.bot || !msg.content.toLowerCase().startsWith('poll:'))
+			return;
+		await msg.react('✅');
+		await msg.react('❌');
+		await msg.react('🤷');
+	}
 }

src/modules/poll.ts

@@ -7,7 +7,6 @@ import {
 } from 'cookiecord';
 import { GuildMember, Message, MessageEmbed, User } from 'discord.js';
 import prettyMilliseconds from 'pretty-ms';
-import { getDB } from '../db';
 import { TS_BLUE } from '../env';
 
 import { RepGive } from '../entities/RepGive';
@@ -17,11 +16,13 @@ export class RepModule extends Module {
 	constructor(client: CookiecordClient) {
 		super(client);
 	}
+
 	MAX_REP = 3;
 
-	async getOrMakeUser(user: User) {
-		const db = await getDB();
+	// all messages have to be fully lowercase
+	THANKS_REGEX = /(?:thanks|thx|cheers|thanx|ty|tks|tkx)\b/i;
 
+	async getOrMakeUser(user: User) {
 		let ru = await RepUser.findOne(
 			{ id: user.id },
 			{ relations: ['got', 'given'] },
@@ -40,11 +41,10 @@ export class RepModule extends Module {
 		const PARTIAL_GIVE = '🤔';
 		const NO_GIVE = '❌';
 
-		// Check for thanks or thx
-		const THANKS_REGEX = /(thanks|thx)+/gi;
-		const exec = THANKS_REGEX.exec(msg.content);
+		// Check for thanks messages
+		const isThanks = this.THANKS_REGEX.test(msg.content);
 
-		if (msg.author.bot || !exec || !msg.guild) return;
+		if (msg.author.bot || !isThanks || !msg.guild) return;
 
 		const mentionUsers = msg.mentions.users.array();
 		if (!mentionUsers.length) return;