- for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
- {
- if (q->watcher == user)
- {
- userrec* targ = Srv->FindNick(q->target);
- if (targ)
- {
- WriteServ(user->fd,"604 %s %s %s %s %lu :is online",user->nick,targ->nick,targ->ident,targ->dhost,targ->age);
- }
- }
- }
- WriteServ(user->fd,"607 %s :End of WATCH list",user->nick);
+ // removing an item from the list
+ if (!ServerInstance->IsNick(nick))
+ {
+ user->WriteServ("942 %s %s :Invalid nickname", user->nick, nick);
+ return CMD_FAILURE;
+ }
+
+ watchlist* wl;
+ if (user->GetExt("watchlist", wl))
+ {
+ /* Yup, is on my list */
+ watchlist::iterator n = wl->find(nick);
+ if (n != wl->end())
+ {
+ if (!n->second.empty())
+ user->WriteServ("602 %s %s %s :stopped watching", user->nick, n->first.c_str(), n->second.c_str());
+ else
+ user->WriteServ("602 %s %s * * 0 :stopped watching", user->nick, nick);
+
+ wl->erase(n);
+ }
+
+ if (!wl->size())
+ {
+ user->Shrink("watchlist");
+ delete wl;
+ }
+
+ watchentries::iterator x = whos_watching_me.find(nick);
+ if (x != whos_watching_me.end())
+ {
+ /* People are watching this user, am i one of them? */
+ std::deque<userrec*>::iterator n = std::find(x->second.begin(), x->second.end(), user);
+ if (n != x->second.end())
+ /* I'm no longer watching you... */
+ x->second.erase(n);
+
+ if (!x->second.size())
+ whos_watching_me.erase(nick);
+ }
+ }
+
+ return CMD_SUCCESS;