[Tcldrop/CVS] tcldrop ./tcldrop ./tcldrop.conf modules/server...

[Philip Moore]

CVSROOT:        /cvsroot/tcldrop
Module name:    tcldrop
Branch:         
Changes by:     Philip Moore <address@hidden>   03/12/02 23:08:36

Modified files:
        .              : tcldrop tcldrop.conf 
        modules/server : server.tcl 

Log message:
        Added support for $max-queue-msg to servers.tcl
        Updated tcldrop.conf to reflect the currently supported settings.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/tcldrop.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/tcldrop.conf.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/modules/server/server.tcl.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: tcldrop/modules/server/server.tcl
diff -u tcldrop/modules/server/server.tcl:1.16 
tcldrop/modules/server/server.tcl:1.17
--- tcldrop/modules/server/server.tcl:1.16      Tue Dec  2 04:01:46 2003
+++ tcldrop/modules/server/server.tcl   Tue Dec  2 23:08:36 2003
@@ -1,6 +1,6 @@
 # server.tcl --
 #
-# $Id: server.tcl,v 1.16 2003/12/02 09:01:46 fireegl Exp $
+# $Id: server.tcl,v 1.17 2003/12/03 04:08:36 fireegl Exp $
 #
 # Copyright (C) 2003 FireEgl (Philip Moore) <address@hidden>
 #
@@ -27,7 +27,7 @@
 
 namespace eval ::tcldrop::server {
        variable version {0.8}
-       variable rcsid {$Id: server.tcl,v 1.16 2003/12/02 09:01:46 fireegl Exp 
$}
+       variable rcsid {$Id: server.tcl,v 1.17 2003/12/03 04:08:36 fireegl Exp 
$}
        # Provide the server module:
        package provide tcldrop::server $version
        # Initialize variables:
@@ -58,6 +58,7 @@
        ::tcldrop::SetDefault servererror-quit {1}
        ::tcldrop::SetDefault botname {}
        ::tcldrop::SetDefault botnick {}
+       ::tcldrop::SetDefault max-queue-msg {99}
        checkmodule conn
 }
 
