X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_callerid.cpp;h=a13d4d613fb36e2f4ba728959365a0789550e1ac;hb=87b1461e2a4710a38b32186c2582da9fe9bb3804;hp=0eb208138276a6b7d4ee3673b2d3af18d4b3b776;hpb=0b63ccd0b5cb26883d6becb196fb98e4f95d0397;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 0eb208138..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 { @@ -73,7 +75,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 +86,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 +127,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 +149,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 @@ -184,17 +180,17 @@ public: extInfo(Creator) { allow_empty_last_param = false; - syntax = "*|(+|-)[,(+|-) ...]"; + syntax = "*|(+|-)[,(+|-)]+"; 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) return; - // Convert a [+|-] into a [-] + // Convert a (+|-) into a [-] ACCEPTAction action = GetTargetAndAction(parameter); if (!action.first) return; @@ -207,7 +203,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; @@ -225,7 +221,7 @@ public: ACCEPTAction action = GetTargetAndAction(tok, user); if (!action.first) { - user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", tok.c_str()); + user->WriteNumeric(Numerics::NoSuchNick(tok)); return CMD_FAILURE; } @@ -240,7 +236,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, @@ -271,7 +267,7 @@ public: for (callerid_data::UserSet::iterator i = dat->accepting.begin(); i != dat->accepting.end(); ++i) user->WriteNumeric(RPL_ACCEPTLIST, (*i)->nick); } - user->WriteNumeric(RPL_ENDOFACCEPT, ":End of ACCEPT list"); + user->WriteNumeric(RPL_ENDOFACCEPT, "End of ACCEPT list"); } bool AddAccept(User* user, User* whotoadd) @@ -280,12 +276,12 @@ public: callerid_data* dat = extInfo.get(user, true); if (dat->accepting.size() >= maxaccepts) { - user->WriteNumeric(ERR_ACCEPTFULL, ":Accept list is full (limit is %d)", maxaccepts); + user->WriteNumeric(ERR_ACCEPTFULL, InspIRCd::Format("Accept list is full (limit is %d)", maxaccepts)); return false; } if (!dat->accepting.insert(whotoadd).second) { - user->WriteNumeric(ERR_ACCEPTEXIST, "%s :is already on your accept list", whotoadd->nick.c_str()); + user->WriteNumeric(ERR_ACCEPTEXIST, whotoadd->nick, "is already on your accept list"); return false; } @@ -303,12 +299,12 @@ public: callerid_data* dat = extInfo.get(user, false); if (!dat) { - user->WriteNumeric(ERR_ACCEPTNOT, "%s :is not on your accept list", whotoremove->nick.c_str()); + user->WriteNumeric(ERR_ACCEPTNOT, whotoremove->nick, "is not on your accept list"); return false; } if (!dat->accepting.erase(whotoremove)) { - user->WriteNumeric(ERR_ACCEPTNOT, "%s :is not on your accept list", whotoremove->nick.c_str()); + user->WriteNumeric(ERR_ACCEPTNOT, whotoremove->nick, "is not on your accept list"); return false; } @@ -330,13 +326,35 @@ 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; - 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,30 +382,35 @@ class ModuleCallerID : public Module } public: - ModuleCallerID() : cmd(this), myumode(this) + ModuleCallerID() + : 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& 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 HandleMessage(User* user, const MessageTarget& target) { - 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/ignore-callerid")) return MOD_RES_PASSTHRU; callerid_data* dat = cmd.extInfo.get(dest, true); @@ -395,12 +418,12 @@ public: { time_t now = ServerInstance->Time(); /* +g and *not* accepted */ - user->WriteNumeric(ERR_TARGUMODEG, "%s :is in +g mode (server-side ignore).", dest->nick.c_str()); + user->WriteNumeric(ERR_TARGUMODEG, dest->nick, "is in +g mode (server-side ignore)."); if (now > (dat->lastnotify + (time_t)notify_cooldown)) { - user->WriteNumeric(RPL_TARGNOTIFY, "%s :has been informed that you messaged them.", dest->nick.c_str()); - dest->SendText(":%s %03d %s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.", - ServerInstance->Config->ServerName.c_str(), RPL_UMODEGMSG, dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str()); + 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 user mode +g set. Use /ACCEPT +%s to allow.", + user->nick.c_str())); dat->lastnotify = now; } return MOD_RES_DENY; @@ -408,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) @@ -422,10 +455,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