summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2011-01-18 18:41:16 -0500
committerAdam <Adam@anope.org>2011-01-18 18:41:16 -0500
commit34c6c664c9ef5d080475642dac8a7796e7f40044 (patch)
tree0d2852e172f222a3512e0bff0f6ecdacee474c0e /modules
parent4a3ee91c5523b643dc7f7a05b70934e87f7ff0a4 (diff)
Added amsg kicker settings to /bs info
Diffstat (limited to 'modules')
-rw-r--r--modules/core/bs_info.cpp10
-rw-r--r--modules/core/bs_kick.cpp2
2 files changed, 11 insertions, 1 deletions
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);