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

Cleaned up MentionUtils

Browse Source
This commit is contained in:
RogueException
2016-07-13 13:43:47 -03:00
parent efc87ef06d
commit dc6ee3510a
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Discord.Net/Entities/Messages/Message.cs
View File

@@ -114,7 +114,7 @@ namespace Discord
if (guildChannel != null) if (guildChannel != null)
{ {
MentionedUsers = MentionUtils.GetUserMentions(text, Channel.IsAttached ? Channel : null, MentionedUsers); MentionedUsers = MentionUtils.GetUserMentions(text, Channel, MentionedUsers);
MentionedChannelIds = MentionUtils.GetChannelMentions(text, guildChannel.Guild); MentionedChannelIds = MentionUtils.GetChannelMentions(text, guildChannel.Guild);
MentionedRoles = MentionUtils.GetRoleMentions(text, guildChannel.Guild); MentionedRoles = MentionUtils.GetRoleMentions(text, guildChannel.Guild);
} }
@@ -173,8 +173,7 @@ namespace Discord
text = MentionUtils.ResolveUserMentions(text, Channel, MentionedUsers, userMode); text = MentionUtils.ResolveUserMentions(text, Channel, MentionedUsers, userMode);
if (guild != null) if (guild != null)
{ {
if (guild.IsAttached) //It's too expensive to do a channel lookup in REST mode text = MentionUtils.ResolveChannelMentions(text, guild);
text = MentionUtils.ResolveChannelMentions(text, guild);
text = MentionUtils.ResolveRoleMentions(text, guild, MentionedRoles); text = MentionUtils.ResolveRoleMentions(text, guild, MentionedRoles);
} }
return text; return text;

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

@@ -99,7 +99,7 @@ namespace Discord
if (ulong.TryParse(match.Groups[1].Value, NumberStyles.None, CultureInfo.InvariantCulture, out id)) if (ulong.TryParse(match.Groups[1].Value, NumberStyles.None, CultureInfo.InvariantCulture, out id))
{ {
IUser user = null; IUser user = null;
if (channel != null) if (channel.IsAttached) //Waiting this sync is safe because it's using a cache
user = channel.GetUserAsync(id).GetAwaiter().GetResult() as IUser; user = channel.GetUserAsync(id).GetAwaiter().GetResult() as IUser;
if (user == null) if (user == null)
{ {
@@ -195,18 +195,22 @@ namespace Discord
} }
internal static string ResolveChannelMentions(string text, IGuild guild) internal static string ResolveChannelMentions(string text, IGuild guild)
{ {
return _channelRegex.Replace(text, new MatchEvaluator(e => if (guild.IsAttached) //It's too expensive to do a channel lookup in REST mode
{ {
ulong id; return _channelRegex.Replace(text, new MatchEvaluator(e =>
if (ulong.TryParse(e.Groups[1].Value, NumberStyles.None, CultureInfo.InvariantCulture, out id))
{ {
IGuildChannel channel = null; ulong id;
channel = guild.GetChannelAsync(id).GetAwaiter().GetResult(); if (ulong.TryParse(e.Groups[1].Value, NumberStyles.None, CultureInfo.InvariantCulture, out id))
if (channel != null) {
return '#' + channel.Name; IGuildChannel channel = null;
} channel = guild.GetChannelAsync(id).GetAwaiter().GetResult();
return e.Value; if (channel != null)
})); return '#' + channel.Name;
}
return e.Value;
}));
}
return text;
} }
internal static string ResolveRoleMentions(string text, IGuild guild, IReadOnlyCollection<IRole> mentions) internal static string ResolveRoleMentions(string text, IGuild guild, IReadOnlyCollection<IRole> mentions)
{ {