[cvslog] (2003-01-15 00:35:11 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Tue Jan 14 18:36:01 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-01-15 00:35:11 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 doc/tcl-commands.doc doc/html/tcl-commands.html
     src/patch.h src/mod/irc.mod/chan.c

Log message:

The NICK bind type now gets triggered even if the nickname isn't
found in any channels (i.e. when the bot's nickname changes
before it joins channels). Patch by BarkerJr.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.439 eggdrop1.6/doc/UPDATES1.6:1.440
--- eggdrop1.6/doc/UPDATES1.6:1.439	Wed Jan  1 18:07:46 2003
+++ eggdrop1.6/doc/UPDATES1.6	Tue Jan 14 18:35:01 2003
@@ -1,10 +1,13 @@
-$Id: UPDATES1.6,v 1.439 2003/01/02 00:07:46 wcc Exp $
+$Id: UPDATES1.6,v 1.440 2003/01/15 00:35:01 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.14
 Found by  Fixed by  What...
+          BarkerJr  bind NICK mow gets triggered even if the nickname isn't
+                    found in any channels (i.e. when the bot's nickname changes
+                    before it joins channels).
           darko``   fixed parsing of userhosts in gotwall()
 reed      Wcc       updated UnderNet's max_bans to 45
 various   BarkerJr  config file updates
Index: eggdrop1.6/doc/html/tcl-commands.html
diff -u eggdrop1.6/doc/html/tcl-commands.html:1.23 eggdrop1.6/doc/html/tcl-commands.html:1.24
--- eggdrop1.6/doc/html/tcl-commands.html:1.23	Wed Jan  1 20:42:53 2003
+++ eggdrop1.6/doc/html/tcl-commands.html	Tue Jan 14 18:35:01 2003
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: tcl-commands.html,v 1.23 2003/01/02 02:42:53 wcc Exp $ -->
+<!-- $Id: tcl-commands.html,v 1.24 2003/01/15 00:35:01 wcc Exp $ -->
 
 <html>
   <head>
@@ -3676,7 +3676,7 @@
             </li>
 
             <li>
-              <p><strong>NICK (stackable)</strong></p>
+              <p><strong>* NICK (stackable)</strong></p>
 
               <p><strong>bind nick &lt;flags&gt; &lt;mask&gt; &lt;proc&gt;<br>
               procname &lt;nick&gt; &lt;user at host&gt; &lt;handle&gt;
@@ -3684,7 +3684,8 @@
 
               <p><strong>Description:</strong> triggered when someone changes
               nicknames. The mask is matched against &#39;#channel
-              newnick&#39; and can contain wildcards.</p>
+              newnick&#39; and can contain wildcards. Channel is "*" if the user
+              isn't on a channel (usually the bot not yet in a channel).</p>
 
               <p><strong>Module:</strong> irc</p>
             </li>
Index: eggdrop1.6/doc/tcl-commands.doc
diff -u eggdrop1.6/doc/tcl-commands.doc:1.93 eggdrop1.6/doc/tcl-commands.doc:1.94
--- eggdrop1.6/doc/tcl-commands.doc:1.93	Wed Jan  1 20:42:53 2003
+++ eggdrop1.6/doc/tcl-commands.doc	Tue Jan 14 18:35:01 2003
@@ -1700,6 +1700,8 @@
 
          Description: triggered when someone changes nicknames. The mask
            is matched against '#channel newnick' and can contain wildcards.
+|          Channel is "*" if the user isn't on a channel (usually the bot not
+|          yet in a channel).
          Module: irc
 
     (14) MODE   (stackable)
Index: eggdrop1.6/src/mod/irc.mod/chan.c
diff -u eggdrop1.6/src/mod/irc.mod/chan.c:1.102 eggdrop1.6/src/mod/irc.mod/chan.c:1.103
--- eggdrop1.6/src/mod/irc.mod/chan.c:1.102	Mon Dec 23 20:30:08 2002
+++ eggdrop1.6/src/mod/irc.mod/chan.c	Tue Jan 14 18:35:01 2003
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  *
- * $Id: chan.c,v 1.102 2002/12/24 02:30:08 wcc Exp $
+ * $Id: chan.c,v 1.103 2003/01/15 00:35:01 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1970,6 +1970,7 @@
 static int gotnick(char *from, char *msg)
 {
   char *nick, *chname, s1[UHOSTLEN], buf[UHOSTLEN], *uhost = buf;
+  unsigned char found = 0;
   memberlist *m, *mm;
   struct chanset_t *chan, *oldchan = NULL;
   struct userrec *u;
@@ -2027,6 +2028,7 @@
       }
       u = get_user_by_host(from); /* make sure this is in the loop, someone could have changed the record
                                      in an earlier iteration of the loop */
+      found = 1;
       check_tcl_nick(nick, uhost, u, chan->dname, msg);
     
       if (!findchan_by_dname(chname)) {
@@ -2034,6 +2036,13 @@
         continue;
       }
     }
+  }
+  if (!found)
+  {
+    u = get_user_by_host(from);
+    s1[0] = '*';
+    s1[1] = 0;
+    check_tcl_nick(nick, uhost, u, s1, msg);
   }
   return 0;
 }
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.867 eggdrop1.6/src/patch.h:1.868
--- eggdrop1.6/src/patch.h:1.867	Wed Jan  1 20:42:53 2003
+++ eggdrop1.6/src/patch.h	Tue Jan 14 18:35:01 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.867 2003/01/02 02:42:53 wcc Exp $
+ * $Id: patch.h,v 1.868 2003/01/15 00:35:01 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1041475323");		/* current unixtime */
+patch("1042590744");		/* current unixtime */
 /*
  *
  *
  */
-patch("wallopsfix2");
+patch("nickbind");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list