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

Fixed websocket message mention detection

Browse Source
This commit is contained in:
RogueException
2016-10-04 13:37:40 -03:00
parent 857255abde
commit c67bd04c5a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Discord.Net.Core/Utils/MentionsHelper.cs
View File

@@ -62,6 +62,9 @@ namespace Discord
internal static ImmutableArray<TRole> GetRoleMentions<TRole>(string text, IGuild guild) internal static ImmutableArray<TRole> GetRoleMentions<TRole>(string text, IGuild guild)
where TRole : class, IRole where TRole : class, IRole
{ {
if (guild == null)
return ImmutableArray.Create<TRole>();
var matches = _roleRegex.Matches(text); var matches = _roleRegex.Matches(text);
var builder = ImmutableArray.CreateBuilder<TRole>(matches.Count); var builder = ImmutableArray.CreateBuilder<TRole>(matches.Count);
foreach (var match in matches.OfType<Match>()) foreach (var match in matches.OfType<Match>())

7
src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs
View File

@@ -96,10 +96,11 @@ namespace Discord.WebSocket
if (model.Content.IsSpecified) if (model.Content.IsSpecified)
{ {
var text = model.Content.Value; var text = model.Content.Value;
var guild = (Channel as SocketGuildChannel)?.Guild;
_mentionedUsers = MentionsHelper.GetUserMentions(text, null, mentions); _mentionedUsers = MentionsHelper.GetUserMentions(text, Channel, mentions);
_mentionedChannelIds = MentionsHelper.GetChannelMentions(text, null); _mentionedChannelIds = MentionsHelper.GetChannelMentions(text, guild);
_mentionedRoles = MentionsHelper.GetRoleMentions<RestRole>(text, null); _mentionedRoles = MentionsHelper.GetRoleMentions<RestRole>(text, guild);
model.Content = text; model.Content = text;
} }
} }