diff --git a/src/Discord.Net.Core/Entities/Messages/IMessage.cs b/src/Discord.Net.Core/Entities/Messages/IMessage.cs index 6f0a60e0f..e5a5ebcbe 100644 --- a/src/Discord.Net.Core/Entities/Messages/IMessage.cs +++ b/src/Discord.Net.Core/Entities/Messages/IMessage.cs @@ -23,17 +23,17 @@ namespace Discord /// Gets the author of this message. IUser Author { get; } - /// Returns a collection of all attachments included in this message. + /// Returns all attachments included in this message. IReadOnlyCollection Attachments { get; } - /// Returns a collection of all embeds included in this message. + /// Returns all embeds included in this message. IReadOnlyCollection Embeds { get; } - /// Returns a collection of all tags included in this message's content. + /// Returns all tags included in this message's content. IReadOnlyCollection Tags { get; } - /// Returns a collection of channel ids mentioned in this message. + /// Returns the ids of channels mentioned in this message. IReadOnlyCollection MentionedChannelIds { get; } - /// Returns a collection of roles mentioned in this message. - IReadOnlyCollection MentionedRoles { get; } - /// Returns a collection of users mentioned in this message. - IReadOnlyCollection MentionedUsers { get; } + /// Returns the ids of roles mentioned in this message. + IReadOnlyCollection MentionedRoleIds { get; } + /// Returns the ids of users mentioned in this message. + IReadOnlyCollection MentionedUserIds { get; } } } \ No newline at end of file diff --git a/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs index 87999caa0..c2f9ab659 100644 --- a/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs +++ b/src/Discord.Net.Rest/Entities/Messages/RestMessage.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Linq; using System.Threading.Tasks; using Model = Discord.API.Message; @@ -23,7 +24,7 @@ namespace Discord.Rest public virtual IReadOnlyCollection Attachments => ImmutableArray.Create(); public virtual IReadOnlyCollection Embeds => ImmutableArray.Create(); public virtual IReadOnlyCollection MentionedChannelIds => ImmutableArray.Create(); - public virtual IReadOnlyCollection MentionedRoles => ImmutableArray.Create(); + public virtual IReadOnlyCollection MentionedRoleIds => ImmutableArray.Create(); public virtual IReadOnlyCollection MentionedUsers => ImmutableArray.Create(); public virtual IReadOnlyCollection Tags => ImmutableArray.Create(); @@ -64,7 +65,6 @@ namespace Discord.Rest IUser IMessage.Author => Author; IReadOnlyCollection IMessage.Attachments => Attachments; IReadOnlyCollection IMessage.Embeds => Embeds; - IReadOnlyCollection IMessage.MentionedRoles => MentionedRoles; - IReadOnlyCollection IMessage.MentionedUsers => MentionedUsers; + IReadOnlyCollection IMessage.MentionedUserIds => MentionedUsers.Select(x => x.Id).ToImmutableArray(); } } diff --git a/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs index f30f57023..1f27d762f 100644 --- a/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs +++ b/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs @@ -27,7 +27,7 @@ namespace Discord.Rest public override IReadOnlyCollection Attachments => _attachments; public override IReadOnlyCollection Embeds => _embeds; public override IReadOnlyCollection MentionedChannelIds => MessageHelper.FilterTagsByKey(TagType.ChannelMention, _tags); - public override IReadOnlyCollection MentionedRoles => MessageHelper.FilterTagsByValue(TagType.RoleMention, _tags); + public override IReadOnlyCollection MentionedRoleIds => MessageHelper.FilterTagsByKey(TagType.RoleMention, _tags); public override IReadOnlyCollection MentionedUsers => MessageHelper.FilterTagsByValue(TagType.UserMention, _tags); public override IReadOnlyCollection Tags => _tags; diff --git a/src/Discord.Net.WebSocket/Entities/Messages/SocketMessage.cs b/src/Discord.Net.WebSocket/Entities/Messages/SocketMessage.cs index 89bfbfb01..7093fabb6 100644 --- a/src/Discord.Net.WebSocket/Entities/Messages/SocketMessage.cs +++ b/src/Discord.Net.WebSocket/Entities/Messages/SocketMessage.cs @@ -60,8 +60,8 @@ namespace Discord.WebSocket IReadOnlyCollection IMessage.Attachments => Attachments; IReadOnlyCollection IMessage.Embeds => Embeds; IReadOnlyCollection IMessage.MentionedChannelIds => MentionedChannels.Select(x => x.Id).ToImmutableArray(); - IReadOnlyCollection IMessage.MentionedRoles => MentionedRoles; - IReadOnlyCollection IMessage.MentionedUsers => MentionedUsers; + IReadOnlyCollection IMessage.MentionedRoleIds => MentionedRoles.Select(x => x.Id).ToImmutableArray(); + IReadOnlyCollection IMessage.MentionedUserIds => MentionedUsers.Select(x => x.Id).ToImmutableArray(); ulong IMessage.ChannelId => Channel.Id; } }