Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow easier handling of targeting user groups when sending packets

Browse Source
This commit is contained in:
Salanto 2021-11-20 17:35:05 +01:00
parent 7dbbf41d33
commit d943981ef1
5 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/include/aoclient.h
View File

@ -307,6 +307,16 @@ class AOClient : public QObject {
*/
bool m_is_logging_in = false;
/**
* @brief Checks if the client would be authorised to something based on its necessary permissions.
*
* @param acl_mask The permissions bitflag that the client's own permissions should be checked against.
*
* @return True if the client's permissions are high enough for `acl_mask`, or higher than it.
* False if the client is missing some permissions.
*/
bool checkAuth(unsigned long long acl_mask);
public slots:
/**
* @brief A slot for when the client disconnects from the server.
@ -433,16 +443,6 @@ class AOClient : public QObject {
*/
void sendServerBroadcast(QString message);
/**
* @brief Checks if the client would be authorised to something based on its necessary permissions.
*
* @param acl_mask The permissions bitflag that the client's own permissions should be checked against.
*
* @return True if the client's permissions are high enough for `acl_mask`, or higher than it.
* False if the client is missing some permissions.
*/
bool checkAuth(unsigned long long acl_mask);
/**
* @name Packet headers
*

17
core/include/server.h
View File

@ -79,7 +79,8 @@ class Server : public QObject {
* @brief Enum to specifc different targets to send altered packets to a specific usergroup.
*/
enum class TARGET_TYPE {
AUTHENTICATED
AUTHENTICATED,
MODCHAT
};
Q_ENUM(TARGET_TYPE)
@ -139,9 +140,21 @@ class Server : public QObject {
/**
* @brief Sends a packet to clients, sends an altered packet to a specific usergroup.
*
* @param The packet to send to the clients.
*
* @param ENUM to determine the targets of the altered packet.
*/
void broadcast(AOPacket packet, TARGET_TYPE target);
/**
* @brief Sends a packet to clients, sends an altered packet to a specific usergroup.
*
* @param The packet to send to the clients.
*
* @param The altered packet to send to the other clients.
* @param tENUM to determine the targets of the altered packet.
*
* @param ENUM to determine the targets of the altered packet.
*/
void broadcast(AOPacket packet, AOPacket other_packet, enum TARGET_TYPE target);

12
core/src/commands/messaging.cpp
View File

@ -173,11 +173,7 @@ void AOClient::cmdM(int argc, QStringList argv)
QString l_sender_name = m_ooc_name;
QString l_sender_message = argv.join(" ");
for (AOClient* client : qAsConst(server->m_clients)) {
if (client->checkAuth(ACLFlags.value("MODCHAT")))
client->sendPacket("CT", {"[M]" + l_sender_name, l_sender_message});
}
return;
server->broadcast(AOPacket("CT", {"[M]" + l_sender_name, l_sender_message}), Server::TARGET_TYPE::MODCHAT);
}
void AOClient::cmdGM(int argc, QStringList argv)
@ -187,11 +183,7 @@ void AOClient::cmdGM(int argc, QStringList argv)
QString l_sender_name = m_ooc_name;
QString l_sender_area = server->m_area_names.value(m_current_area);
QString l_sender_message = argv.join(" ");
for (AOClient* l_client : qAsConst(server->m_clients)) {
if (l_client->m_global_enabled) {
l_client->sendPacket("CT", {"[G][" + l_sender_area + "]" + "["+ l_sender_name+"][M]", l_sender_message});
}
}
server->broadcast(AOPacket("CT", {"[G][" + l_sender_area + "]" + "["+ l_sender_name+"][M]", l_sender_message}),Server::TARGET_TYPE::MODCHAT);
}
void AOClient::cmdLM(int argc, QStringList argv)

18
core/src/server.cpp
View File

@ -215,6 +215,21 @@ void Server::broadcast(AOPacket packet)
}
}
void Server::broadcast(AOPacket packet, TARGET_TYPE target)
{
switch (target) {
case TARGET_TYPE::MODCHAT:
for (AOClient* l_client : qAsConst(m_clients)) {
if (l_client->checkAuth(l_client->ACLFlags.value("MODCHAT"))) {
l_client->sendPacket(packet);
}
}
default:
//Unimplemented, so not handled.
break;
}
}
void Server::broadcast(AOPacket packet, AOPacket other_packet, TARGET_TYPE target)
{
switch (target) {
@ -227,6 +242,9 @@ void Server::broadcast(AOPacket packet, AOPacket other_packet, TARGET_TYPE targe
client->sendPacket(packet);
}
}
default:
//Unimplemented, so not handled.
break;
}
}