Browse Source

Minor edit to Relationship property in SocketUser

pull/369/head
ObsidianMinor 8 years ago
parent
commit
f8af992bdb
2 changed files with 7 additions and 4 deletions
  1. +6
    -3
      src/Discord.Net.WebSocket/DiscordSocketClient.cs
  2. +1
    -1
      src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs

+ 6
- 3
src/Discord.Net.WebSocket/DiscordSocketClient.cs View File

@@ -1679,16 +1679,19 @@ namespace Discord.WebSocket
return channel; return channel;
} }


internal SocketRelationship GetRelationship(ulong id)
{
return State.GetRelationship(id);
}
internal SocketRelationship AddRelationship(Relationship model, ClientState state) internal SocketRelationship AddRelationship(Relationship model, ClientState state)
{ {
var relation = SocketRelationship.Create(this, state, model); var relation = SocketRelationship.Create(this, state, model);
state.AddRelationship(relation);
state.AddRelationship(SocketRelationship.Create(this, state, model));
return relation; return relation;
} }
internal SocketRelationship RemoveRelationship(ulong id) internal SocketRelationship RemoveRelationship(ulong id)
{ {
var relation = State.RemoveRelationship(id);
return relation;
return State.RemoveRelationship(id);
} }


//IDiscordClient //IDiscordClient


+ 1
- 1
src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs View File

@@ -22,7 +22,7 @@ namespace Discord.WebSocket
public string Mention => MentionUtils.MentionUser(Id); public string Mention => MentionUtils.MentionUser(Id);
public Game? Game => Presence.Game; public Game? Game => Presence.Game;
public UserStatus Status => Presence.Status; 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) internal SocketUser(DiscordSocketClient discord, ulong id)
: base(discord, id) : base(discord, id)


Loading…
Cancel
Save