Release 2.0.9.

This avoids the id being shown on the logout event.

docs/Changes

@@ -1,3 +1,9 @@
+Anope Version 2.0.9
+-------------------
+Fix a regression from 2.0.8 that prevented serialising to MySQL.
+Send account identifiers to InspIRCd on SASL logins too
+Fix a query bug in irc2sql.
+
 Anope Version 2.0.8
 -------------------
 Add +K channel mode for ircd-hybrid

docs/Changes.conf

@@ -1,3 +1,7 @@
+Anope Version 2.0.9
+-------------------
+No significant changes.
+
 Anope Version 2.0.8
 -------------------
 Fix ns_register:unconfirmedexpire not being used

modules/extra/stats/irc2sql/irc2sql.cpp

@@ -71,7 +71,7 @@ void IRC2SQL::OnNewServer(Server *server)
 	query = "INSERT DELAYED INTO `" + prefix + "server` (name, hops, comment, link_time, online, ulined) "
 		"VALUES (@name@, @hops@, @comment@, now(), 'Y', @ulined@) "
 		"ON DUPLICATE KEY UPDATE name=VALUES(name), hops=VALUES(hops), comment=VALUES(comment), "
-			"link_time=VALUES(link_time), online=VALUES(online), ulined=(ulined)";
+			"link_time=VALUES(link_time), online=VALUES(online), ulined=VALUES(ulined)";
 	query.SetValue("name", server->GetName());
 	query.SetValue("hops", server->GetHops());
 	query.SetValue("comment", server->GetDescription());

modules/protocol/inspircd3.cpp

@@ -405,14 +405,14 @@ class InspIRCd3Proto : public IRCDProto
 		if (na->nc->HasExt("UNCONFIRMED"))
 			return;
 
-		UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountname :" << na->nc->display;
 		UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountid :" << na->nc->GetId();
+		UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountname :" << na->nc->display;
 	}
 
 	void SendLogout(User *u) anope_override
 	{
-		UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountname :";
 		UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountid :";
+		UplinkSocket::Message(Me) << "METADATA " << u->GetUID() << " accountname :";
 	}
 
 	void SendChannel(Channel *c) anope_override
@@ -427,6 +427,12 @@ class InspIRCd3Proto : public IRCDProto
 
 	void SendSVSLogin(const Anope::string &uid, const Anope::string &acc, const Anope::string &vident, const Anope::string &vhost) anope_override
 	{
+		// TODO: in 2.1 this function should take a NickAlias instead of strings.
+		NickCore *nc = NickCore::Find(acc);
+		if (!nc)
+			return;
+
+		UplinkSocket::Message(Me) << "METADATA " << uid << " accountid :" << nc->GetId();
 		UplinkSocket::Message(Me) << "METADATA " << uid << " accountname :" << acc;
 
 		if (!vident.empty())

src/nickcore.cpp

@@ -74,7 +74,7 @@ NickCore::~NickCore()
 void NickCore::Serialize(Serialize::Data &data) const
 {
 	data["display"] << this->display;
-	data["id"] << this->id;
+	data["uniqueid"] << this->id;
 	data["pass"] << this->pass;
 	data["email"] << this->email;
 	data["language"] << this->language;
@@ -94,7 +94,7 @@ Serializable* NickCore::Unserialize(Serializable *obj, Serialize::Data &data)
 	data["display"] >> sdisplay;
 
 	uint64_t sid = 0;
-	data["id"] >> sid;
+	data["uniqueid"] >> sid;
 
 	if (obj)
 		nc = anope_dynamic_static_cast<NickCore *>(obj);

src/version.sh

@@ -2,5 +2,5 @@
 
 VERSION_MAJOR=2
 VERSION_MINOR=0
-VERSION_PATCH=8
+VERSION_PATCH=9
 VERSION_EXTRA=""