X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=1d53a30f74159727415b96528839aba110151b84;hb=27cef863f7286b626e01f1287f31005478a66fea;hp=7fea35d348638c86af47e7f97311bc6e9cb82d5a;hpb=dd98d56cabcd08a3d5207454e002b187af98d28a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 7fea35d34..1d53a30f7 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -7,33 +7,30 @@ /* $ModDesc: Implementation of callerid (umode +g & /accept, ala hybrid etc) */ -class callerid_data +class callerid_data : public classbase { public: time_t lastnotify; std::set accepting; + + callerid_data() : lastnotify(0) { } }; callerid_data* GetData(User* who, bool extend = true) { callerid_data* dat; if (who->GetExt("callerid_data", dat)) - { return dat; - } else { if (extend) { dat = new callerid_data; - dat->lastnotify = 0; // Can't init in struct. who->Extend("callerid_data", dat); return dat; } else - { return NULL; - } } } @@ -41,7 +38,10 @@ void RemoveData(User* who) { callerid_data* dat; who->GetExt("callerid_data", dat); - if (!dat) return; + + if (!dat) + return; + who->Shrink("callerid_data"); delete dat; } @@ -51,30 +51,24 @@ void RemoveFromAllAccepts(InspIRCd* ServerInstance, User* who) for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); ++i) { callerid_data* dat = GetData(i->second, false); - if (!dat) continue; + + if (!dat) + continue; + std::set& accepting = dat->accepting; std::set::iterator iter = accepting.find(who); - if (iter == accepting.end()) continue; + + if (iter == accepting.end()) + continue; + accepting.erase(iter); } } -class User_g : public ModeHandler +class User_g : public SimpleUserModeHandler { -private: - public: - User_g(InspIRCd* Instance) : ModeHandler(Instance, 'g', 0, 0, false, MODETYPE_USER, false) { } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) - { - if (adding != dest->IsModeSet('g')) - { - dest->SetMode('g', adding); - return MODEACTION_ALLOW; - } - return MODEACTION_DENY; - } + User_g(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'g') { } }; class CommandAccept : public Command @@ -88,54 +82,47 @@ public: syntax = "{[+|-]}|*}"; } - /* Will take any number of nicks, which can be seperated by spaces, commas, or a mix. + /** Will take any number of nicks, which can be seperated by spaces, commas, or a mix. * - in front of any nick removes, and an * lists. This effectively means you can do: - * /accept nick1,nick2,nick3 * + * /accept nick1,nick2,nick3,* * to add 3 nicks and then show your list */ - CmdResult Handle(const char** parameters, int pcnt, User* user) + CmdResult Handle(const std::vector ¶meters, User* user) { - if (pcnt < 1) - { - /* Command stuff should've dealt with this already */ - return CMD_FAILURE; - } /* Even if callerid mode is not set, we let them manage their ACCEPT list so that if they go +g they can * have a list already setup. */ bool atleastonechange = false; - for (int i = 0; i < pcnt; ++i) + for (unsigned int i = 0; i < parameters.size(); ++i) { - const char* arg = parameters[i]; + const char* arg = parameters[i].c_str(); irc::commasepstream css(arg); std::string tok; + while (css.GetToken(tok)) { - if (tok.length() < 1) + if (tok.empty()) continue; + if (tok == "*") { - if (IS_LOCAL(user)) continue; + if (IS_LOCAL(user)) + continue; + ListAccept(user); } else if (tok[0] == '-') { User* whotoremove = ServerInstance->FindNick(tok.substr(1)); if (whotoremove) - { atleastonechange = RemoveAccept(user, whotoremove, false) || atleastonechange; - } } else { User* whotoadd = ServerInstance->FindNick(tok[0] == '+' ? tok.substr(1) : tok); if (whotoadd) - { atleastonechange = AddAccept(user, whotoadd, false) || atleastonechange; - } else - { - user->WriteServ("401 %s %s :No such nick/channel", user->nick, tok.c_str()); - } + user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), tok.c_str()); } } } @@ -148,11 +135,9 @@ public: if (dat) { for (std::set::iterator i = dat->accepting.begin(); i != dat->accepting.end(); ++i) - { - user->WriteServ("281 %s %s", user->nick, (*i)->nick); - } + user->WriteNumeric(281, "%s %s", user->nick.c_str(), (*i)->nick.c_str()); } - user->WriteServ("282 %s :End of ACCEPT list", user->nick); + user->WriteNumeric(282, "%s :End of ACCEPT list", user->nick.c_str()); } bool AddAccept(User* user, User* whotoadd, bool quiet) @@ -161,12 +146,16 @@ public: std::set& accepting = dat->accepting; if (accepting.size() >= maxaccepts) { - if (!quiet) user->WriteServ("456 %s :Accept list is full (limit is %d)", user->nick, maxaccepts); + if (!quiet) + user->WriteNumeric(456, "%s :Accept list is full (limit is %d)", user->nick.c_str(), maxaccepts); + return false; } if (!accepting.insert(whotoadd).second) { - if (!quiet) user->WriteServ("457 %s %s :is already on your accept list", user->nick, whotoadd->nick); + if (!quiet) + user->WriteNumeric(457, "%s %s :is already on your accept list", user->nick.c_str(), whotoadd->nick.c_str()); + return false; } return true; @@ -177,14 +166,18 @@ public: callerid_data* dat = GetData(user, false); if (!dat) { - if (!quiet) user->WriteServ("458 %s %s :is not on your accept list", user->nick, whotoremove->nick); + if (!quiet) + user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick.c_str(), whotoremove->nick.c_str()); + return false; } std::set& accepting = dat->accepting; std::set::iterator i = accepting.find(whotoremove); if (i == accepting.end()) { - if (!quiet) user->WriteServ("458 %s %s :is not on your accept list", user->nick, whotoremove->nick); + if (!quiet) + user->WriteNumeric(458, "%s %s :is not on your accept list", user->nick.c_str(), whotoremove->nick.c_str()); + return false; } accepting.erase(i); @@ -210,17 +203,21 @@ public: OnRehash(NULL, ""); mycommand = new CommandAccept(ServerInstance, maxaccepts); myumode = new User_g(ServerInstance); - try { + + try + { ServerInstance->AddCommand(mycommand); - } catch (const ModuleException& e) { + } + catch (const ModuleException& e) + { delete mycommand; - throw; + throw ModuleException("Could not add command!"); } if (!ServerInstance->Modes->AddMode(myumode)) { delete mycommand; delete myumode; - throw new ModuleException("Could not add usermode and command!"); + throw ModuleException("Could not add usermode +g"); } Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnCleanup }; ServerInstance->Modules->Attach(eventlist, this, 7); @@ -228,12 +225,13 @@ public: ~ModuleCallerID() { + ServerInstance->Modes->DelMode(myumode); delete myumode; } Version GetVersion() { - return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } void On005Numeric(std::string& output) @@ -243,21 +241,26 @@ public: int PreText(User* user, User* dest, std::string& text, bool notice) { - if (!dest->IsModeSet('g')) return 0; - if (operoverride && IS_OPER(user)) return 0; + if (!dest->IsModeSet('g')) + return 0; + + if (operoverride && IS_OPER(user)) + return 0; + callerid_data* dat = GetData(dest, true); std::set& accepting = dat->accepting; time_t& lastnotify = dat->lastnotify; std::set::iterator i = accepting.find(dest); + if (i == accepting.end()) { time_t now = time(NULL); /* +g and *not* accepted */ - user->WriteServ("716 %s %s :is in +g mode (server-side ignore).", user->nick, dest->nick); + user->WriteNumeric(716, "%s %s :is in +g mode (server-side ignore).", user->nick.c_str(), dest->nick.c_str()); if (now > (lastnotify + (time_t)notify_cooldown)) { - user->WriteServ("717 %s %s :has been informed that you messaged them.", user->nick, dest->nick); - dest->WriteServ("718 %s %s %s@%s :is messaging you, and you have umode +g", dest->nick, user->nick, user->ident, user->dhost); + user->WriteNumeric(717, "%s %s :has been informed that you messaged them.", user->nick.c_str(), dest->nick.c_str()); + dest->WriteNumeric(718, "%s %s %s@%s :is messaging you, and you have umode +g", dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str()); lastnotify = now; } return 1; @@ -269,6 +272,7 @@ public: { if (IS_LOCAL(user) && target_type == TYPE_USER) return PreText(user, (User*)dest, text, true); + return 0; } @@ -276,12 +280,15 @@ public: { if (IS_LOCAL(user) && target_type == TYPE_USER) return PreText(user, (User*)dest, text, true); + return 0; } void OnCleanup(int type, void* item) { - if (type != TYPE_USER) return; + if (type != TYPE_USER) + return; + User* u = (User*)item; /* Cleanup only happens on unload (before dtor), so keep this O(n) instead of O(n^2) which deferring to OnUserQuit would do. */ RemoveData(u); @@ -303,50 +310,10 @@ public: void OnRehash(User* user, const std::string& parameter) { ConfigReader Conf(ServerInstance); - int new_maxaccepts, new_cooldown; - bool new_override, new_track; - new_maxaccepts = Conf.ReadInteger("callerid", "maxaccepts", "16", 0, true); - switch (Conf.GetError()) - { - case 0: break; - case CONF_VALUE_NOT_FOUND: - new_maxaccepts = 16; - break; - case CONF_NOT_A_NUMBER: - if (user) user->WriteServ("NOTICE %s :Invalid maxaccepts value '%s', not a number", Conf.ReadValue("callerid", "maxaccepts", "", 0).c_str()); - throw ModuleException("Invalid maxaccepts value, not a number"); - case CONF_INT_NEGATIVE: - if (user) user->WriteServ("NOTICE %s :Invalid maxaccepts value '%s', negative", Conf.ReadValue("callerid", "maxaccepts", "", 0).c_str()); - throw ModuleException("Invalid maxaccepts value, negative"); - default: - /* Yikes */ - throw ModuleException("Invalid maxaccepts value, unknown config error"); - } - new_override = Conf.ReadFlag("callerid", "operoverride", "0", 0); - if (Conf.GetError() == CONF_VALUE_NOT_FOUND) new_override = false; - new_track = Conf.ReadFlag("callerid", "tracknick", "0", 0); - if (Conf.GetError() == CONF_VALUE_NOT_FOUND) new_track = false; - new_cooldown = Conf.ReadInteger("callerid", "cooldown", "60", 0, true); - switch (Conf.GetError()) - { - case 0: break; - case CONF_VALUE_NOT_FOUND: - new_cooldown = 16; - break; - case CONF_NOT_A_NUMBER: - if (user) user->WriteServ("NOTICE %s :Invalid cooldown value '%s', not a number", Conf.ReadValue("callerid", "maxaccepts", "", 0).c_str()); - throw ModuleException("Invalid cooldown value, not a number"); - case CONF_INT_NEGATIVE: - if (user) user->WriteServ("NOTICE %s :Invalid cooldown value '%s', negative", Conf.ReadValue("callerid", "maxaccepts", "", 0).c_str()); - throw ModuleException("Invalid cooldown value, negative"); - default: - /* Yikes */ - throw ModuleException("Invalid cooldown value, unknown config error"); - } - maxaccepts = new_maxaccepts; - notify_cooldown = new_cooldown; - operoverride = new_override; - tracknick = new_track; + maxaccepts = Conf.ReadInteger("callerid", "maxaccepts", "16", 0, true); + operoverride = Conf.ReadFlag("callerid", "operoverride", "0", 0); + tracknick = Conf.ReadFlag("callerid", "tracknick", "0", 0); + notify_cooldown = Conf.ReadInteger("callerid", "cooldown", "60", 0, true); } };