Added AuthorMember to BindableMessage

Author: Avid29

src/Quarrel.Client/Models/Messages/Message.cs

@@ -17,6 +17,7 @@ public class Message : SnowflakeItem, IMessage
         internal Message(JsonMessage jsonMessage, QuarrelClient context) :
             base(context)
         {
+            GuildId = jsonMessage.GuildId;
             Type = jsonMessage.Type;
             IsTextToSpeech = jsonMessage.IsTextToSpeech ?? false;
             IsPinned = jsonMessage.Pinned ?? false;
@@ -40,6 +41,8 @@ internal Message(JsonMessage jsonMessage, QuarrelClient context) :
             }
         }
 
+        public ulong? GuildId{ get; private set; }
+
         /// <inheritdoc/>
         public MessageType Type { get; private set; }
 

src/Quarrel.Client/QuarrelClient.Methods.cs

@@ -41,7 +41,7 @@ public partial class QuarrelClient
         /// Gets messages in a channel.
         /// </summary>
         /// <param name="channelId">The channel's id.</param>
-        public async Task<Message[]> GetMessagesAsync(ulong channelId)
+        public async Task<Message[]> GetMessagesAsync(ulong channelId, ulong? guildId = null)
         {
             Guard.IsNotNull(_channelService, nameof(_channelService));
 
@@ -51,6 +51,7 @@ public async Task<Message[]> GetMessagesAsync(ulong channelId)
             Message[] messages = new Message[jsonMessages.Length];
             for (int i = 0; i < messages.Length; i++)
             {
+                jsonMessages[i].GuildId = jsonMessages[i].GuildId ?? guildId;
                 messages[i] = new Message(jsonMessages[i], this);
             }
 

src/Quarrel.ViewModels/Bindables/Channels/Abstract/BindableChannel.cs

@@ -1,6 +1,7 @@
 // Quarrel © 2022
 
 using Quarrel.Bindables.Abstract;
+using Quarrel.Bindables.Channels.Interfaces;
 using Quarrel.Client.Models.Channels;
 using Quarrel.Client.Models.Channels.Abstract;
 using Quarrel.Client.Models.Channels.Interfaces;
@@ -15,7 +16,7 @@ namespace Quarrel.Bindables.Channels.Abstract
     /// <summary>
     /// A wrapper of a <see cref="Client.Models.Channels.Abstract.Channel"/> that can be bound to the UI.
     /// </summary>
-    public abstract partial class BindableChannel : SelectableItem
+    public abstract partial class BindableChannel : SelectableItem, IBindableChannel
     {
         private Channel _channel;
 
@@ -29,14 +30,10 @@ internal BindableChannel(IDiscordService discordService, IDispatcherService disp
             _channel.ItemUpdated += AckUpdateRoot;
         }
 
-        /// <summary>
-        /// Gets the id of the channel.
-        /// </summary>
+        /// <inheritdoc/>
         public ulong Id => Channel.Id;
 
-        /// <summary>
-        /// Gets the name of the channel as displayed.
-        /// </summary>
+        /// <inheritdoc/>
         public virtual string? Name => _channel.Name;
 
         /// <summary>
@@ -65,6 +62,12 @@ private set
             }
         }
 
+        /// <inheritdoc/>
+        public abstract ulong? GuildId { get; }
+
+        /// <inheritdoc/>
+        public abstract bool IsAccessible { get; }
+
         /// <summary>
         /// Invokes property changed for mutable properties when <see cref="Channel.ItemUpdated"/> is invoked.
         /// </summary>

src/Quarrel.ViewModels/Bindables/Channels/Abstract/BindableGuildChannel.cs

@@ -40,6 +40,11 @@ internal BindableGuildChannel(IDiscordService discordService, IDispatcherService
             ApplyOverrides(channel.PermissionOverwrites, selfMember);
         }
 
+        private GuildChannel GuildChannel => (GuildChannel)Channel;
+
+        /// <inheritdoc/>
+        public override ulong? GuildId => GuildChannel.GuildId;
+
         /// <summary>
         /// The category the channel belongs to.
         /// </summary>
