Browse Source

Update user entities for globaluser setter

pull/2077/head
Armano den Boef 3 years ago
parent
commit
90ada29f16
6 changed files with 7 additions and 8 deletions
  1. +2
    -1
      src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs
  2. +1
    -1
      src/Discord.Net.WebSocket/Entities/Users/SocketGroupUser.cs
  3. +1
    -1
      src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs
  4. +1
    -1
      src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs
  5. +1
    -2
      src/Discord.Net.WebSocket/Entities/Users/SocketUnknownUser.cs
  6. +1
    -2
      src/Discord.Net.WebSocket/Entities/Users/SocketWebhookUser.cs

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

@@ -1,3 +1,4 @@
using System;
using System.Diagnostics;
using System.Linq;
using Model = Discord.API.User;
@@ -14,7 +15,7 @@ namespace Discord.WebSocket
internal override SocketPresence Presence { get; set; }

public override bool IsWebhook => false;
internal override SocketGlobalUser GlobalUser => this;
internal override SocketGlobalUser GlobalUser { get => this; set => throw new NotImplementedException(); }

private readonly object _lockObj = new object();
private ushort _references;


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

@@ -19,7 +19,7 @@ namespace Discord.WebSocket
/// </returns>
public SocketGroupChannel Channel { get; }
/// <inheritdoc />
internal override SocketGlobalUser GlobalUser { get; }
internal override SocketGlobalUser GlobalUser { get; set; }

/// <inheritdoc />
public override bool IsBot { get { return GlobalUser.IsBot; } internal set { GlobalUser.IsBot = value; } }


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

@@ -18,7 +18,7 @@ namespace Discord.WebSocket
public bool IsVerified { get; private set; }
/// <inheritdoc />
public bool IsMfaEnabled { get; private set; }
internal override SocketGlobalUser GlobalUser { get; }
internal override SocketGlobalUser GlobalUser { get; set; }

/// <inheritdoc />
public override bool IsBot { get { return GlobalUser.IsBot; } internal set { GlobalUser.IsBot = value; } }


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

@@ -194,7 +194,7 @@ namespace Discord.WebSocket

string IGuildUser.GetGuildAvatarUrl(ImageFormat format, ushort size) => GuildUser.GetGuildAvatarUrl(format, size);

internal override SocketGlobalUser GlobalUser => GuildUser.GlobalUser;
internal override SocketGlobalUser GlobalUser { get => GuildUser.GlobalUser; set => GuildUser.GlobalUser = value; }

internal override SocketPresence Presence { get => GuildUser.Presence; set => GuildUser.Presence = value; }



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

@@ -29,8 +29,7 @@ namespace Discord.WebSocket
internal override SocketPresence Presence { get { return new SocketPresence(UserStatus.Offline, null, null); } set { } }
/// <inheritdoc />
/// <exception cref="NotSupportedException">This field is not supported for an unknown user.</exception>
internal override SocketGlobalUser GlobalUser =>
throw new NotSupportedException();
internal override SocketGlobalUser GlobalUser { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

internal SocketUnknownUser(DiscordSocketClient discord, ulong id)
: base(discord, id)


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

@@ -34,8 +34,7 @@ namespace Discord.WebSocket
public override bool IsWebhook => true;
/// <inheritdoc />
internal override SocketPresence Presence { get { return new SocketPresence(UserStatus.Offline, null, null); } set { } }
internal override SocketGlobalUser GlobalUser =>
throw new NotSupportedException();
internal override SocketGlobalUser GlobalUser { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }

internal SocketWebhookUser(SocketGuild guild, ulong id, ulong webhookId)
: base(guild.Discord, id)


Loading…
Cancel
Save