Skip to content
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

Fix character name issues (creating and approving) #130

Merged
merged 1 commit into from
Nov 8, 2020
Merged

Fix character name issues (creating and approving) #130

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Uchu.Char/Handlers/CharacterHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public async Task CharacterCreate(CharacterCreateRequest packet, IRakConnection

await using (var ctx = new UchuContext())
{
if (ctx.Characters.Any(c => c.Name == packet.CharacterName))
if (ctx.Characters.Any(c => c.Name == packet.CharacterName || c.CustomName == packet.CharacterName))
{
Logger.Debug($"{connection} character create rejected due to duplicate name");
connection.Send(new CharacterCreateResponse
Expand All @@ -121,7 +121,7 @@ public async Task CharacterCreate(CharacterCreateRequest packet, IRakConnection
return;
}

if (ctx.Characters.Any(c => c.Name == name))
if (ctx.Characters.Any(c => c.Name == name || c.CustomName == name))
{
Logger.Debug($"{connection} character create rejected due to duplicate pre-made name");
connection.Send(new CharacterCreateResponse
Expand Down
10 changes: 5 additions & 5 deletions Uchu.Core/Handlers/Commands/StandardCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,15 @@ public static async Task<string> ApproveUsernames(string[] arguments)
ResourceStrings.StandardCommandHandler_ApproveUsername_ArgumentsNullException);

await using var ctx = new UchuContext();
if (arguments.Length == 0 || arguments[0].ToLower() == "all")
if (arguments.Length == 0 || arguments[0].ToLower() == "*" || arguments[0] == "")
{
var unApproved = ctx.Characters.Where(c => !c.NameRejected && c.Name != c.CustomName && !string.IsNullOrEmpty(c.CustomName));

if (arguments.Length != 1 || arguments[0] != "all")
if (arguments.Length != 1 || arguments[0] != "*")
{
return string.Join("\n",
unApproved.Select(s => s.CustomName)
) + "\napprove <name> / all";
unApproved.Select(s => s.CustomName)
) + "\napprove <name> / *";
}

foreach (var character in unApproved)
Expand All @@ -203,7 +203,7 @@ public static async Task<string> ApproveUsernames(string[] arguments)
}

var selectedCharacter = await ctx.Characters.FirstOrDefaultAsync(
c => c.CustomName == arguments[1] && !c.NameRejected
c => c.CustomName == arguments[0] && !c.NameRejected
).ConfigureAwait(false);

if (selectedCharacter == null)
Expand Down