@@ -50,11 +55,6 @@ internal BindableGuildChannel(IDiscordService discordService, IDispatcherService
         /// </summary>
         public Permissions Permissions { get; private set; }
 
-        /// <summary>
-        /// Gets if the user has permission to open the channel.
-        /// </summary>
-        public abstract bool IsAccessible { get; }
-
         /// <summary>
         /// Creates a new <see cref="BindableGuildChannel"/> based on the type.
         /// </summary>

src/Quarrel.ViewModels/Bindables/Channels/Abstract/BindablePrivateChannel.cs

@@ -23,7 +23,10 @@ internal BindablePrivateChannel(IDiscordService discordService, IDispatcherServi
         }
 
         /// <inheritdoc/>
-        public bool IsAccessible => true;
+        public override ulong? GuildId => null;
+
+        /// <inheritdoc/>
+        public override bool IsAccessible => true;
 
         /// <inheritdoc/>
         public IMessageChannel MessageChannel => (IMessageChannel)Channel;

src/Quarrel.ViewModels/Bindables/Channels/BindableTextChannel.cs

@@ -28,7 +28,7 @@ internal BindableTextChannel(IDiscordService discordService, IDispatcherService
 
         /// <inheritdoc/>
         public IMessageChannel MessageChannel => (IMessageChannel)Channel;
-        
+
         /// <inheritdoc/>
         protected override void AckUpdate()
         {

src/Quarrel.ViewModels/Bindables/Channels/Interfaces/IBindableChannel.cs

@@ -13,7 +13,17 @@ public interface IBindableChannel
         /// Gets the id of the channel.
         /// </summary>
         public ulong Id { get; }
-        
+
+        /// <summary>
+        /// Gets the id of the guild the channel belongs to, or null if a DM.
+        /// </summary>
+        public ulong? GuildId { get; }
+
+        /// <summary>
+        /// Gets the name of the channel as displayed.
+        /// </summary>
+        public string? Name { get; }
+
         /// <summary>
         /// Gets if the user has permission to open the channel.
         /// </summary>

src/Quarrel.ViewModels/Bindables/Messages/BindableMessage.cs

@@ -33,13 +33,20 @@ internal BindableMessage(IDiscordService discordService, IDispatcherService disp
             {
                 Users.Add(user.Id, _discordService.GetUser(user.Id));
             }
+
+            if (message.GuildId.HasValue)
+            {
+                AuthorMember = _discordService.GetGuildMember(message.Author.Id, message.GuildId.Value);
+            }
         }
 
         /// <summary>
         /// Gets the author of the message as a bindable user.
         /// </summary>
         public BindableUser? Author { get; }
 
+        public BindableGuildMember? AuthorMember { get; }
+
         public Dictionary<ulong, BindableUser?> Users { get; }
     }
 }

src/Quarrel.ViewModels/Bindables/Users/BindableGuildMember.cs

@@ -0,0 +1,29 @@
+// Quarrel © 2022
+
+using Quarrel.Bindables.Abstract;
+using Quarrel.Client.Models.Users;
+using Quarrel.Services.Discord;
+using Quarrel.Services.Dispatcher;
+
+namespace Quarrel.Bindables.Users
+{
+    public class BindableGuildMember : BindableItem
+    {
+        private GuildMember _guildMember;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BindableGuildMember"/> class.
+        /// </summary>
+        internal BindableGuildMember(IDiscordService discordService, IDispatcherService dispatcherService, GuildMember guildMember) :
+            base(discordService, dispatcherService)
+        {
+            _guildMember = guildMember;
+        }
+
+        public GuildMember GuildMember
+        {
+            get => _guildMember;
+            set => SetProperty(ref _guildMember, value);
+        }
+    }
+}

src/Quarrel.ViewModels/Services/Discord/DiscordService.Methods.cs

@@ -70,11 +70,11 @@ public BindableGuildFolder[] GetMyGuildFolders()
 
             return folders;
         }
-        
+
         /// <inheritdoc/>
         public async Task<BindableMessage[]> GetChannelMessagesAsync(IBindableMessageChannel channel)
         {
-            var rawMessages = await _quarrelClient.GetMessagesAsync(channel.Id);
+            var rawMessages = await _quarrelClient.GetMessagesAsync(channel.Id, channel.GuildId);
             Guard.IsNotNull(rawMessages, nameof(rawMessages));
             BindableMessage[] messages = new BindableMessage[rawMessages.Length];
             for (int i = 0; i < messages.Length; i++)
@@ -169,5 +169,17 @@ public async Task<BindableMessage[]> GetChannelMessagesAsync(IBindableMessageCha
 
             return channels;
         }
+
+        /// <inheritdoc/>
+        public BindableGuildMember? GetGuildMember(ulong userId, ulong guildId)
+        {
+            var member = _quarrelClient.GetGuildMember(userId, guildId);
+            if (member is not null)
+            {
+                return new BindableGuildMember(this, _dispatcherService, member);
+            }
+
+            return null;
+        }
     }
 }