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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index f50bdeedf..a13d4d613 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -21,6 +21,8 @@
 
 
 #include "inspircd.h"
+#include "modules/callerid.h"
+#include "modules/ctctags.h"
 
 enum
 {
@@ -98,7 +100,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 +180,7 @@ public:
 		extInfo(Creator)
 	{
 		allow_empty_last_param = false;
-		syntax = "*|(+|-)<nick>[,(+|-)<nick> ...]";
+		syntax = "*|(+|-)<nick>[,(+|-)<nick>]+";
 		TRANSLATE1(TR_CUSTOM);
 	}
 
@@ -188,7 +190,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 +326,32 @@ public:
 	}
 };
 
-class ModuleCallerID : public Module
+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
+	, public CTCTags::EventListener
 {
 	CommandAccept cmd;
+	CallerIDAPIImpl api;
 	SimpleUserModeHandler myumode;
 
 	// Configuration variables:
@@ -358,14 +383,16 @@ class ModuleCallerID : public Module
 
 public:
 	ModuleCallerID()
-		: cmd(this)
+		: CTCTags::EventListener(this)
+		, cmd(this)
+		, api(this, cmd.extInfo)
 		, myumode(this, "callerid", 'g')
 	{
 	}
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Implementation of callerid, usermode +g, /accept", VF_COMMON | VF_VENDOR);
+		return Version("Implementation of callerid, provides user mode +g and the ACCEPT command", VF_COMMON | VF_VENDOR);
 	}
 
 	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
@@ -374,7 +401,7 @@ public:
 		tokens["CALLERID"] = ConvToStr(myumode.GetModeChar());
 	}
 
-	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+	ModResult HandleMessage(User* user, const MessageTarget& target)
 	{
 		if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_USER)
 			return MOD_RES_PASSTHRU;
@@ -383,7 +410,7 @@ public:
 		if (!dest->IsModeSet(myumode) || (user == dest))
 			return MOD_RES_PASSTHRU;
 
-		if (user->HasPrivPermission("users/callerid-override"))
+		if (user->HasPrivPermission("users/ignore-callerid"))
 			return MOD_RES_PASSTHRU;
 
 		callerid_data* dat = cmd.extInfo.get(dest, true);
@@ -395,7 +422,7 @@ public:
 			if (now > (dat->lastnotify + (time_t)notify_cooldown))
 			{
 				user->WriteNumeric(RPL_TARGNOTIFY, dest->nick, "has been informed that you messaged them.");
-				dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
+				dest->WriteRemoteNumeric(RPL_UMODEGMSG, user->nick, InspIRCd::Format("%s@%s", user->ident.c_str(), user->GetDisplayedHost().c_str()), InspIRCd::Format("is messaging you, and you have user mode +g set. Use /ACCEPT +%s to allow.",
 						user->nick.c_str()));
 				dat->lastnotify = now;
 			}
@@ -404,6 +431,16 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
+	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE
+	{
+		return HandleMessage(user, target);
+	}
+
+	ModResult OnUserPreTagMessage(User* user, const MessageTarget& target, CTCTags::TagMessageDetails& details) CXX11_OVERRIDE
+	{
+		return HandleMessage(user, target);
+	}
+
 	void OnUserPostNick(User* user, const std::string& oldnick) CXX11_OVERRIDE
 	{
 		if (!tracknick)
@@ -418,7 +455,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);
 	}