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

fix: don't skip flags before MatchClear/MatchRaw

Browse Source
This commit is contained in:
spiral 2021-09-06 19:09:43 -04:00
parent ae5451d901
commit 023d2577e5
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PluralKit.Bot/Commands/Groups.cs
View File

@ -103,7 +103,7 @@ namespace PluralKit.Bot
// No perms check, display name isn't covered by member privacy // No perms check, display name isn't covered by member privacy
if (!ctx.HasNext()) if (!ctx.HasNext(false))
{ {
if (target.DisplayName == null) if (target.DisplayName == null)
await ctx.Reply(noDisplayNameSetMessage); await ctx.Reply(noDisplayNameSetMessage);
@ -160,7 +160,7 @@ namespace PluralKit.Bot
if (ctx.System?.Id == target.System) if (ctx.System?.Id == target.System)
noDescriptionSetMessage += $" To set one, type `pk;group {target.Reference()} description <description>`."; noDescriptionSetMessage += $" To set one, type `pk;group {target.Reference()} description <description>`.";
if (!ctx.HasNext()) if (!ctx.HasNext(false))
{ {
if (target.Description == null) if (target.Description == null)
await ctx.Reply(noDescriptionSetMessage); await ctx.Reply(noDescriptionSetMessage);

8
PluralKit.Bot/Commands/MemberEdit.cs
View File

@ -66,7 +66,7 @@ namespace PluralKit.Bot
if (!target.DescriptionPrivacy.CanAccess(ctx.LookupContextFor(target.System))) if (!target.DescriptionPrivacy.CanAccess(ctx.LookupContextFor(target.System)))
throw Errors.LookupNotAllowed; throw Errors.LookupNotAllowed;
if (!ctx.HasNext()) if (!ctx.HasNext(false))
{ {
if (target.Description == null) if (target.Description == null)
await ctx.Reply(noDescriptionSetMessage); await ctx.Reply(noDescriptionSetMessage);
@ -118,7 +118,7 @@ namespace PluralKit.Bot
if (!target.PronounPrivacy.CanAccess(ctx.LookupContextFor(target.System))) if (!target.PronounPrivacy.CanAccess(ctx.LookupContextFor(target.System)))
throw Errors.LookupNotAllowed; throw Errors.LookupNotAllowed;
if (!ctx.HasNext()) if (!ctx.HasNext(false))
{ {
if (target.Pronouns == null) if (target.Pronouns == null)
await ctx.Reply(noPronounsSetMessage); await ctx.Reply(noPronounsSetMessage);
@ -354,7 +354,7 @@ namespace PluralKit.Bot
// No perms check, display name isn't covered by member privacy // No perms check, display name isn't covered by member privacy
if (!ctx.HasNext()) if (!ctx.HasNext(false))
{ {
var eb = await CreateMemberNameInfoEmbed(ctx, target); var eb = await CreateMemberNameInfoEmbed(ctx, target);
if (ctx.System?.Id == target.System) if (ctx.System?.Id == target.System)
@ -403,7 +403,7 @@ namespace PluralKit.Bot
// No perms check, display name isn't covered by member privacy // No perms check, display name isn't covered by member privacy
if (!ctx.HasNext()) if (!ctx.HasNext(false))
{ {
var eb = await CreateMemberNameInfoEmbed(ctx, target); var eb = await CreateMemberNameInfoEmbed(ctx, target);
if (ctx.System?.Id == target.System) if (ctx.System?.Id == target.System)

4
PluralKit.Bot/Commands/SystemEdit.cs
View File

@ -33,7 +33,7 @@ namespace PluralKit.Bot
ctx.CheckSystem(); ctx.CheckSystem();
if (!ctx.HasNext()) if (!ctx.HasNext(false))
{ {
if (ctx.System.Name != null) if (ctx.System.Name != null)
await ctx.Reply($"Your system's name is currently **{ctx.System.Name}**. Type `pk;system name -clear` to clear it."); await ctx.Reply($"Your system's name is currently **{ctx.System.Name}**. Type `pk;system name -clear` to clear it.");
@ -77,7 +77,7 @@ namespace PluralKit.Bot
ctx.CheckSystem(); ctx.CheckSystem();
if (!ctx.HasNext()) if (!ctx.HasNext(false))
{ {
if (ctx.System.Description == null) if (ctx.System.Description == null)
await ctx.Reply(noDescriptionSetMessage); await ctx.Reply(noDescriptionSetMessage);