From f9e61d89a670fe06fcb749dca5467b4c2594a178 Mon Sep 17 00:00:00 2001 From: RogueException Date: Sun, 29 Nov 2015 02:47:31 -0400 Subject: [PATCH] Renamed Mention.Clean to Mention.Resolve, added another overload --- src/Discord.Net/Helpers/Mention.cs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Discord.Net/Helpers/Mention.cs b/src/Discord.Net/Helpers/Mention.cs index 038d0a7cc..a6d3db6aa 100644 --- a/src/Discord.Net/Helpers/Mention.cs +++ b/src/Discord.Net/Helpers/Mention.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; @@ -66,10 +67,20 @@ namespace Discord }*/ /// Resolves all mentions in a provided string to those users, channels or roles' names. - internal static string Clean(Message msg, string text) + public static string Resolve(Message source, string text) { - var client = msg.Client; - var server = msg.Server; + if (source == null) throw new ArgumentNullException(nameof(source)); + if (text == null) throw new ArgumentNullException(nameof(text)); + + return Resolve(source.Server, text); + } + + /// Resolves all mentions in a provided string to those users, channels or roles' names. + public static string Resolve(Server server, string text) + { + if (text == null) throw new ArgumentNullException(nameof(text)); + + var client = server.Client; text = Mention.CleanUserMentions(client, server, text); if (server != null) {