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

Make MODT editable - Part 1

Browse Source
This commit is contained in:
Salanto 2021-03-12 00:44:27 +01:00
parent 3e1f9825ca
commit 06864e115a
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/config_sample/config.ini
View File

@ -9,7 +9,7 @@ ms_port=27016
port=27016 port=27016
server_description=This is a placeholder server description. Tell the world of AO who you are here! server_description=This is a placeholder server description. Tell the world of AO who you are here!
server_name=An Unnamed Server server_name=An Unnamed Server
motd=Sample MOTD. motd=MOTD is not set.
webao_enable=true webao_enable=true
webao_port=27017 webao_port=27017
auth=simple auth=simple

1
include/aoclient.h
View File

@ -76,6 +76,7 @@ class AOClient : public QObject {
{"CM", 1ULL << 4}, {"CM", 1ULL << 4},
{"GLOBAL_TIMER", 1ULL << 5}, {"GLOBAL_TIMER", 1ULL << 5},
{"CHANGE_EVI_MOD", 1ULL << 6}, {"CHANGE_EVI_MOD", 1ULL << 6},
{"CHANGE_MOTD", 1ULL << 7},
{"SUPER", ~0ULL} {"SUPER", ~0ULL}
}; };

1
include/server.h
View File

@ -66,6 +66,7 @@ class Server : public QObject {
QStringList backgrounds; QStringList backgrounds;
DBManager* db_manager; DBManager* db_manager;
QString server_name; QString server_name;
QString MOTD;
QTimer* timer; QTimer* timer;

15
src/commands.cpp
View File

@ -859,8 +859,19 @@ void AOClient::cmdPM(int arc, QStringList argv)
void AOClient::cmdMOTD(int argc, QStringList argv) void AOClient::cmdMOTD(int argc, QStringList argv)
{ {
QString MOTD = server->getMOTD(); if (argc == 0) {
sendServerMessage(MOTD); sendServerMessage("=== MOTD ===\r\n" + server->MOTD + "\r\n=============");
}
else if (argc == 1) {
unsigned long long user_acl = server->db_manager->getACL(moderator_name);
if ((user_acl & ACLFlags.value("MODIFY_USERS")) == 0) {
sendServerMessage("You do not have permission to change the MOTD");
}
else {
server->MOTD = argv[0];
}
}
} }
QStringList AOClient::buildAreaList(int area_idx) QStringList AOClient::buildAreaList(int area_idx)

2
src/packets.cpp
View File

@ -112,7 +112,7 @@ void AOClient::pktLoadingDone(AreaData* area, int argc, QStringList argv, AOPack
sendPacket("BN", {area->background}); sendPacket("BN", {area->background});
sendPacket("OPPASS", {"DEADBEEF"}); sendPacket("OPPASS", {"DEADBEEF"});
sendPacket("DONE"); sendPacket("DONE");
sendServerMessage(server->getMOTD()); sendServerMessage("=== MOTD ===\r\n" + server->MOTD + "\r\n=============");
} }
void AOClient::pktCharPassword(AreaData* area, int argc, QStringList argv, AOPacket packet) void AOClient::pktCharPassword(AreaData* area, int argc, QStringList argv, AOPacket packet)

11
src/server.cpp
View File

@ -51,6 +51,8 @@ void Server::start()
qDebug() << "Server listening on" << port; qDebug() << "Server listening on" << port;
} }
MOTD = config.value("motd","MOTD is not set.").toString();
proxy = new WSProxy(port, ws_port, this); proxy = new WSProxy(port, ws_port, this);
if(ws_port != -1) if(ws_port != -1)
proxy->start(); proxy->start();
@ -182,15 +184,6 @@ int Server::getDiceValue(QString value_type)
return value; return value;
} }
QString Server::getMOTD()
{
QSettings settings("config/config.ini", QSettings::IniFormat);
settings.beginGroup("Options");
QString MOTD = settings.value("motd", "No MOTD has been set.").toString();
QString f_MOTD = "=== MOTD ===\r\n" + MOTD + "\r\n============='";
return f_MOTD;
}
AOClient* Server::getClient(QString ipid) AOClient* Server::getClient(QString ipid)
{ {
for (AOClient* client : clients) { for (AOClient* client : clients) {