A lot of updates

This commit is contained in:
WolverinDEV
2019-11-22 20:51:00 +01:00
parent 44fe958f31
commit 0d3d3cfc53
31 changed files with 700 additions and 426 deletions
+8 -1
View File
@@ -32,7 +32,7 @@ namespace ts {
return *_properties;
}
std::shared_ptr<ts::server::InternalClient> getInitalServerAdmin(){ return globalServerAdmin; }
std::shared_ptr<ts::server::InternalClient> getInitialServerAdmin(){ return globalServerAdmin; }
std::shared_ptr<ts::GroupManager> getGroupManager(){ return groupManager; }
std::shared_ptr<ts::ServerChannelTree> getChannelTree() { return this->default_tree; }
@@ -51,6 +51,9 @@ namespace ts {
void executeTick(TSServer*);
void cancelExecute(TSServer*);
bool reloadConfig(std::vector<std::string>& /* errors */, bool /* reload file */);
void setWebCertRoot(const std::string& /* key */, const std::string& /* certificate */, const std::string& /* revision */);
const std::shared_ptr<ConnectedClient>& musicRoot() { return this->_musicRoot; }
std::chrono::milliseconds calculateSpokenTime();
@@ -112,6 +115,8 @@ namespace ts {
std::shared_ptr<permission::PermissionNameMapper> permission_mapper = nullptr;
std::shared_ptr<TeamSpeakLicense> teamspeak_license = nullptr;
std::string web_cert_revision{};
threads::Mutex lock_tick;
private:
bool setupDefaultGroups();
@@ -119,6 +124,8 @@ namespace ts {
void save_group_permissions();
void save_channel_permissions();
void loadWebCertificate();
};
}
}