* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
wl->erase(n);
}
- if (!wl->size())
+ if (wl->empty())
{
user->Shrink("watchlist");
delete wl;
/* I'm no longer watching you... */
x->second.erase(n2);
- if (!x->second.size())
+ if (x->second.empty())
+ /* nobody else is, either. */
whos_watching_me->erase(nick);
}
}
- /* This might seem confusing, but we return CMD_FAILURE
- * to indicate that this message shouldnt be routed across
- * the network to other linked servers.
- */
- return CMD_FAILURE;
+ return CMD_LOCALONLY;
}
CmdResult add_watch(User* user, const char* nick)
}
}
- return CMD_FAILURE;
+ return CMD_LOCALONLY;
}
CommandWatch (InspIRCd* Instance, unsigned int &maxwatch) : Command(Instance,"WATCH",0,0), MAX_WATCH(maxwatch)
CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
{
- if (!parameters.size())
+ if (parameters.empty())
{
watchlist* wl;
if (user->GetExt("watchlist", wl))
/* I'm no longer watching you... */
i2->second.erase(n);
- if (!i2->second.size())
- whos_watching_me->erase(user->nick.c_str());
+ if (i2->second.empty())
+ /* nobody else is, either. */
+ whos_watching_me->erase(i2);
}
}
}
}
}
- /* So that spanningtree doesnt pass the WATCH commands to the network! */
- return CMD_FAILURE;
+ return CMD_LOCALONLY;
}
};
{
for (std::deque<User*>::iterator n = x->second.begin(); n != x->second.end(); n++)
{
- if (!user->Visibility || user->Visibility->VisibleTo(user))
+ if (!user->Visibility || user->Visibility->VisibleTo(*n))
(*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick.c_str() ,user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) ServerInstance->Time());
watchlist* wl;
/* I'm no longer watching you... */
i2->second.erase(n);
- if (!i2->second.size())
- whos_watching_me->erase(user->nick.c_str());
+ if (i2->second.empty())
+ /* and nobody else is, either. */
+ whos_watching_me->erase(i2);
}
}
{
for (std::deque<User*>::iterator n = x->second.begin(); n != x->second.end(); n++)
{
- if (!user->Visibility || user->Visibility->VisibleTo(user))
+ if (!user->Visibility || user->Visibility->VisibleTo(*n))
(*n)->WriteNumeric(600, "%s %s %s %s %lu :arrived online", (*n)->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
watchlist* wl;
watchlist* wl;
if ((*n)->GetExt("watchlist", wl))
{
- if (!user->Visibility || user->Visibility->VisibleTo(user))
+ if (!user->Visibility || user->Visibility->VisibleTo(*n))
(*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick.c_str(), oldnick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
(*wl)[oldnick.c_str()] = "";
}
if ((*n)->GetExt("watchlist", wl))
{
(*wl)[user->nick.c_str()] = std::string(user->ident).append(" ").append(user->dhost).append(" ").append(ConvToStr(user->age));
- if (!user->Visibility || user->Visibility->VisibleTo(user))
+ if (!user->Visibility || user->Visibility->VisibleTo(*n))
(*n)->WriteNumeric(600, "%s %s %s :arrived online", (*n)->nick.c_str(), user->nick.c_str(), (*wl)[user->nick.c_str()].c_str());
}
}