[Bug Fix] Fix Bot Creation Issue (#4235)

# Notes
- Creating bots was failing because were checking for `false` on `Database::CheckUsedName()` in `BotDatabase::QueryNameAvailability`.
- `Database::CheckUsedName()` is now `Database::IsNameUsed()` and checks for both bots and character name usages.
- We were checking for `false` which was always happening when there were no entries for the supplied name, meaning we were never allowed to create a bot.
This commit is contained in:
Alex King
2024-04-02 02:12:08 -04:00
committed by GitHub
parent d7a8fb8691
commit dc48c45421
6 changed files with 27 additions and 34 deletions
+1 -25
View File
@@ -184,35 +184,11 @@ bool BotDatabase::QueryNameAvailablity(const std::string& bot_name, bool& availa
if (
bot_name.empty() ||
bot_name.size() > 60 ||
!database.CheckUsedName(bot_name)
database.IsNameUsed(bot_name)
) {
return false;
}
const auto& bot_data = BotDataRepository::GetWhere(
database,
fmt::format(
"`name` LIKE '{}' LIMIT 1",
bot_name
)
);
if (!bot_data.empty()) {
return false;
}
const auto& character_data = CharacterDataRepository::GetWhere(
database,
fmt::format(
"`name` LIKE '{}' LIMIT 1",
bot_name
)
);
if (!character_data.empty()) {
return false;
}
available_flag = true;
return true;
+2 -2
View File
@@ -2228,8 +2228,8 @@ void Client::ChangeLastName(std::string last_name) {
bool Client::ChangeFirstName(const char* in_firstname, const char* gmname)
{
// check duplicate name
bool usedname = database.CheckUsedName((const char*) in_firstname);
if (!usedname) {
bool used_name = database.IsNameUsed((const char*) in_firstname);
if (used_name) {
return false;
}
+2 -2
View File
@@ -6875,7 +6875,7 @@ void Client::Handle_OP_GMNameChange(const EQApplicationPacket *app)
Client *c = entity_list.GetClientByName(gmn->oldname);
LogInfo("GM([{}]) changeing players name. Old:[{}] New:[{}]", GetName(), gmn->oldname, gmn->newname);
const bool used_name = database.CheckUsedName(gmn->newname);
const bool used_name = database.IsNameUsed(gmn->newname);
if (!c) {
Message(Chat::Red, fmt::format("{} not found for name change. Operation failed!", gmn->oldname).c_str());
return;
@@ -6886,7 +6886,7 @@ void Client::Handle_OP_GMNameChange(const EQApplicationPacket *app)
return;
}
if (!used_name) {
if (used_name) {
Message(Chat::Red, fmt::format("{} is already in use. Operation failed!", gmn->newname).c_str());
return;
}
+1 -1
View File
@@ -4203,7 +4203,7 @@ const char* Merc::GetRandomName(){
//name must begin with an upper-case letter.
valid = false;
}
else if (database.CheckUsedName(rndname)) {
else if (!database.IsNameUsed(rndname)) {
valid = true;
}
else {