X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=3810fcf322157be61e7b1bcd16912d59c44e2e28;hb=d4a1ea70451abb333e71f9cff09b624db59531a0;hp=e11b326de73a7941977946c086b83b92b6c7581f;hpb=dbe5a1fc6f9e18765863f332a3e79d7c918d3e65;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index e11b326de..3810fcf32 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 { @@ -73,7 +74,7 @@ struct CallerIDExtInfo : public ExtensionItem { } - std::string serialize(SerializeFormat format, const Extensible* container, void* item) const + std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE { std::string ret; if (format != FORMAT_NETWORK) @@ -84,21 +85,21 @@ struct CallerIDExtInfo : public ExtensionItem return ret; } - void unserialize(SerializeFormat format, Extensible* container, const std::string& value) + void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE { if (format == FORMAT_NETWORK) return; void* old = get_raw(container); if (old) - this->free(old); + this->free(NULL, old); callerid_data* dat = new callerid_data; set_raw(container, dat); irc::commasepstream s(value); std::string tok; if (s.GetToken(tok)) - dat->lastnotify = ConvToInt(tok); + dat->lastnotify = ConvToNum(tok); while (s.GetToken(tok)) { @@ -125,7 +126,7 @@ struct CallerIDExtInfo : public ExtensionItem return dat; } - void free(void* item) + void free(Extensible* container, void* item) CXX11_OVERRIDE { callerid_data* dat = static_cast(item); @@ -147,12 +148,6 @@ struct CallerIDExtInfo : public ExtensionItem } }; -class User_g : public SimpleUserModeHandler -{ -public: - User_g(Module* Creator) : SimpleUserModeHandler(Creator, "callerid", 'g') { } -}; - class CommandAccept : public Command { /** Pair: first is the target, second is true to add, false to remove @@ -188,7 +183,7 @@ public: TRANSLATE1(TR_CUSTOM); } - void EncodeParameter(std::string& parameter, int index) + void EncodeParameter(std::string& parameter, unsigned int index) CXX11_OVERRIDE { // Send lists as-is (part of 2.0 compat) if (parameter.find(',') != std::string::npos) @@ -207,7 +202,7 @@ public: * /accept nick1,nick2,nick3,* * to add 3 nicks and then show your list */ - CmdResult Handle(const std::vector ¶meters, User* user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { if (CommandParser::LoopCall(user, this, parameters, 0)) return CMD_SUCCESS; @@ -240,7 +235,7 @@ public: return (RemoveAccept(user, action.first) ? CMD_SUCCESS : CMD_FAILURE); } - RouteDescriptor GetRouting(User* user, const std::vector& parameters) + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { // There is a list in parameters[0] in two cases: // Either when the source is remote, this happens because 2.0 servers send comma seperated uuid lists, @@ -330,13 +325,33 @@ 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; - User_g myumode; + CallerIDAPIImpl api; + SimpleUserModeHandler myumode; // Configuration variables: - bool operoverride; // Operators can override callerid. bool tracknick; // Allow ACCEPT entries to update with nick changes. unsigned int notify_cooldown; // Seconds between notifications. @@ -364,7 +379,10 @@ class ModuleCallerID : public Module } public: - ModuleCallerID() : cmd(this), myumode(this) + ModuleCallerID() + : cmd(this) + , api(this, cmd.extInfo) + , myumode(this, "callerid", 'g') { } @@ -375,19 +393,20 @@ public: void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - tokens["CALLERID"] = "g"; + tokens["ACCEPT"] = ConvToStr(cmd.maxaccepts); + tokens["CALLERID"] = ConvToStr(myumode.GetModeChar()); } - ModResult OnUserPreMessage(User* user, void* voiddest, int target_type, std::string& text, char status, CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE { - if (!IS_LOCAL(user) || target_type != TYPE_USER) + if (!IS_LOCAL(user) || target.type != MessageTarget::TYPE_USER) return MOD_RES_PASSTHRU; - User* dest = static_cast(voiddest); + User* dest = target.Get(); if (!dest->IsModeSet(myumode) || (user == dest)) return MOD_RES_PASSTHRU; - if (operoverride && user->IsOper()) + if (user->HasPrivPermission("users/callerid-override")) return MOD_RES_PASSTHRU; callerid_data* dat = cmd.extInfo.get(dest, true); @@ -399,7 +418,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->dhost.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 umode +g. Use /ACCEPT +%s to allow.", user->nick.c_str())); dat->lastnotify = now; } @@ -422,10 +441,9 @@ public: void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { ConfigTag* tag = ServerInstance->Config->ConfValue("callerid"); - cmd.maxaccepts = tag->getInt("maxaccepts", 16); - operoverride = tag->getBool("operoverride"); + cmd.maxaccepts = tag->getUInt("maxaccepts", 30); tracknick = tag->getBool("tracknick"); - notify_cooldown = tag->getInt("cooldown", 60); + notify_cooldown = tag->getDuration("cooldown", 60); } void Prioritize() CXX11_OVERRIDE