* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* KEY: Brain ---> Watched by: Boo, w00t, Om
* KEY: Boo ---> Watched by: Brain, w00t
- *
+ *
* This is used when we want to tell all the users that are watching someone that
* they are now available or no longer available. For example, if the hash was
* populated as shown above, then when Brain signs on, messages are sent to Boo, w00t
* Before you start screaming, this definition is only used here, so moving it to a header is pointless.
* Yes, it's horrid. Blame cl for being different. -- w00t
*/
-#ifdef WINDOWS
-typedef nspace::hash_map<irc::string, std::deque<User*>, nspace::hash_compare<irc::string, std::less<irc::string> > > watchentries;
+#if defined(WINDOWS) && !defined(HASHMAP_DEPRECATED)
+ typedef nspace::hash_map<irc::string, std::deque<User*>, nspace::hash_compare<irc::string, std::less<irc::string> > > watchentries;
#else
-typedef nspace::hash_map<irc::string, std::deque<User*>, nspace::hash<irc::string> > watchentries;
+ typedef nspace::hash_map<irc::string, std::deque<User*>, nspace::hash<irc::string> > watchentries;
#endif
typedef std::map<irc::string, std::string> watchlist;
{
if (!ServerInstance->ULine(user->server))
return CMD_FAILURE;
-
+
User *u = ServerInstance->FindNick(parameters[0]);
if (!u)
return CMD_FAILURE;
-
+
if (IS_LOCAL(u))
{
ServerInstance->Parser->CallHandler("WATCH", parameters, u);
}
-
+
return CMD_SUCCESS;
}
};
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;
}
};
CommandWatch* mycommand;
CommandSVSWatch *sw;
unsigned int maxwatch;
-
+
public:
Modulewatch(InspIRCd* Me)
: Module(Me), maxwatch(32)
{
- OnRehash(NULL, "");
+ OnRehash(NULL);
whos_watching_me = new watchentries();
mycommand = new CommandWatch(ServerInstance, maxwatch);
ServerInstance->AddCommand(mycommand);
ServerInstance->Modules->Attach(eventlist, this, 8);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ virtual void OnRehash(User* user)
{
ConfigReader Conf(ServerInstance);
maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true);
{
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;
if (n != i2->second.end())
/* 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());
}
}
}
- }
+ }
virtual void On005Numeric(std::string &output)
{
// we don't really have a limit...
output = output + " WATCH=" + ConvToStr(maxwatch);
}
-
+
virtual ~Modulewatch()
{
delete whos_watching_me;
}
-
+
virtual Version GetVersion()
{
- return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
};