X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_deaf.cpp;h=6b90502859921f7c7b8c409e6b7be701b5406cba;hb=e071bd88391e00e4d3b0104ada985e08a9eb3210;hp=5d648cff99397cb7a93c3aad69aba6fb96f35f10;hpb=ece985ccb3210a132d67381511642edfb359f5c4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 5d648cff9..6b9050285 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,9 +12,6 @@
  */
 
 #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) */
 
@@ -23,7 +20,7 @@
 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, "deaf", 'd', PARAM_NONE, MODETYPE_USER) { }
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
@@ -31,7 +28,7 @@ class User_d : public ModeHandler
 		{
 			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;
 			}
@@ -50,35 +47,32 @@ class User_d : public ModeHandler
 
 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->Modes->AddMode(m1))
+		if (!ServerInstance->Modes->AddMode(&m1))
 			throw ModuleException("Could not add new modes!");
 
-		OnRehash(NULL, "");
-		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_OnBuildExemptList };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+		OnRehash(NULL);
+		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
 
 
-	virtual void OnRehash(User* user, const std::string&)
+	virtual void OnRehash(User* user)
 	{
-		ConfigReader* conf = new ConfigReader(ServerInstance);
-		deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0);
-		deaf_bypasschars_uline = conf->ReadValue("deaf", "bypasscharsuline", 0);
-
-		delete conf;
+		ConfigReader conf;
+		deaf_bypasschars = conf.ReadValue("deaf", "bypasschars", 0);
+		deaf_bypasschars_uline = conf.ReadValue("deaf", "bypasscharsuline", 0);
 	}
 
-	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)
 		{
@@ -87,10 +81,10 @@ class ModuleDeaf : public Module
 				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)
 		{
@@ -99,17 +93,12 @@ class ModuleDeaf : public Module
 				this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list);
 		}
 
-		return 0;
-	}
-
-	virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
-	{
-		BuildDeafList(message_type, chan, sender, status, text, exempt_list);
+		return MOD_RES_PASSTHRU;
 	}
 
 	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;
@@ -118,13 +107,13 @@ class ModuleDeaf : public Module
 		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;
 		}
 
@@ -135,23 +124,7 @@ class ModuleDeaf : public Module
 		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'))
@@ -168,20 +141,21 @@ class ModuleDeaf : public Module
 			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;
 	}
 
 	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_VENDOR);
 	}
 
 };