github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bannerz W (#2987)

Browse Source
This commit is contained in:
Mihail Gribkov
2024-08-29 00:02:20 +03:00
committed by GitHub
parent bc84b94bd9
commit 57eb906552
8 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs
View File

@@ -50,6 +50,9 @@ namespace Discord.WebSocket
/// <inheritdoc />
public override string GlobalName { get { return GlobalUser.GlobalName; } internal set { GlobalUser.GlobalName = value; } }
/// <inheritdoc/>
public string GuildBannerHash { get; private set; }
/// <inheritdoc />
public GuildPermissions GuildPermissions => new GuildPermissions(Permissions.ResolveGuild(Guild, this));
internal override SocketPresence Presence { get; set; }
@@ -185,6 +188,8 @@ namespace Discord.WebSocket
_timedOutTicks = model.TimedOutUntil.Value?.UtcTicks;
if (model.Pending.IsSpecified)
IsPending = model.Pending.Value;
if (model.Banner.IsSpecified)
GuildBannerHash = model.Banner.Value;
Flags = model.Flags;
}
@@ -263,6 +268,10 @@ namespace Discord.WebSocket
public string GetGuildAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
=> CDN.GetGuildUserAvatarUrl(Id, Guild.Id, GuildAvatarId, size, format);
/// <inheritdoc />
public string GetGuildBannerUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
=> CDN.GetGuildUserBannerUrl(Id, Guild.Id, GuildBannerHash, size, format);
/// <inheritdoc />
public override string GetDisplayAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
=> GetGuildAvatarUrl(format, size) ?? base.GetDisplayAvatarUrl(format, size);

7
src/Discord.Net.WebSocket/Entities/Users/SocketThreadUser.cs
View File

@@ -72,6 +72,10 @@ namespace Discord.WebSocket
public string GuildAvatarId
=> GuildUser.GuildAvatarId;
/// <inheritdoc/>
public string GuildBannerHash
=> GuildUser.GuildBannerHash;
/// <inheritdoc/>
public override ushort DiscriminatorValue
{
@@ -240,6 +244,9 @@ namespace Discord.WebSocket
/// <inheritdoc />
string IGuildUser.GetGuildAvatarUrl(ImageFormat format, ushort size) => GuildUser.GetGuildAvatarUrl(format, size);
/// <inheritdoc />
string IGuildUser.GetGuildBannerUrl(ImageFormat format, ushort size) => GuildUser.GetGuildBannerUrl(format, size);
/// <inheritdoc />
public override string GetDisplayAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
=> GuildUser.GetGuildAvatarUrl() ?? base.GetDisplayAvatarUrl(format, size);

4
src/Discord.Net.WebSocket/Entities/Users/SocketWebhookUser.cs
View File

@@ -75,8 +75,12 @@ namespace Discord.WebSocket
/// <inheritdoc />
string IGuildUser.GuildAvatarId => null;
/// <inheritdoc />
string IGuildUser.GuildBannerHash => null;
/// <inheritdoc />
string IGuildUser.GetGuildAvatarUrl(ImageFormat format, ushort size) => null;
/// <inheritdoc />
string IGuildUser.GetGuildBannerUrl(ImageFormat format, ushort size) => null;
/// <inheritdoc />
DateTimeOffset? IGuildUser.PremiumSince => null;
/// <inheritdoc />
DateTimeOffset? IGuildUser.TimedOutUntil => null;