eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 04:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat(bot): add many aliases

Browse source
This commit is contained in:
Petal Ladenson 2024-08-29 06:32:22 -06:00 • committed by GitHub
parent 7ef1dce0a5
commit 601d266063
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 37 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
PluralKit.Bot/CommandMeta/CommandTree.cs
View file

@ -44,13 +44,13 @@ public partial class CommandTree
else return ctx.Execute<Help>(Help, m => m.HelpRoot(ctx)); else return ctx.Execute<Help>(Help, m => m.HelpRoot(ctx));
if (ctx.Match("explain")) if (ctx.Match("explain"))
return ctx.Execute<Help>(Explain, m => m.Explain(ctx)); return ctx.Execute<Help>(Explain, m => m.Explain(ctx));
if (ctx.Match("message", "msg")) if (ctx.Match("message", "msg", "messageinfo"))
return ctx.Execute<ProxiedMessage>(Message, m => m.GetMessage(ctx)); return ctx.Execute<ProxiedMessage>(Message, m => m.GetMessage(ctx));
if (ctx.Match("edit", "e")) if (ctx.Match("edit", "e"))
return ctx.Execute<ProxiedMessage>(MessageEdit, m => m.EditMessage(ctx, false)); return ctx.Execute<ProxiedMessage>(MessageEdit, m => m.EditMessage(ctx, false));
if (ctx.Match("x")) if (ctx.Match("x"))
return ctx.Execute<ProxiedMessage>(MessageEdit, m => m.EditMessage(ctx, true)); return ctx.Execute<ProxiedMessage>(MessageEdit, m => m.EditMessage(ctx, true));
if (ctx.Match("reproxy", "rp", "crimes")) if (ctx.Match("reproxy", "rp", "crimes", "crime"))
return ctx.Execute<ProxiedMessage>(MessageReproxy, m => m.ReproxyMessage(ctx)); return ctx.Execute<ProxiedMessage>(MessageReproxy, m => m.ReproxyMessage(ctx));
if (ctx.Match("log")) if (ctx.Match("log"))
if (ctx.Match("channel")) if (ctx.Match("channel"))
@ -91,7 +91,7 @@ public partial class CommandTree
if (ctx.Match("rool")) return ctx.Execute<Fun>(null, m => m.Rool(ctx)); if (ctx.Match("rool")) return ctx.Execute<Fun>(null, m => m.Rool(ctx));
if (ctx.Match("sus")) return ctx.Execute<Fun>(null, m => m.Sus(ctx)); if (ctx.Match("sus")) return ctx.Execute<Fun>(null, m => m.Sus(ctx));
if (ctx.Match("error")) return ctx.Execute<Fun>(null, m => m.Error(ctx)); if (ctx.Match("error")) return ctx.Execute<Fun>(null, m => m.Error(ctx));
if (ctx.Match("stats")) return ctx.Execute<Misc>(null, m => m.Stats(ctx)); if (ctx.Match("stats", "status")) return ctx.Execute<Misc>(null, m => m.Stats(ctx));
if (ctx.Match("permcheck")) if (ctx.Match("permcheck"))
return ctx.Execute<Checks>(PermCheck, m => m.PermCheckGuild(ctx)); return ctx.Execute<Checks>(PermCheck, m => m.PermCheckGuild(ctx));
if (ctx.Match("proxycheck")) if (ctx.Match("proxycheck"))
@ -100,7 +100,7 @@ public partial class CommandTree
return HandleDebugCommand(ctx); return HandleDebugCommand(ctx);
if (ctx.Match("admin")) if (ctx.Match("admin"))
return HandleAdminCommand(ctx); return HandleAdminCommand(ctx);
if (ctx.Match("random", "r")) if (ctx.Match("random", "rand", "r"))
if (ctx.Match("group", "g") || ctx.MatchFlag("group", "g")) if (ctx.Match("group", "g") || ctx.MatchFlag("group", "g"))
return ctx.Execute<Random>(GroupRandom, r => r.Group(ctx, ctx.System)); return ctx.Execute<Random>(GroupRandom, r => r.Group(ctx, ctx.System));
else else
@ -229,9 +229,9 @@ public partial class CommandTree
await ctx.CheckSystem(target).Execute<SystemEdit>(SystemTag, m => m.Tag(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemTag, m => m.Tag(ctx, target));
else if (ctx.Match("servertag", "st", "stag", "deer")) else if (ctx.Match("servertag", "st", "stag", "deer"))
await ctx.CheckSystem(target).Execute<SystemEdit>(SystemServerTag, m => m.ServerTag(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemServerTag, m => m.ServerTag(ctx, target));
else if (ctx.Match("description", "desc", "bio", "info", "text")) else if (ctx.Match("description", "desc", "describe", "d", "bio", "info", "text", "intro"))
await ctx.CheckSystem(target).Execute<SystemEdit>(SystemDesc, m => m.Description(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemDesc, m => m.Description(ctx, target));
else if (ctx.Match("pronouns", "prns")) else if (ctx.Match("pronouns", "pronoun", "prns", "pn"))
await ctx.CheckSystem(target).Execute<SystemEdit>(SystemPronouns, m => m.Pronouns(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemPronouns, m => m.Pronouns(ctx, target));
else if (ctx.Match("color", "colour")) else if (ctx.Match("color", "colour"))
await ctx.CheckSystem(target).Execute<SystemEdit>(SystemColor, m => m.Color(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemColor, m => m.Color(ctx, target));
@ -269,7 +269,7 @@ public partial class CommandTree
await ctx.CheckSystem(target).Execute<SystemEdit>(SystemDelete, m => m.Delete(ctx, target)); await ctx.CheckSystem(target).Execute<SystemEdit>(SystemDelete, m => m.Delete(ctx, target));
else if (ctx.Match("id")) else if (ctx.Match("id"))
await ctx.CheckSystem(target).Execute<System>(SystemId, m => m.DisplayId(ctx, target)); await ctx.CheckSystem(target).Execute<System>(SystemId, m => m.DisplayId(ctx, target));
else if (ctx.Match("random", "r")) else if (ctx.Match("random", "rand", "r"))
if (ctx.Match("group", "g") || ctx.MatchFlag("group", "g")) if (ctx.Match("group", "g") || ctx.MatchFlag("group", "g"))
await ctx.CheckSystem(target).Execute<Random>(GroupRandom, r => r.Group(ctx, target)); await ctx.CheckSystem(target).Execute<Random>(GroupRandom, r => r.Group(ctx, target));
else else
@ -299,13 +299,13 @@ public partial class CommandTree
// Commands that have a member target (eg. pk;member <member> delete) // Commands that have a member target (eg. pk;member <member> delete)
if (ctx.Match("rename", "name", "changename", "setname", "rn")) if (ctx.Match("rename", "name", "changename", "setname", "rn"))
await ctx.Execute<MemberEdit>(MemberRename, m => m.Name(ctx, target)); await ctx.Execute<MemberEdit>(MemberRename, m => m.Name(ctx, target));
else if (ctx.Match("description", "info", "bio", "text", "desc")) else if (ctx.Match("description", "desc", "describe", "d", "bio", "info", "text", "intro"))
await ctx.Execute<MemberEdit>(MemberDesc, m => m.Description(ctx, target)); await ctx.Execute<MemberEdit>(MemberDesc, m => m.Description(ctx, target));
else if (ctx.Match("pronouns", "pronoun", "prns", "pn")) else if (ctx.Match("pronouns", "pronoun", "prns", "pn"))
await ctx.Execute<MemberEdit>(MemberPronouns, m => m.Pronouns(ctx, target)); await ctx.Execute<MemberEdit>(MemberPronouns, m => m.Pronouns(ctx, target));
else if (ctx.Match("color", "colour")) else if (ctx.Match("color", "colour"))
await ctx.Execute<MemberEdit>(MemberColor, m => m.Color(ctx, target)); await ctx.Execute<MemberEdit>(MemberColor, m => m.Color(ctx, target));
else if (ctx.Match("birthday", "bday", "birthdate", "cakeday", "bdate")) else if (ctx.Match("birthday", "birth", "bday", "birthdate", "cakeday", "bdate", "bd"))
await ctx.Execute<MemberEdit>(MemberBirthday, m => m.Birthday(ctx, target)); await ctx.Execute<MemberEdit>(MemberBirthday, m => m.Birthday(ctx, target));
else if (ctx.Match("proxy", "tags", "proxytags", "brackets")) else if (ctx.Match("proxy", "tags", "proxytags", "brackets"))
await ctx.Execute<MemberProxy>(MemberProxy, m => m.Proxy(ctx, target)); await ctx.Execute<MemberProxy>(MemberProxy, m => m.Proxy(ctx, target));
@ -313,7 +313,7 @@ public partial class CommandTree
await ctx.Execute<MemberEdit>(MemberDelete, m => m.Delete(ctx, target)); await ctx.Execute<MemberEdit>(MemberDelete, m => m.Delete(ctx, target));
else if (ctx.Match("avatar", "profile", "picture", "icon", "image", "pfp", "pic")) else if (ctx.Match("avatar", "profile", "picture", "icon", "image", "pfp", "pic"))
await ctx.Execute<MemberAvatar>(MemberAvatar, m => m.Avatar(ctx, target)); await ctx.Execute<MemberAvatar>(MemberAvatar, m => m.Avatar(ctx, target));
else if (ctx.Match("proxyavatar", "proxypfp", "webhookavatar", "webhookpfp", "pa")) else if (ctx.Match("proxyavatar", "proxypfp", "webhookavatar", "webhookpfp", "pa", "pavatar", "ppfp"))
await ctx.Execute<MemberAvatar>(MemberAvatar, m => m.WebhookAvatar(ctx, target)); await ctx.Execute<MemberAvatar>(MemberAvatar, m => m.WebhookAvatar(ctx, target));
else if (ctx.Match("banner", "splash", "cover")) else if (ctx.Match("banner", "splash", "cover"))
await ctx.Execute<MemberEdit>(MemberBannerImage, m => m.BannerImage(ctx, target)); await ctx.Execute<MemberEdit>(MemberBannerImage, m => m.BannerImage(ctx, target));
@ -348,7 +348,7 @@ public partial class CommandTree
await ctx.Execute<MemberEdit>(MemberPrivacy, m => m.Privacy(ctx, target, null)); await ctx.Execute<MemberEdit>(MemberPrivacy, m => m.Privacy(ctx, target, null));
else if (ctx.Match("private", "hidden", "hide")) else if (ctx.Match("private", "hidden", "hide"))
await ctx.Execute<MemberEdit>(MemberPrivacy, m => m.Privacy(ctx, target, PrivacyLevel.Private)); await ctx.Execute<MemberEdit>(MemberPrivacy, m => m.Privacy(ctx, target, PrivacyLevel.Private));
else if (ctx.Match("public", "shown", "show")) else if (ctx.Match("public", "shown", "show", "unhide", "unhidden"))
await ctx.Execute<MemberEdit>(MemberPrivacy, m => m.Privacy(ctx, target, PrivacyLevel.Public)); await ctx.Execute<MemberEdit>(MemberPrivacy, m => m.Privacy(ctx, target, PrivacyLevel.Public));
else if (ctx.Match("soulscream")) else if (ctx.Match("soulscream"))
await ctx.Execute<Member>(MemberInfo, m => m.Soulscream(ctx, target)); await ctx.Execute<Member>(MemberInfo, m => m.Soulscream(ctx, target));
@ -376,7 +376,7 @@ public partial class CommandTree
await ctx.Execute<Groups>(GroupRename, g => g.RenameGroup(ctx, target)); await ctx.Execute<Groups>(GroupRename, g => g.RenameGroup(ctx, target));
else if (ctx.Match("nick", "dn", "displayname", "nickname")) else if (ctx.Match("nick", "dn", "displayname", "nickname"))
await ctx.Execute<Groups>(GroupDisplayName, g => g.GroupDisplayName(ctx, target)); await ctx.Execute<Groups>(GroupDisplayName, g => g.GroupDisplayName(ctx, target));
else if (ctx.Match("description", "info", "bio", "text", "desc")) else if (ctx.Match("description", "desc", "describe", "d", "bio", "info", "text", "intro"))
await ctx.Execute<Groups>(GroupDesc, g => g.GroupDescription(ctx, target)); await ctx.Execute<Groups>(GroupDesc, g => g.GroupDescription(ctx, target));
else if (ctx.Match("add", "a")) else if (ctx.Match("add", "a"))
await ctx.Execute<GroupMember>(GroupAdd, await ctx.Execute<GroupMember>(GroupAdd,
@ -386,7 +386,7 @@ public partial class CommandTree
g => g.AddRemoveMembers(ctx, target, Groups.AddRemoveOperation.Remove)); g => g.AddRemoveMembers(ctx, target, Groups.AddRemoveOperation.Remove));
else if (ctx.Match("members", "list", "ms", "l", "ls")) else if (ctx.Match("members", "list", "ms", "l", "ls"))
await ctx.Execute<GroupMember>(GroupMemberList, g => g.ListGroupMembers(ctx, target)); await ctx.Execute<GroupMember>(GroupMemberList, g => g.ListGroupMembers(ctx, target));
else if (ctx.Match("random")) else if (ctx.Match("random", "rand"))
await ctx.Execute<Random>(GroupMemberRandom, r => r.GroupMember(ctx, target)); await ctx.Execute<Random>(GroupMemberRandom, r => r.GroupMember(ctx, target));
else if (ctx.Match("privacy")) else if (ctx.Match("privacy"))
await ctx.Execute<Groups>(GroupPrivacy, g => g.GroupPrivacy(ctx, target, null)); await ctx.Execute<Groups>(GroupPrivacy, g => g.GroupPrivacy(ctx, target, null));

4
PluralKit.Bot/CommandSystem/Context/ContextPrivacyExt.cs
View file

@ -6,10 +6,10 @@ public static class ContextPrivacyExt
{ {
public static PrivacyLevel PopPrivacyLevel(this Context ctx) public static PrivacyLevel PopPrivacyLevel(this Context ctx)
{ {
if (ctx.Match("public", "show", "shown", "visible")) if (ctx.Match("public", "pub", "show", "shown", "visible", "unhide", "unhidden"))
return PrivacyLevel.Public; return PrivacyLevel.Public;
if (ctx.Match("private", "hide", "hidden")) if (ctx.Match("private", "priv", "hide", "hidden"))
return PrivacyLevel.Private; return PrivacyLevel.Private;
if (!ctx.HasNext()) if (!ctx.HasNext())

2
PluralKit.Bot/Commands/Lists/ContextListExt.cs
View file

@ -44,7 +44,7 @@ public static class ContextListExt
p.SortProperty = SortProperty.LastSwitch; p.SortProperty = SortProperty.LastSwitch;
if (ctx.MatchFlag("by-last-message", "blm", "blp")) p.SortProperty = SortProperty.LastMessage; if (ctx.MatchFlag("by-last-message", "blm", "blp")) p.SortProperty = SortProperty.LastMessage;
if (ctx.MatchFlag("by-birthday", "by-birthdate", "bbd")) p.SortProperty = SortProperty.Birthdate; if (ctx.MatchFlag("by-birthday", "by-birthdate", "bbd")) p.SortProperty = SortProperty.Birthdate;
if (ctx.MatchFlag("random")) p.SortProperty = SortProperty.Random; if (ctx.MatchFlag("random", "rand")) p.SortProperty = SortProperty.Random;
// Sort reverse? // Sort reverse?
if (ctx.MatchFlag("r", "rev", "reverse")) if (ctx.MatchFlag("r", "rev", "reverse"))

6
PluralKit.Core/Models/Privacy/GroupPrivacySubject.cs
View file

@ -45,8 +45,12 @@ public static class GroupPrivacyUtils
break; break;
case "description": case "description":
case "desc": case "desc":
case "text": case "describe":
case "d":
case "bio":
case "info": case "info":
case "text":
case "intro":
subject = GroupPrivacySubject.Description; subject = GroupPrivacySubject.Description;
break; break;
case "avatar": case "avatar":

10
PluralKit.Core/Models/Privacy/MemberPrivacySubject.cs
View file

@ -49,8 +49,12 @@ public static class MemberPrivacyUtils
break; break;
case "description": case "description":
case "desc": case "desc":
case "text": case "describe":
case "d":
case "bio":
case "info": case "info":
case "text":
case "intro":
subject = MemberPrivacySubject.Description; subject = MemberPrivacySubject.Description;
break; break;
case "avatar": case "avatar":
@ -64,10 +68,14 @@ public static class MemberPrivacyUtils
case "bday": case "bday":
case "birthdate": case "birthdate":
case "bdate": case "bdate":
case "cakeday":
case "bd":
subject = MemberPrivacySubject.Birthday; subject = MemberPrivacySubject.Birthday;
break; break;
case "pronouns": case "pronouns":
case "pronoun": case "pronoun":
case "prns":
case "pn":
subject = MemberPrivacySubject.Pronouns; subject = MemberPrivacySubject.Pronouns;
break; break;
case "meta": case "meta":

8
PluralKit.Core/Models/Privacy/SystemPrivacySubject.cs
View file

@ -55,12 +55,18 @@ public static class SystemPrivacyUtils
break; break;
case "description": case "description":
case "desc": case "desc":
case "text": case "describe":
case "d":
case "bio":
case "info": case "info":
case "text":
case "intro":
subject = SystemPrivacySubject.Description; subject = SystemPrivacySubject.Description;
break; break;
case "pronouns": case "pronouns":
case "pronoun":
case "prns": case "prns":
case "pn":
subject = SystemPrivacySubject.Pronouns; subject = SystemPrivacySubject.Pronouns;
break; break;
case "members": case "members":