3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-23 01:25:02 +00:00

new regex

This commit is contained in:
metal 2021-08-25 16:11:28 +00:00 committed by GitHub
parent 7f2731262d
commit 8ecf56ace7

View file

@ -743,10 +743,11 @@ export function isNotNull(value): value is Exclude<typeof value, null> {
// discordapp.com/invite/<code> // discordapp.com/invite/<code>
// discord.gg/invite/<code> // discord.gg/invite/<code>
// discord.gg/<code> // discord.gg/<code>
const quickInviteDetection = /(?:discord.com|discordapp.com)\/invite\/([a-z0-9\-]+)|discord.gg\/(?:\S+\/)?([a-z0-9\-]+)/gi; // discord.com/friend-invite/<code>
const quickInviteDetection = /(?:discord.com|discordapp.com)\/(?:invite|friend-invite)\/([a-z0-9\-]+)|discord.gg\/(?:\S+\/)?([a-z0-9\-]+)/gi;
const isInviteHostRegex = /(?:^|\.)(?:discord.gg|discord.com|discordapp.com)$/i; const isInviteHostRegex = /(?:^|\.)(?:discord.gg|discord.com|discordapp.com)$/i;
const longInvitePathRegex = /^\/invite\/([a-z0-9\-]+)$/i; const longInvitePathRegex = /^^\/(?:invite|friend-invite)\/([a-z0-9\-]+)$/i;
export function getInviteCodesInString(str: string): string[] { export function getInviteCodesInString(str: string): string[] {
const inviteCodes: string[] = []; const inviteCodes: string[] = [];
@ -778,6 +779,8 @@ export function getInviteCodesInString(str: string): string[] {
// discord.com/invite/<code>[/anything] // discord.com/invite/<code>[/anything]
// discordapp.com/invite/<code>[/anything] // discordapp.com/invite/<code>[/anything]
// discord.com/friend-invite/<code>[/anything]
// discordapp.com/friend-invite/<code>[/anything]
const longInviteMatch = url.pathname.match(longInvitePathRegex); const longInviteMatch = url.pathname.match(longInvitePathRegex);
if (longInviteMatch) { if (longInviteMatch) {
return longInviteMatch[1]; return longInviteMatch[1];