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

Claned up mentions, added sanitize handler to user/role/channel mentions

Browse Source
This commit is contained in:
RogueException
2016-10-06 00:20:26 -03:00
parent 7e246f942e
commit 2f3831dd6e
8 changed files with 223 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Discord.Net.WebSocket/API/Gateway/RequestMembersParams.cs
View File

@@ -1,7 +1,6 @@
#pragma warning disable CS1591
using Newtonsoft.Json;
using System.Collections.Generic;
using System.Linq;
namespace Discord.API.Gateway
{
@@ -14,6 +13,6 @@ namespace Discord.API.Gateway
public int Limit { get; set; }
[JsonProperty("guild_id")]
private ulong[] GuildIds { get; set; }
public IEnumerable<ulong> GuildIds { get; set; }
}
}

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

@@ -105,9 +105,9 @@ namespace Discord.WebSocket
var text = model.Content.Value;
var guild = (Channel as SocketGuildChannel)?.Guild;
_mentionedUsers = MentionsHelper.GetUserMentions(text, Channel, mentions);
_mentionedChannelIds = MentionsHelper.GetChannelMentions(text, guild);
_mentionedRoles = MentionsHelper.GetRoleMentions<RestRole>(text, guild);
_mentionedUsers = MentionUtils.GetUserMentions(text, Channel, mentions);
_mentionedChannelIds = MentionUtils.GetChannelMentions(text, guild);
_mentionedRoles = MentionUtils.GetRoleMentions<RestRole>(text, guild);
model.Content = text;
}
}
@@ -131,10 +131,10 @@ namespace Discord.WebSocket
public string Resolve(string text, UserMentionHandling userHandling, ChannelMentionHandling channelHandling,
RoleMentionHandling roleHandling, EveryoneMentionHandling everyoneHandling)
{
text = MentionsHelper.ResolveUserMentions(text, null, MentionedUsers, userHandling);
text = MentionsHelper.ResolveChannelMentions(text, null, channelHandling);
text = MentionsHelper.ResolveRoleMentions(text, MentionedRoles, roleHandling);
text = MentionsHelper.ResolveEveryoneMentions(text, everyoneHandling);
text = MentionUtils.ResolveUserMentions(text, null, MentionedUsers, userHandling);
text = MentionUtils.ResolveChannelMentions(text, null, channelHandling);
text = MentionUtils.ResolveRoleMentions(text, MentionedRoles, roleHandling);
text = MentionUtils.ResolveEveryoneMentions(text, everyoneHandling);
return text;
}