[Tcldrop/CVS] tcldrop ./tcldrop.conf ./tcldrop.tcl modules/dc...

[Philip Moore]

CVSROOT:        /cvsroot/tcldrop
Module name:    tcldrop
Branch:         
Changes by:     Philip Moore <address@hidden>   03/12/01 16:19:54

Modified files:
        .              : tcldrop.conf tcldrop.tcl 
        modules        : dcc.tcl 
        modules/channels: channels.tcl 
        modules/irc    : irc.tcl 

Log message:
        Fixed bugs in channels.tcl and dcc.tcl that made it impossible to start 
the bot the first time.
        Dunno WTF changed in the other files.   heh

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/tcldrop.conf.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/tcldrop.tcl.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/modules/dcc.tcl.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/modules/channels/channels.tcl.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/modules/irc/irc.tcl.diff?tr1=1.32&tr2=1.33&r1=text&r2=text

Patches:
Index: tcldrop/modules/channels/channels.tcl
diff -u tcldrop/modules/channels/channels.tcl:1.10 
tcldrop/modules/channels/channels.tcl:1.11
--- tcldrop/modules/channels/channels.tcl:1.10  Mon Dec  1 02:12:07 2003
+++ tcldrop/modules/channels/channels.tcl       Mon Dec  1 16:19:54 2003
@@ -1,6 +1,6 @@
 # channels.tcl --
 #
-# $Id: channels.tcl,v 1.10 2003/12/01 07:12:07 fireegl Exp $
+# $Id: channels.tcl,v 1.11 2003/12/01 21:19:54 fireegl Exp $
 #
 # Copyright (C) 2003 FireEgl (Philip Moore) <address@hidden>
 #
@@ -28,7 +28,7 @@
 namespace eval ::tcldrop::channels {
        # Provide the channels module:
        variable version {0.8}
-       variable rcsid {$Id: channels.tcl,v 1.10 2003/12/01 07:12:07 fireegl 
Exp $}
+       variable rcsid {$Id: channels.tcl,v 1.11 2003/12/01 21:19:54 fireegl 
Exp $}
        package provide tcldrop::channels $version
        # Initialize variables:
        variable Channels
@@ -200,6 +200,22 @@
        close $fid
 }
 
+proc ::tcldrop::channels::SetUdefDefaults {{name {*}}} {
+       variable Channels
+       variable UdefDefaults
+       foreach c [array names Channels] {
+               array set chaninfo $Channels($c)
+               foreach n [array names UdefDefaults $name] {
+                       if {![info exists chaninfo($n)]} {
+                               # It's not already set, so we set it to the 
default:
+                               set chaninfo($n) $UdefDefaults($n)
+                               set Channels($c) [array get chaninfo]
+                       }
+               }
+               array unset chaninfo
+       }
+}
+
 # Loads the channel info from $chanfile:
 proc ::tcldrop::channels::loadchannels {} {
        if {[file exists $::chanfile]} {
@@ -211,10 +227,10 @@
                #        are no longer in use, and discard them.
                array set Channels [read $fid [file size $::chanfile]]
                close $fid
-               SetUdefDefaults
        } else {
                putlog "no chanfile exists..yet."
        }
+       SetUdefDefaults
 }
 
 # Returns 1 if a channel exists in the channel database, or 0 if it doesn't:
@@ -256,22 +272,6 @@
        SetUdefDefaults $name
 }
 
-proc ::tcldrop::channels::SetUdefDefaults {{name {*}}} {
-       variable Channels
-       variable UdefDefaults
-       foreach c [array names Channels] {
-               array set chaninfo $Channels($c)
-               foreach n [array names UdefDefaults $name] {
-                       if {![info exists chaninfo($n)]} {
-                               # It's not already set, so we set it to the 
default:
-                               set chaninfo($n) $UdefDefaults($n)
-                               set Channels($c) [array get chaninfo]
-                       }
-               }
-               array unset chaninfo
-       }
-}
-
 #  renudef <flag/int> <oldname> <newname>
 #    Description: renames a user defined channel flag or integer setting.
 #    Returns: nothing
