ext.set(user, wl);
}
- if (wl->size() == MAX_WATCH)
+ if (wl->size() >= MAX_WATCH)
{
user->WriteNumeric(512, "%s %s :Too many WATCH entries", user->nick.c_str(), nick);
return CMD_FAILURE;
}
User* target = ServerInstance->FindNick(nick);
- if (target)
+ if ((target) && (target->registered == REG_ALL))
{
(*wl)[nick] = std::string(target->ident).append(" ").append(target->dhost).append(" ").append(ConvToStr(target->age));
user->WriteNumeric(604, "%s %s %s :is online",user->nick.c_str(), nick, (*wl)[nick].c_str());
}
else
{
- (*wl)[nick] = "";
+ (*wl)[nick].clear();
user->WriteNumeric(605, "%s %s * * 0 :is offline",user->nick.c_str(), nick);
}
}
{
for (watchlist::iterator q = wl->begin(); q != wl->end(); q++)
{
- if (!q->second.empty())
+ User* targ = ServerInstance->FindNick(q->first.c_str());
+ if (targ && !q->second.empty())
{
user->WriteNumeric(604, "%s %s %s :is online", user->nick.c_str(), q->first.c_str(), q->second.c_str());
- User *targ = ServerInstance->FindNick(q->first.c_str());
if (IS_AWAY(targ))
{
user->WriteNumeric(609, "%s %s %s %s %lu :is away", user->nick.c_str(), targ->nick.c_str(), targ->ident.c_str(), targ->dhost.c_str(), (unsigned long) targ->awaytime);
public:
Modulewatch()
- : maxwatch(32), cmdw(this, maxwatch), sw(this)
+ : maxwatch(32), cmdw(this, maxwatch), sw(this)
{
- OnRehash(NULL);
whos_watching_me = new watchentries();
- ServerInstance->AddCommand(&cmdw);
- ServerInstance->AddCommand(&sw);
- ServerInstance->Extensions.Register(&cmdw.ext);
+ }
+
+ void init()
+ {
+ OnRehash(NULL);
+ ServerInstance->Modules->AddService(cmdw);
+ ServerInstance->Modules->AddService(sw);
+ ServerInstance->Modules->AddService(cmdw.ext);
Implementation eventlist[] = { I_OnRehash, I_OnGarbageCollect, I_OnUserQuit, I_OnPostConnect, I_OnUserPostNick, I_On005Numeric, I_OnSetAway };
- ServerInstance->Modules->Attach(eventlist, this, 7);
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
virtual void OnRehash(User* user)
{
- ConfigReader Conf;
- maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true);
+ maxwatch = ServerInstance->Config->ConfValue("watch")->getInt("maxentries", 32);
if (!maxwatch)
maxwatch = 32;
}
watchlist* wl = cmdw.ext.get(*n);
if (wl)
/* We were on somebody's notify list, set ourselves offline */
- (*wl)[user->nick.c_str()] = "";
+ (*wl)[user->nick.c_str()].clear();
}
}
if (wl)
{
(*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()] = "";
+ (*wl)[oldnick.c_str()].clear();
}
}
}