[Fix] Updated global name not being passed to UserUpdated event (#2726)

* fix

* fix another overgisht
This commit is contained in:
Misha133
2023-08-10 15:41:40 +03:00
committed by GitHub
parent 184a536f95
commit 9dfd4d7a41
8 changed files with 20 additions and 3 deletions

View File

@@ -12,6 +12,7 @@ namespace Discord.WebSocket
public override string Username { get; internal set; }
public override ushort DiscriminatorValue { get; internal set; }
public override string AvatarId { get; internal set; }
public override string GlobalName { get; internal set; }
internal override SocketPresence Presence { get; set; }
public override bool IsWebhook => false;

View File

@@ -30,6 +30,8 @@ namespace Discord.WebSocket
/// <inheritdoc />
public override string AvatarId { get { return GlobalUser.AvatarId; } internal set { GlobalUser.AvatarId = value; } }
/// <inheritdoc />
public override string GlobalName { get { return GlobalUser.GlobalName; } internal set { GlobalUser.GlobalName = value; } }
/// <inheritdoc />
internal override SocketPresence Presence { get { return GlobalUser.Presence; } set { GlobalUser.Presence = value; } }
/// <inheritdoc />

View File

@@ -47,6 +47,8 @@ namespace Discord.WebSocket
public override ushort DiscriminatorValue { get { return GlobalUser.DiscriminatorValue; } internal set { GlobalUser.DiscriminatorValue = value; } }
/// <inheritdoc />
public override string AvatarId { get { return GlobalUser.AvatarId; } internal set { GlobalUser.AvatarId = value; } }
/// <inheritdoc />
public override string GlobalName { get { return GlobalUser.GlobalName; } internal set { GlobalUser.GlobalName = value; } }
/// <inheritdoc />
public GuildPermissions GuildPermissions => new GuildPermissions(Permissions.ResolveGuild(Guild, this));

View File

@@ -29,6 +29,8 @@ namespace Discord.WebSocket
/// <inheritdoc />
public override string AvatarId { get { return GlobalUser.AvatarId; } internal set { GlobalUser.AvatarId = value; } }
/// <inheritdoc />
public override string GlobalName { get { return GlobalUser.GlobalName; } internal set { GlobalUser.GlobalName = value; } }
/// <inheritdoc />
internal override SocketPresence Presence { get { return GlobalUser.Presence; } set { GlobalUser.Presence = value; } }
/// <inheritdoc />
public UserProperties Flags { get; internal set; }

View File

@@ -58,6 +58,13 @@ namespace Discord.WebSocket
get => GuildUser.AvatarId;
internal set => GuildUser.AvatarId = value;
}
/// <inheritdoc />
public override string GlobalName
{
get => GlobalUser.GlobalName;
internal set => GlobalUser.GlobalName = value;
}
/// <inheritdoc/>
public string DisplayAvatarId => GuildAvatarId ?? AvatarId;

View File

@@ -19,6 +19,8 @@ namespace Discord.WebSocket
public override ushort DiscriminatorValue { get; internal set; }
/// <inheritdoc />
public override string AvatarId { get; internal set; }
/// <inheritdoc />
public override string GlobalName { get; internal set; }
/// <inheritdoc />
public override bool IsBot { get; internal set; }

View File

@@ -33,7 +33,7 @@ namespace Discord.WebSocket
internal abstract SocketPresence Presence { get; set; }
/// <inheritdoc />
public string GlobalName { get; internal set; }
public abstract string GlobalName { get; internal set; }
/// <inheritdoc />
public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id);
@@ -93,7 +93,7 @@ namespace Discord.WebSocket
PublicFlags = model.PublicFlags.Value;
hasChanges = true;
}
if (model.GlobalName.IsSpecified)
if (model.GlobalName.IsSpecified && model.GlobalName.Value != GlobalName)
{
GlobalName = model.GlobalName.Value;
hasChanges = true;

View File

@@ -25,7 +25,8 @@ namespace Discord.WebSocket
public override ushort DiscriminatorValue { get; internal set; }
/// <inheritdoc />
public override string AvatarId { get; internal set; }
/// <inheritdoc />
public override string GlobalName { get; internal set; }
/// <inheritdoc />
public override bool IsBot { get; internal set; }