Skip to content

Fix argument parsing on ~theyare #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
karashiiro merged 1 commit into from
Jun 24, 2025
Merged

Fix argument parsing on ~theyare #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions src/Prima.Application/Community/CrystalExploratoryMissions/CensusCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,13 @@
{
_logger.LogInformation("Searching for user: ({World}) {CharacterName}", world, name);
(foundCharacter, lodestoneCharacter) =
await DiscordXIVUser.CreateFromLodestoneSearch(_lodestone, name, world, member.Id);

Check warning on line 152 in src/Prima.Application/Community/CrystalExploratoryMissions/CensusCommands.cs

View workflow job for this annotation

GitHub Actions / dotnet_build 

Dereference of a possibly null reference.
}
else
{
_logger.LogInformation("Fetching user by Lodestone ID: {LodestoneId}", lodestoneId);
(foundCharacter, lodestoneCharacter) =
await DiscordXIVUser.CreateFromLodestoneId(_lodestone, lodestoneId, member.Id);

Check warning on line 158 in src/Prima.Application/Community/CrystalExploratoryMissions/CensusCommands.cs

View workflow job for this annotation

GitHub Actions / dotnet_build 

Dereference of a possibly null reference.
world = foundCharacter?.World ?? "";
}
}
Expand Down Expand Up @@ -309,6 +309,13 @@
await finalReply.DeleteAsync();
}

[Command("theyare2", RunMode = RunMode.Async)]
[RequireUserPermission(GuildPermission.ManageGuild)]
public Task TheyAre2Async(string userMentionStr, params string[] parameters)
{
return TheyAreAsync(userMentionStr, parameters);
}

// Set someone else's character.
[Command("theyare", RunMode = RunMode.Async)]
[RequireUserPermission(GuildPermission.KickMembers)]
Expand All @@ -320,23 +327,11 @@
var userMention = await DiscordUtilities.GetUserFromMention(userMentionStr, Context);

ulong lodestoneId = 0;
if (parameters.Length != 3)
if (parameters.Length < 3)
{
if (parameters.Length == 1)
if (!ulong.TryParse(parameters[0], out lodestoneId))
{
if (!ulong.TryParse(parameters[0], out lodestoneId))
{
_logger.LogInformation("Failed to parse Lodestone ID");
var reply = await ReplyAsync(
$"{Context.User.Mention}, please enter that command in the format `{prefix}theyare Mention World Name Surname`.");
await Task.Delay(MessageDeleteDelay);
await reply.DeleteAsync();
return;
}
}
else
{
_logger.LogInformation("Invalid theyare command syntax");
_logger.LogInformation("Failed to parse Lodestone ID");
var reply = await ReplyAsync(
$"{Context.User.Mention}, please enter that command in the format `{prefix}theyare Mention World Name Surname`.");
await Task.Delay(MessageDeleteDelay);
Expand All @@ -345,23 +340,28 @@
}
}

var world = parameters[0].ToLower();
var name = parameters[1] + " " + parameters[2];
world = RegexSearches.NonAlpha.Replace(world, string.Empty);
name = RegexSearches.AngleBrackets.Replace(name, string.Empty);
name = RegexSearches.UnicodeApostrophe.Replace(name, string.Empty);
world = world.ToLower();
world = world[0].ToString().ToUpper() + world[1..];
if (world == "Courel" || world == "Couerl")
{
world = "Coeurl";
}
else if (world == "Diablos")
var world = "";
var name = "";
if (parameters.Length >= 3)
{
world = "Diabolos";
world = parameters[0].ToLower();
name = parameters[1] + " " + parameters[2];
world = RegexSearches.NonAlpha.Replace(world, string.Empty);
name = RegexSearches.AngleBrackets.Replace(name, string.Empty);
name = RegexSearches.UnicodeApostrophe.Replace(name, string.Empty);
world = world.ToLower();
world = world[0].ToString().ToUpper() + world[1..];
if (world == "Courel" || world == "Couerl")
{
world = "Coeurl";
}
else if (world == "Diablos")
{
world = "Diabolos";
}
}

var force = parameters.Length >= 4 && parameters[3].ToLower() == "force";
var force = parameters[^1].ToLower() == "force";

var guild = Context.Guild ?? Context.Client.Guilds
#if !DEBUG
Expand All @@ -379,7 +379,7 @@
LodestoneCharacter? character;
try
{
if (parameters.Length == 4)
if (parameters.Length >= 3)
{
_logger.LogInformation("Searching for user: ({World}) {CharacterName}", world, name);
(foundCharacter, character) =
Expand Down
Loading