Bah

[user/henk/code/inspircd.git] / src / modules / m_swhois.cpp

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 10e001f817908754c2b6ac31252210e1feb66c8d..97f69c41348795b73f689f3caa658944d09cada9 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -76,7 +76,7 @@ class CommandSwhois : public Command
                 * -- Brain
                 */
                std::deque<std::string>* metadata = new std::deque<std::string>;
-               metadata->push_back(dest->nick);
+               metadata->push_back(dest->uuid);
                metadata->push_back("swhois");          // The metadata id
                metadata->push_back(*text);             // The value to send
                Event event((char*)metadata,(Module*)this,"send_metadata");
@@ -206,11 +206,14 @@ class ModuleSWhois : public Module
                        std::string* text;
                        if (dest->GetExt("swhois", text))
                        {
-                               user->Shrink("swhois");
+                               dest->Shrink("swhois");
                                delete text;
                        }
 
-                       text2 = new std::string(extdata);
+                       if (extdata.empty())
+                               return; // XXX does the command parser even allow sending blank mdata? it needs to here! -- w00t
+
+                       text = new std::string(extdata);
                        dest->Extend("swhois", text);
                }
        }
@@ -260,7 +263,7 @@ class ModuleSWhois : public Module
                std::string *text = new std::string(swhois);
                user->Extend("swhois", text);
                std::deque<std::string>* metadata = new std::deque<std::string>;
-               metadata->push_back(user->nick);
+               metadata->push_back(user->uuid);
                metadata->push_back("swhois");          // The metadata id
                metadata->push_back(*text);             // The value to send
                Event event((char*)metadata,(Module*)this,"send_metadata");