From 4450ae4214b6713532e1670939fc93367551985c Mon Sep 17 00:00:00 2001 From: spiral Date: Fri, 26 Nov 2021 22:02:58 -0500 Subject: [PATCH] feat: go through some TODOs --- .../Controllers/v2/SwitchControllerV2.cs | 6 +- PluralKit.Bot/Commands/Admin.cs | 4 +- PluralKit.Bot/Commands/Checks.cs | 4 +- PluralKit.Bot/Commands/GroupMember.cs | 157 ++++++++++++++++++ PluralKit.Bot/Commands/Groups.cs | 61 ------- PluralKit.Bot/Commands/MemberAvatar.cs | 4 +- PluralKit.Bot/Commands/MemberEdit.cs | 4 +- PluralKit.Bot/Commands/MemberGroup.cs | 87 ---------- PluralKit.Bot/Commands/Misc.cs | 17 +- PluralKit.Bot/Commands/ServerConfig.cs | 7 +- PluralKit.Bot/Commands/System.cs | 4 +- PluralKit.Bot/Commands/SystemEdit.cs | 4 +- PluralKit.Bot/Commands/SystemFront.cs | 4 - PluralKit.Bot/Commands/SystemLink.cs | 4 +- PluralKit.Bot/Commands/SystemList.cs | 8 - PluralKit.Bot/Init.cs | 6 +- PluralKit.Bot/Modules.cs | 2 +- PluralKit.Bot/Proxy/ProxyService.cs | 25 +-- PluralKit.Bot/Services/LoggerCleanService.cs | 4 +- .../Utils/BulkImporter/PluralKitImport.cs | 1 + .../Utils/BulkImporter/TupperboxImport.cs | 30 ++-- 21 files changed, 193 insertions(+), 250 deletions(-) create mode 100644 PluralKit.Bot/Commands/GroupMember.cs delete mode 100644 PluralKit.Bot/Commands/MemberGroup.cs diff --git a/PluralKit.API/Controllers/v2/SwitchControllerV2.cs b/PluralKit.API/Controllers/v2/SwitchControllerV2.cs index 00bdb932..3a48e7f5 100644 --- a/PluralKit.API/Controllers/v2/SwitchControllerV2.cs +++ b/PluralKit.API/Controllers/v2/SwitchControllerV2.cs @@ -95,8 +95,7 @@ public class SwitchControllerV2: PKControllerBase { var member = await ResolveMember(memberRef); if (member == null) - // todo: which member - throw Errors.MemberNotFound; + throw Errors.MemberNotFoundWithRef(memberRef); if (member.System != system.Id) throw Errors.NotOwnMemberErrorWithRef(memberRef); members.Add(member); @@ -214,8 +213,7 @@ public class SwitchControllerV2: PKControllerBase var member = await ResolveMember(memberRef); if (member == null) - // todo: which member - throw Errors.MemberNotFound; + throw Errors.MemberNotFoundWithRef(memberRef); if (member.System != system.Id) throw Errors.NotOwnMemberErrorWithRef(memberRef); diff --git a/PluralKit.Bot/Commands/Admin.cs b/PluralKit.Bot/Commands/Admin.cs index fdce062c..cdfdd24a 100644 --- a/PluralKit.Bot/Commands/Admin.cs +++ b/PluralKit.Bot/Commands/Admin.cs @@ -7,13 +7,11 @@ namespace PluralKit.Bot; public class Admin { private readonly BotConfig _botConfig; - private readonly IDatabase _db; private readonly ModelRepository _repo; - public Admin(BotConfig botConfig, IDatabase db, ModelRepository repo) + public Admin(BotConfig botConfig, ModelRepository repo) { _botConfig = botConfig; - _db = db; _repo = repo; } diff --git a/PluralKit.Bot/Commands/Checks.cs b/PluralKit.Bot/Commands/Checks.cs index 8c7180bb..8e4809e6 100644 --- a/PluralKit.Bot/Commands/Checks.cs +++ b/PluralKit.Bot/Commands/Checks.cs @@ -13,7 +13,6 @@ namespace PluralKit.Bot; public class Checks { - private readonly Bot _bot; private readonly BotConfig _botConfig; private readonly IDiscordCache _cache; private readonly IDatabase _db; @@ -29,11 +28,10 @@ public class Checks PermissionSet.ManageWebhooks }; - public Checks(DiscordApiClient rest, Bot bot, IDiscordCache cache, IDatabase db, ModelRepository repo, + public Checks(DiscordApiClient rest, IDiscordCache cache, IDatabase db, ModelRepository repo, BotConfig botConfig, ProxyService proxy, ProxyMatcher matcher) { _rest = rest; - _bot = bot; _cache = cache; _db = db; _repo = repo; diff --git a/PluralKit.Bot/Commands/GroupMember.cs b/PluralKit.Bot/Commands/GroupMember.cs new file mode 100644 index 00000000..04fefe9d --- /dev/null +++ b/PluralKit.Bot/Commands/GroupMember.cs @@ -0,0 +1,157 @@ +using System.Text; + +using Myriad.Builders; + +using PluralKit.Core; + +namespace PluralKit.Bot; + +public class GroupMember +{ + private readonly IDatabase _db; + private readonly ModelRepository _repo; + + public GroupMember(IDatabase db, ModelRepository repo) + { + _db = db; + _repo = repo; + } + + public async Task AddRemoveGroups(Context ctx, PKMember target, Groups.AddRemoveOperation op) + { + ctx.CheckSystem().CheckOwnMember(target); + + var groups = (await ctx.ParseGroupList(ctx.System.Id)) + .Select(g => g.Id) + .Distinct() + .ToList(); + + var existingGroups = (await _repo.GetMemberGroups(target.Id).ToListAsync()) + .Select(g => g.Id) + .Distinct() + .ToList(); + + List toAction; + + if (op == Groups.AddRemoveOperation.Add) + { + toAction = groups + .Where(group => !existingGroups.Contains(group)) + .ToList(); + + await _repo.AddGroupsToMember(target.Id, toAction); + } + else if (op == Groups.AddRemoveOperation.Remove) + { + toAction = groups + .Where(group => existingGroups.Contains(group)) + .ToList(); + + await _repo.RemoveGroupsFromMember(target.Id, toAction); + } + else + { + return; // otherwise toAction "may be unassigned" + } + + await ctx.Reply(GroupMemberUtils.GenerateResponse(op, 1, groups.Count, toAction.Count, + groups.Count - toAction.Count)); + } + + public async Task ListMemberGroups(Context ctx, PKMember target) + { + var pctx = ctx.LookupContextFor(target.System); + + var groups = await _repo.GetMemberGroups(target.Id) + .Where(g => g.Visibility.CanAccess(pctx)) + .OrderBy(g => g.Name, StringComparer.InvariantCultureIgnoreCase) + .ToListAsync(); + + var description = ""; + var msg = ""; + + if (groups.Count == 0) + description = "This member has no groups."; + else + description = string.Join("\n", groups.Select(g => $"[`{g.Hid}`] **{g.DisplayName ?? g.Name}**")); + + if (pctx == LookupContext.ByOwner) + { + msg += + $"\n\nTo add this member to one or more groups, use `pk;m {target.Reference()} group add [group 2] [group 3...]`"; + if (groups.Count > 0) + msg += + $"\nTo remove this member from one or more groups, use `pk;m {target.Reference()} group remove [group 2] [group 3...]`"; + } + + await ctx.Reply(msg, new EmbedBuilder().Title($"{target.Name}'s groups").Description(description).Build()); + } + + public async Task AddRemoveMembers(Context ctx, PKGroup target, Groups.AddRemoveOperation op) + { + ctx.CheckOwnGroup(target); + + var members = (await ctx.ParseMemberList(ctx.System.Id)) + .Select(m => m.Id) + .Distinct() + .ToList(); + + var existingMembersInGroup = (await _db.Execute(conn => conn.QueryMemberList(target.System, + new DatabaseViewsExt.MemberListQueryOptions { GroupFilter = target.Id }))) + .Select(m => m.Id.Value) + .Distinct() + .ToHashSet(); + + List toAction; + + if (op == Groups.AddRemoveOperation.Add) + { + toAction = members + .Where(m => !existingMembersInGroup.Contains(m.Value)) + .ToList(); + await _repo.AddMembersToGroup(target.Id, toAction); + } + else if (op == Groups.AddRemoveOperation.Remove) + { + toAction = members + .Where(m => existingMembersInGroup.Contains(m.Value)) + .ToList(); + await _repo.RemoveMembersFromGroup(target.Id, toAction); + } + else + { + return; // otherwise toAction "may be undefined" + } + + await ctx.Reply(GroupMemberUtils.GenerateResponse(op, members.Count, 1, toAction.Count, + members.Count - toAction.Count)); + } + + public async Task ListGroupMembers(Context ctx, PKGroup target) + { + var targetSystem = await GetGroupSystem(ctx, target); + ctx.CheckSystemPrivacy(targetSystem, target.ListPrivacy); + + var opts = ctx.ParseMemberListOptions(ctx.LookupContextFor(target.System)); + opts.GroupFilter = target.Id; + + var title = new StringBuilder($"Members of {target.DisplayName ?? target.Name} (`{target.Hid}`) in "); + if (targetSystem.Name != null) + title.Append($"{targetSystem.Name} (`{targetSystem.Hid}`)"); + else + title.Append($"`{targetSystem.Hid}`"); + if (opts.Search != null) + title.Append($" matching **{opts.Search}**"); + + await ctx.RenderMemberList(ctx.LookupContextFor(target.System), target.System, title.ToString(), + target.Color, opts); + } + + private async Task GetGroupSystem(Context ctx, PKGroup target) + { + var system = ctx.System; + if (system?.Id == target.System) + return system; + return await _repo.GetSystem(target.System)!; + } +} \ No newline at end of file diff --git a/PluralKit.Bot/Commands/Groups.cs b/PluralKit.Bot/Commands/Groups.cs index 264ac09e..58686c85 100644 --- a/PluralKit.Bot/Commands/Groups.cs +++ b/PluralKit.Bot/Commands/Groups.cs @@ -471,67 +471,6 @@ public class Groups await ctx.Reply(embed: await _embeds.CreateGroupEmbed(ctx, system, target)); } - // todo: move this to MemberGroup.cs - public async Task AddRemoveMembers(Context ctx, PKGroup target, AddRemoveOperation op) - { - ctx.CheckOwnGroup(target); - - var members = (await ctx.ParseMemberList(ctx.System.Id)) - .Select(m => m.Id) - .Distinct() - .ToList(); - - var existingMembersInGroup = (await _db.Execute(conn => conn.QueryMemberList(target.System, - new DatabaseViewsExt.MemberListQueryOptions { GroupFilter = target.Id }))) - .Select(m => m.Id.Value) - .Distinct() - .ToHashSet(); - - List toAction; - - if (op == AddRemoveOperation.Add) - { - toAction = members - .Where(m => !existingMembersInGroup.Contains(m.Value)) - .ToList(); - await _repo.AddMembersToGroup(target.Id, toAction); - } - else if (op == AddRemoveOperation.Remove) - { - toAction = members - .Where(m => existingMembersInGroup.Contains(m.Value)) - .ToList(); - await _repo.RemoveMembersFromGroup(target.Id, toAction); - } - else - { - return; // otherwise toAction "may be undefined" - } - - await ctx.Reply(GroupMemberUtils.GenerateResponse(op, members.Count, 1, toAction.Count, - members.Count - toAction.Count)); - } - - public async Task ListGroupMembers(Context ctx, PKGroup target) - { - var targetSystem = await GetGroupSystem(ctx, target); - ctx.CheckSystemPrivacy(targetSystem, target.ListPrivacy); - - var opts = ctx.ParseMemberListOptions(ctx.LookupContextFor(target.System)); - opts.GroupFilter = target.Id; - - var title = new StringBuilder($"Members of {target.DisplayName ?? target.Name} (`{target.Hid}`) in "); - if (targetSystem.Name != null) - title.Append($"{targetSystem.Name} (`{targetSystem.Hid}`)"); - else - title.Append($"`{targetSystem.Hid}`"); - if (opts.Search != null) - title.Append($" matching **{opts.Search}**"); - - await ctx.RenderMemberList(ctx.LookupContextFor(target.System), _db, target.System, title.ToString(), - target.Color, opts); - } - public async Task GroupPrivacy(Context ctx, PKGroup target, PrivacyLevel? newValueFromCommand) { ctx.CheckSystem().CheckOwnGroup(target); diff --git a/PluralKit.Bot/Commands/MemberAvatar.cs b/PluralKit.Bot/Commands/MemberAvatar.cs index 29312cc3..496f2bf9 100644 --- a/PluralKit.Bot/Commands/MemberAvatar.cs +++ b/PluralKit.Bot/Commands/MemberAvatar.cs @@ -9,12 +9,10 @@ namespace PluralKit.Bot; public class MemberAvatar { private readonly HttpClient _client; - private readonly IDatabase _db; private readonly ModelRepository _repo; - public MemberAvatar(IDatabase db, ModelRepository repo, HttpClient client) + public MemberAvatar(ModelRepository repo, HttpClient client) { - _db = db; _repo = repo; _client = client; } diff --git a/PluralKit.Bot/Commands/MemberEdit.cs b/PluralKit.Bot/Commands/MemberEdit.cs index d69d62f4..5989965c 100644 --- a/PluralKit.Bot/Commands/MemberEdit.cs +++ b/PluralKit.Bot/Commands/MemberEdit.cs @@ -13,12 +13,10 @@ namespace PluralKit.Bot; public class MemberEdit { private readonly HttpClient _client; - private readonly IDatabase _db; private readonly ModelRepository _repo; - public MemberEdit(IDatabase db, ModelRepository repo, HttpClient client) + public MemberEdit(ModelRepository repo, HttpClient client) { - _db = db; _repo = repo; _client = client; } diff --git a/PluralKit.Bot/Commands/MemberGroup.cs b/PluralKit.Bot/Commands/MemberGroup.cs deleted file mode 100644 index 59b3a1d8..00000000 --- a/PluralKit.Bot/Commands/MemberGroup.cs +++ /dev/null @@ -1,87 +0,0 @@ -using Myriad.Builders; - -using PluralKit.Core; - -namespace PluralKit.Bot; - -public class MemberGroup -{ - private readonly IDatabase _db; - private readonly ModelRepository _repo; - - public MemberGroup(IDatabase db, ModelRepository repo) - { - _db = db; - _repo = repo; - } - - public async Task AddRemove(Context ctx, PKMember target, Groups.AddRemoveOperation op) - { - ctx.CheckSystem().CheckOwnMember(target); - - var groups = (await ctx.ParseGroupList(ctx.System.Id)) - .Select(g => g.Id) - .Distinct() - .ToList(); - - var existingGroups = (await _repo.GetMemberGroups(target.Id).ToListAsync()) - .Select(g => g.Id) - .Distinct() - .ToList(); - - List toAction; - - if (op == Groups.AddRemoveOperation.Add) - { - toAction = groups - .Where(group => !existingGroups.Contains(group)) - .ToList(); - - await _repo.AddGroupsToMember(target.Id, toAction); - } - else if (op == Groups.AddRemoveOperation.Remove) - { - toAction = groups - .Where(group => existingGroups.Contains(group)) - .ToList(); - - await _repo.RemoveGroupsFromMember(target.Id, toAction); - } - else - { - return; // otherwise toAction "may be unassigned" - } - - await ctx.Reply(GroupMemberUtils.GenerateResponse(op, 1, groups.Count, toAction.Count, - groups.Count - toAction.Count)); - } - - public async Task List(Context ctx, PKMember target) - { - var pctx = ctx.LookupContextFor(target.System); - - var groups = await _repo.GetMemberGroups(target.Id) - .Where(g => g.Visibility.CanAccess(pctx)) - .OrderBy(g => g.Name, StringComparer.InvariantCultureIgnoreCase) - .ToListAsync(); - - var description = ""; - var msg = ""; - - if (groups.Count == 0) - description = "This member has no groups."; - else - description = string.Join("\n", groups.Select(g => $"[`{g.Hid}`] **{g.DisplayName ?? g.Name}**")); - - if (pctx == LookupContext.ByOwner) - { - msg += - $"\n\nTo add this member to one or more groups, use `pk;m {target.Reference()} group add [group 2] [group 3...]`"; - if (groups.Count > 0) - msg += - $"\nTo remove this member from one or more groups, use `pk;m {target.Reference()} group remove [group 2] [group 3...]`"; - } - - await ctx.Reply(msg, new EmbedBuilder().Title($"{target.Name}'s groups").Description(description).Build()); - } -} \ No newline at end of file diff --git a/PluralKit.Bot/Commands/Misc.cs b/PluralKit.Bot/Commands/Misc.cs index 1d4b60f2..872417de 100644 --- a/PluralKit.Bot/Commands/Misc.cs +++ b/PluralKit.Bot/Commands/Misc.cs @@ -17,37 +17,22 @@ namespace PluralKit.Bot; public class Misc { - private readonly Bot _bot; private readonly BotConfig _botConfig; private readonly IDiscordCache _cache; - private readonly Cluster _cluster; private readonly CpuStatService _cpu; - private readonly IDatabase _db; - private readonly EmbedService _embeds; - private readonly ProxyMatcher _matcher; private readonly IMetrics _metrics; - private readonly ProxyService _proxy; private readonly ModelRepository _repo; - private readonly DiscordApiClient _rest; private readonly ShardInfoService _shards; public Misc(BotConfig botConfig, IMetrics metrics, CpuStatService cpu, ShardInfoService shards, - EmbedService embeds, ModelRepository repo, IDatabase db, IDiscordCache cache, - DiscordApiClient rest, Bot bot, Cluster cluster, ProxyService proxy, ProxyMatcher matcher) + ModelRepository repo, IDiscordCache cache) { _botConfig = botConfig; _metrics = metrics; _cpu = cpu; _shards = shards; - _embeds = embeds; _repo = repo; - _db = db; _cache = cache; - _rest = rest; - _bot = bot; - _cluster = cluster; - _proxy = proxy; - _matcher = matcher; } public async Task Invite(Context ctx) diff --git a/PluralKit.Bot/Commands/ServerConfig.cs b/PluralKit.Bot/Commands/ServerConfig.cs index 627b6e85..a20d17aa 100644 --- a/PluralKit.Bot/Commands/ServerConfig.cs +++ b/PluralKit.Bot/Commands/ServerConfig.cs @@ -11,20 +11,15 @@ namespace PluralKit.Bot; public class ServerConfig { - private readonly Bot _bot; private readonly IDiscordCache _cache; private readonly LoggerCleanService _cleanService; - private readonly IDatabase _db; private readonly ModelRepository _repo; - public ServerConfig(LoggerCleanService cleanService, IDatabase db, ModelRepository repo, IDiscordCache cache, - Bot bot) + public ServerConfig(LoggerCleanService cleanService, ModelRepository repo, IDiscordCache cache) { _cleanService = cleanService; - _db = db; _repo = repo; _cache = cache; - _bot = bot; } public async Task SetLogChannel(Context ctx) diff --git a/PluralKit.Bot/Commands/System.cs b/PluralKit.Bot/Commands/System.cs index ecd18f44..f25d7757 100644 --- a/PluralKit.Bot/Commands/System.cs +++ b/PluralKit.Bot/Commands/System.cs @@ -4,14 +4,12 @@ namespace PluralKit.Bot; public class System { - private readonly IDatabase _db; private readonly EmbedService _embeds; private readonly ModelRepository _repo; - public System(EmbedService embeds, IDatabase db, ModelRepository repo) + public System(EmbedService embeds, ModelRepository repo) { _embeds = embeds; - _db = db; _repo = repo; } diff --git a/PluralKit.Bot/Commands/SystemEdit.cs b/PluralKit.Bot/Commands/SystemEdit.cs index ef230782..87743002 100644 --- a/PluralKit.Bot/Commands/SystemEdit.cs +++ b/PluralKit.Bot/Commands/SystemEdit.cs @@ -14,12 +14,10 @@ namespace PluralKit.Bot; public class SystemEdit { private readonly HttpClient _client; - private readonly IDatabase _db; private readonly ModelRepository _repo; - public SystemEdit(IDatabase db, ModelRepository repo, HttpClient client) + public SystemEdit(ModelRepository repo, HttpClient client) { - _db = db; _repo = repo; _client = client; } diff --git a/PluralKit.Bot/Commands/SystemFront.cs b/PluralKit.Bot/Commands/SystemFront.cs index 95bb0959..43b31be6 100644 --- a/PluralKit.Bot/Commands/SystemFront.cs +++ b/PluralKit.Bot/Commands/SystemFront.cs @@ -35,10 +35,6 @@ public class SystemFront if (system == null) throw Errors.NoSystemError; ctx.CheckSystemPrivacy(system, system.FrontHistoryPrivacy); - // Gotta be careful here: if we dispose of the connection while the IAE is alive, boom - // todo: this comment was here, but we're not getting a connection here anymore - // hopefully nothing breaks? - var totalSwitches = await _repo.GetSwitchCount(system.Id); if (totalSwitches == 0) throw Errors.NoRegisteredSwitches; diff --git a/PluralKit.Bot/Commands/SystemLink.cs b/PluralKit.Bot/Commands/SystemLink.cs index 9ebfe567..6bcc766b 100644 --- a/PluralKit.Bot/Commands/SystemLink.cs +++ b/PluralKit.Bot/Commands/SystemLink.cs @@ -6,12 +6,10 @@ namespace PluralKit.Bot; public class SystemLink { - private readonly IDatabase _db; private readonly ModelRepository _repo; - public SystemLink(IDatabase db, ModelRepository repo) + public SystemLink(ModelRepository repo) { - _db = db; _repo = repo; } diff --git a/PluralKit.Bot/Commands/SystemList.cs b/PluralKit.Bot/Commands/SystemList.cs index 95e3ee24..b1fbb172 100644 --- a/PluralKit.Bot/Commands/SystemList.cs +++ b/PluralKit.Bot/Commands/SystemList.cs @@ -6,13 +6,6 @@ namespace PluralKit.Bot; public class SystemList { - private readonly IDatabase _db; - - public SystemList(IDatabase db) - { - _db = db; - } - public async Task MemberList(Context ctx, PKSystem target) { if (target == null) throw Errors.NoSystemError; @@ -21,7 +14,6 @@ public class SystemList var opts = ctx.ParseMemberListOptions(ctx.LookupContextFor(target)); await ctx.RenderMemberList( ctx.LookupContextFor(target), - _db, target.Id, GetEmbedTitle(target, opts), target.Color, diff --git a/PluralKit.Bot/Init.cs b/PluralKit.Bot/Init.cs index 8f87b31e..9fd600a1 100644 --- a/PluralKit.Bot/Init.cs +++ b/PluralKit.Bot/Init.cs @@ -122,11 +122,7 @@ public class Init var builder = new ContainerBuilder(); builder.RegisterInstance(config); builder.RegisterModule(new ConfigModule("Bot")); - builder.RegisterModule(new LoggingModule("bot", cfg => - { - // TODO: do we need this? - // cfg.Destructure.With(); - })); + builder.RegisterModule(new LoggingModule("bot")); builder.RegisterModule(new MetricsModule()); builder.RegisterModule(); builder.RegisterModule(); diff --git a/PluralKit.Bot/Modules.cs b/PluralKit.Bot/Modules.cs index 4cbb3c39..71011cd5 100644 --- a/PluralKit.Bot/Modules.cs +++ b/PluralKit.Bot/Modules.cs @@ -74,12 +74,12 @@ public class BotModule: Module builder.RegisterType().AsSelf(); builder.RegisterType().AsSelf(); builder.RegisterType().AsSelf(); + builder.RegisterType().AsSelf(); builder.RegisterType().AsSelf(); builder.RegisterType().AsSelf(); builder.RegisterType().AsSelf(); builder.RegisterType().AsSelf(); builder.RegisterType().AsSelf(); - builder.RegisterType().AsSelf(); builder.RegisterType().AsSelf(); builder.RegisterType().AsSelf(); builder.RegisterType().AsSelf(); diff --git a/PluralKit.Bot/Proxy/ProxyService.cs b/PluralKit.Bot/Proxy/ProxyService.cs index 5b4c7b55..f9203da2 100644 --- a/PluralKit.Bot/Proxy/ProxyService.cs +++ b/PluralKit.Bot/Proxy/ProxyService.cs @@ -71,7 +71,7 @@ public class ProxyService throw new PKError("PluralKit cannot proxy messages over 2000 characters in length."); // Permission check after proxy match so we don't get spammed when not actually proxying - if (!await CheckBotPermissionsOrError(botPermissions, rootChannel.Id)) + if (!CheckBotPermissionsOrError(botPermissions, rootChannel.Id)) return false; // this method throws, so no need to wrap it in an if statement @@ -345,7 +345,7 @@ public class ProxyService catch (UnauthorizedException) { } } - private async Task CheckBotPermissionsOrError(PermissionSet permissions, ulong responseChannel) + private bool CheckBotPermissionsOrError(PermissionSet permissions, ulong responseChannel) { // If we can't send messages at all, just bail immediately. // 2020-04-22: Manage Messages does *not* override a lack of Send Messages. @@ -353,25 +353,12 @@ public class ProxyService return false; if (!permissions.HasFlag(PermissionSet.ManageWebhooks)) - { - // todo: PKError-ify these - await _rest.CreateMessage(responseChannel, new MessageRequest - { - Content = $"{Emojis.Error} PluralKit does not have the *Manage Webhooks* permission in this channel, and thus cannot proxy messages." - + " Please contact a server administrator to remedy this." - }); - return false; - } + throw new PKError("PluralKit does not have the *Manage Webhooks* permission in this channel, and thus cannot proxy messages." + + " Please contact a server administrator to remedy this."); if (!permissions.HasFlag(PermissionSet.ManageMessages)) - { - await _rest.CreateMessage(responseChannel, new MessageRequest - { - Content = $"{Emojis.Error} PluralKit does not have the *Manage Messages* permission in this channel, and thus cannot delete the original trigger message." - + " Please contact a server administrator to remedy this." - }); - return false; - } + throw new PKError("PluralKit does not have the *Manage Messages* permission in this channel, and thus cannot delete the original trigger message." + + " Please contact a server administrator to remedy this."); return true; } diff --git a/PluralKit.Bot/Services/LoggerCleanService.cs b/PluralKit.Bot/Services/LoggerCleanService.cs index 581153df..0dc84429 100644 --- a/PluralKit.Bot/Services/LoggerCleanService.cs +++ b/PluralKit.Bot/Services/LoggerCleanService.cs @@ -68,19 +68,17 @@ public class LoggerCleanService .Where(b => b.WebhookName != null) .ToDictionary(b => b.WebhookName); - private readonly Bot _bot; // todo: get rid of this nasty private readonly IDiscordCache _cache; private readonly DiscordApiClient _client; private readonly IDatabase _db; private readonly ILogger _logger; - public LoggerCleanService(IDatabase db, DiscordApiClient client, IDiscordCache cache, Bot bot, ILogger logger) + public LoggerCleanService(IDatabase db, DiscordApiClient client, IDiscordCache cache, ILogger logger) { _db = db; _client = client; _cache = cache; - _bot = bot; _logger = logger.ForContext(); } diff --git a/PluralKit.Core/Utils/BulkImporter/PluralKitImport.cs b/PluralKit.Core/Utils/BulkImporter/PluralKitImport.cs index 565f166c..bfac7e06 100644 --- a/PluralKit.Core/Utils/BulkImporter/PluralKitImport.cs +++ b/PluralKit.Core/Utils/BulkImporter/PluralKitImport.cs @@ -104,6 +104,7 @@ public partial class BulkImporter if (isNewMember) { + patch.MessageCount = member.Value("message_count"); var newMember = await _repo.CreateMember(_system.Id, patch.Name.Value, _conn); memberId = newMember.Id; } diff --git a/PluralKit.Core/Utils/BulkImporter/TupperboxImport.cs b/PluralKit.Core/Utils/BulkImporter/TupperboxImport.cs index e33f3e7f..2b694aef 100644 --- a/PluralKit.Core/Utils/BulkImporter/TupperboxImport.cs +++ b/PluralKit.Core/Utils/BulkImporter/TupperboxImport.cs @@ -47,6 +47,20 @@ public partial class BulkImporter var multipleTags = false; var name = tupper.Value("name"); + + var isNewMember = false; + if (!_existingMemberNames.TryGetValue(name, out var memberId)) + { + var newMember = await _repo.CreateMember(_system.Id, name, _conn); + memberId = newMember.Id; + isNewMember = true; + _result.Added++; + } + else + { + _result.Modified++; + } + var patch = new MemberPatch(); patch.Name = name; @@ -63,8 +77,7 @@ public partial class BulkImporter patch.ProxyTags = tags.ToArray(); } - // todo: && if is new member - if (tupper.ContainsKey("posts")) patch.MessageCount = tupper.Value("posts"); + if (tupper.ContainsKey("posts") && isNewMember) patch.MessageCount = tupper.Value("posts"); if (tupper.ContainsKey("show_brackets")) patch.KeepProxy = tupper.Value("show_brackets"); if (tupper.ContainsKey("birthday") && tupper["birthday"].Type != JTokenType.Null) { @@ -100,19 +113,6 @@ public partial class BulkImporter throw new ImportException($"Field {err.Key} in tupper {name} is invalid."); } - var isNewMember = false; - if (!_existingMemberNames.TryGetValue(name, out var memberId)) - { - var newMember = await _repo.CreateMember(_system.Id, name, _conn); - memberId = newMember.Id; - isNewMember = true; - _result.Added++; - } - else - { - _result.Modified++; - } - _logger.Debug( "Importing member with identifier {FileId} to system {System} (is creating new member? {IsCreatingNewMember})", name, _system.Id, isNewMember);