From 19e9c0bc2220668a7391542c66a6fe10dd9697f2 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sat, 6 Feb 2021 03:44:36 -0600 Subject: [PATCH] Move ClientTaskState::RemoveTask to repository methods --- zone/tasks.cpp | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/zone/tasks.cpp b/zone/tasks.cpp index 26e4dbea8..77d08d5dd 100644 --- a/zone/tasks.cpp +++ b/zone/tasks.cpp @@ -3618,27 +3618,15 @@ void ClientTaskState::RemoveTask(Client *client, int sequence_number, TaskType t break; } - std::string query = StringFormat( - "DELETE FROM character_activities WHERE charid=%i AND taskid = %i", - character_id, task_id + CharacterActivitiesRepository::DeleteWhere( + database, + fmt::format("charid = {} AND taskid = {}", character_id, task_id) ); - auto results = database.QueryDatabase(query); - if (!results.Success()) { - LogError("[TASKS] Error in CientTaskState::CancelTask [{}]", - results.ErrorMessage().c_str()); - return; - } - Log(Logs::General, Logs::Tasks, "[UPDATE] CancelTask: %s", query.c_str()); - query = StringFormat( - "DELETE FROM character_tasks WHERE charid=%i AND taskid = %i AND type=%i", character_id, - task_id, static_cast(task_type)); - results = database.QueryDatabase(query); - if (!results.Success()) - LogError("[TASKS] Error in CientTaskState::CancelTask [{}]", - results.ErrorMessage().c_str()); - - Log(Logs::General, Logs::Tasks, "[UPDATE] CancelTask: %s", query.c_str()); + CharacterTasksRepository::DeleteWhere( + database, + fmt::format("charid = {} AND taskid = {} AND type = {}", character_id, task_id, static_cast(task_type)) + ); switch (task_type) { case TaskType::Task: