yeah it's sadge (#2880)
This commit is contained in:
@@ -16,6 +16,8 @@ namespace Discord.API
|
|||||||
public Optional<string> Avatar { get; set; }
|
public Optional<string> Avatar { get; set; }
|
||||||
[JsonProperty("banner")]
|
[JsonProperty("banner")]
|
||||||
public Optional<string> Banner { get; set; }
|
public Optional<string> Banner { get; set; }
|
||||||
|
[JsonProperty("banner_color")]
|
||||||
|
public Optional<Color?> BannerColor { get; set; }
|
||||||
[JsonProperty("accent_color")]
|
[JsonProperty("accent_color")]
|
||||||
public Optional<uint?> AccentColor { get; set; }
|
public Optional<uint?> AccentColor { get; set; }
|
||||||
|
|
||||||
|
|||||||
@@ -25,8 +25,23 @@ namespace Discord.Rest
|
|||||||
public ushort DiscriminatorValue { get; private set; }
|
public ushort DiscriminatorValue { get; private set; }
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public string AvatarId { get; private set; }
|
public string AvatarId { get; private set; }
|
||||||
/// <inheritdoc />
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the hash of the banner.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// <see langword="null"/> if the user has no banner set.
|
||||||
|
/// </remarks>
|
||||||
public string BannerId { get; private set; }
|
public string BannerId { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the color of the banner.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// <see langword="null"/> if the user has no banner set.
|
||||||
|
/// </remarks>
|
||||||
|
public Color? BannerColor { get; private set; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public Color? AccentColor { get; private set; }
|
public Color? AccentColor { get; private set; }
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@@ -92,6 +107,8 @@ namespace Discord.Rest
|
|||||||
AvatarId = model.Avatar.Value;
|
AvatarId = model.Avatar.Value;
|
||||||
if (model.Banner.IsSpecified)
|
if (model.Banner.IsSpecified)
|
||||||
BannerId = model.Banner.Value;
|
BannerId = model.Banner.Value;
|
||||||
|
if (model.BannerColor.IsSpecified)
|
||||||
|
BannerColor = model.BannerColor.Value;
|
||||||
if (model.AccentColor.IsSpecified)
|
if (model.AccentColor.IsSpecified)
|
||||||
AccentColor = model.AccentColor.Value;
|
AccentColor = model.AccentColor.Value;
|
||||||
if (model.Discriminator.IsSpecified)
|
if (model.Discriminator.IsSpecified)
|
||||||
|
|||||||
@@ -20,6 +20,22 @@ namespace Discord.WebSocket
|
|||||||
public bool IsMfaEnabled { get; private set; }
|
public bool IsMfaEnabled { get; private set; }
|
||||||
internal override SocketGlobalUser GlobalUser { get; set; }
|
internal override SocketGlobalUser GlobalUser { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the hash of the banner.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// <see langword="null"/> if the user has no banner set.
|
||||||
|
/// </remarks>
|
||||||
|
public string BannerId { get; internal set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the color of the banner.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// <see langword="null"/> if the user has no banner set.
|
||||||
|
/// </remarks>
|
||||||
|
public Color? BannerColor { get; internal set; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override bool IsBot { get { return GlobalUser.IsBot; } internal set { GlobalUser.IsBot = value; } }
|
public override bool IsBot { get { return GlobalUser.IsBot; } internal set { GlobalUser.IsBot = value; } }
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
@@ -86,6 +102,18 @@ namespace Discord.WebSocket
|
|||||||
Locale = model.Locale.Value;
|
Locale = model.Locale.Value;
|
||||||
hasGlobalChanges = true;
|
hasGlobalChanges = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (model.BannerColor.IsSpecified && model.BannerColor.Value != BannerColor)
|
||||||
|
{
|
||||||
|
BannerColor = model.BannerColor.Value;
|
||||||
|
hasGlobalChanges = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (model.Banner.IsSpecified && model.Banner.Value != BannerId)
|
||||||
|
{
|
||||||
|
BannerId = model.Banner.Value;
|
||||||
|
hasGlobalChanges = true;
|
||||||
|
}
|
||||||
return hasGlobalChanges;
|
return hasGlobalChanges;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user