From 8e5fb3857734c3408abbb2e255d79f1783a17fa8 Mon Sep 17 00:00:00 2001 From: ObsidianMinor Date: Sat, 4 Mar 2017 22:28:46 -0600 Subject: [PATCH] Minor edit to Relationship property in SocketUser --- src/Discord.Net.WebSocket/DiscordSocketClient.cs | 9 ++++++--- src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs index 59cb70503..ed1053d58 100644 --- a/src/Discord.Net.WebSocket/DiscordSocketClient.cs +++ b/src/Discord.Net.WebSocket/DiscordSocketClient.cs @@ -1679,16 +1679,19 @@ namespace Discord.WebSocket return channel; } + internal SocketRelationship GetRelationship(ulong id) + { + return State.GetRelationship(id); + } internal SocketRelationship AddRelationship(Relationship model, ClientState state) { var relation = SocketRelationship.Create(this, state, model); - state.AddRelationship(relation); + state.AddRelationship(SocketRelationship.Create(this, state, model)); return relation; } internal SocketRelationship RemoveRelationship(ulong id) { - var relation = State.RemoveRelationship(id); - return relation; + return State.RemoveRelationship(id); } //IDiscordClient diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs index 0acbdb32c..3b92141d7 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs @@ -22,7 +22,7 @@ namespace Discord.WebSocket public string Mention => MentionUtils.MentionUser(Id); public Game? Game => Presence.Game; public UserStatus Status => Presence.Status; - public RelationshipType Relationship => Discord.Relationships.FirstOrDefault(r => r.User.Id == Id)?.Type ?? RelationshipType.None; + public RelationshipType Relationship => Discord.GetRelationship(Id)?.Type ?? RelationshipType.None; internal SocketUser(DiscordSocketClient discord, ulong id) : base(discord, id)