primary constructor
This commit is contained in:
parent
3f6468f374
commit
df6012bb86
1 changed files with 4 additions and 13 deletions
|
@ -4,24 +4,15 @@ using EllieBot.Db.Models;
|
||||||
namespace EllieBot.Modules.EllieExpressions;
|
namespace EllieBot.Modules.EllieExpressions;
|
||||||
|
|
||||||
[Name("Expressions")]
|
[Name("Expressions")]
|
||||||
public partial class EllieExpressions : EllieModule<EllieExpressionsService>
|
public partial class EllieExpressions(IBotCreds creds, IHttpClientFactory clientFactory) : EllieModule<EllieExpressionsService>
|
||||||
{
|
{
|
||||||
public enum All
|
public enum All
|
||||||
{
|
{
|
||||||
All
|
All
|
||||||
}
|
}
|
||||||
|
|
||||||
private readonly IBotCreds _creds;
|
|
||||||
private readonly IHttpClientFactory _clientFactory;
|
|
||||||
|
|
||||||
public EllieExpressions(IBotCreds creds, IHttpClientFactory clientFactory)
|
|
||||||
{
|
|
||||||
_creds = creds;
|
|
||||||
_clientFactory = clientFactory;
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool AdminInGuildOrOwnerInDm()
|
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);
|
|| (ctx.Guild is not null && ((IGuildUser)ctx.User).GuildPermissions.Administrator);
|
||||||
|
|
||||||
private async Task ExprAddInternalAsync(string key, string message)
|
private async Task ExprAddInternalAsync(string key, string message)
|
||||||
|
@ -121,7 +112,7 @@ public partial class EllieExpressions : EllieModule<EllieExpressionsService>
|
||||||
|
|
||||||
private bool IsValidExprEditor()
|
private bool IsValidExprEditor()
|
||||||
=> (ctx.Guild is not null && ((IGuildUser)ctx.User).GuildPermissions.Administrator)
|
=> (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]
|
[Cmd]
|
||||||
[Priority(1)]
|
[Priority(1)]
|
||||||
|
@ -423,7 +414,7 @@ public partial class EllieExpressions : EllieModule<EllieExpressionsService>
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
using var client = _clientFactory.CreateClient();
|
using var client = clientFactory.CreateClient();
|
||||||
input = await client.GetStringAsync(attachment.Url);
|
input = await client.GetStringAsync(attachment.Url);
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(input))
|
if (string.IsNullOrWhiteSpace(input))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue