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

Merge pull request #80 from AttorneyOnline/uncm-player

Browse Source 
Allow moderators to uncm other clients
This commit is contained in:
Marisa P 2021-04-17 20:40:59 -05:00 committed by GitHub
commit 5be1f821db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/aoclient.h
View File

@ -219,6 +219,7 @@ class AOClient : public QObject {
{"ANNOUNCE", 1ULL << 8 }, {"ANNOUNCE", 1ULL << 8 },
{"MODCHAT", 1ULL << 9 }, {"MODCHAT", 1ULL << 9 },
{"MUTE", 1ULL << 10}, {"MUTE", 1ULL << 10},
{"UNCM", 1ULL << 11},
{"SUPER", ~0ULL }, {"SUPER", ~0ULL },
}; };

33
src/commands/area.cpp
View File

@ -61,9 +61,36 @@ void AOClient::cmdCM(int argc, QStringList argv)
void AOClient::cmdUnCM(int argc, QStringList argv) void AOClient::cmdUnCM(int argc, QStringList argv)
{ {
AreaData* area = server->areas[current_area]; AreaData* area = server->areas[current_area];
int removed = area->owners.removeAll(id); int uid;
area->invited.removeAll(id);
sendServerMessage("You are no longer CM in this area."); if (area->owners.isEmpty()) {
sendServerMessage("There are no CMs in this area.");
return;
}
else if (argc == 0) {
uid = id;
sendServerMessage("You are no longer CM in this area.");
}
else if (checkAuth(ACLFlags.value("UNCM")) && argc == 1) {
bool conv_ok = false;
uid = argv[0].toInt(&conv_ok);
if (!conv_ok) {
sendServerMessage("Invalid user ID.");
return;
}
if (!area->owners.contains(uid)) {
sendServerMessage("That user is not CMed.");
return;
}
AOClient* target = server->getClientByID(uid);
target->sendServerMessage("You have been unCMed by a moderator.");
}
else {
sendServerMessage("Invalid command.");
return;
}
area->owners.removeAll(uid);
area->invited.removeAll(uid);
arup(ARUPType::CM, true); arup(ARUPType::CM, true);
if (area->owners.isEmpty()) { if (area->owners.isEmpty()) {
area->invited.clear(); area->invited.clear();