github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed nullref in channel mention resolving for DM channels

Browse Source
This commit is contained in:
RogueException
2016-08-16 20:29:39 -03:00
parent 8ea812cba3
commit 7b130f6528
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Discord.Net/Rest/Entities/Messages/Message.cs
View File

@@ -1,5 +1,4 @@
using Discord.API.Rest; using Discord.API.Rest;
using Discord.Rest;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Immutable; using System.Collections.Immutable;

30
src/Discord.Net/Utilities/MentionUtils.cs
View File

@@ -208,30 +208,30 @@ namespace Discord
{ {
if (mode == ChannelMentionHandling.Ignore) return text; if (mode == ChannelMentionHandling.Ignore) return text;
if (guild.IsAttached) //It's too expensive to do a channel lookup in REST mode return _channelRegex.Replace(text, new MatchEvaluator(e =>
{ {
return _channelRegex.Replace(text, new MatchEvaluator(e => ulong id;
if (ulong.TryParse(e.Groups[1].Value, NumberStyles.None, CultureInfo.InvariantCulture, out id))
{ {
ulong id; switch (mode)
if (ulong.TryParse(e.Groups[1].Value, NumberStyles.None, CultureInfo.InvariantCulture, out id))
{ {
switch (mode) case ChannelMentionHandling.Remove:
{ return "";
case ChannelMentionHandling.Remove: case ChannelMentionHandling.Name:
return ""; if (guild != null && guild.IsAttached) //It's too expensive to do a channel lookup in REST mode
case ChannelMentionHandling.Name: {
IGuildChannel channel = null; IGuildChannel channel = null;
channel = guild?.GetChannel(id); channel = guild.GetChannel(id);
if (channel != null) if (channel != null)
return $"#{channel.Name}"; return $"#{channel.Name}";
else else
return $"#deleted-channel"; return $"#deleted-channel";
} }
break;
} }
return e.Value; }
})); return e.Value;
} }));
return text;
} }
internal static string ResolveRoleMentions(string text, IReadOnlyCollection<IRole> mentions, RoleMentionHandling mode) internal static string ResolveRoleMentions(string text, IReadOnlyCollection<IRole> mentions, RoleMentionHandling mode)
{ {