[Account] Convert UpdateGMStatus to Repositories (#3859)

- Convert `UpdateGMStatus` to repositories.
- Convert parameter of status to `int`.
This commit is contained in:
Alex King 2024-01-07 01:24:02 -05:00 committed by GitHub
parent b288202c96
commit 44d63c47d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 21 deletions

View File

@ -10317,7 +10317,7 @@ void Client::RemoveItem(uint32 item_id, uint32 quantity)
} }
} }
void Client::SetGMStatus(int16 new_status) { void Client::SetGMStatus(int new_status) {
if (Admin() != new_status) { if (Admin() != new_status) {
database.UpdateGMStatus(AccountID(), new_status); database.UpdateGMStatus(AccountID(), new_status);
UpdateAdmin(); UpdateAdmin();

View File

@ -1607,7 +1607,7 @@ public:
void SetAccountFlag(const std::string& flag, const std::string& value); void SetAccountFlag(const std::string& flag, const std::string& value);
std::string GetAccountFlag(const std::string& flag); std::string GetAccountFlag(const std::string& flag);
std::vector<std::string> GetAccountFlags(); std::vector<std::string> GetAccountFlags();
void SetGMStatus(int16 new_status); void SetGMStatus(int new_status);
void Consume(const EQ::ItemData *item, uint8 type, int16 slot, bool auto_consume); void Consume(const EQ::ItemData *item, uint8 type, int16 slot, bool auto_consume);
void PlayMP3(const char* fname); void PlayMP3(const char* fname);
void ExpeditionSay(const char *str, int ExpID); void ExpeditionSay(const char *str, int ExpID);

View File

@ -2279,7 +2279,7 @@ void Lua_Client::RemoveItem(uint32 item_id, uint32 quantity) {
self->RemoveItem(item_id, quantity); self->RemoveItem(item_id, quantity);
} }
void Lua_Client::SetGMStatus(int16 new_status) { void Lua_Client::SetGMStatus(int new_status) {
Lua_Safe_Call_Void(); Lua_Safe_Call_Void();
self->SetGMStatus(new_status); self->SetGMStatus(new_status);
} }
@ -3711,7 +3711,7 @@ luabind::scope lua_register_client() {
.def("SetFactionLevel2", (void(Lua_Client::*)(uint32,int,int,int,int,int,int))&Lua_Client::SetFactionLevel2) .def("SetFactionLevel2", (void(Lua_Client::*)(uint32,int,int,int,int,int,int))&Lua_Client::SetFactionLevel2)
.def("SetFeigned", (void(Lua_Client::*)(bool))&Lua_Client::SetFeigned) .def("SetFeigned", (void(Lua_Client::*)(bool))&Lua_Client::SetFeigned)
.def("SetGM", (void(Lua_Client::*)(bool))&Lua_Client::SetGM) .def("SetGM", (void(Lua_Client::*)(bool))&Lua_Client::SetGM)
.def("SetGMStatus", (void(Lua_Client::*)(int16))&Lua_Client::SetGMStatus) .def("SetGMStatus", (void(Lua_Client::*)(int))&Lua_Client::SetGMStatus)
.def("SetHideMe", (void(Lua_Client::*)(bool))&Lua_Client::SetHideMe) .def("SetHideMe", (void(Lua_Client::*)(bool))&Lua_Client::SetHideMe)
.def("SetHorseId", (void(Lua_Client::*)(int))&Lua_Client::SetHorseId) .def("SetHorseId", (void(Lua_Client::*)(int))&Lua_Client::SetHorseId)
.def("SetHunger", (void(Lua_Client::*)(int))&Lua_Client::SetHunger) .def("SetHunger", (void(Lua_Client::*)(int))&Lua_Client::SetHunger)

View File

@ -439,7 +439,7 @@ public:
int CountItem(uint32 item_id); int CountItem(uint32 item_id);
void RemoveItem(uint32 item_id); void RemoveItem(uint32 item_id);
void RemoveItem(uint32 item_id, uint32 quantity); void RemoveItem(uint32 item_id, uint32 quantity);
void SetGMStatus(int16 new_status); void SetGMStatus(int new_status);
int16 GetGMStatus(); int16 GetGMStatus();
void AddItem(luabind::object item_table); void AddItem(luabind::object item_table);
int CountAugmentEquippedByID(uint32 item_id); int CountAugmentEquippedByID(uint32 item_id);

View File

@ -1208,7 +1208,7 @@ void Perl_Client_ReadBook(Client* self, const char* book_text, uint8 type) // @c
self->QuestReadBook(book_text, type); self->QuestReadBook(book_text, type);
} }
void Perl_Client_SetGMStatus(Client* self, int16 new_status) // @categories Script Utility void Perl_Client_SetGMStatus(Client* self, int new_status) // @categories Script Utility
{ {
self->SetGMStatus(new_status); self->SetGMStatus(new_status);
} }

View File

@ -4439,22 +4439,16 @@ void ZoneDatabase::SetEXPModifier(uint32 character_id, uint32 zone_id, double ex
database.QueryDatabase(query); database.QueryDatabase(query);
} }
void ZoneDatabase::UpdateGMStatus(uint32 accID, int newStatus) void ZoneDatabase::UpdateGMStatus(uint32 account_id, int new_status)
{ {
if (accID) { auto e = AccountRepository::FindOne(*this, account_id);
std::string query = fmt::format( if (!e.id) {
SQL( return;
UPDATE
`account`
SET `status` = {}
WHERE
`id` = {}
),
newStatus,
accID
);
database.QueryDatabase(query);
} }
e.status = new_status;
AccountRepository::UpdateOne(*this, e);
} }
void ZoneDatabase::SaveCharacterBinds(Client *c) void ZoneDatabase::SaveCharacterBinds(Client *c)

View File

@ -401,7 +401,7 @@ public:
void UpdateBuyLine(uint32 CharID, uint32 BuySlot, uint32 Quantity); void UpdateBuyLine(uint32 CharID, uint32 BuySlot, uint32 Quantity);
void UpdateGMStatus(uint32 accID, int newStatus); void UpdateGMStatus(uint32 account_id, int new_status);
/** /**
************************************************ ************************************************