I'll give you ##TOAST, :p

[user/henk/code/inspircd.git] / src / cmd_who.cpp

diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 7601a10699a680fb7c14d86d6c14242e9a6efda4..367bdb326715335ccd4570d4ae165381c39badab 100644 (file)
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -17,15 +17,9 @@
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "wildcard.h"
 #include "commands/cmd_who.h"
 
-extern InspIRCd* ServerInstance;
-extern chan_hash chanlist;
-extern std::vector<userrec*> all_opers;
-
 /* get the last 'visible' chan of a user */
 static char *getlastchanname(userrec *u)
 {
@@ -48,6 +42,9 @@ bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_
        bool realhost = false;
        bool realname = false;
 
+       if (user->registered != REG_ALL)
+               return false;
+
        if (opt_realname)
                realname = match(user->fullname, matchtext);
 
@@ -57,7 +54,14 @@ bool whomatch(userrec* user, const char* matchtext, bool opt_realname, bool opt_
        return ((realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext)));
 }
 
-void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
+
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_who(Instance);
+}
+
+CmdResult cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
 {
        /*
         * XXX - RFC says:
@@ -149,7 +153,7 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                wholine.append("*");
                        }
 
-                       wholine = wholine + ch->GetStatusChar(i->second) + " :0 " + i->second->fullname;
+                       wholine = wholine + ch->GetPrefixChar(i->second) + " :0 " + i->second->fullname;
                        whoresults.push_back(wholine);
                }
        }
@@ -160,7 +164,7 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                if (opt_viewopersonly)
                {
                        /* Showing only opers */
-                       for (std::vector<userrec*>::iterator i = all_opers.begin(); i != all_opers.end(); i++)
+                       for (std::vector<userrec*>::iterator i = ServerInstance->all_opers.begin(); i != ServerInstance->all_opers.end(); i++)
                        {
                                userrec* oper = *i;
 
@@ -171,6 +175,8 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                        wholine = wholine + getlastchanname(oper) + " " + oper->ident + " " + (opt_showrealhost ? oper->host : oper->dhost) + " " + 
                                                        oper->server + " " + oper->nick + " ";
 
+                                       ch = ServerInstance->FindChan(getlastchanname(oper));
+
                                        /* away? */
                                        if (*oper->awaymsg)
                                        {
@@ -187,7 +193,7 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                                wholine.append("*");
                                        }
        
-                                       wholine = wholine + ch->GetStatusChar(oper) + " :0 " + oper->fullname;
+                                       wholine = wholine + (ch ? ch->GetPrefixChar(oper) : "") + " :0 " + oper->fullname;
                                        whoresults.push_back(wholine);
                                }
                        }
@@ -203,6 +209,8 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                        wholine = wholine + getlastchanname(i->second) + " " + i->second->ident + " " + (opt_showrealhost ? i->second->host : i->second->dhost) + " " + 
                                                i->second->server + " " + i->second->nick + " ";
        
+                                       ch = ServerInstance->FindChan(getlastchanname(i->second));
+
                                        /* away? */
                                        if (*(i->second)->awaymsg)
                                        {
@@ -219,7 +227,7 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
                                                wholine.append("*");
                                        }
 
-                                       wholine = wholine + ch->GetStatusChar(i->second) + " :0 " + i->second->fullname;
+                                       wholine = wholine + (ch ? ch->GetPrefixChar(i->second) : "") + " :0 " + i->second->fullname;
                                        whoresults.push_back(wholine);
                                }
                        }
@@ -230,11 +238,13 @@ void cmd_who::Handle (const char** parameters, int pcnt, userrec *user)
        {
                for (std::vector<std::string>::const_iterator n = whoresults.begin(); n != whoresults.end(); n++)
                        user->WriteServ(*n);
-               user->WriteServ("315 %s %s :End of /WHO list.",user->nick, parameters[0]);
+               user->WriteServ("315 %s %s :End of /WHO list.",user->nick, *parameters[0] ? parameters[0] : "*");
+               return CMD_SUCCESS;
        }
        else
        {
                /* BZZT! Too many results. */
                user->WriteServ("315 %s %s :Too many results",user->nick, parameters[0]);
+               return CMD_FAILURE;
        }
 }