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

Fixed nullref in Message.Update

Browse Source
This commit is contained in:
RogueException
2015-11-03 17:13:01 -04:00
parent 9ae1761d34
commit c280ed0bda
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Discord.Net/Models/Message.cs
View File

@@ -228,15 +228,24 @@ namespace Discord
text = Mention.CleanChannelMentions(_client, server, text, mentionedChannels); text = Mention.CleanChannelMentions(_client, server, text, mentionedChannels);
text = Mention.CleanRoleMentions(_client, server, text, mentionedRoles); text = Mention.CleanRoleMentions(_client, server, text, mentionedRoles);
} }
Text = text;
//MentionedUsers = mentionedUsers; //MentionedUsers = mentionedUsers;
MentionedChannels = mentionedChannels; MentionedChannels = mentionedChannels;
MentionedRoles = mentionedRoles; MentionedRoles = mentionedRoles;
} }
IsMentioningMe = model.Mentions if (server != null)
.Any(x => x.Id == _client.CurrentUserId) || {
(server != null && MentionedRoles.Any(x => server.CurrentUser.HasRole(x))); var me = server.CurrentUser;
IsMentioningMe = (MentionedUsers?.Contains(me) ?? false) ||
(MentionedRoles?.Any(x => me.HasRole(x)) ?? false);
}
else
{
var me = _client.CurrentUser;
IsMentioningMe = MentionedUsers?.Contains(me) ?? false;
}
} }
public override bool Equals(object obj) => obj is Message && (obj as Message).Id == Id; public override bool Equals(object obj) => obj is Message && (obj as Message).Id == Id;