X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_privmsg.cpp;h=cefdd48008b5c8d24e1685156aac99d9d0f9dc35;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=c6e74db8b134ab32053baca2cedddd016d75f10d;hpb=86775e2e98f55b3b88befe2daff0ca23f02f3155;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp index c6e74db8b..cefdd4800 100644 --- a/src/commands/cmd_privmsg.cpp +++ b/src/commands/cmd_privmsg.cpp @@ -1,23 +1,54 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Craig Edwards + * Copyright (C) 2007 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" -#include "commands/cmd_privmsg.h" -extern "C" DllExport Command* init_command(InspIRCd* Instance) +/** Handle /PRIVMSG. These command handlers can be reloaded by the core, + * and handle basic RFC1459 commands. Commands within modules work + * the same way, however, they can be fully unloaded, where these + * may not. + */ +class CommandPrivmsg : public Command { - return new CommandPrivmsg(Instance); -} + public: + /** Constructor for privmsg. + */ + CommandPrivmsg ( Module* parent) : Command(parent,"PRIVMSG",2,2) { syntax = "{,} "; } + /** Handle command. + * @param parameters The parameters to the comamnd + * @param pcnt The number of parameters passed to teh command + * @param user The user issuing the command + * @return A value from CmdResult to indicate command success or failure. + */ + CmdResult Handle(const std::vector& parameters, User *user); + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + if (IS_LOCAL(user)) + // This is handled by the OnUserMessage hook to split the LoopCall pieces + return ROUTE_LOCALONLY; + else + return ROUTE_MESSAGE(parameters[0]); + } +}; CmdResult CommandPrivmsg::Handle (const std::vector& parameters, User *user) { @@ -37,7 +68,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector& parameters, Us ModResult MOD_RESULT; std::string temp = parameters[1]; - FIRST_MOD_RESULT(ServerInstance, OnUserPreMessage, MOD_RESULT, (user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, except_list)); + FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user, (void*)parameters[0].c_str(), TYPE_SERVER, temp, 0, except_list)); if (MOD_RESULT == MOD_RES_DENY) return CMD_FAILURE; @@ -64,11 +95,11 @@ CmdResult CommandPrivmsg::Handle (const std::vector& parameters, Us { chan = ServerInstance->FindChan(target); - except_list[user] = user->nick; + except_list.insert(user); if (chan) { - if (IS_LOCAL(user) && chan->GetStatus(user) < STATUS_VOICE) + if (IS_LOCAL(user) && chan->GetPrefixValue(user) < VOICE_VALUE) { if (chan->IsModeSet('n') && !chan->HasUser(user)) { @@ -94,7 +125,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector& parameters, Us ModResult MOD_RESULT; std::string temp = parameters[1]; - FIRST_MOD_RESULT(ServerInstance, OnUserPreMessage, MOD_RESULT, (user,chan,TYPE_CHANNEL,temp,status,except_list)); + FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user,chan,TYPE_CHANNEL,temp,status,except_list)); if (MOD_RESULT == MOD_RES_DENY) return CMD_FAILURE; @@ -148,7 +179,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector& parameters, Us nickonly.assign(destnick, 0, targetserver - destnick); dest = ServerInstance->FindNickOnly(nickonly); - if (dest && strcasecmp(dest->server, targetserver + 1)) + if (dest && strcasecmp(dest->server.c_str(), targetserver + 1)) { /* Incorrect server for user */ user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str()); @@ -161,7 +192,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector& parameters, Us else dest = ServerInstance->FindNick(destnick); - if (dest) + if ((dest) && (dest->registered == REG_ALL)) { if (parameters[1].empty()) { @@ -178,7 +209,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector& parameters, Us ModResult MOD_RESULT; std::string temp = parameters[1]; - FIRST_MOD_RESULT(ServerInstance, OnUserPreMessage, MOD_RESULT, (user, dest, TYPE_USER, temp, 0, except_list)); + FIRST_MOD_RESULT(OnUserPreMessage, MOD_RESULT, (user, dest, TYPE_USER, temp, 0, except_list)); if (MOD_RESULT == MOD_RES_DENY) return CMD_FAILURE; @@ -202,3 +233,5 @@ CmdResult CommandPrivmsg::Handle (const std::vector& parameters, Us } return CMD_SUCCESS; } + +COMMAND_INIT(CommandPrivmsg)