[cvslog] (2003-12-01 02:54:27 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Sun Nov 30 20:54:27 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-12-01 02:54:27 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/patch.h src/mod/irc.mod/chan.c

Log message:

* Fixed a bug causing the bot to rejoin when kicked from inactive channels.
  This can happen when bot-server connection lag exists or queues become
  full. Patch by BarkerJr/Eule.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.517 eggdrop1.6/doc/UPDATES1.6:1.518
--- eggdrop1.6/doc/UPDATES1.6:1.517	Sun Nov 30 15:39:30 2003
+++ eggdrop1.6/doc/UPDATES1.6	Sun Nov 30 20:54:17 2003
@@ -1,10 +1,13 @@
-$Id: UPDATES1.6,v 1.517 2003/11/30 21:39:30 wcc Exp $
+$Id: UPDATES1.6,v 1.518 2003/12/01 02:54:17 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.16
 Found by     Fixed by  What...
+             BarkerJr/ don't rejoin +inactive channels when kicked from them.
+	     Eule      This can be caused by bot-server connection lag or full 
+		       queues.
              Wcc       uname fix in msg_status; os should display on freebsd now
              Wcc       fixed a buffer overrun in msg_status()
              Wcc       coxmetic fixes to .status, .who, and various msgcmds
Index: eggdrop1.6/src/mod/irc.mod/chan.c
diff -u eggdrop1.6/src/mod/irc.mod/chan.c:1.111 eggdrop1.6/src/mod/irc.mod/chan.c:1.112
--- eggdrop1.6/src/mod/irc.mod/chan.c:1.111	Tue Aug 19 23:52:14 2003
+++ eggdrop1.6/src/mod/irc.mod/chan.c	Sun Nov 30 20:54:17 2003
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  *
- * $Id: chan.c,v 1.111 2003/08/20 04:52:14 wcc Exp $
+ * $Id: chan.c,v 1.112 2003/12/01 02:54:17 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1928,7 +1928,8 @@
   if (!chan)
     return 0;
   nick = newsplit(&msg);
-  if (match_my_nick(nick) && channel_pending(chan)) {
+  if (match_my_nick(nick) && channel_pending(chan) &&
+      !channel_inactive(chan)) {
     chan->status &= ~(CHAN_ACTIVE | CHAN_PEND);
     dprintf(DP_MODE, "JOIN %s %s\n",
             (chan->name[0]) ? chan->name : chan->dname,
@@ -1971,7 +1972,7 @@
     putlog(LOG_MODES, chan->dname, "%s kicked from %s by %s: %s", s1,
            chan->dname, from, msg);
     /* Kicked ME?!? the sods! */
-    if (match_my_nick(nick)) {
+    if (match_my_nick(nick) && !channel_inactive(chan)) {
       chan->status &= ~(CHAN_ACTIVE | CHAN_PEND);
       dprintf(DP_MODE, "JOIN %s %s\n",
               (chan->name[0]) ? chan->name : chan->dname,
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1020 eggdrop1.6/src/patch.h:1.1021
--- eggdrop1.6/src/patch.h:1.1020	Sun Nov 30 15:39:30 2003
+++ eggdrop1.6/src/patch.h	Sun Nov 30 20:54:17 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1020 2003/11/30 21:39:30 wcc Exp $
+ * $Id: patch.h,v 1.1021 2003/12/01 02:54:17 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1070228294");            /* current unixtime */
+patch("1070247186");            /* current unixtime */
 /*
  *
  *
  */
-patch("help-and-docs3");
+patch("inactive-kick");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list