This commit is contained in:
2018-11-23 16:15:51 +01:00
parent 42f41aefa0
commit 90c85e8646

View File

@@ -9,8 +9,8 @@ void IrcPlugin::applyConfig(IrcConfig cfg)
{ {
server = String(cfg.server); server = String(cfg.server);
port = cfg.port; port = cfg.port;
nick = String(cfg.nickname); nick = String(cfg.nickname ? cfg.nickname : "Sprocket" + String(ESP.getChipId()));
user = String(cfg.user); user = String(cfg.user ? cfg.user : "Sprocket" + String(ESP.getChipId()));
} }
void IrcPlugin::applyConfigFromFile(const char *fileName) void IrcPlugin::applyConfigFromFile(const char *fileName)
@@ -35,11 +35,6 @@ void IrcPlugin::activate(Scheduler *scheduler)
subscribe("irc/join", bind(&IrcPlugin::join, this, _1)); subscribe("irc/join", bind(&IrcPlugin::join, this, _1));
subscribe("irc/sendMessage", bind(&IrcPlugin::sendMessage, this, _1)); subscribe("irc/sendMessage", bind(&IrcPlugin::sendMessage, this, _1));
if (server.length() == 0 || port == 0 || nick.length() == 0 || user.length() == 0)
{
publish("irc/needsConfig", "");
}
//enableConnectTask(scheduler); //enableConnectTask(scheduler);
enableProcessTask(scheduler); enableProcessTask(scheduler);
PRINT_MSG(Serial, "IRC", "plugin activated"); PRINT_MSG(Serial, "IRC", "plugin activated");
@@ -61,6 +56,11 @@ void IrcPlugin::enableProcessTask(Scheduler *scheduler)
void IrcPlugin::connect() void IrcPlugin::connect()
{ {
if (server.length() == 0 || port == 0 || nick.length() == 0 || user.length() == 0)
{
publish("irc/needsConfig", "");
return;
}
if (!client->connected()) if (!client->connected())
{ {
PRINT_MSG(Serial, "IRC", String("Attempting connection to " + server + ":" + String(port)).c_str()); PRINT_MSG(Serial, "IRC", String("Attempting connection to " + server + ":" + String(port)).c_str());