From 639885b26e693e43b60a689bb0d999eb8e01208e Mon Sep 17 00:00:00 2001
From: RogueException <rogueexception@gmail.com>
Date: Sun, 29 Nov 2015 02:44:14 -0400
Subject: [PATCH] Added Mention.Clean

---
 src/Discord.Net/Helpers/CachedObject.cs |  1 +
 src/Discord.Net/Helpers/Mention.cs      | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Discord.Net/Helpers/CachedObject.cs b/src/Discord.Net/Helpers/CachedObject.cs
index 9dbd21b03..d0232b91a 100644
--- a/src/Discord.Net/Helpers/CachedObject.cs
+++ b/src/Discord.Net/Helpers/CachedObject.cs
@@ -23,6 +23,7 @@ namespace Discord
 		protected readonly DiscordClient _client;
 		private bool _isCached;
 
+		internal DiscordClient Client => _client;
 		internal bool IsCached => _isCached;
 
         internal CachedObject(DiscordClient client)
diff --git a/src/Discord.Net/Helpers/Mention.cs b/src/Discord.Net/Helpers/Mention.cs
index 2ce845866..038d0a7cc 100644
--- a/src/Discord.Net/Helpers/Mention.cs
+++ b/src/Discord.Net/Helpers/Mention.cs
@@ -64,5 +64,19 @@ namespace Discord
 				return e.Value;
 			}));
 		}*/
-	}
+
+		/// <summary>Resolves all mentions in a provided string to those users, channels or roles' names.</summary>
+		internal static string Clean(Message msg, string text)
+		{
+			var client = msg.Client;
+			var server = msg.Server;
+            text = Mention.CleanUserMentions(client, server, text);
+			if (server != null)
+			{
+				text = Mention.CleanChannelMentions(client, server, text);
+				//text = Mention.CleanRoleMentions(_client, User, channel, text);
+			}
+			return text;
+		}
+    }
 }