From dc840e9b99adf78dbf5b11896f843c8ad7f4d732 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 21 Aug 2011 23:30:23 +0200 Subject: Send DROP event when forbidding nicks and channels, if applicable. --- Changes | 7 ++++--- docs/EVENTS | 20 ++++++++++---------- src/core/cs_forbid.c | 4 +++- src/core/ns_forbid.c | 1 + version.log | 3 ++- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/Changes b/Changes index bfc89c6d3..2da73736d 100644 --- a/Changes +++ b/Changes @@ -1,12 +1,13 @@ Anope Version 1.8 - GIT ----------------------- +08/18 A Added support for Hybrid's channel mode +S [#1319] +08/18 A Added support for Hybrid's channel mode +O [#1320] +08/18 R Removed support for Hybrid's (old) channel mode +a [#1318] 05/30 F Fixed removing vhosts on InspIRCd when m_cloaking is unloaded [#1273] 07/23 F Fixed a potential crash in the badwords kicker [ #00] 08/09 F Fixed deopping the first user to join a channel during a burst [#1287] 08/10 F Fixed loading bs_fantasy_owner on InspIRCd 2.0 on startup [ #00] -08/18 R Removed support for Hybrid's (old) channel mode +a [#1318] -08/18 A Added support for Hybrid's channel mode +S [#1319] -08/18 A Added support for Hybrid's channel mode +O [#1320] +08/21 F Send DROP event when forbidding nicks and channels. Anope Version 1.8.6 ------------------- diff --git a/docs/EVENTS b/docs/EVENTS index c572c015d..d8f22325d 100644 --- a/docs/EVENTS +++ b/docs/EVENTS @@ -183,9 +183,9 @@ Anope Internal Events EVENT_BOT_BAN A BotServ bot has banned a user, e.g. kickers. - av[0] The nick of the user banned. - av[1] The Channel the user was banned from. - av[2] The mask that was banned. + av[0] The nick of the user banned. + av[1] The Channel the user was banned from. + av[2] The mask that was banned. EVENT_BOT_CHANGE The properties of a BotServ bot have been changed. @@ -214,10 +214,10 @@ Anope Internal Events EVENT_BOT_FANTASY_NO_ACCESS A fantasy command of the bot has been triggered by someone without - access to BotServ FANTASY commands on the channel. This will NOT - trigger if someone with access has triggered a fantasy command; use - EVENT_BOT_FANTASY for those. Hook to both events to catch both event - triggers. + access to BotServ FANTASY commands on the channel. This will NOT + trigger if someone with access has triggered a fantasy command; use + EVENT_BOT_FANTASY for those. Hook to both events to catch both event + triggers. av[0] The fantasy command that has been triggered without leading '!'. av[1] The nickname of the user that has triggered the fantasy command. @@ -234,9 +234,9 @@ Anope Internal Events EVENT_BOT_KICK A BotServ bot has kicked a user from a channel. - av[0] The name of the user that has been kicked. - av[1] The name of the channel the user was kicked from. - av[2] The reason for the kick. + av[0] The name of the user that has been kicked. + av[1] The name of the channel the user was kicked from. + av[2] The reason for the kick. EVENT_BOT_UNASSIGN A BotServ bot is being unassigned from a channel. This event is being diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c index 4a11b6a7c..b9cf40ce3 100644 --- a/src/core/cs_forbid.c +++ b/src/core/cs_forbid.c @@ -89,8 +89,10 @@ int do_forbid(User * u) } if (readonly) notice_lang(s_ChanServ, u, READ_ONLY_MODE); - if ((ci = cs_findchan(chan)) != NULL) + if ((ci = cs_findchan(chan)) != NULL) { delchan(ci); + send_event(EVENT_CHAN_DROP, 1, chan); + } ci = makechan(chan); if (ci) { ci->flags |= CI_VERBOTEN; diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c index 352a978b7..bef904b78 100644 --- a/src/core/ns_forbid.c +++ b/src/core/ns_forbid.c @@ -95,6 +95,7 @@ int do_forbid(User * u) return MOD_CONT; } delnick(na); + send_event(EVENT_NICK_DROPPED, 1, nick); } na = makenick(nick); if (na) { diff --git a/version.log b/version.log index aadd9776a..2d1db68a0 100644 --- a/version.log +++ b/version.log @@ -8,9 +8,10 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="7" VERSION_EXTRA="-git" -VERSION_BUILD="3079" +VERSION_BUILD="3080" # $Log$ # Changes since 1.8.6 Release +#Revision 3080 - Send DROP event when forbidding nicks and channels, if applicable. #Revision 3079 - Bug #1318 - #1320 - Added support for Hybrid's +S and +O channel modes, and removed support for +a #Revision 3078 - Fixed loading bs_fantasy_owner on startup when using InspIRCd 2.0 #Revision 3077 - Bug #1287 - Fixed chan_set_correct_modes to not deop the first user from syncing servers -- cgit