Merge branch 'master' of https://github.com/mojira/mojira-discord-bot into feature/mention-config

Author: NeunEinser

Diff for: src/commands/MentionCommand.ts

@@ -41,7 +41,13 @@ export default class MentionCommand extends Command<MentionArguments> {
 		return { mentions, matches };
 	}
 
+<<<<<<< HEAD
 	public async run( message: Message, args: MentionArguments ): Promise<boolean> {
+=======
+	public static get ticketLinkRegex(): RegExp {
+		return new RegExp( `https?://bugs.mojang.com/(?:browse|projects/\\w+/issues)/(${ MentionCommand.ticketPattern })`, 'g' );
+	}
+>>>>>>> 43b3cdfff8d4e88c40b2cdb9a8405d529a0bb327
 
 		let mentions = new Array<Mention>();
 		let group = false;

Diff for: src/permissions/ModeratorPermission.ts

@@ -6,7 +6,7 @@ import Permission from './Permission';
  * This allows the command to be run by any guild member who has the "Manage messages" permission serverwide.
  */
 export default class ModeratorPermission extends Permission {
-	public checkPermission( member: GuildMember ): boolean {
-		return member.hasPermission( 'MANAGE_MESSAGES' );
+	public checkPermission( member?: GuildMember ): boolean {
+		return member?.hasPermission( 'MANAGE_MESSAGES' );
 	}
 }

Diff for: src/permissions/OwnerPermission.ts

@@ -3,7 +3,7 @@ import Permission from './Permission';
 import BotConfig from '../BotConfig';
 
 export default class OwnerPermission extends Permission {
-	public checkPermission( member: GuildMember ): boolean {
-		return member.id === BotConfig.owner;
+	public checkPermission( member?: GuildMember ): boolean {
+		return member?.id === BotConfig.owner;
 	}
 }

Diff for: src/util/MentionUtil.ts

@@ -14,7 +14,7 @@ export default class MentionUtil {
 	}
 
 	public static get linkPattern(): string {
-		return 'https?:\\/\\/bugs.mojang.com\\/browse\\/';
+		return 'https?:\\/\\/bugs.mojang.com\\/(?:browse|projects\\/\\w+\\/issues)\\/';
 	}
 
 	public static get ticketLinkPattern(): string {