@@ -342,17 +343,19 @@
 # $queue must be mode, serv, help, or a integer from 1-99.
 # $option can be -normal or -next (Like in Eggdrop).
 proc ::tcldrop::server::putqueue {queue text {option {-normal}}} {
-       variable QueueAliases
-       if {[info exists QueueAliases($queue)]} { set priority 
$QueueAliases($queue) }
-       variable Queue
-       # Unlike Eggdrop, we deal with people sending multiple lines at once..
-       foreach line [split $text \n] {
-               if {$line != {}} {
-                       if {[info exists "::double-$queue"] && ![set 
"::double-$queue"] && [lsearch -exact $Queue($priority) $line] != -1} {
-                               putloglev d * "msg already queued. skipping: 
$line"
-                       } else {
-                               putloglev v * "\[!$queue\] $line"
-                               Queue $priority $line $option
+       if {[queuesize] < ${::max-queue-msg}} {
+               variable QueueAliases
+               if {[info exists QueueAliases($queue)]} { set priority 
$QueueAliases($queue) }
+               variable Queue
+               # Unlike Eggdrop, we deal with people sending multiple lines at 
once..
+               foreach line [split $text \n] {
+                       if {$line != {}} {
+                               if {[info exists "::double-$queue"] && ![set 
"::double-$queue"] && [lsearch -exact $Queue($priority) $line] != -1} {
+                                       putloglev d * "msg already queued. 
skipping: $line"
+                               } else {
+                                       putloglev v * "\[!$queue\] $line"
+                                       Queue $priority $line $option
+                               }
                        }
                }
        }
Index: tcldrop/tcldrop
diff -u tcldrop/tcldrop:1.5 tcldrop/tcldrop:1.6
--- tcldrop/tcldrop:1.5 Tue Nov  4 12:15:08 2003
+++ tcldrop/tcldrop     Tue Dec  2 23:08:36 2003
@@ -1,8 +1,8 @@
 #! /bin/sh
 # The next line restarts using tclsh \
-exec tclsh8.3 "$0" ${1+"$@"}
+exec tclsh8.5 "$0" ${1+"$@"}
 
-# $Id: tcldrop,v 1.5 2003/11/04 17:15:08 fireegl Exp $
+# $Id: tcldrop,v 1.6 2003/12/03 04:08:36 fireegl Exp $
 #
 # Copyright (C) 2003 FireEgl (Philip Moore) <address@hidden>
 #
Index: tcldrop/tcldrop.conf
diff -u tcldrop/tcldrop.conf:1.7 tcldrop/tcldrop.conf:1.8
--- tcldrop/tcldrop.conf:1.7    Mon Dec  1 16:38:35 2003
+++ tcldrop/tcldrop.conf        Tue Dec  2 23:08:36 2003
@@ -1,6 +1,6 @@
 # tcldrop.conf
 #
-# $Id: tcldrop.conf,v 1.7 2003/12/01 21:38:35 fireegl Exp $
+# $Id: tcldrop.conf,v 1.8 2003/12/03 04:08:36 fireegl Exp $
 #
 # This is a sample Tcldrop configuration file which includes all possible
 # settings that can be used to configure your bot.
@@ -180,6 +180,7 @@
 
 # If you want your userfile to be sorted upon saving, enable this setting.
 # This causes the bot to use bit more CPU when saving the usefile.
+# Tcldrop's users::arraydb module has no use for this option, it won't be 
supported.
 set sort-users 0
 
 # Specify here where Eggdrop should look for help files. Don't modify this
@@ -350,6 +351,7 @@
 #   set hourly-updates 15
 #
 # The bot will save its userfile 15 minutes past every hour.
+# Tcldrop supports this.
 set hourly-updates 00
 
 # Un-comment the next line and set the list of owners of the bot.
@@ -457,6 +459,7 @@
 # The following settings are used as default values when you .+chan #chan or 
.tcl
 # channel add #chan. Look in the section below for explanation of every option.
 
+# Tcldrop recognizes these settings:
 set global-flood-chan 10:60
 set global-flood-deop 3:10
 set global-flood-kick 3:10
@@ -471,7 +474,6 @@
 set global-ban-time 120
 set global-exempt-time 60
 set global-invite-time 60
-
 set global-chanset {
         -autoop         -autovoice
         -bitch          +cycle
@@ -785,6 +787,7 @@
 # Set the alternative nick which the bot uses on IRC if the nick specified
 # by 'set nick' is unavailable. All '?' characters will be replaced by random
 # numbers.
+# Tcldrop supports this.
 set altnick "Tcl_drop"
 
 # Set what should be displayed in the real-name field for the bot on IRC.
@@ -880,6 +883,7 @@
 # Set here the maximum number of lines to queue to the server. If you're
 # going to dump large chunks of text to people over IRC, you will probably
 # want to raise this. 300 is fine for most people though.
+# Tcldrop supports this.
 set max-queue-msg 300
 
 # If you want Eggdrop to trigger binds for ignored users, set this to 1.
@@ -1055,6 +1059,7 @@
 # At the moment, the current IRCnet IRCd version (2.10) doesn't support the
 # mixing of b, o and v modes with e and I modes. This might be changed in the
 # future, so use 1 at the moment for this setting.
+# Tcldrop supports this.
 set prevent-mixing 1
 
 ### IRC MODULE - OTHER NETWORKS (net-type 5) ###
@@ -1072,6 +1077,7 @@
 # This setting is limited to 6, although if you want to use a higher value,
 # you can modify this by changing the value of MODES_PER_LINE_MAX in
 # src/chan.h and recompiling the bot.
+# Tcldrop supports this.
 #set modes-per-line 3
 
 # Some networks don't include the +l limit and +k or -k key modes