Merge branch 'dev' of https://github.com/Discord-Net/Discord.Net into merger-labs

src/Discord.Net.Core/Entities/Channels/IVoiceChannel.cs

@@ -6,7 +6,7 @@ namespace Discord
     /// <summary>
     ///     Represents a generic voice channel in a guild.
     /// </summary>
-    public interface IVoiceChannel : INestedChannel, IAudioChannel
+    public interface IVoiceChannel : INestedChannel, IAudioChannel, IMentionable
     {
         /// <summary>
         ///     Gets the bit-rate that the clients in this voice channel are requested to use.

src/Discord.Net.Rest/Entities/Channels/RestVoiceChannel.cs

@@ -21,6 +21,9 @@ namespace Discord.Rest
         /// <inheritdoc />
         public ulong? CategoryId { get; private set; }
 
+        /// <inheritdoc />
+        public string Mention => MentionUtils.MentionChannel(Id);
+
         internal RestVoiceChannel(BaseDiscordClient discord, IGuild guild, ulong id)
             : base(discord, guild, id)
         {

src/Discord.Net.WebSocket/Entities/Channels/SocketVoiceChannel.cs

@@ -20,6 +20,7 @@ namespace Discord.WebSocket
         public int Bitrate { get; private set; }
         /// <inheritdoc />
         public int? UserLimit { get; private set; }
+
         /// <inheritdoc />
         public ulong? CategoryId { get; private set; }
         /// <summary>
@@ -30,6 +31,10 @@ namespace Discord.WebSocket
         /// </returns>
         public ICategoryChannel Category
             => CategoryId.HasValue ? Guild.GetChannel(CategoryId.Value) as ICategoryChannel : null;
+
+        /// <inheritdoc />
+        public string Mention => MentionUtils.MentionChannel(Id);
+
         /// <inheritdoc />
         public Task SyncPermissionsAsync(RequestOptions options = null)
             => ChannelHelper.SyncPermissionsAsync(this, Discord, options);

test/Discord.Net.Tests.Unit/MockedEntities/MockedVoiceChannel.cs

@@ -12,6 +12,8 @@ namespace Discord
 
         public int? UserLimit => throw new NotImplementedException();
 
+        public string Mention => throw new NotImplementedException();
+
         public ulong? CategoryId => throw new NotImplementedException();
 
         public int Position => throw new NotImplementedException();