fix MatchRaw commands *again*

This commit is contained in:
spiral
2021-09-13 01:22:40 -04:00
parent bae883c11f
commit a165a42046
3 changed files with 79 additions and 79 deletions

View File

@@ -33,14 +33,6 @@ namespace PluralKit.Bot
ctx.CheckSystem();
if (!ctx.HasNext(false))
{
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.");
else
await ctx.Reply(noNameSetMessage);
return;
}
if (ctx.MatchRaw())
{
if (ctx.System.Name != null)
@@ -49,6 +41,14 @@ namespace PluralKit.Bot
await ctx.Reply(noNameSetMessage);
return;
}
if (!ctx.HasNext())
{
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.");
else
await ctx.Reply(noNameSetMessage);
return;
}
if (await ctx.MatchClear("your system's name"))
{
@@ -77,7 +77,15 @@ namespace PluralKit.Bot
ctx.CheckSystem();
if (!ctx.HasNext(false))
if (ctx.MatchRaw())
{
if (ctx.System.Description == null)
await ctx.Reply(noDescriptionSetMessage);
else
await ctx.Reply($"```\n{ctx.System.Description}\n```");
return;
}
if (!ctx.HasNext())
{
if (ctx.System.Description == null)
await ctx.Reply(noDescriptionSetMessage);
@@ -89,14 +97,6 @@ namespace PluralKit.Bot
.Build());
return;
}
if (ctx.MatchRaw())
{
if (ctx.System.Description == null)
await ctx.Reply(noDescriptionSetMessage);
else
await ctx.Reply($"```\n{ctx.System.Description}\n```");
return;
}
if (await ctx.MatchClear("your system's description"))
{
@@ -167,14 +167,6 @@ namespace PluralKit.Bot
ctx.CheckSystem();
if (!ctx.HasNext(skipFlags: false))
{
if (ctx.System.Tag == null)
await ctx.Reply(noTagSetMessage);
else
await ctx.Reply($"Your current system tag is {ctx.System.Tag.AsCode()}. To change it, type `pk;s tag <tag>`. To clear it, type `pk;s tag -clear`.");
return;
}
if (ctx.MatchRaw())
{
if (ctx.System.Tag == null)
@@ -183,6 +175,14 @@ namespace PluralKit.Bot
await ctx.Reply($"```\n{ctx.System.Tag}\n```");
return;
}
if (!ctx.HasNext())
{
if (ctx.System.Tag == null)
await ctx.Reply(noTagSetMessage);
else
await ctx.Reply($"Your current system tag is {ctx.System.Tag.AsCode()}. To change it, type `pk;s tag <tag>`. To clear it, type `pk;s tag -clear`.");
return;
}
if (await ctx.MatchClear("your system's tag"))
{