From 383fab15a6e0d3f624bf2a8f03cb9763a454ed9a Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 4 Mar 2020 16:31:03 +0100 Subject: [PATCH 1/3] Fixed permission notify client disconnect --- server/src/client/ConnectedClient.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/src/client/ConnectedClient.cpp b/server/src/client/ConnectedClient.cpp index 0ac2e5d..a3cb0c1 100644 --- a/server/src/client/ConnectedClient.cpp +++ b/server/src/client/ConnectedClient.cpp @@ -564,6 +564,11 @@ bool ConnectedClient::notifyClientNeededPermissions() { cmd[index++]["permvalue"] = value.second.has_value ? value.second.value : 0; } + if(index == 0) { + cmd[index]["permid"] = permission::i_client_talk_power; + cmd[index++]["permvalue"] = 0; + } + this->sendCommand(cmd); return true; } From 3aafe342c7338a0f554b420405a4b8c7982fa31a Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Thu, 5 Mar 2020 14:33:28 +0100 Subject: [PATCH 2/3] Fixed some bugs --- music | 2 +- server/src/client/query/QueryClientCommands.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/music b/music index ae7f8c7..ad24c38 160000 --- a/music +++ b/music @@ -1 +1 @@ -Subproject commit ae7f8c7f3d4121704d229cd8995ec33e4824841b +Subproject commit ad24c38923afe23d94452973337a416540e3c7aa diff --git a/server/src/client/query/QueryClientCommands.cpp b/server/src/client/query/QueryClientCommands.cpp index b83899c..c1e4589 100644 --- a/server/src/client/query/QueryClientCommands.cpp +++ b/server/src/client/query/QueryClientCommands.cpp @@ -303,7 +303,7 @@ command_result QueryClient::handleCommandServerSelect(Command &cmd) { target = serverInstance->getVoiceServerManager()->findServerById(static_cast(stol(parm))); if(!target && (!cmd[0].has("0") && (!cmd[0].has("sid") || !cmd["sid"] == 0))) return command_result{error::server_invalid_id, "Invalid server id"}; - if(target && target->getState() != ServerState::ONLINE) return command_result{error::server_is_not_running}; + if(target && target->getState() != ServerState::ONLINE && target->getState() != ServerState::OFFLINE) return command_result{error::server_is_not_running}; if(target == this->server) return command_result{error::ok}; if(target) { From d6314f22b29a499b34c5852eb7020ca370f68241 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Tue, 10 Mar 2020 17:04:30 +0100 Subject: [PATCH 3/3] Fixed license shutdown issue --- server/src/lincense/LicenseService.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/lincense/LicenseService.cpp b/server/src/lincense/LicenseService.cpp index 3028547..d4849b5 100644 --- a/server/src/lincense/LicenseService.cpp +++ b/server/src/lincense/LicenseService.cpp @@ -160,6 +160,7 @@ void LicenseService::execute_dns_request() { } void LicenseService::handle_check_succeeded() { + this->timings.last_succeeded = std::chrono::system_clock::now(); { std::lock_guard rlock{this->request_lock}; this->abort_request(rlock, strobf("request succeeded").string());