Merge pull request #258 from dev-kittens/feat/member-group

Group improvements

PluralKit.Bot/Commands/CommandTree.cs

@@ -39,6 +39,9 @@ namespace PluralKit.Bot
         public static Command MemberProxy = new Command("member proxy", "member <member> proxy [add|remove] [example proxy]", "Changes, adds, or removes a member's proxy tags");
         public static Command MemberDelete = new Command("member delete", "member <member> delete", "Deletes a member");
         public static Command MemberAvatar = new Command("member avatar", "member <member> avatar [url|@mention]", "Changes a member's avatar");
+        public static Command MemberGroups = new Command("member group", "member <member> group", "Shows the groups a member is in");
+        public static Command MemberGroupAdd = new Command("member group", "member <member> group add <group> [group 2] [group 3...]", "Adds a member to one or more groups");
+        public static Command MemberGroupRemove = new Command("member group", "member <member> group remove <group> [group 2] [group 3...]", "Removes a member from one or more groups");
         public static Command MemberServerAvatar = new Command("member serveravatar", "member <member> serveravatar [url|@mention]", "Changes a member's avatar in the current server");
         public static Command MemberDisplayName = new Command("member displayname", "member <member> displayname [display name]", "Changes a member's display name");
         public static Command MemberServerName = new Command("member servername", "member <member> servername [server name]", "Changes a member's display name in the current server");
@@ -89,8 +92,8 @@ namespace PluralKit.Bot
 
         public static Command[] MemberCommands = {
             MemberInfo, MemberNew, MemberRename, MemberDisplayName, MemberServerName, MemberDesc, MemberPronouns,
-            MemberColor, MemberBirthday, MemberProxy, MemberKeepProxy, MemberDelete, MemberAvatar, MemberServerAvatar, MemberPrivacy,
-            MemberRandom
+            MemberColor, MemberBirthday, MemberProxy, MemberKeepProxy, MemberGroups, MemberGroupAdd, MemberGroupRemove,
+            MemberDelete, MemberAvatar, MemberServerAvatar, MemberPrivacy, MemberRandom
         };
 
         public static Command[] GroupCommands =
@@ -328,6 +331,13 @@ namespace PluralKit.Bot
                 await ctx.Execute<MemberEdit>(MemberDelete, m => m.Delete(ctx, target));
             else if (ctx.Match("avatar", "profile", "picture", "icon", "image", "pfp", "pic"))
                 await ctx.Execute<MemberAvatar>(MemberAvatar, m => m.Avatar(ctx, target));
+            else if (ctx.Match("group", "groups"))
+                if (ctx.Match("add", "a"))
+                    await ctx.Execute<MemberGroup>(MemberGroupAdd, m => m.AddRemove(ctx, target, Groups.AddRemoveOperation.Add));
+                else if (ctx.Match("remove", "rem"))
+                    await ctx.Execute<MemberGroup>(MemberGroupRemove, m => m.AddRemove(ctx, target, Groups.AddRemoveOperation.Remove));
+                else 
+                    await ctx.Execute<MemberGroup>(MemberGroups, m => m.List(ctx, target));
             else if (ctx.Match("serveravatar", "servericon", "serverimage", "serverpfp", "serverpic", "savatar", "spic", "guildavatar", "guildpic", "guildicon", "sicon"))
                 await ctx.Execute<MemberAvatar>(MemberServerAvatar, m => m.ServerAvatar(ctx, target));
             else if (ctx.Match("displayname", "dn", "dname", "nick", "nickname", "dispname"))

PluralKit.Bot/Commands/Groups.cs

