Fix middleware bug in DMs, fix other compiler errors, update tasks.json

Author: zajrik

.gitignore

@@ -5,7 +5,7 @@ config.json
 npm-debug*
 /test/storage
 /test/**/*.d.ts
-/test/**/*.js
+/test/**/*.js*
 test_*.js
 /scripts/**/*.js
 /scripts/**/*.d.ts

.vscode/tasks.json

@@ -2,27 +2,25 @@
 	// See https://go.microsoft.com/fwlink/?LinkId=733558
 	// for the documentation about the tasks.json format
 	"version": "2.0.0",
-	"command": "gulp",
+	"command": "npx",
 	"type": "shell",
 	"tasks": [
 		{
 			"label": "build:vscode",
-			"args": [],
+			"args": ["gulp", "build"],
 			"group": "build",
 			"isBackground": false,
 			"problemMatcher": ["$tsc"]
 		},
 		{
 			"label": "tests",
-			"args": ["tests"],
-			"command": "gulp",
+			"args": ["gulp", "tests"],
 			"type": "shell",
 			"problemMatcher": ["$tsc"]
 		},
 		{
 			"label": "docs",
-			"args": ["docs"],
-			"command": "gulp",
+			"args": ["gulp", "docs"],
 			"type": "shell"
 		}
 	]

src/command/CommandDecorators.ts

@@ -43,7 +43,7 @@ export function using(func: MiddlewareFunction): MethodDecorator
 			// Send the middleware result to the channel, utilizing compact mode if enabled
 			const sendMiddlewareResult: (result: string, options?: MessageOptions) => Promise<any> =
 				async (result, options) => {
-					if (await message.guild.storage!.settings.get('compact') || this.client.compact)
+					if (await message.guild?.storage?.settings.get('compact') || this.client.compact)
 					{
 						if (message.reactions.size > 0) await message.reactions.removeAll();
 						return CompactModeHelper.registerButton(

src/command/CommandDispatcher.ts

@@ -155,7 +155,7 @@ export class CommandDispatcher
 		// Function to send middleware result, utilizing compact mode if enabled
 		const sendMiddlewareResult: (result: string, options?: MessageOptions) => Promise<any> =
 			async (result, options) => {
-				if (await message.guild.storage!.settings.get('compact') || this._client.compact)
+				if (await message.guild?.storage?.settings.get('compact') || this._client.compact)
 				{
 					if (message.reactions.size > 0) await message.reactions.removeAll();
 					return CompactModeHelper.registerButton(

src/command/CommandRegistry.ts

@@ -32,7 +32,7 @@ export class CommandRegistry<
 	}
 
 	public static get [Symbol.species]() {
-		return Collection;
+		return Collection as any;
 	}
 
 	/**

src/command/base/Shortcuts.ts

@@ -89,7 +89,7 @@ Of course the eval command is owner-only, but this should give you an idea of ho
 
 		await message.guild.storage!.settings.set(`shortcuts.${name}`, content);
 
-		content = Util.escapeMarkdown(content, true);
+		content = Util.escapeMarkdown(content, { codeBlock: true, codeBlockContent: true });
 		return this.respond(message, res.CMD_SHORTCUTS_SET_SUCCESS({ name, content }));
 	}
 
@@ -102,7 +102,7 @@ Of course the eval command is owner-only, but this should give you an idea of ho
 		if (!shortcuts[name])
 			return this.respond(message, res.CMD_SHORTCUTS_ERR_MISSING({ name }));
 
-		const content: string = Util.escapeMarkdown(shortcuts[name], true);
+		const content: string = Util.escapeMarkdown(shortcuts[name], { codeBlock: true, codeBlockContent: true });
 		return this.respond(message, res.CMD_SHORTCUTS_GET_CONTENT({ name, content }));
 	}
 

src/storage/SequelizeProvider.ts

@@ -51,7 +51,7 @@ export function SequelizeProvider(url: string, dialect: Dialect, debug: boolean)
 					key: { type: dataTypes.STRING, allowNull: false, primaryKey: true },
 					value: [Dialect.Postgres, Dialect.SQLite, Dialect.MSSQL].includes(dialect)
 						? dataTypes.TEXT
-						: dataTypes.TEXT('long')
+						: dataTypes.TEXT({ length: 'long' })
 				},
 				{
 					modelName: name,

test/commands/test_command.ts

@@ -35,9 +35,13 @@ export class TestCommandTwo extends TestCommandClass
 			desc: 'test command 2',
 			usage: '<prefix>test2 <test> <foo>',
 		});
+
+		this.use((message, args) => "bbbbbbb");
 	}
 
-	public action() {}
+	public action() {
+		console.log('aaaaa');
+	}
 }
 
 // @ownerOnly
@@ -55,14 +59,16 @@ export default class extends TestCommandClass
 			aliases: ['testing', 'testo'],
 			desc: 'test command',
 			usage: '<prefix>test <test> <foo>',
-			guildOnly: true,
+			// guildOnly: true,
 			argOpts: {
 				separator: ''
 			}
 			// ratelimit: '2/10s'
 		});
 
-		this.lock = new CommandLock('help', 'ping');
+		this.use((message, args) => [message, args]);
+
+		// this.lock = new CommandLock('help', 'ping');
 
 		// this.use(resolve('foo: BannedUser'));
 		// this.use(expect('foo: BannedUser'));