X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_privmsg.cpp;h=e387b6ae345482adf0a77b069ff1ab36507dca36;hb=547ee1342e8b07bcdf46bc81343d1a1f7a2998e5;hp=883a75d4781afb27e5f0c8a943318d755dc382f1;hpb=235a0a2035bda6dd214719107083266207f39883;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp index 883a75d47..e387b6ae3 100644 --- a/src/cmd_privmsg.cpp +++ b/src/cmd_privmsg.cpp @@ -14,95 +14,68 @@ * --------------------------------------------------- */ -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 "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_privmsg.h" +#include "commands/cmd_privmsg.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[MAX_DESCRIPTORS]; +extern "C" command_t* init_command(InspIRCd* Instance) +{ + return new cmd_privmsg(Instance); +} -void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user) +void cmd_privmsg::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(this,parameters,pcnt,user,0,pcnt-2,0)) + if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0)) return; - if (parameters[0][0] == '$') + + if ((parameters[0][0] == '$') && ((*user->oper) || (ServerInstance->ULine(user->server)))) { + int MOD_RESULT = 0; + std::string temp = parameters[1]; + FOREACH_RESULT(I_OnUserPreMessage,OnUserPreMessage(user,(void*)parameters[0],TYPE_SERVER,temp,0)); + if (MOD_RESULT) + return; + parameters[1] = (char*)temp.c_str(); // notice to server mask - char* servermask = parameters[0]; - servermask++; - if (match(Config->ServerName,servermask)) - { - ServerPrivmsgAll("%s",parameters[1]); - } + const char* servermask = parameters[0] + 1; + if (match(ServerInstance->Config->ServerName,servermask)) + { + ServerInstance->ServerPrivmsgAll("%s",parameters[1]); + } + FOREACH_MOD(I_OnUserMessage,OnUserMessage(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]++; - } - if (parameters[0][0] == '#') + } + char status = 0; + if ((*parameters[0] == '@') || (*parameters[0] == '%') || (*parameters[0] == '+')) { - chan = FindChan(parameters[0]); + status = *parameters[0]; + parameters[0]++; + } + if (parameters[0][0] == '#') + { + chan = ServerInstance->FindChan(parameters[0]); if (chan) { if (IS_LOCAL(user)) { - if ((chan->binarymodes & CM_NOEXTERNAL) && (!has_channel(user,chan))) + if ((chan->modes[CM_NOEXTERNAL]) && (!chan->HasUser(user))) { - WriteServ(user->fd,"404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name); + user->WriteServ("404 %s %s :Cannot send to channel (no external messages)", user->nick, chan->name); return; } - if ((chan->binarymodes & CM_MODERATED) && (cstatus(user,chan)modes[CM_MODERATED]) && (chan->GetStatus(user) < STATUS_VOICE)) { - WriteServ(user->fd,"404 %s %s :Cannot send to channel (+m)", user->nick, chan->name); + user->WriteServ("404 %s %s :Cannot send to channel (+m)", user->nick, chan->name); return; } } @@ -117,28 +90,28 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user) if (temp == "") { - WriteServ(user->fd,"412 %s No text to send", user->nick); + user->WriteServ("412 %s No text to send", user->nick); return; } - ChanExceptSender(chan, user, status, "PRIVMSG %s :%s", chan->name, parameters[1]); + chan->WriteAllExceptSender(user, status, "PRIVMSG %s :%s", chan->name, parameters[1]); FOREACH_MOD(I_OnUserMessage,OnUserMessage(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) { - if (*dest->awaymsg) + if ((IS_LOCAL(user)) && (*dest->awaymsg)) { /* auto respond with aweh msg */ - WriteServ(user->fd,"301 %s %s :%s",user->nick,dest->nick,dest->awaymsg); + user->WriteServ("301 %s %s :%s",user->nick,dest->nick,dest->awaymsg); } int MOD_RESULT = 0; @@ -150,10 +123,10 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user) } parameters[1] = (char*)temp.c_str(); - if (dest->fd > -1) + if (IS_LOCAL(dest)) { // direct write, same server - WriteTo(user, dest, "PRIVMSG %s :%s", dest->nick, parameters[1]); + user->WriteTo(dest, "PRIVMSG %s :%s", dest->nick, parameters[1]); } FOREACH_MOD(I_OnUserMessage,OnUserMessage(user,dest,TYPE_USER,parameters[1],0)); @@ -161,8 +134,6 @@ void cmd_privmsg::Handle (char **parameters, int pcnt, userrec *user) 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]); } } - -