Added IMentionable

src/Discord.Net.Net45/Discord.Net.csproj

@@ -424,6 +424,9 @@
     <Compile Include="..\Discord.Net\Format.cs">
       <Link>Format.cs</Link>
     </Compile>
+    <Compile Include="..\Discord.Net\IMentionable.cs">
+      <Link>IMentionable.cs</Link>
+    </Compile>
     <Compile Include="..\Discord.Net\IService.cs">
       <Link>IService.cs</Link>
     </Compile>

src/Discord.Net/IMentionable.cs

@@ -0,0 +1,7 @@
+namespace Discord
+{
+    public interface IMentionable
+    {
+        string Mention { get; }
+    }
+}

src/Discord.Net/Models/Channel.cs

@@ -12,7 +12,7 @@ using APIChannel = Discord.API.Client.Channel;
 
 namespace Discord
 {
-    public sealed class Channel
+    public sealed class Channel : IMentionable
     {
         private struct Member
         {

src/Discord.Net/Models/Role.cs

@@ -9,7 +9,7 @@ using APIRole = Discord.API.Client.Role;
 
 namespace Discord
 {
-	public sealed class Role
+	public sealed class Role : IMentionable
     {
         internal DiscordClient Client => Server.Client;
 
@@ -37,16 +37,7 @@ namespace Discord
         public IEnumerable<User> Members => IsEveryone ? Server.Users : Server.Users.Where(x => x.HasRole(this));
 
         /// <summary> Gets the string used to mention this role. </summary>
-        public string Mention
+        public string Mention => IsEveryone ? "@everyone" : "";
-        {
-            get
-            {
-                if (IsEveryone)
-                    return "@everyone";
-                else
-                    throw new InvalidOperationException("Roles may only be mentioned if IsEveryone is true");
-            }
-        }
 
 		internal Role(ulong id, Server server)
 		{

src/Discord.Net/Models/User.cs

@@ -9,7 +9,7 @@ using APIMember = Discord.API.Client.Member;
 
 namespace Discord
 {
-	public sealed class User
+	public sealed class User : IMentionable
     {
         internal static string GetAvatarUrl(ulong userId, string avatarId) 
             => avatarId != null ? $"{DiscordConfig.ClientAPIUrl}users/{userId}/avatars/{avatarId}.jpg" : null;