if (opt_metadata)
match = user->GetExt(matchtext, dummy);
else if (opt_realname)
- match = InspIRCd::Match(user->fullname, matchtext, lowermap);
+ match = InspIRCd::Match(user->fullname, matchtext);
else if (opt_showrealhost)
- match = InspIRCd::Match(user->host, matchtext, lowermap);
+ match = InspIRCd::Match(user->host, matchtext);
else if (opt_ident)
- match = InspIRCd::Match(user->ident, matchtext, lowermap);
+ match = InspIRCd::Match(user->ident, matchtext);
else if (opt_port)
{
irc::portparser portrange(matchtext, false);
}
}
else if (opt_away)
- match = InspIRCd::Match(user->awaymsg, matchtext, lowermap);
+ 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
* -- w00t
*/
if (!match)
- match = InspIRCd::Match(user->dhost, matchtext, lowermap);
+ match = InspIRCd::Match(user->dhost, matchtext);
if (!match)
- match = InspIRCd::Match(user->nick, matchtext, lowermap);
+ match = InspIRCd::Match(user->nick, matchtext);
if (!match)
- match = InspIRCd::Match(user->server, matchtext, lowermap);
+ 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'))
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_viewopersonly = true;
break;
case 'h':
- if (IS_OPER(user))
+ if (user->HasPrivPermission("users/auspex"))
opt_showrealhost = true;
break;
case 'u':
- if (IS_OPER(user))
+ if (user->HasPrivPermission("users/auspex"))
opt_unlimit = true;
break;
case 'r':
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;
}