* ---------------------------------------------------
*/
+#include "inspircd.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
#include "hashcomp.h"
-#include "inspircd.h"
/* $ModDesc: Provides support for the /WATCH command */
* of users using WATCH.
*/
-typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash<irc::string> > watchentries;
-typedef std::map<irc::string, std::string> watchlist;
+/*
+ * 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<userrec*>, nspace::hash_compare<irc::string, less<irc::string> > > watchentries;
+#else
+typedef nspace::hash_map<irc::string, std::deque<userrec*>, nspace::hash<irc::string> > watchentries;
+#endif
+typedef std::map<irc::string, std::string>watchlist;
/* Who's watching each nickname.
* NOTE: We do NOT iterate this to display a user's WATCH list!
watchlist* wl;
if (!user->GetExt("watchlist", wl))
{
- ServerInstance->Log(DEBUG,"Allocate new watchlist");
wl = new watchlist();
user->Extend("watchlist", wl);
}
watchlist::iterator n = wl->find(nick);
if (n == wl->end())
{
- ServerInstance->Log(DEBUG,"*** Add to WATCH: '%s'", nick);
/* Don't already have the user on my watch list, proceed */
watchentries::iterator x = whos_watching_me->find(nick);
if (x != whos_watching_me->end())
userrec* target = ServerInstance->FindNick(nick);
if (target)
{
+ if (target->Visibility && !target->Visibility->VisibleTo(user))
+ {
+ (*wl)[nick] = "";
+ user->WriteServ("605 %s %s * * 0 :is offline",user->nick, nick);
+ return CMD_FAILURE;
+ }
+
(*wl)[nick] = std::string(target->ident).append(" ").append(target->dhost).append(" ").append(ConvToStr(target->age));
user->WriteServ("604 %s %s %s :is online",user->nick, nick, (*wl)[nick].c_str());
}
user->WriteServ("605 %s %s * * 0 :is offline",user->nick, nick);
}
}
- else
- {
- ServerInstance->Log(DEBUG,"*** WATCH entry '%s' already exists!", nick);
- }
return CMD_FAILURE;
}
for (int x = 0; x < pcnt; x++)
{
const char *nick = parameters[x];
- ServerInstance->Log(DEBUG,"WATCH iterate item '%s'", nick);
if (!strcasecmp(nick,"C"))
{
// watch clear
public:
Modulewatch(InspIRCd* Me)
- : Module::Module(Me), maxwatch(32)
+ : Module(Me), maxwatch(32)
{
+ OnRehash(NULL, "");
whos_watching_me = new watchentries();
mycommand = new cmd_watch(ServerInstance, maxwatch);
ServerInstance->AddCommand(mycommand);
}
+ virtual void OnRehash(userrec* user, const std::string ¶meter)
+ {
+ ConfigReader Conf(ServerInstance);
+ maxwatch = Conf.ReadInteger("watch", "maxentries", 0, true);
+ if (!maxwatch)
+ maxwatch = 32;
+ }
+
void Implements(char* List)
{
- List[I_OnGarbageCollect] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1;
+ List[I_OnRehash] = List[I_OnGarbageCollect] = List[I_OnCleanup] = List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1;
}
- virtual void OnUserQuit(userrec* user, const std::string &reason)
+ virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
{
- ServerInstance->Log(DEBUG,"*** WATCH: On global quit: user %s",user->nick);
watchentries::iterator x = whos_watching_me->find(user->nick);
if (x != whos_watching_me->end())
{
for (std::deque<userrec*>::iterator n = x->second.begin(); n != x->second.end(); n++)
{
- (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick ,user->nick, user->ident, user->dhost, ServerInstance->Time());
+ if (!user->Visibility || user->Visibility->VisibleTo(user))
+ (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick ,user->nick, user->ident, user->dhost, ServerInstance->Time());
+
watchlist* wl;
if ((*n)->GetExt("watchlist", wl))
/* We were on somebody's notify list, set ourselves offline */
virtual void OnGarbageCollect()
{
watchentries* old_watch = whos_watching_me;
- whos_watching_me = new watchentries();
+ whos_watching_me = new watchentries();
for (watchentries::const_iterator n = old_watch->begin(); n != old_watch->end(); n++)
whos_watching_me->insert(*n);
- delete old_watch;
+ delete old_watch;
}
- virtual void OnCleanup(int target_type, void* item)
+ virtual void OnCleanup(int target_type, void* item)
{
if (target_type == TYPE_USER)
{
virtual void OnPostConnect(userrec* user)
{
- ServerInstance->Log(DEBUG,"*** WATCH: On global connect: user %s",user->nick);
watchentries::iterator x = whos_watching_me->find(user->nick);
if (x != whos_watching_me->end())
{
for (std::deque<userrec*>::iterator n = x->second.begin(); n != x->second.end(); n++)
{
- (*n)->WriteServ("600 %s %s %s %s %lu :arrived online", (*n)->nick, user->nick, user->ident, user->dhost, user->age);
+ if (!user->Visibility || user->Visibility->VisibleTo(user))
+ (*n)->WriteServ("600 %s %s %s %s %lu :arrived online", (*n)->nick, user->nick, user->ident, user->dhost, user->age);
+
watchlist* wl;
if ((*n)->GetExt("watchlist", wl))
/* We were on somebody's notify list, set ourselves online */
virtual void OnUserPostNick(userrec* user, const std::string &oldnick)
{
- ServerInstance->Log(DEBUG,"*** WATCH: On global nickchange: old nick: %s new nick: %s",oldnick.c_str(),user->nick);
-
watchentries::iterator new_online = whos_watching_me->find(user->nick);
watchentries::iterator new_offline = whos_watching_me->find(assign(oldnick));
if ((*n)->GetExt("watchlist", wl))
{
(*wl)[user->nick] = std::string(user->ident).append(" ").append(user->dhost).append(" ").append(ConvToStr(user->age));
- (*n)->WriteServ("600 %s %s %s :arrived online", (*n)->nick, user->nick, (*wl)[user->nick].c_str());
+ if (!user->Visibility || user->Visibility->VisibleTo(user))
+ (*n)->WriteServ("600 %s %s %s :arrived online", (*n)->nick, user->nick, (*wl)[user->nick].c_str());
}
}
}
watchlist* wl;
if ((*n)->GetExt("watchlist", wl))
{
- /*ServerInstance->Log(DEBUG,"nick=%s", (*n)->nick);
- ServerInstance->Log(DEBUG,"nick2=%s", user->nick);*/
- (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick, oldnick.c_str(), user->ident, user->dhost, user->age);
- (*wl)[user->nick] = "";
+ if (!user->Visibility || user->Visibility->VisibleTo(user))
+ (*n)->WriteServ("601 %s %s %s %s %lu :went offline", (*n)->nick, oldnick.c_str(), user->ident, user->dhost, user->age);
+ (*wl)[oldnick.c_str()] = "";
}
}
}
virtual void On005Numeric(std::string &output)
{
// we don't really have a limit...
- output = output + " WATCH=32";
+ output = output + " WATCH=" + ConvToStr(maxwatch);
}
virtual ~Modulewatch()
};
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
{
return new ModulewatchFactory;
}
projects / user / henk / code / inspircd.git / blobdiff