Update DM channel logic

zajrik · zajrik · commit 111f1f1bd4a1 · 2021-01-07T19:49:07.000-06:00
diff --git a/src/command/CommandDispatcher.ts b/src/command/CommandDispatcher.ts
@@ -64,7 +64,7 @@ export class CommandDispatcher
 	private async _handleMessage(message: Message): Promise<boolean>
 	{
 		const dispatchStart: number = Util.now();
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 
 		// Dismiss messages with no author
 		if (!message.author) return false;
diff --git a/src/command/RateLimiter.ts b/src/command/RateLimiter.ts
@@ -62,6 +62,6 @@ export class RateLimiter
 	 */
 	private _isGlobal(message?: Message): boolean
 	{
-		return message ? message.channel.type !== 'text' || this._global : this._global;
+		return message ? message.channel.type === 'dm' || this._global : this._global;
 	}
 }
diff --git a/src/command/base/Help.ts b/src/command/base/Help.ts
@@ -24,7 +24,7 @@ export default class extends Command
 	@using(Middleware.localize)
 	public async action(message: Message, [res, commandName]: [ResourceProxy, string]): Promise<void>
 	{
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const mentionName: string = `@${this.client.user!.tag} `;
 		const lang: string = dm ? this.client.defaultLang
 			: await message.guild.storage!.settings.get('lang');
diff --git a/src/command/middleware/Expect.ts b/src/command/middleware/Expect.ts
@@ -23,7 +23,7 @@ export function expect(argTypes: string | MappedArgType): MiddlewareFunction
 
 	return async function(this: Command, message: Message, args: any[]): Promise<[Message, any[]]>
 	{
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const lang: string = dm
 			? this.client.defaultLang
 			: await message.guild.storage!.settings.get('lang')
diff --git a/src/command/resolvers/base/BannedUserResolver.ts b/src/command/resolvers/base/BannedUserResolver.ts
@@ -58,7 +58,7 @@ export class BannedUserResolver extends Resolver
 		const lang: string = await Lang.getLangFromMessage(message);
 		const res: ResourceProxy = Lang.createResourceProxy(lang);
 
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefix: string = !dm ? await message.guild.storage!.settings.get('prefix') : '';
 		const usage: string = Lang.getCommandInfo(command, lang).usage.replace(/<prefix>/g, prefix);
 
diff --git a/src/command/resolvers/base/BooleanResolver.ts b/src/command/resolvers/base/BooleanResolver.ts
@@ -36,7 +36,7 @@ export class BooleanResolver extends Resolver
 		const lang: string = await Lang.getLangFromMessage(message);
 		const res: ResourceProxy = Lang.createResourceProxy(lang);
 
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefix: string = !dm ? await message.guild.storage!.settings.get('prefix') : '';
 		const usage: string = Lang.getCommandInfo(command, lang).usage.replace(/<prefix>/g, prefix);
 
diff --git a/src/command/resolvers/base/ChannelResolver.ts b/src/command/resolvers/base/ChannelResolver.ts
@@ -55,7 +55,7 @@ export class ChannelResolver extends Resolver
 		const lang: string = await Lang.getLangFromMessage(message);
 		const res: ResourceProxy = Lang.createResourceProxy(lang);
 
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefix: string = !dm ? await message.guild.storage!.settings.get('prefix') : '';
 		const usage: string = Lang.getCommandInfo(command, lang).usage.replace(/<prefix>/g, prefix);
 
diff --git a/src/command/resolvers/base/CommandGroupResolver.ts b/src/command/resolvers/base/CommandGroupResolver.ts
@@ -29,7 +29,7 @@ export class CommandGroupResolver extends Resolver
 		const lang: string = await Lang.getLangFromMessage(message);
 		const res: ResourceProxy = Lang.createResourceProxy(lang);
 
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefix: string = !dm ? await message.guild.storage!.settings.get('prefix') : '';
 		const usage: string = Lang.getCommandInfo(command, lang).usage.replace(/<prefix>/g, prefix);
 
diff --git a/src/command/resolvers/base/CommandResolver.ts b/src/command/resolvers/base/CommandResolver.ts
@@ -27,7 +27,7 @@ export class CommandResolver extends Resolver
 		const lang: string = await Lang.getLangFromMessage(message);
 		const res: ResourceProxy = Lang.createResourceProxy(lang);
 
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefix: string = !dm ? await message.guild.storage!.settings.get('prefix') : '';
 		const usage: string = Lang.getCommandInfo(command, lang).usage.replace(/<prefix>/g, prefix);
 
diff --git a/src/command/resolvers/base/DurationResolver.ts b/src/command/resolvers/base/DurationResolver.ts
@@ -28,7 +28,7 @@ export class DurationResolver extends Resolver
 		const lang: string = await Lang.getLangFromMessage(message);
 		const res: ResourceProxy = Lang.createResourceProxy(lang);
 
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefix: string = !dm ? await message.guild.storage!.settings.get('prefix') : '';
 		const usage: string = Lang.getCommandInfo(command, lang).usage.replace(/<prefix>/g, prefix);
 
diff --git a/src/command/resolvers/base/MemberResolver.ts b/src/command/resolvers/base/MemberResolver.ts
@@ -61,7 +61,7 @@ export class MemberResolver extends Resolver
 		const lang: string = await Lang.getLangFromMessage(message);
 		const res: ResourceProxy = Lang.createResourceProxy(lang);
 
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefix: string = !dm ? await message.guild.storage!.settings.get('prefix') : '';
 		const usage: string = Lang.getCommandInfo(command, lang).usage.replace(/<prefix>/g, prefix);
 
diff --git a/src/command/resolvers/base/NumberResolver.ts b/src/command/resolvers/base/NumberResolver.ts
@@ -27,7 +27,7 @@ export class NumberResolver extends Resolver
 		const lang: string = await Lang.getLangFromMessage(message);
 		const res: ResourceProxy = Lang.createResourceProxy(lang);
 
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefix: string = !dm ? await message.guild.storage!.settings.get('prefix') : '';
 		const usage: string = Lang.getCommandInfo(command, lang).usage.replace(/<prefix>/g, prefix);
 
diff --git a/src/command/resolvers/base/RoleResolver.ts b/src/command/resolvers/base/RoleResolver.ts
@@ -53,7 +53,7 @@ export class RoleResolver extends Resolver
 		const lang: string = await Lang.getLangFromMessage(message);
 		const res: ResourceProxy = Lang.createResourceProxy(lang);
 
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefix: string = !dm ? await message.guild.storage!.settings.get('prefix') : '';
 		const usage: string = Lang.getCommandInfo(command, lang).usage.replace(/<prefix>/g, prefix);
 
diff --git a/src/command/resolvers/base/UserResolver.ts b/src/command/resolvers/base/UserResolver.ts
@@ -65,7 +65,7 @@ export class UserResolver extends Resolver
 		const lang: string = await Lang.getLangFromMessage(message);
 		const res: ResourceProxy = Lang.createResourceProxy(lang);
 
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefix: string = !dm ? await message.guild.storage!.settings.get('prefix') : '';
 		const usage: string = Lang.getCommandInfo(command, lang).usage.replace(/<prefix>/g, prefix);
 
diff --git a/src/localization/Lang.ts b/src/localization/Lang.ts
@@ -400,7 +400,7 @@ export class Lang
 	 */
 	public static async getLangFromMessage(message: Message): Promise<string>
 	{
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const storage: GuildStorage | undefined | null = !dm
 			? Lang._instance._client.storage.guilds.get(message.guild.id)
 			: null;
diff --git a/src/util/Util.ts b/src/util/Util.ts
@@ -35,7 +35,7 @@ export class Util
 	public static async wasCommandCalled(message: Message): Promise<[boolean, Command | null, string, string | null]>
 	{
 		const client: Client = message.client as Client;
-		const dm: boolean = message.channel.type !== 'text';
+		const dm: boolean = message.channel.type === 'dm';
 		const prefixes: string[] = [
 			`<@${client.user!.id}>`,
 			`<@!${client.user!.id}>`

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export class CommandDispatcher`
`64`	`64`	`private async _handleMessage(message: Message): Promise<boolean>`
`65`	`65`	`{`
`66`	`66`	`const dispatchStart: number = Util.now();`
`67`		`- const dm: boolean = message.channel.type !== 'text';`
	`67`	`+ const dm: boolean = message.channel.type === 'dm';`
`68`	`68`
`69`	`69`	`// Dismiss messages with no author`
`70`	`70`	`if (!message.author) return false;`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,6 @@ export class RateLimiter`
`62`	`62`	`*/`
`63`	`63`	`private _isGlobal(message?: Message): boolean`
`64`	`64`	`{`
`65`		`- return message ? message.channel.type !== 'text' \|\| this._global : this._global;`
	`65`	`+ return message ? message.channel.type === 'dm' \|\| this._global : this._global;`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export default class extends Command`
`24`	`24`	`@using(Middleware.localize)`
`25`	`25`	`public async action(message: Message, [res, commandName]: [ResourceProxy, string]): Promise<void>`
`26`	`26`	`{`
`27`		`- const dm: boolean = message.channel.type !== 'text';`
	`27`	`+ const dm: boolean = message.channel.type === 'dm';`
`28`	`28`	const mentionName: string = `@${this.client.user!.tag} `;
`29`	`29`	`const lang: string = dm ? this.client.defaultLang`
`30`	`30`	`: await message.guild.storage!.settings.get('lang');`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export function expect(argTypes: string \| MappedArgType): MiddlewareFunction`
`23`	`23`
`24`	`24`	`return async function(this: Command, message: Message, args: any[]): Promise<[Message, any[]]>`
`25`	`25`	`{`
`26`		`- const dm: boolean = message.channel.type !== 'text';`
	`26`	`+ const dm: boolean = message.channel.type === 'dm';`
`27`	`27`	`const lang: string = dm`
`28`	`28`	`? this.client.defaultLang`
`29`	`29`	`: await message.guild.storage!.settings.get('lang')`