diff options
| -rw-r--r-- | include/message.h | 2 | ||||
| -rw-r--r-- | src/coremods/core_message.cpp | 10 | ||||
| -rw-r--r-- | src/modules/m_botmode.cpp | 21 |
3 files changed, 27 insertions, 6 deletions
diff --git a/include/message.h b/include/message.h index eae27ff94..5d83829f6 100644 --- a/include/message.h +++ b/include/message.h @@ -58,7 +58,7 @@ class CoreExport MessageDetails std::string text; /** The type of message. */ - const MessageType type; + MessageType type; /** Determines whether the specified message is a CTCP. If the specified message * is a CTCP then the CTCP name and CTCP body are extracted and stored in the diff --git a/src/coremods/core_message.cpp b/src/coremods/core_message.cpp index 585e29948..c950ab24b 100644 --- a/src/coremods/core_message.cpp +++ b/src/coremods/core_message.cpp @@ -247,21 +247,21 @@ class CommandMessage : public Command return CMD_FAILURE; } - // If the target is away then inform the user. - if (target->IsAway() && msgtype == MSG_PRIVMSG) - source->WriteNumeric(RPL_AWAY, target->nick, target->awaymsg); - // Fire the pre-message events. MessageTarget msgtarget(target); MessageDetailsImpl msgdetails(msgtype, parameters[1], parameters.GetTags()); if (!FirePreEvents(source, msgtarget, msgdetails)) return CMD_FAILURE; + // If the target is away then inform the user. + if (target->IsAway() && msgdetails.type == MSG_PRIVMSG) + source->WriteNumeric(RPL_AWAY, target->nick, target->awaymsg); + LocalUser* const localtarget = IS_LOCAL(target); if (localtarget) { // Send to the target if they are a local user. - ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, source, localtarget->nick, msgdetails.text, msgtype); + ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, source, localtarget->nick, msgdetails.text, msgdetails.type); privmsg.AddTags(msgdetails.tags_out); privmsg.SetSideEffect(true); localtarget->Send(ServerInstance->GetRFCEvents().privmsg, privmsg); diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp index 7abf6f749..a31d51d3d 100644 --- a/src/modules/m_botmode.cpp +++ b/src/modules/m_botmode.cpp @@ -69,6 +69,7 @@ class ModuleBotMode private: SimpleUserModeHandler bm; BotTag tag; + bool forcenotice; public: ModuleBotMode() @@ -79,11 +80,31 @@ class ModuleBotMode { } + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE + { + forcenotice = ServerInstance->Config->ConfValue("botmode")->getBool("forcenotice"); + } + void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE { tokens["BOT"] = ConvToStr(bm.GetModeChar()); } + ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE + { + // Allow sending if forcenotice is off, the user is not a bot, or if the message is a notice. + if (!forcenotice || !user->IsModeSet(bm) || details.type == MSG_NOTICE) + return MOD_RES_PASSTHRU; + + // Allow sending PRIVMSGs to services pseudoclients. + if (target.type == MessageTarget::TYPE_USER && target.Get<User>()->server->IsULine()) + return MOD_RES_PASSTHRU; + + // Force the message to be broadcast as a NOTICE. + details.type = MSG_NOTICE; + return MOD_RES_PASSTHRU; + } + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE { size_t flag_index; |