* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 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.
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
/* $ModDesc: Provides support for ircu style usermode +d (deaf to channel messages and channel notices) */
class User_d : public ModeHandler
{
public:
- User_d(InspIRCd* Instance) : ModeHandler(Instance, 'd', 0, 0, false, MODETYPE_USER, false) { }
+ User_d(Module* Creator) : ModeHandler(Creator, 'd', PARAM_NONE, MODETYPE_USER) { }
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
{
if (!dest->IsModeSet('d'))
{
- dest->WriteServ("NOTICE %s :*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode %s -d.", dest->nick, dest->nick);
+ dest->WriteServ("NOTICE %s :*** You have enabled usermode +d, deaf mode. This mode means you WILL NOT receive any messages from any channels you are in. If you did NOT mean to do this, use /mode %s -d.", dest->nick.c_str(), dest->nick.c_str());
dest->SetMode('d',true);
return MODEACTION_ALLOW;
}
class ModuleDeaf : public Module
{
- User_d* m1;
+ User_d m1;
std::string deaf_bypasschars;
std::string deaf_bypasschars_uline;
public:
- ModuleDeaf(InspIRCd* Me)
- : Module(Me)
+ ModuleDeaf()
+ : m1(this)
{
- m1 = new User_d(ServerInstance);
- if (!ServerInstance->AddMode(m1))
+ if (!ServerInstance->Modes->AddMode(&m1))
throw ModuleException("Could not add new modes!");
- OnRehash(NULL, "");
+ OnRehash(NULL);
Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_OnBuildExemptList };
ServerInstance->Modules->Attach(eventlist, this, 4);
}
- void Implements(char* List)
- {
- List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = List[I_OnBuildExemptList] = 1;
- }
- virtual void OnRehash(User* user, const std::string&)
+ virtual void OnRehash(User* user)
{
- ConfigReader* conf = new ConfigReader(ServerInstance);
+ ConfigReader* conf = new ConfigReader;
deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0);
deaf_bypasschars_uline = conf->ReadValue("deaf", "bypasscharsuline", 0);
delete conf;
}
- virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
if (target_type == TYPE_CHANNEL)
{
this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list);
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
{
if (target_type == TYPE_CHANNEL)
{
this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list);
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list)
{
- CUList *ulist;
+ const UserMembList *ulist = chan->GetUsers();
bool is_a_uline;
bool is_bypasschar, is_bypasschar_avail;
bool is_bypasschar_uline, is_bypasschar_uline_avail;
if (!deaf_bypasschars.empty())
{
is_bypasschar_avail = 1;
- if (deaf_bypasschars.find(text[0], 0) != string::npos)
+ if (deaf_bypasschars.find(text[0], 0) != std::string::npos)
is_bypasschar = 1;
}
if (!deaf_bypasschars_uline.empty())
{
is_bypasschar_uline_avail = 1;
- if (deaf_bypasschars_uline.find(text[0], 0) != string::npos)
+ if (deaf_bypasschars_uline.find(text[0], 0) != std::string::npos)
is_bypasschar_uline = 1;
}
if (!is_bypasschar_uline_avail && is_bypasschar)
return;
- switch (status)
- {
- case '@':
- ulist = chan->GetOppedUsers();
- break;
- case '%':
- ulist = chan->GetHalfoppedUsers();
- break;
- case '+':
- ulist = chan->GetVoicedUsers();
- break;
- default:
- ulist = chan->GetUsers();
- break;
- }
-
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
{
/* not +d ? */
if (!i->first->IsModeSet('d'))
if (is_bypasschar && !is_a_uline)
continue; /* deliver message */
+ if (status && !strchr(chan->GetAllPrefixChars(i->first), status))
+ continue;
+
/* don't deliver message! */
- exempt_list[i->first] = i->first->nick;
+ exempt_list.insert(i->first);
}
}
virtual ~ModuleDeaf()
{
- ServerInstance->Modes->DelMode(m1);
- delete m1;
+ ServerInstance->Modes->DelMode(&m1);
}
virtual Version GetVersion()
{
- return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("Provides support for ircu style usermode +d (deaf to channel messages and channel notices)", VF_COMMON|VF_VENDOR,API_VERSION);
}
};
projects / user / henk / code / inspircd.git / blobdiff