Browse Source

Updating webhook regex for discord.com

Updates webhook URL regex matching for discordapp.com and discord.com
pull/1551/head
moiph 5 years ago
parent
commit
ce97d5c7cc
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      src/Discord.Net.Webhook/DiscordWebhookClient.cs

+ 4
- 4
src/Discord.Net.Webhook/DiscordWebhookClient.cs View File

@@ -33,7 +33,7 @@ namespace Discord.Webhook
: this(webhookUrl, new DiscordRestConfig()) { } : this(webhookUrl, new DiscordRestConfig()) { }


// regex pattern to match webhook urls // regex pattern to match webhook urls
private static Regex WebhookUrlRegex = new Regex(@"^.*discordapp\.com\/api\/webhooks\/([\d]+)\/([a-z0-9_-]+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static Regex WebhookUrlRegex = new Regex(@"^.*(discord|discordapp)\.com\/api\/webhooks\/([\d]+)\/([a-z0-9_-]+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);


/// <summary> Creates a new Webhook Discord client. </summary> /// <summary> Creates a new Webhook Discord client. </summary>
public DiscordWebhookClient(ulong webhookId, string webhookToken, DiscordRestConfig config) public DiscordWebhookClient(ulong webhookId, string webhookToken, DiscordRestConfig config)
@@ -133,12 +133,12 @@ namespace Discord.Webhook
{ {
// ensure that the first group is a ulong, set the _webhookId // ensure that the first group is a ulong, set the _webhookId
// 0th group is always the entire match, so start at index 1 // 0th group is always the entire match, so start at index 1
if (!(match.Groups[1].Success && ulong.TryParse(match.Groups[1].Value, NumberStyles.None, CultureInfo.InvariantCulture, out webhookId)))
if (!(match.Groups[2].Success && ulong.TryParse(match.Groups[2].Value, NumberStyles.None, CultureInfo.InvariantCulture, out webhookId)))
throw ex("The webhook Id could not be parsed."); throw ex("The webhook Id could not be parsed.");


if (!match.Groups[2].Success)
if (!match.Groups[3].Success)
throw ex("The webhook token could not be parsed."); throw ex("The webhook token could not be parsed.");
webhookToken = match.Groups[2].Value;
webhookToken = match.Groups[3].Value;
} }
else else
throw ex(); throw ex();


Loading…
Cancel
Save