X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=49143034f570ea8a4d0ef58affbe83262db8e7c5;hb=d57cad7896a4e9f78565d998e3fbd98b0b32c94e;hp=f50bdeedff3ca2b5e6e970d46a86de21d9f755e7;hpb=f8a9b6ba4ae0b4b3c7b2a408332230dd82eb4608;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index f50bdeedf..49143034f 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -21,6 +21,7 @@
 
 
 #include "inspircd.h"
+#include "modules/callerid.h"
 
 enum
 {
@@ -98,7 +99,7 @@ struct CallerIDExtInfo : public ExtensionItem
 		irc::commasepstream s(value);
 		std::string tok;
 		if (s.GetToken(tok))
-			dat->lastnotify = ConvToInt(tok);
+			dat->lastnotify = ConvToNum<time_t>(tok);
 
 		while (s.GetToken(tok))
 		{
@@ -178,7 +179,7 @@ public:
 		extInfo(Creator)
 	{
 		allow_empty_last_param = false;
-		syntax = "*|(+|-)<nick>[,(+|-)<nick> ...]";
+		syntax = "*|(+|-)<nick>[,(+|-)<nick>]+";
 		TRANSLATE1(TR_CUSTOM);
 	}
 
@@ -188,7 +189,7 @@ public:
 		if (parameter.find(',') != std::string::npos)
 			return;
 
-		// Convert a [+|-]<nick> into a [-]<uuid>
+		// Convert a (+|-)<nick> into a [-]<uuid>
 		ACCEPTAction action = GetTargetAndAction(parameter);
 		if (!action.first)
 			return;
@@ -324,9 +325,30 @@ public:
 	}
 };
 
+class CallerIDAPIImpl : public CallerID::APIBase
+{
+ private:
+	CallerIDExtInfo& ext;
+
+ public:
+	CallerIDAPIImpl(Module* Creator, CallerIDExtInfo& Ext)
+		: CallerID::APIBase(Creator)
+		, ext(Ext)
+	{
+	}
+
+	bool IsOnAcceptList(User* source, User* target) CXX11_OVERRIDE
+	{
+		callerid_data* dat = ext.get(target, true);
+		return dat->accepting.count(source);
+	}
+};
+
+
 class ModuleCallerID : public Module
 {
 	CommandAccept cmd;
+	CallerIDAPIImpl api;
 	SimpleUserModeHandler myumode;
 
 	// Configuration variables:
@@ -359,6 +381,7 @@ class ModuleCallerID : public Module
 public:
 	ModuleCallerID()
 		: cmd(this)
+		, api(this, cmd.extInfo)
 		, myumode(this, "callerid", 'g')
 	{
 	}
@@ -418,7 +441,7 @@ public:
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("callerid");
-		cmd.maxaccepts = tag->getUInt("maxaccepts", 16);
+		cmd.maxaccepts = tag->getUInt("maxaccepts", 30);
 		tracknick = tag->getBool("tracknick");
 		notify_cooldown = tag->getDuration("cooldown", 60);
 	}