@@ -380,7 +380,9 @@
 
 # After Tcldrop loads, we (re)load the chanfile:
 bind evnt - loaded ::tcldrop::channels::Loaded -priority 0
-proc ::tcldrop::channels::Loaded {type} { loadchannels }
+proc ::tcldrop::channels::Loaded {type} {
+putlog "Loading CHANELL!!!!"
+loadchannels }
 
 bind evnt - save ::tcldrop::channels::SaveChannels -priority 0
 proc ::tcldrop::channels::SaveChannels {type} { savechannels }
Index: tcldrop/modules/dcc.tcl
diff -u tcldrop/modules/dcc.tcl:1.30 tcldrop/modules/dcc.tcl:1.31
--- tcldrop/modules/dcc.tcl:1.30        Sun Nov 30 20:59:51 2003
+++ tcldrop/modules/dcc.tcl     Mon Dec  1 16:19:53 2003
@@ -1,6 +1,6 @@
 # dcc.tcl --
 #
-# $Id: dcc.tcl,v 1.30 2003/12/01 01:59:51 fireegl Exp $
+# $Id: dcc.tcl,v 1.31 2003/12/01 21:19:53 fireegl Exp $
 #
 # Copyright (C) 2003 FireEgl (Philip Moore) <address@hidden>
 #
@@ -32,7 +32,7 @@
        # Provide the users module:
        variable version {0.4}
        package provide tcldrop::dcc $version
-       variable rcsid {$Id: dcc.tcl,v 1.30 2003/12/01 01:59:51 fireegl Exp $}
+       variable rcsid {$Id: dcc.tcl,v 1.31 2003/12/01 21:19:53 fireegl Exp $}
        #checkmodule console
        # Export all the commands that should be available to 3rd-party 
scripters:
        namespace export dcclist listen putdcc getchan setchan console echo 
strip idx2hand hand2idx link bots islinked putbot putallbots sock2idx idx2sock
@@ -312,7 +312,7 @@
                                putidx $idx {Try another one please: }
                        } else {
                                putidx $idx {Okay, now choose and enter a 
password: }
-                               adduser $line *!$chatinfo(ident)@$chatinfo(ip)
+                               adduser $line *!$chatinfo(remote)
                                ::tcldrop::idx::ChInfo $idx [list handle $line 
type TELNET_PW other {newp  waited 3s} timestamp [unixtime] traffictype 
partyline]
                        }
                }
Index: tcldrop/modules/irc/irc.tcl
diff -u tcldrop/modules/irc/irc.tcl:1.32 tcldrop/modules/irc/irc.tcl:1.33
--- tcldrop/modules/irc/irc.tcl:1.32    Mon Dec  1 01:49:31 2003
+++ tcldrop/modules/irc/irc.tcl Mon Dec  1 16:19:54 2003
@@ -4,7 +4,7 @@
 #              * All IRC related commands.
 #      Depends: core, server, channels.
 #
-# $Id: irc.tcl,v 1.32 2003/12/01 06:49:31 fireegl Exp $
+# $Id: irc.tcl,v 1.33 2003/12/01 21:19:54 fireegl Exp $
 #
 # Copyright (C) 2003 Tcldrop Development Team <Tcldrop-Devel>
 #
