X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_muteban.cpp;h=6e3ca525fe19b1bb03d57e26f5dc2043b4a4333c;hb=7107ec12d8640d35cfe3d5002db1bc1deb33625d;hp=811c85e0dfb5dfa978df299365e04bbbeb24b842;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index 811c85e0d..6e3ca525f 100644
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -19,8 +19,7 @@ class ModuleQuietBan : public Module
 {
  private:
  public:
-	ModuleQuietBan(InspIRCd* Me) : Module(Me)
-	{
+	ModuleQuietBan() 	{
 		Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
@@ -31,41 +30,27 @@ class ModuleQuietBan : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Implements extban +b m: - mute bans",VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	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 (!IS_LOCAL(user))
-			return 0;
+		if (!IS_LOCAL(user) || target_type != TYPE_CHANNEL)
+			return MOD_RES_PASSTHRU;
 
-		if (target_type == TYPE_CHANNEL)
+		Channel* chan = static_cast<Channel*>(dest);
+		if (chan->GetExtBanStatus(user, 'm') == MOD_RES_DENY && chan->GetPrefixValue(user) < VOICE_VALUE)
 		{
-			if (((Channel *)dest)->GetExtBanStatus(user, 'm') < 0)
-			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot send to " + ((Channel *)dest)->name + ", as you are muted");
-				return 1;
-			}
+			user->WriteNumeric(404, "%s %s :Cannot send to channel (you're muted)", user->nick.c_str(), chan->name.c_str());
+			return MOD_RES_DENY;
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	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 (!IS_LOCAL(user))
-			return 0;
-
-		if (target_type == TYPE_CHANNEL)
-		{
-			if (((Channel *)dest)->GetExtBanStatus(user, 'm') < 0)
-			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Cannot send to " + ((Channel *)dest)->name + ", as you are muted");
-				return 1;
-			}
-		}
-
-		return 0;
+		return OnUserPreMessage(user, dest, target_type, text, status, exempt_list);
 	}
 
 	virtual void On005Numeric(std::string &output)