Merge pull request #164 from tjjfvi/update

Author: robertt

.github/workflows/main.yml

@@ -13,10 +13,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v1
-            - name: install node v12
+            - name: install node v16
               uses: actions/setup-node@v1
               with:
-                  node-version: 12
+                  node-version: 16
 
             - name: yarn install
               run: yarn install

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3'
 
 services:
     bot:
-        image: node:13
+        image: node:16
         command: yarn start
         depends_on:
             - postgres

package.json

@@ -6,7 +6,7 @@
 	"dependencies": {
 		"@typescript/twoslash": "^2.1.0",
 		"algoliasearch": "^4.8.6",
-		"cookiecord": "^0.5.18",
+		"cookiecord": "^0.8.18",
 		"dotenv-safe": "^8.2.0",
 		"html-entities": "^2.3.2",
 		"lz-string": "^1.4.4",

src/index.ts

@@ -20,11 +20,18 @@ const client = new CookiecordClient(
 		prefix: ['!', 't!'],
 	},
 	{
-		ws: { intents: Intents.NON_PRIVILEGED },
 		partials: ['REACTION', 'MESSAGE', 'USER', 'CHANNEL'],
-		disableMentions: 'everyone',
+		allowedMentions: {
+			parse: ['users'],
+		},
+		intents: new Intents([
+			'GUILDS',
+			'GUILD_MESSAGES',
+			'GUILD_MEMBERS',
+			'GUILD_MESSAGE_REACTIONS',
+		]),
 	},
-);
+).setMaxListeners(Infinity);
 
 for (const mod of [
 	AutoroleModule,

src/modules/etc.ts

@@ -11,7 +11,9 @@ import {
 	GuildMember,
 	User,
 	ReactionEmoji,
+	TextChannel,
 } from 'discord.js';
+import { MessageChannel } from 'worker_threads';
 import {
 	clearMessageOwnership,
 	DELETE_EMOJI,
@@ -30,7 +32,7 @@ export class EtcModule extends Module {
 		await msg.channel.send('pong. :ping_pong:');
 	}
 
-	@listener({ event: 'message' })
+	@listener({ event: 'messageCreate' })
 	async onMessage(msg: Message) {
 		if (msg.author.bot || !msg.content.toLowerCase().startsWith('poll:'))
 			return;
@@ -47,7 +49,8 @@ export class EtcModule extends Module {
 	async onReact(reaction: MessageReaction, member: GuildMember) {
 		if (reaction.partial) return;
 
-		if (reaction.message.author.id !== this.client.user?.id) return;
+		if ((await reaction.message.fetch()).author.id !== this.client.user?.id)
+			return;
 		if (reaction.emoji.name !== DELETE_EMOJI) return;
 		if (member.id === this.client.user?.id) return;
 
@@ -69,7 +72,8 @@ export class EtcModule extends Module {
 		const reactionFilter = (reaction: MessageReaction, user: User) =>
 			reaction.emoji.name === confirm && user.id === msg.author.id;
 		const proceed = await confirmationMessage
-			.awaitReactions(reactionFilter, {
+			.awaitReactions({
+				filter: reactionFilter,
 				max: 1,
 				time: 10 * 1000,
 				errors: ['time'],

src/modules/handbook.ts

@@ -35,7 +35,7 @@ export class HandbookModule extends Module {
 	async handbook(msg: Message, text: string) {
 		if (!text)
 			return await sendWithMessageOwnership(msg, {
-				embed: this.HANDBOOK_EMBED,
+				embeds: [this.HANDBOOK_EMBED],
 			});
 		const data = await algolia.search<AlgoliaResult>([
 			{
@@ -61,6 +61,6 @@ export class HandbookModule extends Module {
 			.setTitle(decode(hierarchyParts[hierarchyParts.length - 1]))
 			.setAuthor(decode(hierarchyParts.slice(0, -1).join(' / ')))
 			.setURL(hit.url);
-		await sendWithMessageOwnership(msg, { embed });
+		await sendWithMessageOwnership(msg, { embeds: [embed] });
 	}
 }

src/modules/help.ts

@@ -76,12 +76,12 @@ export class HelpModule extends Module {
 
 			embed
 				.setFooter(
-					this.client.user?.username,
-					this.client.user?.displayAvatarURL(),
+					this.client.user!.username,
+					this.client.user!.displayAvatarURL(),
 				)
 				.setTimestamp();
 
-			return await sendWithMessageOwnership(msg, { embed });
+			return await sendWithMessageOwnership(msg, { embeds: [embed] });
 		}
 
 		let cmd: { description?: string; triggers?: string[] } =
@@ -116,6 +116,6 @@ export class HelpModule extends Module {
 			`*${splitCategoryDescription(cmd.description ?? '')[1]}*`,
 		);
 
-		await sendWithMessageOwnership(msg, { embed });
+		await sendWithMessageOwnership(msg, { embeds: [embed] });
 	}
 }