Make FJOIN send UUID

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7862 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 0da85685d069a28f1b2b2d5fdd40667fae87807a..49f490e83127ae89cd2f78d4aac6ec908f33cdc9 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -980,7 +980,7 @@ void ModuleSpanningTree::OnUserJoin(userrec* user, chanrec* channel, bool &silen
                        // new joining permissions for the user.
                        params.push_back(channel->name);
                        params.push_back(ConvToStr(channel->age));
-                       params.push_back(std::string(channel->GetAllPrefixChars(user))+","+std::string(user->nick));
+                       params.push_back(std::string(channel->GetAllPrefixChars(user))+","+std::string(user->uuid));
                        Utils->DoOneToMany(ServerInstance->Config->ServerName,"FJOIN",params);
                        /* First user in, sync the modes for the channel */
                        params.pop_back();

diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 1008c327d295f6024f3a553b4b8530282dd4fea2..0f9d17f68cb11e242443129637dbe11f3e8c8810 100644 (file)
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -1060,7 +1060,7 @@ void TreeSocket::SendFJoins(TreeServer* Current, chanrec* c)
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
                // The first parameter gets a : before it
-               size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixChars(i->first), i->first->nick);
+               size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixChars(i->first), i->first->uuid);
 
                curlen += ptrlen;
                ptr += ptrlen;