acetone
/
ircabot
mirror of https://notabug.org/acetone/ircabot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

common commit

ver3
acetone 2023-03-04 21:30:13 +03:00
parent c88f3e2782
commit 7143458781
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/adminircpanel.h
View File

@ -31,6 +31,6 @@ public:
static bool parse(const QString& networkName, const QString& input, QStringList& answer); static bool parse(const QString& networkName, const QString& input, QStringList& answer);
private: private:
static qint64 m_identifiedTimestamp; static QMap<QString,qint64> m_identifiedTimestamps;
}; };

6
src/config.cpp
View File

@ -36,7 +36,7 @@ constexpr const char CFG_USE_UTC_TIME[] = "useUTC";
constexpr const char CFG_IRC_ADMIN_TIMEOUT[] = "ircabotAdminAutorizationTimeout"; constexpr const char CFG_IRC_ADMIN_TIMEOUT[] = "ircabotAdminAutorizationTimeout";
constexpr const char CFG_WEBUI[] = "webUI"; constexpr const char CFG_WEBUI[] = "webUI";
constexpr const char CFG_WEBUI_BASE_URL[] = "baseUrl"; constexpr const char CFG_WEBUI_BASE_URLS[] = "baseUrls";
constexpr const char CFG_WEBUI_ADDRESS[] = "address"; constexpr const char CFG_WEBUI_ADDRESS[] = "address";
constexpr const char CFG_WEBUI_PORT[] = "port"; constexpr const char CFG_WEBUI_PORT[] = "port";
constexpr const char CFG_WEBUI_THREADS[] = "threads"; constexpr const char CFG_WEBUI_THREADS[] = "threads";
@ -118,7 +118,7 @@ bool Config::initFromJson(const QJsonObject &config, QString* errorString)
m_webUiThreads = webUi.value(CFG_WEBUI_THREADS) .toInt(0); // if <1, then system number m_webUiThreads = webUi.value(CFG_WEBUI_THREADS) .toInt(0); // if <1, then system number
m_webUiBaseUrls.clear(); m_webUiBaseUrls.clear();
QJsonArray baseUrls = webUi.value(CFG_WEBUI_BASE_URL).toArray(); QJsonArray baseUrls = webUi.value(CFG_WEBUI_BASE_URLS).toArray();
for (const auto& jurl: baseUrls) for (const auto& jurl: baseUrls)
{ {
auto url = jurl.toString(); auto url = jurl.toString();
@ -224,7 +224,7 @@ bool Config::updateConfigWithCurrentData(QString *errorString)
const auto url = baseUrlsIter.next(); const auto url = baseUrlsIter.next();
baseUrls.push_back(url); baseUrls.push_back(url);
} }
webui.insert(CFG_WEBUI_BASE_URL, baseUrls); webui.insert(CFG_WEBUI_BASE_URLS, baseUrls);
config.insert(CFG_WEBUI, webui); config.insert(CFG_WEBUI, webui);