@@ -30,7 +30,7 @@
 namespace eval ::tcldrop::irc {
        # Provide the irc module:
        variable version {0.6}
-       variable rcsid {$Id: irc.tcl,v 1.32 2003/12/01 06:49:31 fireegl Exp $}
+       variable rcsid {$Id: irc.tcl,v 1.33 2003/12/01 21:19:54 fireegl Exp $}
        package provide tcldrop::irc $version
        # Initialize variables:
        # Nicks stores the non-channel specific info for each nick:
@@ -123,6 +123,7 @@
 # irc.inter.net.il: 353 FireEgl @ #pgpnet @Jax @Parker @Delta` @Dispatch @Lilo 
@Whore @DJ @Harley @Robin @Skyway @Slut` @Batman FireEgl @pgpbot @Deryl @ardya 
@pgpkeys
 # irc.inter.net.il: 329 FireEgl #pgpnet 1064713818
 # irc.inter.net.il: 401 FireEgl Deryl_ No such nick/channel
+# irc.choopa.net: 402 FireEgl papillon No such server
 
 proc ::tcldrop::irc::resetchan {channel} {
        putquick "MODE $channel +b"
@@ -265,8 +266,14 @@
                        lappend joinchannels $channel
                } elseif {![botisop $channel]} {
                        callneed $channel op
+                       if {![botishalfop $channel]} {
+                               # FixMe: This should only ask for halfop's on 
networks that support halfops.
+                               callneed $channel halfop
+                               if {![botisvoice $channel]} {
+                                       callneed $channel voice
+                               }
+                       }
                }
-               # Note/FixMe: This is where support for need-voice and 
need-halfops would go, if we want that.
        }
        if {[info exists joinchannels]} { putserv "JOIN [join $joinchannels ,]" 
}
        if {[info exists partchannels]} { puthelp "PART [join $partchannels ,]" 
}
@@ -731,6 +738,7 @@
        set handle [finduser $from]
        set dest [lindex $larg 0]
        set text [string range [join [lrange $larg 1 end]] 1 end]
+       # FixMe: Support for ctcr binds go here.
        # Call all the notc binds:
        foreach b [binds notc] {
                foreach {type flags mask count proc} $b {}
Index: tcldrop/tcldrop.conf
diff -u tcldrop/tcldrop.conf:1.5 tcldrop/tcldrop.conf:1.6
--- tcldrop/tcldrop.conf:1.5    Tue Nov 18 20:46:37 2003
+++ tcldrop/tcldrop.conf        Mon Dec  1 16:19:53 2003
@@ -1,6 +1,6 @@
 # tcldrop.conf
 #
-# $Id: tcldrop.conf,v 1.5 2003/11/19 01:46:37 fireegl Exp $
+# $Id: tcldrop.conf,v 1.6 2003/12/01 21:19:53 fireegl Exp $
 #
 # This is a sample Tcldrop configuration file which includes all possible
 # settings that can be used to configure your bot.
@@ -300,6 +300,7 @@
 
 # This settings defines a time in seconds that the bot should wait before
 # a dcc chat, telnet, or relay connection times out.
+# Tcldrop partially supports this.
 set connect-timeout 15
 
 # Specify here the number of lines to accept from a user on the partyline
@@ -889,12 +890,15 @@
 set trigger-on-ignore 0
 
 # Allow identical messages in the mode queue?
+# Tcldrop supports this.
 set double-mode 0
 
 # Allow identical messages in the server queue?
+# Tcldrop supports this.
 set double-server 0
 
 # Allow identical messages in the help queue?
+# Tcldrop supports this.
 set double-help 0
 
 # This optimizes the kick queue. It also traces nick changes and parts in
Index: tcldrop/tcldrop.tcl
diff -u tcldrop/tcldrop.tcl:1.3 tcldrop/tcldrop.tcl:1.4
--- tcldrop/tcldrop.tcl:1.3     Tue Nov  4 07:04:17 2003
+++ tcldrop/tcldrop.tcl Mon Dec  1 16:19:53 2003
@@ -1,24 +1,24 @@
 # Tcldrop --
 #
-# $Id: tcldrop.tcl,v 1.3 2003/11/04 12:04:17 fireegl Exp $
+# $Id: tcldrop.tcl,v 1.4 2003/12/01 21:19:53 fireegl Exp $
 #
 # Copyright (C) 2003 FireEgl (Philip Moore) <address@hidden>
-# 
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program (see gpl.txt); if not, write to the
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
02111-1307, USA.
 # Or visit http://www.GNU.Org/licenses/gpl.html
-# 
+#
 # The author of this project can be reached at address@hidden
 # Or can be found on IRC (EFNet or FreeNode) as FireEgl.
 
@@ -43,7 +43,8 @@
 
 namespace eval tcldrop {
        # Provide tcldrop as a package:
-       package provide tcldrop 0.3
+       variable version {0.4}
+       package provide tcldrop $version
        # Initialize variables:
        variable Tcldrop
        array set Tcldrop {}