liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new-shard-handler'

Browse Source
This commit is contained in:
Ske
2021-06-08 10:20:59 +02:00
parent 1fa2d9a093 118f2d49a6
commit 41f1c58a9f
24 changed files with 723 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PluralKit.Bot/CommandSystem/Context.cs
View File

@@ -29,8 +29,6 @@ namespace PluralKit.Bot
private readonly MessageCreateEvent _message;
private readonly Parameters _parameters;
private readonly MessageContext _messageContext;
private readonly PermissionSet _botPermissions;
private readonly PermissionSet _userPermissions;
private readonly IDatabase _db;
private readonly ModelRepository _repo;
@@ -42,7 +40,7 @@ namespace PluralKit.Bot
private Command _currentCommand;
public Context(ILifetimeScope provider, Shard shard, Guild? guild, Channel channel, MessageCreateEvent message, int commandParseOffset,
PKSystem senderSystem, MessageContext messageContext, PermissionSet botPermissions)
PKSystem senderSystem, MessageContext messageContext)
{
_message = message;
_shard = shard;
@@ -59,9 +57,6 @@ namespace PluralKit.Bot
_parameters = new Parameters(message.Content?.Substring(commandParseOffset));
_rest = provider.Resolve<DiscordApiClient>();
_cluster = provider.Resolve<Cluster>();
_botPermissions = botPermissions;
_userPermissions = _cache.PermissionsFor(message);
}
public IDiscordCache Cache => _cache;
@@ -76,8 +71,8 @@ namespace PluralKit.Bot
public Cluster Cluster => _cluster;
public MessageContext MessageContext => _messageContext;
public PermissionSet BotPermissions => _botPermissions;
public PermissionSet UserPermissions => _userPermissions;
public PermissionSet BotPermissions => _provider.Resolve<Bot>().PermissionsIn(_channel.Id);
public PermissionSet UserPermissions => _cache.PermissionsFor(_message);
public DiscordApiClient Rest => _rest;