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

Dont crash if a mention is sent in PM

Browse Source
This commit is contained in:
RogueException
2015-10-31 00:36:24 -03:00
parent de139337af
commit 8d953a69e9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net/Helpers/Mention.cs
View File

@@ -24,7 +24,7 @@ namespace Discord
text = _userRegex.Replace(text, new MatchEvaluator(e => text = _userRegex.Replace(text, new MatchEvaluator(e =>
{ {
string id = e.Value.Substring(2, e.Value.Length - 3); string id = e.Value.Substring(2, e.Value.Length - 3);
var user = client.Users[id, server.Id]; var user = client.Users[id, server?.Id];
if (user != null) if (user != null)
return '@' + user.Name; return '@' + user.Name;
else //User not found else //User not found
@@ -34,7 +34,7 @@ namespace Discord
{ {
string id = e.Value.Substring(2, e.Value.Length - 3); string id = e.Value.Substring(2, e.Value.Length - 3);
var channel = client.Channels[id]; var channel = client.Channels[id];
if (channel != null && channel.Server.Id == server.Id) if (channel != null && channel.Server?.Id == server?.Id)
return '#' + channel.Name; return '#' + channel.Name;
else //Channel not found else //Channel not found
return '#' + e.Value; return '#' + e.Value;