1
0
mirror of https://github.com/anope/anope.git synced 2026-07-04 20:33:12 +02:00

Backport of bugfix for bug #1073 from SVN r2217, fantasy commands in CTCP ACTIONs will now be ignored instead of processed.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2218 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
cyberbotx
2009-03-30 06:17:26 +00:00
parent 8f3958d0f4
commit 35ca9adc25
2 changed files with 7 additions and 3 deletions
+5 -2
View File
@@ -134,6 +134,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)
int16 cstatus = 0;
char *cmd;
UserData *ud;
int was_action = 0;
if (!u || !buf || !ci) {
return;
@@ -148,8 +149,10 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)
* at the end, because one character just doesn't matter,
* but the ACTION may create strange behaviours with the
* caps or badwords kickers */
if (!strnicmp(buf, "\1ACTION ", 8))
if (!strnicmp(buf, "\1ACTION ", 8)) {
buf += 8;
was_action = 1;
}
/* Now we can make kicker stuff. We try to order the checks
* from the fastest one to the slowest one, since there's
@@ -410,7 +413,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf)
/* Fantaisist commands */
if (buf && (ci->botflags & BS_FANTASY) && *buf == *BSFantasyCharacter) {
if (buf && (ci->botflags & BS_FANTASY) && *buf == *BSFantasyCharacter && !was_action) {
cmd = strtok(buf, " ");
if (cmd && (cmd[0] == *BSFantasyCharacter)) {
+2 -1
View File
@@ -9,10 +9,11 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="0"
VERSION_EXTRA="-svn"
VERSION_BUILD="2199"
VERSION_BUILD="2218"
# $Log$ # Changes since 1.8.0 Release
#Revision 2218 - Backport of bugfix for bug #1073 from SVN r2217, fantasy commands in CTCP ACTIONS will now be ignored instead of processed.
#Revision 2199 - Correct backport of bug #1064, patch from DukePyrolator, there is no nc on the User struct in 1.8.x, use nickTrack instead, oops.
#Revision 2196 - Backport of bugfix for bug #1044 from SVN r2195, CS SET MLOCK no longer requires a parameter, and leaving out the parameter renders the mlock to +r as it should be.
#Revision 2193 - Backport of bugfix for bug #1065 from SVN r2192, original patch from DukePyrolator, force a user off a nick when it is suspended.