1 files changed, 53 insertions, 7 deletions

diff --git a/modules/stats/irc2sql/irc2sql.cpp b/modules/stats/irc2sql/irc2sql.cpp
index e47abf34a..a537f184c 100644
--- a/modules/stats/irc2sql/irc2sql.cpp
+++ b/modules/stats/irc2sql/irc2sql.cpp
@@ -29,6 +29,33 @@ void IRC2SQL::OnReload(Configuration::Conf *conf) anope_override
 	StatServ = BotInfo::Find(snick, true);
 	if (!StatServ)
 		throw ConfigException(Module::name + ": no bot named " + snick);
+
+	if (firstrun)
+	{
+		firstrun = false;
+
+		for (Anope::map<Server *>::const_iterator it = Servers::ByName.begin(); it != Servers::ByName.end(); ++it)
+		{
+			this->OnNewServer(it->second);
+		}
+
+		for (channel_map::const_iterator it = ChannelList.begin(), it_end = ChannelList.end(); it != it_end; ++it)
+		{
+			this->OnChannelCreate(it->second);
+		}
+
+		for (user_map::const_iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
+		{
+			User *u = it->second;
+			bool exempt = false;
+			this->OnUserConnect(u, exempt);
+			for (User::ChanUserList::const_iterator cit = u->chans.begin(), cit_end = u->chans.end(); cit != cit_end; ++cit)
+			{
+				this->OnJoinChannel(u, cit->second->chan);
+			}
+		}
+	}
+
 }
 
 void IRC2SQL::OnNewServer(Server *server) anope_override
@@ -49,8 +76,7 @@ void IRC2SQL::OnServerQuit(Server *server) anope_override
 	if (quitting)
 		return;
 
-	query = "UPDATE `" + prefix + "server` "
-		"SET currentusers = 0, online = 'N', split_time = now()";
+	query = "CALL " + prefix + "ServerQuit(@name@)";
 	query.SetValue("name", server->GetName());
 	this->RunQuery(query);
 }
@@ -73,7 +99,7 @@ void IRC2SQL::OnUserConnect(User *u, bool &exempt) anope_override
 	query.SetValue("ip", u->ip);
 	query.SetValue("ident", u->GetIdent());
 	query.SetValue("vident", u->GetVIdent());
-	query.SetValue("secure", u->HasMode("SSL") || u->HasExt("SSL") ? "Y" : "N");
+	query.SetValue("secure", u->HasMode("SSL") || u->HasExt("ssl") ? "Y" : "N");
 	query.SetValue("account", u->Account() ? u->Account()->display : "");
 	query.SetValue("fingerprint", u->fingerprint);
 	query.SetValue("signon", u->signon);
@@ -83,14 +109,14 @@ void IRC2SQL::OnUserConnect(User *u, bool &exempt) anope_override
 	query.SetValue("oper", u->HasMode("OPER") ? "Y" : "N");
 	this->RunQuery(query);
 
-	if (ctcpuser && (Me->IsSynced() || ctcpeob))
+	if (ctcpuser && (Me->IsSynced() || ctcpeob) && u->server != Me)
 		IRCD->SendPrivmsg(StatServ, u->GetUID(), "\1VERSION\1");
 
 }
 
 void IRC2SQL::OnUserQuit(User *u, const Anope::string &msg) anope_override
 {
-	if (quitting)
+	if (quitting || u->server->IsQuitting())
 		return;
 
 	query = "CALL " + prefix + "UserQuit(@nick@)";
@@ -109,7 +135,7 @@ void IRC2SQL::OnUserNickChange(User *u, const Anope::string &oldnick) anope_over
 void IRC2SQL::OnFingerprint(User *u) anope_override
 {
 	query = "UPDATE `" + prefix + "user` SET secure=@secure@, fingerprint=@fingerprint@ WHERE nick=@nick@";
-	query.SetValue("secure", u->HasMode("SSL") || u->HasExt("SSL") ? "Y" : "N");
+	query.SetValue("secure", u->HasMode("SSL") || u->HasExt("ssl") ? "Y" : "N");
 	query.SetValue("fingerprint", u->fingerprint);
 	query.SetValue("nick", u->nick);
 	this->RunQuery(query);
@@ -187,11 +213,31 @@ void IRC2SQL::OnJoinChannel(User *u, Channel *c) anope_override
 	this->RunQuery(query);
 }
 
+EventReturn IRC2SQL::OnChannelModeSet(Channel *c, MessageSource &setter, ChannelMode *mode, const Anope::string &param) anope_override
+{
+	query = "UPDATE `" + prefix + "chan` SET modes=@modes@ WHERE channel=@channel@";
+	query.SetValue("channel", c->name);
+	query.SetValue("modes", c->GetModes(true,true));
+	this->RunQuery(query);
+	return EVENT_CONTINUE;
+}
+
+EventReturn IRC2SQL::OnChannelModeUnset(Channel *c, MessageSource &setter, ChannelMode *mode, const Anope::string &param) anope_override
+{
+	this->OnChannelModeSet(c, setter, mode, param);
+	return EVENT_CONTINUE;
+}
+
 void IRC2SQL::OnLeaveChannel(User *u, Channel *c) anope_override
 {
 	if (quitting)
 		return;
-
+	/*
+	 * user is quitting, we already received a OnUserQuit()
+	 * at this point the user is already removed from SQL and all channels
+	 */
+	if (u->Quitting())
+		return;
 	query = "CALL " + prefix + "PartUser(@nick@,@channel@)";
 	query.SetValue("nick", u->nick);
 	query.SetValue("channel", c->name);