From b276951a3fad7fcd0c5f4817d2e69b82f36a3dd5 Mon Sep 17 00:00:00 2001 From: Calle <22471295+calledude@users.noreply.github.com> Date: Tue, 26 Mar 2024 17:55:59 +0100 Subject: [PATCH] Update D.NET to 3.14.1 and MudBlazor to 6.19.1 (#1007) --- Directory.Build.targets | 2 +- Modix.Data/Models/Core/EphemeralUser.cs | 13 +++++++++++++ Modix.Web/Modix.Web.csproj | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index b430fc594..629400e99 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -12,7 +12,7 @@ - + diff --git a/Modix.Data/Models/Core/EphemeralUser.cs b/Modix.Data/Models/Core/EphemeralUser.cs index ac42c2188..8e0a73535 100644 --- a/Modix.Data/Models/Core/EphemeralUser.cs +++ b/Modix.Data/Models/Core/EphemeralUser.cs @@ -95,6 +95,10 @@ public class EphemeralUser : IGuildUser public string? GlobalName { get; private set; } + public string? AvatarDecorationHash { get; private set; } + + public ulong? AvatarDecorationSkuId { get; private set; } + public async Task AddRoleAsync(ulong roleId, RequestOptions? options = null) => await OnGuildUserOrThrowAsync(user => user.AddRoleAsync(roleId, options)); @@ -330,6 +334,12 @@ public EphemeralUser WithIGuildUserData(IGuildUser? user) if (user.TimedOutUntil != default) TimedOutUntil = user.TimedOutUntil; + if (user.AvatarDecorationHash != default) + AvatarDecorationHash = user.AvatarDecorationHash; + + if (user.AvatarDecorationSkuId != default) + AvatarDecorationSkuId = user.AvatarDecorationSkuId; + return WithIUserData(user) .WithIVoiceStateData(user); } @@ -416,6 +426,9 @@ private T OnGuildUserOrThrow(Func action) return action.Invoke(_guildUser); } + public string GetAvatarDecorationUrl() + => $"{DiscordConfig.CDNUrl}avatar-decoration-presets/{AvatarDecorationHash}.png"; + private IUser? _user; private IGuildUser? _guildUser; } diff --git a/Modix.Web/Modix.Web.csproj b/Modix.Web/Modix.Web.csproj index 02a9f2313..e14aa2824 100644 --- a/Modix.Web/Modix.Web.csproj +++ b/Modix.Web/Modix.Web.csproj @@ -10,7 +10,7 @@ - +