X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_notice.cpp;h=2099724006ebeb6ba9f275387ee453e54a232c24;hb=6050df73f498d05597fb37c6157868df1f6f4db2;hp=52c954d4e0c4c70c68f5982d5832c5d638effd92;hpb=293df6a8b55e89c127e60e92711ef0ef1027bff8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp index 52c954d4e..209972400 100644 --- a/src/cmd_notice.cpp +++ b/src/cmd_notice.cpp @@ -2,10 +2,10 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: - * - * + * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see @@ -14,124 +14,105 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#ifdef GCC3 -#include -#else -#include -#endif #include #include #include #include +#include "configreader.h" +#include "hash_map.h" #include "users.h" -#include "ctables.h" -#include "globals.h" #include "modules.h" -#include "dynamic.h" #include "wildcard.h" -#include "message.h" #include "commands.h" -#include "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" -#include "cmd_notice.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern whowas_hash whowas; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[65536]; +#include "hashcomp.h" +#include "commands/cmd_notice.h" -void cmd_notice::Handle (char **parameters, int pcnt, userrec *user) +void cmd_notice::Handle (const char** parameters, int pcnt, userrec *user) { userrec *dest; chanrec *chan; - user->idle_lastmsg = TIME; + user->idle_lastmsg = ServerInstance->Time(); - /*if (ServerInstance->Parser->LoopCall(handle_notice,parameters,pcnt,user,0,pcnt-2,0)) - return;*/ - if (parameters[0][0] == '$') - { - // notice to server mask - char* servermask = parameters[0]; - servermask++; - if (match(Config->ServerName,servermask)) - { - NoticeAll(user, true, "%s",parameters[1]); - } + if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0)) return; + if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server)))) + { + int MOD_RESULT = 0; + std::string temp = parameters[1]; + FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,(void*)parameters[0],TYPE_SERVER,temp,0)); + if (MOD_RESULT) + return; + parameters[1] = (char*)temp.c_str(); + // notice to server mask + const char* servermask = parameters[0] + 1; + if (match(ServerInstance->Config->ServerName,servermask)) + { + user->NoticeAll("%s",parameters[1]); + } + FOREACH_MOD(I_OnUserMessage,OnUserNotice(user,(void*)parameters[0],TYPE_SERVER,parameters[1],0)); + return; + } + char status = 0; + if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+')) + { + status = *parameters[0]; + parameters[0]++; } - else if (parameters[0][0] == '#') + if (*parameters[0] == '#') { - chan = FindChan(parameters[0]); + chan = ServerInstance->FindChan(parameters[0]); if (chan) { - if ((chan->binarymodes & CM_NOEXTERNAL) && (!has_channel(user,chan))) + if (IS_LOCAL(user)) { - WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name); - return; - } - if ((chan->binarymodes & CM_MODERATED) && (cstatus(user,chan)fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name); - return; + if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user))) + { + user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name); + return; + } + if ((chan->modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE)) + { + user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name); + return; + } } int MOD_RESULT = 0; std::string temp = parameters[1]; - FOREACH_RESULT(OnUserPreNotice(user,chan,TYPE_CHANNEL,temp)); + FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,chan,TYPE_CHANNEL,temp,status)); if (MOD_RESULT) { return; } parameters[1] = (char*)temp.c_str(); - if (temp == "") - { - WriteServ(user->fd,"412 %s No text to send", user->nick); - return; - } + if (temp == "") + { + user->WriteServ("412 %s No text to send", user->nick); + return; + } - ChanExceptSender(chan, user, "NOTICE %s :%s", chan->name, parameters[1]); + chan->WriteAllExceptSender(user, status, "NOTICE %s :%s", chan->name, parameters[1]); - FOREACH_MOD OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1]); + FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,chan,TYPE_CHANNEL,parameters[1],status)); } else { /* no such nick/channel */ - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); + user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]); } return; } - dest = Find(parameters[0]); + dest = ServerInstance->FindNick(parameters[0]); if (dest) { int MOD_RESULT = 0; std::string temp = parameters[1]; - FOREACH_RESULT(OnUserPreNotice(user,dest,TYPE_USER,temp)); + FOREACH_RESULT(I_OnUserPreNotice,OnUserPreNotice(user,dest,TYPE_USER,temp,0)); if (MOD_RESULT) { return; } @@ -140,16 +121,14 @@ void cmd_notice::Handle (char **parameters, int pcnt, userrec *user) if (dest->fd > -1) { // direct write, same server - WriteTo(user, dest, "NOTICE %s :%s", dest->nick, parameters[1]); + user->WriteTo(dest, "NOTICE %s :%s", dest->nick, parameters[1]); } - FOREACH_MOD OnUserNotice(user,dest,TYPE_USER,parameters[1]); + FOREACH_MOD(I_OnUserNotice,OnUserNotice(user,dest,TYPE_USER,parameters[1],0)); } else { /* no such nick/channel */ - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]); + user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]); } } - -