diff --git a/src/Routes/RouteAdminDeactivate.c b/src/Routes/RouteAdminDeactivate.c index 587aceb..079ad62 100644 --- a/src/Routes/RouteAdminDeactivate.c +++ b/src/Routes/RouteAdminDeactivate.c @@ -96,18 +96,12 @@ ROUTE_IMPL(RouteAdminDeactivate, path, argp) if (method == HTTP_DELETE) { - char * str; UserDeactivateWithInfo(removed, UserGetName(user), reason); response = HashMapCreate(); - str = removedLocalpart; - JsonSet(response, JsonValueString(str), 1, "user"); - - str = reason; - JsonSet(response, JsonValueString(str), 1, "reason"); - - str = UserGetName(user); - JsonSet(response, JsonValueString(str), 1, "banned_by"); + JsonSet(response, JsonValueString(removedLocalpart), 1, "user"); + JsonSet(response, JsonValueString(reason), 1, "reason"); + JsonSet(response, JsonValueString(UserGetName(user)), 1, "banned_by"); } else { @@ -116,14 +110,8 @@ ROUTE_IMPL(RouteAdminDeactivate, path, argp) } finish: - if (user) - { - UserUnlock(user); - } - if (removed) - { - UserUnlock(removed); - } + UserUnlock(user); + UserUnlock(removed); JsonFree(request); return response; }