#include "inspircd.h"
+#include "modules/callerid.h"
+#include "modules/ctctags.h"
enum
{
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))
{
extInfo(Creator)
{
allow_empty_last_param = false;
- syntax = "*|(+|-)<nick>[,(+|-)<nick> ...]";
+ syntax = "*|(+|-)<nick>[,(+|-)<nick>]+";
TRANSLATE1(TR_CUSTOM);
}
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;
}
};
-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:
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
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;
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);
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;
}
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)