Merge branch 'feature/better-relations' of https://github.com/ObsidianMinor/Discord.Net into feature/better-relations

src/Discord.Net.Rest/ClientHelper.cs

@@ -128,5 +128,11 @@ namespace Discord.Rest
             var models = await client.ApiClient.GetVoiceRegionsAsync().ConfigureAwait(false);
             return models.Select(x => RestVoiceRegion.Create(client, x)).Where(x => x.Id == id).FirstOrDefault();
         }
+
+        public static async Task<IReadOnlyCollection<RestRelationship>> GetRelationshipsAsync(BaseDiscordClient client)
+        {
+            var models = await client.ApiClient.GetRelationshipsAsync().ConfigureAwait(false);
+            return models.Select(r => RestRelationship.Create(client, r)).ToImmutableArray();
+        }
     }
 }

src/Discord.Net.Rest/DiscordRestClient.cs

@@ -89,6 +89,9 @@ namespace Discord.Rest
         public Task<RestVoiceRegion> GetVoiceRegionAsync(string id)
             => ClientHelper.GetVoiceRegionAsync(this, id);
 
+        public Task<IReadOnlyCollection<RestRelationship>> GetRelationshipsAsync()
+            => ClientHelper.GetRelationshipsAsync(this);
+
         //IDiscordClient
         async Task<IApplication> IDiscordClient.GetApplicationInfoAsync()
             => await GetApplicationInfoAsync().ConfigureAwait(false);

src/Discord.Net.Rest/Entities/Users/RestRelationship.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Model = Discord.API.Relationship;
+
+namespace Discord.Rest
+{
+    public class RestRelationship : IRelationship
+    {
+        public RelationshipType Type { get; internal set; }
+
+        public IUser User { get; internal set; }
+
+        internal RestRelationship(RelationshipType type, IUser user)
+        {
+            Type = type;
+            User = user;
+        }
+
+        internal static RestRelationship Create(BaseDiscordClient discord, Model model)
+        {
+            RestUser user = RestUser.Create(discord, model.User);
+            return new RestRelationship(model.Type, user);
+        }
+    }
+}

src/Discord.Net.Rest/Entities/Users/RestUser.cs

@@ -53,26 +53,18 @@ namespace Discord.Rest
 
         public override string ToString() => $"{Username}#{Discriminator}";
         private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})";
+        
+        public Task AddFriendAsync(RequestOptions options = null)
+            => Discord.ApiClient.AddFriendAsync(Id, options);
+        public Task BlockUserAsync(RequestOptions options = null)
+            => Discord.ApiClient.BlockUserAsync(Id, options);
+        public Task RemoveRelationshipAsync(RequestOptions options = null)
+            => Discord.ApiClient.RemoveRelationshipAsync(Id, options);
 
         //IUser
         Task<IDMChannel> IUser.GetDMChannelAsync(CacheMode mode, RequestOptions options)
             => Task.FromResult<IDMChannel>(null);
         async Task<IDMChannel> IUser.CreateDMChannelAsync(RequestOptions options)
             => await CreateDMChannelAsync(options).ConfigureAwait(false);
-
-        public Task AddFriendAsync(RequestOptions options = null)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task BlockUserAsync(RequestOptions options = null)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task RemoveRelationshipAsync(RequestOptions options = null)
-        {
-            throw new NotImplementedException();
-        }
     }
 }

src/Discord.Net.Rpc/Entities/Users/RpcUser.cs

@@ -55,19 +55,11 @@ namespace Discord.Rpc
         async Task<IDMChannel> IUser.CreateDMChannelAsync(RequestOptions options)
             => await CreateDMChannelAsync(options).ConfigureAwait(false);
 
-        public Task AddFriendAsync(RequestOptions options = null)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task BlockUserAsync(RequestOptions options = null)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Task RemoveRelationshipAsync(RequestOptions options = null)
-        {
-            throw new NotImplementedException();
-        }
+        Task IUser.AddFriendAsync(RequestOptions options)
+            => throw new NotSupportedException();
+        Task IUser.BlockUserAsync(RequestOptions options)
+            => throw new NotSupportedException();
+        Task IUser.RemoveRelationshipAsync(RequestOptions options)
+            => throw new NotSupportedException();
     }
 }

src/Discord.Net.WebSocket/DiscordSocketClient.cs

@@ -272,6 +272,9 @@ namespace Discord.WebSocket
         public Task<RestInvite> GetInviteAsync(string inviteId)
             => ClientHelper.GetInviteAsync(this, inviteId);
         
+        public Task<IReadOnlyCollection<SocketRelationship>> GetRelationshipsAsync()
+            => Task.FromResult(State.Relationships);
+
         /// <inheritdoc />
         public SocketUser GetUser(ulong id)
         {
@@ -1730,5 +1733,8 @@ namespace Discord.WebSocket
             => await StartAsync().ConfigureAwait(false);
         async Task IDiscordClient.StopAsync()
             => await StopAsync().ConfigureAwait(false);
+
+        async Task<IReadOnlyCollection<IRelationship>> IDiscordClient.GetRelationshipsAsync()
+            => await GetRelationshipsAsync();
     }
 }