From 34c6c664c9ef5d080475642dac8a7796e7f40044 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 18 Jan 2011 18:41:16 -0500 Subject: Added amsg kicker settings to /bs info --- modules/core/bs_info.cpp | 10 ++++++++++ modules/core/bs_kick.cpp | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/core/bs_info.cpp b/modules/core/bs_info.cpp index 7da063b5c..f9dc499ed 100644 --- a/modules/core/bs_info.cpp +++ b/modules/core/bs_info.cpp @@ -162,6 +162,16 @@ class CommandBSInfo : public Command } else source.Reply(BOT_INFO_CHAN_KICK_ITALICS, GetString(u, BOT_INFO_INACTIVE).c_str()); + if (ci->botflags.HasFlag(BS_KICK_AMSGS)) + { + if (ci->ttb[TTB_AMSGS]) + source.Reply(BOT_INFO_CHAN_KICK_AMSGS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_AMSGS]); + else + source.Reply(BOT_INFO_CHAN_KICK_AMSGS, GetString(u, BOT_INFO_ACTIVE).c_str()); + } + else + source.Reply(BOT_INFO_CHAN_KICK_AMSGS, GetString(u, BOT_INFO_INACTIVE).c_str()); + if (ci->botflags.HasFlag(BS_MSG_PRIVMSG)) source.Reply(BOT_INFO_CHAN_MSG, "PRIVMSG"); else if (ci->botflags.HasFlag(BS_MSG_NOTICE)) diff --git a/modules/core/bs_kick.cpp b/modules/core/bs_kick.cpp index fef71e9f6..eba5de508 100644 --- a/modules/core/bs_kick.cpp +++ b/modules/core/bs_kick.cpp @@ -471,7 +471,7 @@ class BSKick : public Module Channel *c = (*it)->chan; ++it; - if (c->ci != NULL) + if (c->ci != NULL && c->ci->botflags.HasFlag(BS_KICK_AMSGS)) { check_ban(c->ci, u, TTB_AMSGS); bot_kick(c->ci, u, BOT_REASON_AMSGS); -- cgit