X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=e3dc6b353c989d791c1ed8c9ab55537a278c9767;hb=2db77cda56947d4ee0f913c8082f6607855ca713;hp=d3df1948b76e228cf296c75fd716eb596e8b4a25;hpb=20bea3078d67a090ebcca64bf3cdbd7e6ab6adb6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index d3df1948b..e3dc6b353 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -7,7 +7,7 @@ /* $ModDesc: Implementation of callerid (umode +g & /accept, ala hybrid etc) */ -class callerid_data +class callerid_data : public classbase { public: time_t lastnotify; @@ -48,7 +48,7 @@ void RemoveData(User* who) void RemoveFromAllAccepts(InspIRCd* ServerInstance, User* who) { - for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); ++i) + 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; @@ -66,7 +66,7 @@ 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) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) { if (adding != dest->IsModeSet('g')) { @@ -93,7 +93,7 @@ public: * /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 char* const* parameters, int pcnt, User* user) { if (pcnt < 1) { @@ -134,7 +134,7 @@ public: } 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, tok.c_str()); } } } @@ -149,10 +149,10 @@ public: { 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, (*i)->nick); } } - user->WriteServ("282 %s :End of ACCEPT list", user->nick); + user->WriteNumeric(282, "%s :End of ACCEPT list", user->nick); } bool AddAccept(User* user, User* whotoadd, bool quiet) @@ -161,12 +161,12 @@ 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, 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, whotoadd->nick); return false; } return true; @@ -177,14 +177,14 @@ 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, whotoremove->nick); 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, whotoremove->nick); return false; } accepting.erase(i); @@ -253,11 +253,11 @@ public: { 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, dest->nick); 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, dest->nick); + dest->WriteNumeric(718, "%s %s %s@%s :is messaging you, and you have umode +g", dest->nick, user->nick, user->ident, user->dhost); lastnotify = now; } return 1; @@ -313,10 +313,10 @@ public: 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()); + if (user) user->WriteServ("NOTICE %s :Invalid maxaccepts value '%s', not a number", user->nick, 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()); + if (user) user->WriteServ("NOTICE %s :Invalid maxaccepts value '%s', negative", user->nick, Conf.ReadValue("callerid", "maxaccepts", "", 0).c_str()); throw ModuleException("Invalid maxaccepts value, negative"); default: /* Yikes */ @@ -334,10 +334,10 @@ public: 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()); + if (user) user->WriteServ("NOTICE %s :Invalid cooldown value '%s', not a number", user->nick, 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()); + if (user) user->WriteServ("NOTICE %s :Invalid cooldown value '%s', negative", user->nick, Conf.ReadValue("callerid", "maxaccepts", "", 0).c_str()); throw ModuleException("Invalid cooldown value, negative"); default: /* Yikes */