std::string chlist(userrec *user,userrec* source)
{
- std::string cmp = "";
- std::string lst = "";
+ /* Should this be a stringstream? Not sure if it would be faster as streams are more oriented at appending stuff, which is all we do */
+ std::ostringstream list;
+
if (!user || !source)
- {
- return lst;
- }
- bool userinvisible = (user->modebits & UM_INVISIBLE);
+ return "";
+
for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
{
- if ((((ucrec*)(*i))->channel != NULL) && (((ucrec*)(*i))->channel->name))
+ ucrec* rec = *i;
+
+ if(rec->channel && rec->channel->name)
{
- cmp = std::string(((ucrec*)(*i))->channel->name) + " ";
- if (!strstr(lst.c_str(),cmp.c_str()))
- {
- // if the channel is NOT private/secret, OR the source user is on the channel, AND the user is not invisible.
- // if the user is the same as the source, shortcircuit the comparison.
- if ((source == user) || ((((!(((ucrec*)(*i))->channel->custom_modes[CM_PRIVATE])) && (!(((ucrec*)(*i))->channel->custom_modes[CM_SECRET])) && (!userinvisible)) || (((ucrec*)(*i))->channel->HasUser(source)))))
+ /* XXX - Why does this check need to be here at all? :< */
+ /* Commenting this out until someone finds a case where we need it */
+ //if (lst.find(rec->channel->name) == std::string::npos)
+ //{
+
+ /*
+ * If the target is the same as the sender, let them see all their channels.
+ * If the channel is NOT private/secret AND the user is not invisible.
+ * If the user is an oper, and the <options:operspywhois> option is set.
+ */
+ if ((source == user) || (*source->oper && Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET]) && !(user->modebits & UM_INVISIBLE)) || (rec->channel->HasUser(source))))
{
- lst = lst + std::string(cmode(user,((ucrec*)(*i))->channel)) + std::string(((ucrec*)(*i))->channel->name) + " ";
+ list << cmode(user, rec->channel) << rec->channel->name << " ";
}
- }
+ //}
}
}
- return lst;
+
+ return list.str();
}
-