X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=f2ac26fb3692a8617cdb5fc19590b1903b5eee57;hb=63aa8d0d42f619c52d382bde3e6ba2e5e23b12ac;hp=1c76b72f75133bf55db1909c7e263e5bd1dbe9bb;hpb=6c7a3ceb6c674a9af09da955ee0238e9291cf29a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 1c76b72f7..f2ac26fb3 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -45,8 +45,8 @@
 // pair of hostmask and flags
 typedef std::pair<std::string, int> silenceset;
 
-// deque list of pairs
-typedef std::deque<silenceset> silencelist;
+// list of pairs
+typedef std::vector<silenceset> silencelist;
 
 // intmasks for flags
 static int SILENCE_PRIVATE	= 0x0001; /* p  private messages      */
@@ -76,7 +76,7 @@ class CommandSVSSilence : public Command
 		 * style command so services can modify lots of entries at once.
 		 * leaving it backwards compatible for now as it's late. -- w
 		 */
-		if (!ServerInstance->ULine(user->server))
+		if (!user->server->IsULine())
 			return CMD_FAILURE;
 
 		User *u = ServerInstance->FindNick(parameters[0]);
@@ -85,7 +85,7 @@ class CommandSVSSilence : public Command
 
 		if (IS_LOCAL(u))
 		{
-			ServerInstance->Parser->CallHandler("SILENCE", std::vector<std::string>(++parameters.begin(), parameters.end()), u);
+			ServerInstance->Parser.CallHandler("SILENCE", std::vector<std::string>(parameters.begin() + 1, parameters.end()), u);
 		}
 
 		return CMD_SUCCESS;
@@ -106,7 +106,8 @@ class CommandSilence : public Command
  public:
 	SimpleExtItem<silencelist> ext;
 	CommandSilence(Module* Creator, unsigned int &max) : Command(Creator, "SILENCE", 0),
-		maxsilence(max), ext("silence_list", Creator)
+		maxsilence(max)
+		, ext("silence_list", ExtensionItem::EXT_USER, Creator)
 	{
 		allow_empty_last_param = false;
 		syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}";
@@ -134,7 +135,7 @@ class CommandSilence : public Command
 		else if (parameters.size() > 0)
 		{
 			// one or more parameters, add or delete entry from the list (only the first parameter is used)
-			std::string mask = parameters[0].substr(1);
+			std::string mask(parameters[0], 1);
 			char action = parameters[0][0];
 			// Default is private and notice so clients do not break
 			int pattern = CompilePattern("pn");
@@ -211,7 +212,7 @@ class CommandSilence : public Command
 				}
 				if (((pattern & SILENCE_EXCLUDE) > 0))
 				{
-					sl->push_front(silenceset(mask,pattern));
+					sl->insert(sl->begin(), silenceset(mask, pattern));
 				}
 				else
 				{
@@ -290,6 +291,7 @@ class CommandSilence : public Command
 class ModuleSilence : public Module
 {
 	unsigned int maxsilence;
+	bool ExemptULine;
 	CommandSilence cmdsilence;
 	CommandSVSSilence cmdsvssilence;
  public:
@@ -301,9 +303,13 @@ class ModuleSilence : public Module
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		maxsilence = ServerInstance->Config->ConfValue("showwhois")->getInt("maxentries", 32);
+		ConfigTag* tag = ServerInstance->Config->ConfValue("silence");
+
+		maxsilence = tag->getInt("maxentries", 32);
 		if (!maxsilence)
 			maxsilence = 32;
+
+		ExemptULine = tag->getBool("exemptuline", true);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -312,12 +318,12 @@ class ModuleSilence : public Module
 		tokens["SILENCE"] = ConvToStr(maxsilence);
 	}
 
-	void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
+	void BuildExemptList(MessageType message_type, Channel* chan, User* sender, CUList& exempt_list)
 	{
 		int public_silence = (message_type == MSG_PRIVMSG ? SILENCE_CHANNEL : SILENCE_CNOTICE);
-		const UserMembList *ulist = chan->GetUsers();
 
-		for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
+		const Channel::MemberMap& ulist = chan->GetUsers();
+		for (Channel::MemberMap::const_iterator i = ulist.begin(); i != ulist.end(); ++i)
 		{
 			if (IS_LOCAL(i->first))
 			{
@@ -338,10 +344,7 @@ class ModuleSilence : public Module
 		else if (target_type == TYPE_CHANNEL)
 		{
 			Channel* chan = (Channel*)dest;
-			if (chan)
-			{
-				this->OnBuildExemptList(msgtype, chan, user, status, exempt_list, "");
-			}
+			BuildExemptList(msgtype, chan, user, exempt_list);
 		}
 		return MOD_RES_PASSTHRU;
 	}
@@ -353,9 +356,8 @@ class ModuleSilence : public Module
 
 	ModResult MatchPattern(User* dest, User* source, int pattern)
 	{
-		/* Server source */
-		if (!source || !dest)
-			return MOD_RES_ALLOW;
+		if (ExemptULine && source->server->IsULine())
+			return MOD_RES_PASSTHRU;
 
 		silencelist* sl = cmdsilence.ext.get(dest);
 		if (sl)