From df6012bb86141631dc871e2ec7f6fc78c1838b61 Mon Sep 17 00:00:00 2001 From: Toastie <toastie@toastiet0ast.com> Date: Tue, 8 Apr 2025 09:07:32 +1200 Subject: [PATCH] primary constructor --- .../Modules/Expressions/EllieExpressions.cs | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/EllieBot/Modules/Expressions/EllieExpressions.cs b/src/EllieBot/Modules/Expressions/EllieExpressions.cs index 49a3a74..13dda4f 100644 --- a/src/EllieBot/Modules/Expressions/EllieExpressions.cs +++ b/src/EllieBot/Modules/Expressions/EllieExpressions.cs @@ -4,24 +4,15 @@ using EllieBot.Db.Models; namespace EllieBot.Modules.EllieExpressions; [Name("Expressions")] -public partial class EllieExpressions : EllieModule<EllieExpressionsService> +public partial class EllieExpressions(IBotCreds creds, IHttpClientFactory clientFactory) : EllieModule<EllieExpressionsService> { public enum All { All } - private readonly IBotCreds _creds; - private readonly IHttpClientFactory _clientFactory; - - public EllieExpressions(IBotCreds creds, IHttpClientFactory clientFactory) - { - _creds = creds; - _clientFactory = clientFactory; - } - private bool AdminInGuildOrOwnerInDm() - => (ctx.Guild is null && _creds.IsOwner(ctx.User)) + => (ctx.Guild is null && creds.IsOwner(ctx.User)) || (ctx.Guild is not null && ((IGuildUser)ctx.User).GuildPermissions.Administrator); private async Task ExprAddInternalAsync(string key, string message) @@ -121,7 +112,7 @@ public partial class EllieExpressions : EllieModule<EllieExpressionsService> private bool IsValidExprEditor() => (ctx.Guild is not null && ((IGuildUser)ctx.User).GuildPermissions.Administrator) - || (ctx.Guild is null && _creds.IsOwner(ctx.User)); + || (ctx.Guild is null && creds.IsOwner(ctx.User)); [Cmd] [Priority(1)] @@ -423,7 +414,7 @@ public partial class EllieExpressions : EllieModule<EllieExpressionsService> return; } - using var client = _clientFactory.CreateClient(); + using var client = clientFactory.CreateClient(); input = await client.GetStringAsync(attachment.Url); if (string.IsNullOrWhiteSpace(input))