From 371ca06bfa2c2cf73d7c6c6eb3e5ada75c8853b7 Mon Sep 17 00:00:00 2001
From: WolverinDEV <git@teaspeak.de>
Date: Sat, 15 Feb 2020 22:03:08 +0100
Subject: [PATCH] Some updated

---
 git-teaspeak                          | 2 +-
 server/src/Group.cpp                  | 6 +++---
 server/src/InstanceHandler.cpp        | 2 +-
 server/src/client/query/QueryClient.h | 6 ++----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/git-teaspeak b/git-teaspeak
index a6e1c3c..c1e7b0c 160000
--- a/git-teaspeak
+++ b/git-teaspeak
@@ -1 +1 @@
-Subproject commit a6e1c3cf1c97dd45405b08ad05578ea3d5d89e4a
+Subproject commit c1e7b0c8f22a2eb24352e9dd25962d9c7bcdad30
diff --git a/server/src/Group.cpp b/server/src/Group.cpp
index 40eed0a..f26cdd5 100644
--- a/server/src/Group.cpp
+++ b/server/src/Group.cpp
@@ -711,8 +711,8 @@ std::vector<std::shared_ptr<GroupAssignment>> GroupManager::getAssignedServerGro
     sql::result res;
     std::vector<std::shared_ptr<GroupAssignment>> result;
     if(this->root) {
-        auto root = this->root->getAssignedServerGroups(cldbid);
-        result.insert(result.begin(), root.begin(), root.end());
+        auto client_groups = this->root->getAssignedServerGroups(cldbid);
+        result.insert(result.begin(), client_groups.begin(), client_groups.end());
     }
 
     if(cached) {
@@ -726,7 +726,7 @@ std::vector<std::shared_ptr<GroupAssignment>> GroupManager::getAssignedServerGro
         shared_ptr<Group> group = nullptr;
         time_point<system_clock> until;
 
-        for(int index = 0; index < length; index++){
+        for(int index = 0; index < length; index++) {
             if(value[index] == nullptr) {
                 logError(this->getServerId(), string() + "Invalid value at " + column[index]);
                 continue;
diff --git a/server/src/InstanceHandler.cpp b/server/src/InstanceHandler.cpp
index 9ff266b..08a78bb 100644
--- a/server/src/InstanceHandler.cpp
+++ b/server/src/InstanceHandler.cpp
@@ -903,7 +903,7 @@ std::vector<std::pair<permission::PermissionType, permission::v2::PermissionFlag
     for(const auto& permission : permissions) {
         permission::v2::PermissionFlaggedValue value{0, false};
 
-        for(const auto &gr : this->getGroupManager()->getServerGroups(cldbid, type)){
+        for(const auto &gr : server_groups){
             auto group_permissions = gr->group->permissions();
             auto flagged_permissions = granted ? group_permissions->permission_granted_flagged(permission) : group_permissions->permission_value_flagged(permission);
             if(flagged_permissions.has_value)
diff --git a/server/src/client/query/QueryClient.h b/server/src/client/query/QueryClient.h
index f4f7c85..68c4195 100644
--- a/server/src/client/query/QueryClient.h
+++ b/server/src/client/query/QueryClient.h
@@ -131,16 +131,14 @@ namespace ts {
 
                 bool notifyClientEnterView(const std::deque<std::shared_ptr<ConnectedClient>> &deque, const ViewReasonSystemT &t) override;
 
-                bool
-                notifyClientMoved(const std::shared_ptr<ConnectedClient> &client, const std::shared_ptr<BasicChannel> &target_channel, ViewReasonId reason, std::string msg, std::shared_ptr<ConnectedClient> invoker, bool lock_channel_tree) override;
+                bool notifyClientMoved(const std::shared_ptr<ConnectedClient> &client, const std::shared_ptr<BasicChannel> &target_channel, ViewReasonId reason, std::string msg, std::shared_ptr<ConnectedClient> invoker, bool lock_channel_tree) override;
 
                 bool notifyClientLeftView(const std::shared_ptr<ConnectedClient> &client, const std::shared_ptr<BasicChannel> &target_channel, ViewReasonId reasonId, const std::string &reasonMessage, std::shared_ptr<ConnectedClient> invoker,
                                           bool lock_channel_tree) override;
 
                 bool notifyClientLeftView(const std::deque<std::shared_ptr<ConnectedClient>> &deque, const std::string &string, bool b, const ViewReasonServerLeftT &t) override;
 
-                bool
-                notifyClientLeftViewKicked(const std::shared_ptr<ConnectedClient> &client, const std::shared_ptr<BasicChannel> &target_channel, const std::string &message, std::shared_ptr<ConnectedClient> invoker, bool lock_channel_tree) override;
+                bool notifyClientLeftViewKicked(const std::shared_ptr<ConnectedClient> &client, const std::shared_ptr<BasicChannel> &target_channel, const std::string &message, std::shared_ptr<ConnectedClient> invoker, bool lock_channel_tree) override;
 
                 bool notifyClientLeftViewBanned(const std::shared_ptr<ConnectedClient> &client, const std::string &message, std::shared_ptr<ConnectedClient> invoker, size_t length, bool lock_channel_tree) override;