From 553ad960d3df1a0482a085c3aeb9535310c01e36 Mon Sep 17 00:00:00 2001 From: ZeldaZach Date: Fri, 27 Dec 2024 23:44:36 -0500 Subject: [PATCH] Support Moderator/Admin force activating users --- servatrice/src/serversocketinterface.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index 773b0532d..c87226610 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -1713,9 +1713,11 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForceActivateUser(const auto *getUserTokenQuery = sqlInterface->prepareQuery("select token from {prefix}_users WHERE name = :name"); getUserTokenQuery->bindValue(":name", QString::fromStdString(cmd.username_to_activate())); if (!sqlInterface->execSqlQuery(getUserTokenQuery)) { + // Internal server error return Response::RespInternalError; } if (!getUserTokenQuery->next()) { + // User doesn't exist return Response::RespNameNotFound; } const auto &token = getUserTokenQuery->value(0).toString(); @@ -1730,7 +1732,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdForceActivateUser(const cmdActivate.set_user_name(cmd.username_to_activate()); cmdActivate.set_token(token.toStdString()); - // Send activation request + // Send activation request -- Either User exists or User activated return cmdActivateAccount(cmdActivate, rc); }