@@ -318,49 +318,38 @@ namespace PluralKit.Bot
         {
             ctx.CheckOwnGroup(target);
 
-            var members = await ctx.ParseMemberList(ctx.System.Id);
+            var members = (await ctx.ParseMemberList(ctx.System.Id))
+                .Select(m => m.Id)
+                .Distinct()
+                .ToList();
             
             await using var conn = await _db.Obtain();
             
             var existingMembersInGroup = (await conn.QueryMemberList(target.System,
                 new DatabaseViewsExt.MemberListQueryOptions {GroupFilter = target.Id}))
                 .Select(m => m.Id.Value)
+                .Distinct()
                 .ToHashSet();
             
+            List<MemberId> toAction;
+
             if (op == AddRemoveOperation.Add)
             {
-                var membersNotInGroup = members
-                    .Where(m => !existingMembersInGroup.Contains(m.Id.Value))
-                    .Select(m => m.Id)
-                    .Distinct()
+                toAction = members
+                    .Where(m => !existingMembersInGroup.Contains(m.Value))
                     .ToList();
-                await _repo.AddMembersToGroup(conn, target.Id, membersNotInGroup);
-                
-                if (membersNotInGroup.Count == members.Count)
-                    await ctx.Reply(members.Count == 0 ? $"{Emojis.Success} Member added to group." : $"{Emojis.Success} {"members".ToQuantity(membersNotInGroup.Count)} added to group.");
-                else
-                    if (membersNotInGroup.Count == 0)
-                        await ctx.Reply(members.Count == 1 ? $"{Emojis.Error} Member not added to group (member already in group)." : $"{Emojis.Error} No members added to group (members already in group).");
-                    else
-                        await ctx.Reply($"{Emojis.Success} {"members".ToQuantity(membersNotInGroup.Count)} added to group ({"members".ToQuantity(members.Count - membersNotInGroup.Count)} already in group).");
+                await _repo.AddMembersToGroup(conn, target.Id, toAction);
             }
             else if (op == AddRemoveOperation.Remove)
             {
-                var membersInGroup = members
-                    .Where(m => existingMembersInGroup.Contains(m.Id.Value))
-                    .Select(m => m.Id)
-                    .Distinct()
+                toAction = members
+                    .Where(m => existingMembersInGroup.Contains(m.Value))
                     .ToList();
-                await _repo.RemoveMembersFromGroup(conn, target.Id, membersInGroup);
-                
-                if (membersInGroup.Count == members.Count)
-                    await ctx.Reply(members.Count == 0 ? $"{Emojis.Success} Member removed from group." : $"{Emojis.Success} {"members".ToQuantity(membersInGroup.Count)} removed from group.");
-                else
-                    if (membersInGroup.Count == 0)
-                        await ctx.Reply(members.Count == 1 ? $"{Emojis.Error} Member not removed from group (member already not in group)." : $"{Emojis.Error} No members removed from group (members already not in group).");
-                    else
-                        await ctx.Reply($"{Emojis.Success} {"members".ToQuantity(membersInGroup.Count)} removed from group ({"members".ToQuantity(members.Count - membersInGroup.Count)} already not in group).");
+                await _repo.RemoveMembersFromGroup(conn, target.Id, toAction);
             }
+            else return; // otherwise toAction "may be undefined"
+
+            await ctx.Reply(MiscUtils.GroupAddRemoveResponse<MemberId>(members, toAction, op));
         }
 
         public async Task ListGroupMembers(Context ctx, PKGroup target)

PluralKit.Bot/Commands/MemberGroup.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+using DSharpPlus.Entities;
+
+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();
+
+            await using var conn = await _db.Obtain();
+            var existingGroups = (await _repo.GetMemberGroups(conn, target.Id).ToListAsync())
+                .Select(g => g.Id)
+                .Distinct()
+                .ToList();
+
+            List<GroupId> toAction;
+
+            if (op == Groups.AddRemoveOperation.Add)
+            {
+                toAction = groups
+                    .Where(group => !existingGroups.Contains(group))
+                    .ToList();
+
+                await _repo.AddGroupsToMember(conn, target.Id, toAction);
+            }
+            else if (op == Groups.AddRemoveOperation.Remove)
+            {
+                toAction = groups
+                    .Where(group => existingGroups.Contains(group))
+                    .ToList();
+
+                await _repo.RemoveGroupsFromMember(conn, target.Id, toAction);
+            }
+            else return; // otherwise toAction "may be unassigned"
+
+            await ctx.Reply(MiscUtils.GroupAddRemoveResponse<GroupId>(groups, toAction, op));
+        }
+
+        public async Task List(Context ctx, PKMember target)
+        {
+            await using var conn = await _db.Obtain();
+
+            var pctx = ctx.LookupContextFor(target.System);
+
+            var groups = await _repo.GetMemberGroups(conn, 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> [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> [group 2] [group 3...]`";
+            }
+            
+            await ctx.Reply(msg, embed: (new DiscordEmbedBuilder().WithTitle($"{target.Name}'s groups").WithDescription(description)).Build());
+        }
+    }
+}