*/
#include "inspircd.h"
-#include "wildcard.h"
#include "commands/cmd_who.h"
-static const char *get_first_visible_channel(User *u)
+static const std::string star = "*";
+
+static const std::string& get_first_visible_channel(User *u)
{
UCListIter i = u->chans.begin();
if (i != u->chans.end())
return i->first->name;
}
- return "*";
+ return star;
}
bool CommandWho::whomatch(User* user, const char* matchtext)
{
- bool realhost = false;
- bool realname = false;
- bool positive = true;
- bool metadata = false;
- bool ident = false;
- bool away = false;
- bool port = false;
+ bool match = false;
+ bool positive = false;
char* dummy = NULL;
if (user->registered != REG_ALL)
}
else
{
-
+ /*
+ * This was previously one awesome pile of ugly nested if, when really, it didn't need
+ * to be, since only one condition was ever checked, a chained if works just fine.
+ * -- w00t
+ */
if (opt_metadata)
- metadata = user->GetExt(matchtext, dummy);
- else
+ match = user->GetExt(matchtext, dummy);
+ else if (opt_realname)
+ match = InspIRCd::Match(user->fullname, matchtext);
+ else if (opt_showrealhost)
+ match = InspIRCd::Match(user->host, matchtext);
+ else if (opt_ident)
+ match = InspIRCd::Match(user->ident, matchtext);
+ else if (opt_port)
{
- if (opt_realname)
- realname = match(user->fullname, matchtext);
- else
- {
- if (opt_showrealhost)
- realhost = match(user->host, matchtext);
- else
+ irc::portparser portrange(matchtext, false);
+ long portno = -1;
+ while ((portno = portrange.GetToken()))
+ if (portno == user->GetPort())
{
- if (opt_ident)
- ident = match(user->ident, matchtext);
- else
- {
- if (opt_port)
- {
- irc::portparser portrange(matchtext, false);
- long portno = -1;
- while ((portno = portrange.GetToken()))
- if (portno == user->GetPort())
- port = true;
- }
- else
- {
- if (opt_away)
- away = match(user->awaymsg, matchtext);
- }
- }
+ match = true;
+ break;
}
- }
}
- return ((port) || (away) || (ident) || (metadata) || (realname) || (realhost) || (match(user->dhost, matchtext)) || (match(user->nick, matchtext)) || (match(user->server, matchtext)));
+ else if (opt_away)
+ match = InspIRCd::Match(user->awaymsg, matchtext);
+ else if (opt_time)
+ {
+ long seconds = ServerInstance->Duration(matchtext);
+
+ // Okay, so time matching, we want all users connected `seconds' ago
+ if (user->age >= ServerInstance->Time() - seconds)
+ match = true;
+ }
+
+ /*
+ * Once the conditionals have been checked, only check dhost/nick/server
+ * if they didn't match this user -- and only match if we don't find a match.
+ *
+ * This should make things minutely faster, and again, less ugly.
+ * -- w00t
+ */
+ if (!match)
+ match = InspIRCd::Match(user->dhost, matchtext);
+
+ if (!match)
+ match = InspIRCd::Match(user->nick, matchtext);
+
+ if (!match)
+ match = InspIRCd::Match(user->server, matchtext);
+
+ return match;
}
}
if (chan->HasUser(user))
return true;
/* Opers see all */
- if (IS_OPER(user))
+ if (user->HasPrivPermission("users/auspex"))
return true;
/* Cant see inside a +s or a +p channel unless we are a member (see above) */
else if (!chan->IsModeSet('s') && !chan->IsModeSet('p'))
if (u->Visibility && !u->Visibility->VisibleTo(user))
return;
- std::string lcn = get_first_visible_channel(u);
+ const std::string& lcn = get_first_visible_channel(u);
Channel* chlast = ServerInstance->FindChan(lcn);
std::string wholine = initial + (ch ? ch->name : lcn) + " " + u->ident + " " + (opt_showrealhost ? u->host : u->dhost) + " " +
- ((*ServerInstance->Config->HideWhoisServer && !IS_OPER(user)) ? ServerInstance->Config->HideWhoisServer : u->server) +
+ ((*ServerInstance->Config->HideWhoisServer && !user->HasPrivPermission("servers/auspex")) ? ServerInstance->Config->HideWhoisServer : u->server) +
" " + u->nick + " ";
/* away? */
opt_away = false;
opt_local = false;
opt_far = false;
+ opt_time = false;
Channel *ch = NULL;
std::vector<std::string> whoresults;
if (ServerInstance->FindServerName(matchtext))
usingwildcards = true;
- if (!parameters.empty())
+ if (parameters.size() > 1)
{
- /* parse flags */
- const char *iter = parameters[1].c_str();
-
/* Fix for bug #444, WHO flags count as a wildcard */
usingwildcards = true;
- while (*iter)
+ for (std::string::const_iterator iter = parameters[1].begin(); iter != parameters[1].end(); ++iter)
{
switch (*iter)
{
case 'o':
opt_viewopersonly = true;
- break;
+ break;
case 'h':
- if (IS_OPER(user))
+ if (user->HasPrivPermission("users/auspex"))
opt_showrealhost = true;
- break;
+ break;
case 'u':
- if (IS_OPER(user))
+ if (user->HasPrivPermission("users/auspex"))
opt_unlimit = true;
- break;
+ break;
case 'r':
opt_realname = true;
- break;
+ break;
case 'm':
opt_mode = true;
- break;
+ break;
case 'M':
opt_metadata = true;
- break;
+ break;
case 'i':
opt_ident = true;
- break;
+ break;
case 'p':
opt_port = true;
- break;
+ break;
case 'a':
opt_away = true;
- break;
+ break;
case 'l':
opt_local = true;
- break;
+ break;
case 'f':
opt_far = true;
- break;
+ break;
+ case 't':
+ opt_time = true;
+ break;
}
-
- *iter++;
}
}
continue;
/* If we're not inside the channel, hide +i users */
- if (i->first->IsModeSet('i') && !inside && !IS_OPER(user))
+ if (i->first->IsModeSet('i') && !inside && !user->HasPrivPermission("users/auspex"))
continue;
}
{
if (!user->SharesChannelWith(oper))
{
- if (usingwildcards && (!oper->IsModeSet('i')) && (!IS_OPER(user)))
+ if (usingwildcards && (!oper->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
continue;
}
{
if (!user->SharesChannelWith(i->second))
{
- if (usingwildcards && (i->second->IsModeSet('i')) && (!IS_OPER(user)))
+ if (usingwildcards && (i->second->IsModeSet('i')) && (!user->HasPrivPermission("users/auspex")))
continue;
}
{
for (std::vector<std::string>::const_iterator n = whoresults.begin(); n != whoresults.end(); n++)
user->WriteServ(*n);
- user->WriteNumeric(315, "%s %s :End of /WHO list.",user->nick, *parameters[0].c_str() ? parameters[0].c_str() : "*");
+ user->WriteNumeric(315, "%s %s :End of /WHO list.",user->nick.c_str(), *parameters[0].c_str() ? parameters[0].c_str() : "*");
return CMD_SUCCESS;
}
else
{
/* BZZT! Too many results. */
- user->WriteNumeric(315, "%s %s :Too many results",user->nick, parameters[0].c_str());
+ user->WriteNumeric(315, "%s %s :Too many results",user->nick.c_str(), parameters[0].c_str());
return CMD_FAILURE;
}
}
projects / user / henk / code / inspircd.git / blobdiff