--- gozerbot-0.99.1.orig/setup.cfg
+++ gozerbot-0.99.1/setup.cfg
@@ -2,4 +2,3 @@
 tag_build = 
 tag_date = 0
 tag_svn_revision = 0
-
--- gozerbot-0.99.1.orig/debian/gozerbot.postrm
+++ gozerbot-0.99.1/debian/gozerbot.postrm
@@ -0,0 +1,46 @@
+#!/bin/sh
+# postrm script for gozerbot
+#
+# see: dh_installdeb(1)
+. /usr/share/debconf/confmodule
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge)
+        deluser --quiet --system gozerbot > /dev/null || true
+        delgroup --quiet --system gozerbot > /dev/null || true
+        rm -rf /var/log/gozerbot.log*
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- gozerbot-0.99.1.orig/debian/compat
+++ gozerbot-0.99.1/debian/compat
@@ -0,0 +1 @@
+5
--- gozerbot-0.99.1.orig/debian/gozerbot-stop.1
+++ gozerbot-0.99.1/debian/gozerbot-stop.1
@@ -0,0 +1 @@
+.so man1/gozerbot.1
--- gozerbot-0.99.1.orig/debian/gozerbot-init.1
+++ gozerbot-0.99.1/debian/gozerbot-init.1
@@ -0,0 +1 @@
+.so man1/gozerbot.1
--- gozerbot-0.99.1.orig/debian/gozerbot.init
+++ gozerbot-0.99.1/debian/gozerbot.init
@@ -0,0 +1,111 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          gozerbot
+# Required-Start:    $local_fs $remote_fs $network $named
+# Required-Stop:     $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Gozerbot IRC and Jabber bot
+# Description:       Gozerbot is an IRC and Jabber bot written in Python.
+### END INIT INFO
+
+NAME=gozerbot
+DESC="Gozerbot IRC robot"
+DATADIR=/var/lib/gozerbot
+PIDFILE=$DATADIR/gozerbot.pid
+LOGFILE=/var/log/gozerbot.log
+
+PID=`cat $PIDFILE` 2>/dev/null
+
+# Include gozerbot defaults if available
+if [ -f /etc/default/gozerbot ] ; then
+    . /etc/default/gozerbot
+fi
+
+if [ "$RUN" != "yes" ] ; then
+    echo "$NAME disabled; edit /etc/default/gozerbot"
+    exit 0
+fi
+
+if [ -z "$RUNUSER" ] ; then
+    RUNUSER=gozerbot
+fi
+
+status()
+{
+	test -n "$PID" && ps auxw | grep -v grep | grep gozerbot | grep -q -s " $PID " && return 0
+        return 1
+}
+
+stop()
+{
+	if status
+	then
+		kill -KILL $PID
+	fi
+}
+
+start()
+{
+	status && exit 1 # already running
+        if [ -e $DATADIR ]
+        then
+          cd $DATADIR
+        else
+          mkdir -p $DATADIR
+          cd $DATADIR
+        fi
+        if [ -e gozerdata/mainconfig ]
+        then
+           su $RUNUSER -c "$NAME >> /var/log/gozerbot.log 2>&1 &"
+        else
+           su $RUNUSER -c gozerbot-init
+           rm -rf /etc/gozerbot
+           ln -s /var/lib/gozerbot/gozerdata /etc/gozerbot
+           echo ""
+           echo "A default config file /etc/gozerbot/mainconfig has been created."
+           echo "irc and jabber bot example files are installed in /etc/gozerbot/fleet."
+           echo "Please edit those files and then run this script again to start gozerbot."
+        fi
+}
+
+case "$1" in
+start)
+	echo -n "Starting $DESC: $NAME"
+	start
+	case "$?" in
+		0) echo "." ; exit 0 ;;
+		1) echo " (already running)." ; exit 0 ;;
+		*) echo " (failed)." ; exit 1 ;;
+	esac
+	;;
+stop)
+	echo -n "Stopping $DESC: $NAME"
+	stop
+	case "$?" in
+		0) echo "." ; exit 0 ;;
+		1) echo " (not running)." ; exit 0 ;;
+		*) echo " (failed)." ; exit 1 ;;
+	esac
+	;;
+restart|force-reload|reload)
+	echo -n "Restarting $DESC: $NAME"
+	stop
+	start
+	;;
+status)
+	echo -n "Status of $DESC service: "
+	status
+	case "$?" in
+		0) echo "running." ; exit 0 ;;
+		1) echo "not running." ; exit 3 ;;
+	esac
+	;;
+*)
+	echo "Usage: /etc/init.d/gozerbot {start|stop|reload|force-reload|restart|status}" >&2
+	exit 1
+	;;
+esac
+
+*t
--- gozerbot-0.99.1.orig/debian/changelog
+++ gozerbot-0.99.1/debian/changelog
@@ -0,0 +1,132 @@
+gozerbot (0.99.1-3) unstable; urgency=low
+
+  * Remove python-central bits (Closes: #716688).
+
+ -- Jeremy Malcolm <terminus@debian.org>  Thu, 11 Jul 2013 14:33:31 +0800
+
+gozerbot (0.99.1-2) unstable; urgency=low
+
+  * Removes logfiles on purge (Closes: #668767)
+  * Reverted location of installed files back to /usr/lib/gozerbot.
+
+ -- Jeremy Malcolm <terminus@debian.org>  Tue, 03 Apr 2012 21:58:28 +0800
+
+gozerbot (0.99.1-1) unstable; urgency=low
+
+  * New upstream version (Closes: #630359, #640850)
+  * Fixed initscript to better test for RUNUSER emptyness (Closes: #612434)
+
+ -- Jeremy Malcolm <terminus@debian.org>  Thu, 15 Oct 2011 11:54:00 +0800
+
+gozerbot (0.9.1.3-6) unstable; urgency=low
+
+  * No longer require an obsolete version of python (Closes: #602006)
+
+ -- Jeremy Malcolm <terminus@debian.org>  Thu, 19 May 2011 03:45:38 +0800
+
+gozerbot (0.9.1.3-5) unstable; urgency=low
+
+  * Added python2.5 build dependency. 
+
+ -- Jeremy Malcolm <terminus@debian.org>  Wed, 29 Sep 2010 18:20:02 +0800
+
+gozerbot (0.9.1.3-4) unstable; urgency=low
+
+  * Moved home directory from /var/run to /var/lib (Closes: #571566)
+  * Corrected dependency on python-sqlalchemy (Closes: #571567)
+
+ -- Jeremy Malcolm <terminus@debian.org>  Sat, 27 Feb 2010 10:44:53 +0800
+
+gozerbot (0.9.1.3-3) unstable; urgency=low
+
+  * Changed dependency on python-setuptools to python-pkg-resources
+    (Closes: #546435) 
+
+ -- Jeremy Malcolm <terminus@debian.org>  Mon, 14 Sep 2009 09:00:29 +0800
+
+gozerbot (0.9.1.3-2) unstable; urgency=low
+
+  * Re-uploaded as a non-native package. 
+
+ -- Jeremy Malcolm <terminus@debian.org>  Fri, 04 Sep 2009 11:53:07 +0800
+
+gozerbot (0.9.1.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jeremy Malcolm <terminus@debian.org>  Sat, 15 Aug 2009 15:04:11 +0800
+
+gozerbot (0.9.1.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #516244, #521612, #530405, #523731,
+    #521611, #521610).
+  * Split gozerbot-plugins into a separate package.
+
+ -- Jeremy Malcolm <terminus@debian.org>  Mon, 20 Jul 2009 16:26:52 +0800
+
+gozerbot (0.8.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jeremy Malcolm <terminus@debian.org>  Mon, 02 Jun 2008 19:26:39 +0800
+
+gozerbot (0.8-1) unstable; urgency=low
+
+  * Upgrades python-xmpp to a dependency (Closes: #480273, #480267)
+
+ -- Jeremy Malcolm <terminus@debian.org>  Sat, 10 May 2008 16:22:46 +0800
+
+gozerbot (0.8) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jeremy Malcolm <terminus@debian.org>  Wed, 05 Mar 2008 08:55:39 +0900
+
+gozerbot (0.7.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jeremy Malcolm <terminus@debian.org>  Tue, 25 Sep 2007 14:45:03 +0800
+
+gozerbot (0.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jeremy Malcolm <terminus@debian.org>  Mon, 20 Aug 2007 21:08:20 +0800
+
+gozerbot (0.7-2) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jeremy Malcolm <terminus@debian.org>  Wed,  4 Jul 2007 08:26:29 +0800
+
+gozerbot (0.6.4.2-2) unstable; urgency=low
+
+  * Worked around upstream bug whereby Python install script no longer
+    works.
+
+ -- Jeremy Malcolm <terminus@debian.org>  Thu, 17 May 2007 21:41:26 +0800
+
+gozerbot (0.6.4.2-1) unstable; urgency=low
+
+  * New upstream release which fixes build bug. (Closes: #424363)
+
+ -- Jeremy Malcolm <terminus@debian.org>  Wed, 16 May 2007 14:59:42 +0800
+
+gozerbot (0.6.4-3) unstable; urgency=low
+
+  * Added build dependency for python-support. (Closes: #423769)
+
+ -- Jeremy Malcolm <terminus@debian.org>  Mon, 14 May 2007 21:16:34 +0800
+
+gozerbot (0.6.4-2) unstable; urgency=low
+
+  * Corrected minor packaging errors.
+
+ -- Jeremy Malcolm <terminus@debian.org>  Mon, 30 Apr 2007 16:51:27 +0800
+
+gozerbot (0.6.4-1) unstable; urgency=low
+
+  * Initial release. (Closes: #411833)
+
+ -- Jeremy Malcolm <terminus@debian.org>  Wed, 11 Apr 2007 10:43:10 +0800
--- gozerbot-0.99.1.orig/debian/control
+++ gozerbot-0.99.1/debian/control
@@ -0,0 +1,24 @@
+Source: gozerbot
+Section: net
+Priority: optional
+Maintainer: Jeremy Malcolm <terminus@debian.org>
+Build-Depends: python, python-setuptools (>= 0.6b3), debhelper (>= 7), python-support (>= 0.5.3), quilt
+Standards-Version: 3.9.1
+XS-Python-Version: all
+
+Package: gozerbot
+Architecture: all
+Depends: ${python:Depends}, python-tz (>= 1.0), python-simplejson (>= 1.0), python-feedparser (>= 1.0), python-dns (>= 2.3.3), adduser, python-pkg-resources (>= 0.6b3)
+Replaces: gozerbot-plugins
+Suggests: gnupg
+XB-Python-Version: ${python:Versions}
+Provides: ${python:Provides}
+Description: IRC and Jabber bot written in Python
+ Gozerbot is a channel bot that aids with conversation in IRC channels
+ and Jabber conference rooms. It's mainly used to send notifications (RSS,
+ Nagios, etc.) and to provide custom commands for the channel. More then 
+ just a channel bot Gozerbot aims to provide a platform for the user to 
+ program his own bot and make it into something that's useful. This is done 
+ with a plugin structure that makes it easy to program your own plugins. 
+ But Gozerbot comes with some batteries included, there are now over 100 
+ plugins already written and ready for use.
--- gozerbot-0.99.1.orig/debian/rules
+++ gozerbot-0.99.1/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+include /usr/share/quilt/quilt.make
+
+%:
+	dh $@ --with quilt
+
+binary: build
+	dh binary --until install --with quilt
+	rm -rf debian/gozerbot/usr/gozernest
+	chmod +x debian/gozerbot/usr/lib/gozerbot/gozerbot.cron
+	chmod +x debian/gozerbot/usr/lib/gozerbot/nagios-udp
+	dh binary --remaining
--- gozerbot-0.99.1.orig/debian/gozerbot-upgrade.1
+++ gozerbot-0.99.1/debian/gozerbot-upgrade.1
@@ -0,0 +1 @@
+.so man1/gozerbot.1
--- gozerbot-0.99.1.orig/debian/gozerbot-install.1
+++ gozerbot-0.99.1/debian/gozerbot-install.1
@@ -0,0 +1 @@
+.so man1/gozerbot.1
--- gozerbot-0.99.1.orig/debian/README.Debian
+++ gozerbot-0.99.1/debian/README.Debian
@@ -0,0 +1,21 @@
+gozerbot for DEBIAN
+-------------------
+With version 0.9, the configuration file format for gozerbot has
+changed significantly.  An experimental upgrade tool, gozerbot-upgrade,
+is available.  No automatic upgrade will be attempted.  To attempt an
+upgrade manually, move your existing gozerbot configuration directory
+and run the upgrade script as follows:
+
+  cd ~
+  mv .gozerbot .gozerbot.old
+  gozerbot-upgrade .gozerbot.old .gozerbot
+
+It is now also possible to run a systemwide gozerbot.  If you want to do
+this, edit the file /etc/defaults/gozerbot to change the value of RUN to
+"yes", then run "/etc/init.d/gozerbot start" (it will also run on boot).
+
+Plugins are included in the separate package gozerbot-plugins.  You can
+also use the included utility gozerbot-install, which downloads and
+installs gozerbot modules over the Internet.
+
+Jeremy Malcolm <terminus@debian.org>
--- gozerbot-0.99.1.orig/debian/gozerbot.1
+++ gozerbot-0.99.1/debian/gozerbot.1
@@ -0,0 +1,55 @@
+.TH GOZERBOT 1 "21 Feb 07" "Debian GNU/Linux" "gozerbot manual"
+.SH NAME
+gozerbot \- an IRC and Jabber bot written in Python
+.SH SYNOPSIS
+.B gozerbot-start [data directory]
+.SH "DESCRIPTION"
+This manual page documents briefly the
+.B gozerbot
+program.
+.P
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page.
+Instead, it has documentation in text format; see below.
+.PP
+.B gozerbot
+is an IRC and Jabber bot written in Python.
+.SH USAGE
+A template configuration file ~/.gozerbot/gozerdata/config will be created when running
+.B gozerbot-start
+for the first time, or can be created in some other directory by running
+.B gozerbot-start [data directory].
+Once at least one valid IRC server or Jabber service for gozerbot to connect to has been specified in that file, running
+.B gozerbot-start [data directory]
+again will start gozerbot.
+.PP
+To perform further configuration, message your gozerbot on the IRC server or Jabber service to which it has connected, using the name specified in the configuration file (by default, gozerbot).  To summon gozerbot to an IRC channel, you will need to
+.B
+/msg gozerbot join #channel.
+Other useful commands are:
+
+.TP
+.B !perms
+.IP
+See what permissions you have
+
+.TP
+.B !available
+.IP
+See what plugins are available
+
+.TP
+.B !commands
+.IP
+See what commands are available
+
+.TP
+.B !help [command]
+.IP
+Obtain usage information for a command
+
+.SH "SEE ALSO"
+The program is documented fully in the text documentation.
+.SH AUTHOR
+This manual page was written by Jeremy Malcolm <terminus@debian.org>,
+for the Debian GNU/Linux system (but may be used by others).
--- gozerbot-0.99.1.orig/debian/README.source
+++ gozerbot-0.99.1/debian/README.source
@@ -0,0 +1,3 @@
+This package uses quilt to manage all modifications to the upstream source.
+Changes are stored in the source package as diffs in debian/patches and
+applied during the build.
--- gozerbot-0.99.1.orig/debian/gozerbot-start.1
+++ gozerbot-0.99.1/debian/gozerbot-start.1
@@ -0,0 +1 @@
+.so man1/gozerbot.1
--- gozerbot-0.99.1.orig/debian/gozerbot-udp.1
+++ gozerbot-0.99.1/debian/gozerbot-udp.1
@@ -0,0 +1 @@
+.so man1/gozerbot.1
--- gozerbot-0.99.1.orig/debian/manpages
+++ gozerbot-0.99.1/debian/manpages
@@ -0,0 +1,7 @@
+debian/gozerbot.1
+debian/gozerbot-init.1
+debian/gozerbot-install.1
+debian/gozerbot-start.1
+debian/gozerbot-stop.1
+debian/gozerbot-udp.1
+debian/gozerbot-upgrade.1
--- gozerbot-0.99.1.orig/debian/copyright
+++ gozerbot-0.99.1/debian/copyright
@@ -0,0 +1,38 @@
+This is gozerbot, written and maintained by Bart Thate
+
+This package was debianized by Jeremy Malcolm <terminus@debian.org>.
+
+The original source can always be found at:
+	http://code.google.com/p/gozerbot
+
+Copyright Holder:  B.H.J Thate <bthate@gmail.com>
+
+License:
+
+The individual files in this package have their own copyright either 
+public domain or BSD. This license is for the software as a whole.
+
+* Copyright (c) 2005-2007, B.H.J Thate
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are met:
+*     * Redistributions of source code must retain the above copyright
+*       notice, this list of conditions and the following disclaimer.
+*     * Redistributions in binary form must reproduce the above copyright
+*       notice, this list of conditions and the following disclaimer in the
+*       documentation and/or other materials provided with the distribution.
+*     * Neither the name of the author nor the
+*       names of its contributors may be used to endorse or promote products
+*       derived from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY B.H.J. Thate ``AS IS'' AND ANY
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* DISCLAIMED. IN NO EVENT SHALL B.H.J. Thate BE LIABLE FOR ANY
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- gozerbot-0.99.1.orig/debian/gozerbot.default
+++ gozerbot-0.99.1/debian/gozerbot.default
@@ -0,0 +1,7 @@
+# Defaults for the gozerbot initscript
+
+# Set to yes to start a system-wide instance of gozerbot
+RUN=no
+
+# Set to the user gozerbot should run as
+RUNUSER=gozerbot
--- gozerbot-0.99.1.orig/debian/gozerbot.dirs
+++ gozerbot-0.99.1/debian/gozerbot.dirs
@@ -0,0 +1,2 @@
+usr/lib/gozerbot
+usr/share/gozerbot
--- gozerbot-0.99.1.orig/debian/dirs
+++ gozerbot-0.99.1/debian/dirs
@@ -0,0 +1,2 @@
+etc/gozerbot
+var/run/gozerbot
--- gozerbot-0.99.1.orig/debian/gozerbot.postinst
+++ gozerbot-0.99.1/debian/gozerbot.postinst
@@ -0,0 +1,59 @@
+#!/bin/sh
+# postinst script for gozerbot
+#
+# see: dh_installdeb(1)
+. /usr/share/debconf/confmodule
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    # If gozerbot was previously installed with home directory /var/run/gozerbot
+    if [ -d /var/run/gozerbot ]; then
+        mv /var/run/gozerbot /var/lib/gozerbot 2>/dev/null
+        deluser gozerbot
+    fi
+    # If gozerbot was never installed before, or after home directory moved above
+    if ! getent passwd gozerbot >/dev/null; then
+        if ! [ -d /var/lib/gozerbot ]; then
+            mkdir /var/lib/gozerbot 2>/dev/null
+        fi
+        adduser --disabled-password  --quiet --system \
+        --home /var/lib/gozerbot --no-create-home \
+        --shell /bin/sh --gecos "Gozerbot" --group gozerbot 
+        touch /var/log/gozerbot.log
+        chown gozerbot:gozerbot /var/lib/gozerbot
+        chown gozerbot:gozerbot /var/log/gozerbot.log
+    fi
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
--- gozerbot-0.99.1.orig/debian/patches/series
+++ gozerbot-0.99.1/debian/patches/series
@@ -0,0 +1 @@
+setup
--- gozerbot-0.99.1.orig/debian/patches/setup
+++ gozerbot-0.99.1/debian/patches/setup
@@ -0,0 +1,12 @@
+Index: gozerbot-0.99.1/setup.py
+===================================================================
+--- gozerbot-0.99.1.orig/setup.py	2012-04-21 17:15:16.000000000 +0800
++++ gozerbot-0.99.1/setup.py	2012-04-21 17:16:05.000000000 +0800
+@@ -88,6 +88,6 @@
+         'Topic :: Communications :: Chat :: Internet Relay Chat',
+         'Topic :: Software Development :: Libraries :: Python Modules',
+     ],
+-    data_files=[('files', uploadfiles('files')),
++    data_files=[('lib/gozerbot', uploadfiles('files')),
+                 ('gozernest', uploadfiles('gozernest'))],
+ )
--- gozerbot-0.99.1.orig/gozerbot.egg-info/SOURCES.txt
+++ gozerbot-0.99.1/gozerbot.egg-info/SOURCES.txt
@@ -1,6 +1,7 @@
 Changelog
 MANIFEST.in
 README.txt
+setup.cfg
 setup.py
 bin/gozerbot
 bin/gozerbot-init
--- gozerbot-0.99.1.orig/gozerbot.egg-info/PKG-INFO
+++ gozerbot-0.99.1/gozerbot.egg-info/PKG-INFO
@@ -1,4 +1,4 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: gozerbot
 Version: 0.99.1
 Summary: the irc bot and jabber bot in one
--- gozerbot-0.99.1.orig/build/lib/gozerbot/cache.py
+++ gozerbot-0.99.1/build/lib/gozerbot/cache.py
@@ -0,0 +1,12 @@
+# gozerbot.cache
+#
+#
+
+""" attempt to make a global usercache. not used yet. """
+
+# INIT SECTION
+
+# global userhost cache
+userhosts = {}
+
+# END SECTION
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gozerbot/monitor.py
+++ gozerbot-0.99.1/build/lib/gozerbot/monitor.py
@@ -0,0 +1,168 @@
+# gozerbot/monitor.py
+#
+#
+
+""" `gozerbot.monitor` .. monitor the bots output
+
+This module contains the Monitor base class use to implement callbacks for 
+the bot's output. Used in logging plugins. The actual monitor objects live
+irc and xmpp submodules.
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+## IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.config import config
+from gozerbot.stats import stats
+from utils.log import rlog
+from utils.exception import handle_exception
+from utils.trace import calledfrom
+from config import config
+from threads.threadloop import ThreadLoop
+from runner import waitrunners
+import threads.thr as thr
+
+# basic imports
+import Queue, sys
+
+## END IMPORT
+
+## LOCK SECTION
+
+# no locks
+
+## END LOCK
+
+class Monitor(ThreadLoop):
+
+    """ monitor base class. used as base class for jabber and irc 
+        output monitoting.
+
+        :param name: name of the monitor
+        :type name: string
+
+    """
+
+    def __init__(self, name="monitor"):
+        ThreadLoop.__init__(self, name)        
+        self.outs = []
+
+    def add(self, name, callback, pre, threaded=False):
+
+        """ add a monitoring callback.
+
+            :param name: name of the plugin using this monitor callback
+            :type name: string
+            :param callback: the callback to fire
+            :type callback: function
+            :param pre: precondition (function) to check if callback should fire
+            :type pre: function
+            :param threaded: whether callback should be called in its own thread
+            :type threaded: boolean
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/monitor.py
+                :pyobject: Monitor.add
+
+        """
+
+        name = name or calledfrom(sys._getframe(0))
+
+        if config['loadlist'] and name not in config['loadlist']:
+            return False
+
+        self.outs.append([name, callback, pre, threaded, False])
+        rlog(0, self.name, 'added monitor %s (%s)' % (name, str(callback)))
+        return True
+
+    def disable(self, name):
+        name = name.lower()
+
+        for i in range(len(self.outs)-1, -1, -1):
+            if self.outs[i][0] == name:
+                self.outs[i][4] = False
+
+    def activate(self, name):
+        name = name.lower()
+
+        for i in range(len(self.outs)-1, -1, -1):
+            if self.outs[i][0] == name:
+                self.outs[i][4] = True
+        
+    def unload(self, name):
+
+        """ delete monitor callback. 
+
+            :param name: name of the plugin which monitors need to be unloaded
+            :type name: string
+            :rtype: integer .. number of monitors removed
+
+            .. literalinclude:: ../../gozerbot/monitor.py
+                :pyobject: Monitor.unload
+
+        """
+
+        name = name.lower()
+        nr = 0
+
+        for i in range(len(self.outs)-1, -1, -1):
+            if self.outs[i][0] == name:
+                del self.outs[i]
+                nr += 1
+
+        return nr
+   
+    def handle(self, *args, **kwargs):
+
+        """ check if monitor callbacks need to be fired. 
+
+           :param args: arguments passed to the callback
+           :type args: list
+           :param kwargs: quoted arguments passed to the callback
+           :type kwargs: dict
+           :rtype: number of callbacks called 
+
+           .. literalinclude:: ../../gozerbot/monitor.py
+               :pyobject: Monitor.handle
+
+        """
+
+        nr = 0
+        for i in self.outs:
+
+            if not i[4]:
+                continue
+            # check if precondition is met
+            try:
+                if i[2]:
+                    stats.up('monitors', thr.getname(str(i[2])))
+                    rlog(-10, 'monitor', 'checking inloop %s' % str(i[2]))
+                    doit = i[2](*args, **kwargs)
+                else:
+                    doit = 1
+
+            except Exception, ex:
+                handle_exception()
+                doit = 0
+
+            if doit:
+                # run monitor callback in its own thread
+                rlog(0, 'monitor', 'excecuting monitor callback %s' % i[0])
+                stats.up('monitors', thr.getname(str(i[1])))
+                if not i[3]:
+                    waitrunners.put("monitor-%s" % i[0], i[1], *args)
+                else:
+                    thr.start_new_thread(i[1], args, kwargs)
+
+                nr += 1
+
+        return nr
+
+## INIT SECTION
+
+# no vars
+
+## END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/less.py
+++ gozerbot-0.99.1/build/lib/gozerbot/less.py
@@ -0,0 +1,159 @@
+# gozerbot/less.py
+#
+#
+
+""" maintain bot output cache. """
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION
+
+# gozerbot imports
+from utils.limlist import Limlist
+
+# END IMPORT
+# ==========
+
+# ============
+# LOCK SECTION
+
+# no locks
+
+# END LOCK
+# ========
+
+class Less(object):
+
+    """
+        output cache .. caches upto <nr> item of txt lines per nick.
+
+        :param nr: size of backlog
+        :type nr: integer
+
+    """
+
+    def __init__(self, nr):
+        self.data = {}
+        self.index = {}
+        self.nr = nr
+
+    def add(self, nick, listoftxt):
+
+        """
+            add listoftxt to nick's output .. set index for used by more 
+            commands.
+
+            :param nick: nick to add txt to cache for
+            :type nick: string
+            :param listoftxt: list of txt to cache
+            :type listoftxt: list
+
+            .. literalinclude:: ../../gozerbot/less.py
+                :pyobject: Less.add
+
+        """
+
+        nick = nick.lower()
+
+        # see if we already have cached output .. if not create limited list
+        if not self.data.has_key(nick):
+            self.data[nick] = Limlist(self.nr)
+
+        # add data
+        self.data[nick].insert(0, listoftxt)
+        self.index[nick] = 1
+
+    def get(self, nick, index1, index2):
+
+        """
+             return less entry.
+
+             entry is self.data[nick][index1][index2]
+
+             :param nick: nick to get data for
+             :type nick: string
+             :param index1: number of txtlines back
+             :type index1: integer
+             :param index2: index into the txtlines 
+             :type index2: integer
+             :rtype: string
+
+             .. literalinclude:: ../../gozerbot/less.py
+                 :pyobject: Less.get
+
+        """
+
+        nick = nick.lower()
+
+        try:
+            txt = self.data[nick][index1][index2]
+        except (KeyError, IndexError):
+            txt = None
+        return txt
+
+    def more(self, nick, index1):
+
+        """
+             return more entry pointed to by index .. increase index.
+
+             :param nick: nick to fetch data for
+             :type nick: string
+             :param index1: index into cache data
+             :type index1: integer
+             :rtype: tuple .. (txt, index)
+
+             .. literalinclude:: ../../gozerbot/less.py
+                 :pyobject: Less.more
+
+        """
+
+        nick = nick.lower()
+
+        try:
+            nr = self.index[nick]
+        except KeyError:
+            nr = 1
+
+        try:
+            txt = self.data[nick][index1][nr]
+            size = len(self.data[nick][index1])-nr
+            self.index[nick] = nr+1
+        except (KeyError, IndexError):
+            txt = None
+            size = 0
+
+        return (txt, size-1)
+
+    def size(self, nick):
+
+        """
+             return sizes of cached output.
+
+             :param nick: nick to get cache sizes for
+             :type nick: string
+             :rtype: list .. list of sizes
+
+             .. literalinclude:: ../../gozerbot/less.py
+                 :pyobject: Less.size
+
+        """
+
+        nick = nick.lower()
+        sizes = []
+
+        if not self.data.has_key(nick):
+            return sizes
+
+        for i in self.data[nick]:
+            sizes.append(len(i))
+
+        return sizes
+
+# ============
+# INIT SECTION
+
+# no vars
+
+# END INIT
+# ========
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gozerbot/partyline.py
+++ gozerbot-0.99.1/build/lib/gozerbot/partyline.py
@@ -0,0 +1,365 @@
+# gozerbot/partyline.py
+#
+#
+
+""" provide partyline functionality .. manage dcc sockets. """
+
+
+__copyright__ = 'this file is in the public domain'
+__author__ = 'Aim'
+
+## IMPORT SECTION
+
+# gozerbot imports
+from utils.log import rlog
+from utils.exception import handle_exception
+from fleet import fleet
+from simplejson import load
+from threads.thr import start_new_thread
+
+# basic imports
+import thread, pickle, socket
+
+## END IMPORT
+
+## LOCK SECTION
+
+# no locks
+
+## END LOCK
+
+class PartyLine(object):
+
+    """
+        partyline can be used to talk through dcc chat connections.
+
+    """
+
+    def __init__(self):
+        self.socks = [] # partyline sockets list
+        self.jids = []
+        self.lock = thread.allocate_lock()
+
+    def _doresume(self, data, reto=None):
+
+        """
+            resume a party line connection after reboot.
+
+            :param data: resume data
+            :type data: dict .. see PartyLine._resumedata
+            :param reto: nick of user to reply to
+            :type reto: string
+
+            .. literalinclude:: ../../gozerbot/partyline.py
+               :pyobject PartyLine._doresume
+
+        """
+
+        for i in data['partyline']:
+            bot = fleet.byname(i['botname'])
+            sock = socket.fromfd(i['fileno'], socket.AF_INET, socket.SOCK_STREAM)
+            sock.setblocking(1)
+            nick = i['nick']
+            userhost = i['userhost']
+            channel = i['channel']
+
+            if not bot:
+                rlog(10, 'partyline', "can't find %s bot in fleet" % i['botname'])
+                continue
+
+            self.socks.append({'bot': bot, 'sock': sock, 'nick': nick, 'userhost': userhost, 'channel': channel, 'silent': i['silent']})
+            bot._dccresume(sock, nick, userhost, channel)        
+
+            if reto:
+                self.say_nick(nick, 'rebooting done')
+
+    def _resumedata(self):
+
+        """
+             return data used for resume.
+
+             :rtype: list .. list of resumedata (dicts)
+
+             .. literalinclude:: ../../gozerbot/partyline.py
+                 :pyobject: PartyLine._resumedata
+        """
+
+        result = []
+
+        for i in self.socks:
+            result.append({'botname': i['bot'].name, 'fileno': i['sock'].fileno(), 'nick': i['nick'], 'userhost': i['userhost'], 'channel': i['channel'], 'silent': i['silent']})
+
+        return result
+
+    def resume(self, sessionfile):
+
+        """
+             resume from session file.
+
+             :param sessionfile: path to resume file
+             :type sessionfile: string
+
+             .. literalinclude:: ../../gozerbot/partyline.py
+                 :pyobject PartyLine.resume
+        """
+
+        session = load(open(sessionfile, 'r'))
+
+        try:
+            reto = session['channel']
+            self._doresume(session, reto)
+
+        except Exception, ex:
+            handle_exception()
+
+    def stop(self, bot):
+
+        """
+            stop all users on bot.
+
+            :param bot: bot to stop users on
+            :type bot: gozerbot.eventbase.EventBase
+            
+            .. literalinclude:: ../../gozerbot/partyline.py
+                :pyobject: PartyLine.stop
+        """
+
+        for i in self.socks:
+
+            if i['bot'] == bot:
+                try:
+                    i['sock'].shutdown(2)
+                    i['sock'].close()
+                except:
+                    pass
+                 
+    def stop_all(self):
+
+        """
+             stop every user on partyline.
+
+             .. literalinclude:: ../../gozerbot/partyline.py
+                 :pyobject: PartyLine.stop_all
+
+        """
+
+        for i in self.socks:
+            try:
+                i['sock'].shutdown(2)
+                i['sock'].close()
+            except:
+                pass
+
+    def loud(self, nick): 
+
+        """
+            enable broadcasting of txt for nick.
+
+            :param nick: nick to put into loud mode
+            :type nick: string
+
+            .. literalinclude:: ../../gozerbot/partyline.py
+                :pyobject: PartyLine.loud
+
+        """
+
+        for i in self.socks:
+
+            if i['nick'] == nick:
+                i['silent'] = False
+
+    def silent(self, nick):
+
+        """
+            disable broadcasting txt from/to nick.
+
+            :param nick: nick to put into silent mode
+            :type nick: string
+
+            .. literalinclude:: ../../gozerbot/partyline.py
+                :pyobject: PartyLine.disable
+
+        """
+
+        for i in self.socks:
+
+            if i['nick'] == nick:
+                i['silent'] = True
+
+    def add_party(self, bot, sock, nick, userhost, channel):
+
+        '''
+            add a socket with nick to the list.
+
+            :param bot: bot to add party on
+            :type bot: gozerbot.botbase.BotBase
+            :param sock: socket of party to add
+            :type sock: socket.socket
+            :param nick: nick of party to add
+            :type nick: string
+            :param userhost: userhost of party to add
+            :type userhost: string
+            :param channel: channel of party to add
+            :type channel: string
+
+            .. literalinclude:: ../../gozerbot/partyline.py
+                :pyobject: PartyLine.add_party
+
+        '''
+
+        for i in self.socks:
+
+            if i['sock'] == sock:
+                return            
+
+        self.socks.append({'bot': bot, 'sock': sock, 'nick': nick, \
+'userhost': userhost, 'channel': channel, 'silent': False})
+
+        rlog(1, 'partyline', 'added user %s on the partyline' % nick)
+
+    def del_party(self, nick):
+
+        '''
+            remove a socket with nick from the list.
+
+            :param nick: nick to remove
+            :type nick: string
+
+            .. literalinclude:: ../../gozerbot/partyline.py
+                :pyobject: PartyLine.del_party
+ 
+        '''
+
+        nick = nick.lower()
+        self.lock.acquire()
+
+        try:
+
+            for socknr in range(len(self.socks)-1, -1, -1):	
+
+                if self.socks[socknr]['nick'].lower() == nick:
+                    del self.socks[socknr]
+
+            rlog(1, 'partyline', 'removed user %s from the partyline' % nick)
+
+        finally:
+            self.lock.release()
+
+    def list_nicks(self):
+
+        '''
+            list all connected nicks.
+
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/partyline.py
+                :pyobject: PartyLine.list_nicks
+
+        '''
+
+        result = []
+
+        for item in self.socks:
+            result.append(item['nick'])
+
+        return result
+
+    def say_broadcast(self, txt):
+
+        '''
+            broadcast a message to all ppl on partyline.
+
+            :param txt: txt to broadcast
+            :type txt: string
+
+            .. literalinclude:: ../../gozerbot/partyline.py
+                :pyobject: PartyLine.say_broadcast
+
+        '''
+
+        for item in self.socks:
+
+            if not item['silent']:
+                item['sock'].send("%s\n" % txt)
+
+    def say_broadcast_notself(self, nick, txt):
+
+        '''
+             broadcast a message to all ppl on partyline, except the sender.
+
+            :param nick: nick to ignore
+            :type nick: string
+            :param txt: text to broadcast
+            :type txt: string
+
+            .. literalinclude:: ../../gozerbot/partyline.py
+               :pyobject: PartyLine.say_broadcast_notself
+
+        '''
+
+        nick = nick.lower()
+
+        for item in self.socks:
+
+            if item['nick'] == nick:
+                continue
+
+            if not item['silent']:
+                item['sock'].send("%s\n" % txt)
+
+    def say_nick(self, nickto, msg):
+
+        '''
+            say a message on the partyline to an user.
+
+            :param nickto: nick to send txt to
+            :type nickto: string
+            :param msg: msg to send
+            :type msg: string
+
+            .. literalinclude:: ../../gozerbot/partyline.py
+                :pyobject: PartyLine.say_nick
+
+        '''
+
+        nickto = nickto.lower()
+
+        for item in self.socks:
+
+            if item['nick'].lower() == nickto:
+
+                if not '\n' in msg:
+                    msg += "\n"
+
+                item['sock'].send("%s" % msg)
+                return
+
+    def is_on(self, nick):
+
+        '''
+            checks if user an is on the partyline.
+
+            :param nick: nick to check
+            :type nick: string
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/partyline.py
+                :pyobject: PartyLine.is_on
+
+        '''
+
+        nick = nick.lower()
+
+        for item in self.socks:
+
+            if item['nick'].lower() == nick:
+                return True
+
+        return False
+
+## INIT SECTION
+
+# the partyline !
+partyline = PartyLine()
+
+## END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plughelp.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plughelp.py
@@ -0,0 +1,73 @@
+# gozerbot/plughelp.py
+#
+#
+
+"""
+   help about plugins.
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+## IMPORT SECTION
+
+# no imports
+
+## END IMPORT
+
+## LOCK SECTION
+
+# no locks
+
+## END LOCK
+
+class PlugHelp(dict):
+
+    """
+        dict holding plugins help string.
+
+    """ 
+
+    def add(self, item, descr):
+
+        """
+            add plugin help string.
+
+            :param item: the plugin to store description for
+            :type item: string
+            :param descr: the description of the plugin
+            :type descr: string
+
+            .. literalinclude ../../gozerbot/plughelp.py
+                :pyobject: PlugHelp.add
+
+        """
+
+        item = item.lower()
+        self[item] = descr
+
+    def get(self, item):
+
+        """
+            get plugin help string.
+
+            :param item: plugin to get description for
+            :type item: string
+            :rtype: string
+
+            .. literalinclude:: ../../gozerbot/plughelp.py
+                :pyobject: PlugHelp.get
+        """
+
+        item = item.lower()
+        try:
+            return self[item]
+        except KeyError:
+            return None
+
+## INIT SECTION
+
+# plughelp object
+plughelp = PlugHelp()
+
+# END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/generic.py
+++ gozerbot-0.99.1/build/lib/gozerbot/generic.py
@@ -0,0 +1,31 @@
+# generic compat stub
+#
+#
+
+""" utils stub for backwards compatibility. """
+
+# ==============
+# IMPORT SECTION
+
+from utils.log import *
+from utils.generic import *
+from utils.exception import *
+from utils.popen import *
+from utils.timeutils import *
+from utils.fileutils import *
+from utils.reboot import *
+from utils.trace import *
+from utils.locking import *
+from utils.rsslist import *
+from utils.url import *
+
+# END IMPORT
+# ==========
+
+# =========
+# LOCK SECTION
+
+# no locks
+
+# END LOCK
+# ========
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugins.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugins.py
@@ -0,0 +1,1509 @@
+# gozerbot/plugins.py
+#
+#
+
+""" provide plugin infrastructure """
+
+__copyright__ = 'this file is in the public domain'
+
+## gozerbot imports
+
+from gozerbot.stats import stats
+from gozerbot.tests import tests
+from gozerbot.datadir import datadir
+from users import users
+from irc.monitor import outmonitor, saymonitor
+from xmpp.monitor import xmppmonitor
+from utils.log import rlog
+from utils.exception import handle_exception
+from utils.generic import checkchan
+from utils.locking import lockdec, funclocked, Locked
+from utils.generic import plugnames, waitforqueue, uniqlist, makeoptions, makeargrest, cleanpycfile
+from gozerimport import gozer_import, force_import
+from persist.persist import Persist
+from persist.persistconfig import PersistConfig
+from config import config
+from commands import cmnds
+from callbacks import callbacks, jcallbacks, gn_callbacks
+from redispatcher import rebefore, reafter
+from aliases import aliascheck, aliasget
+from ignore import shouldignore
+from threads.thr import start_new_thread, getname
+from persist.persiststate import PersistState
+from simplejson import loads
+from morphs import inputmorphs, outputmorphs
+from eventbase import EventBase
+from admin import cmndtable, pluginlist
+
+# basic imports
+import os, os.path, thread, time, Queue, re, copy
+
+## END IMPORT
+
+## LOCK SECTION
+
+loadlock = thread.allocate_lock()
+loadlocked = lockdec(loadlock)
+
+## END LOCK
+
+class Plugins(object):
+
+    """
+        hold all the plugins.
+
+    """
+
+    def __init__(self):
+        self.plugs = {} # dict with the plugins
+        self.reloadlock = thread.allocate_lock()
+        # persisted data for deny of plugins (blacklist)
+        self.plugdeny = Persist(datadir + os.sep + 'plugdeny', init=False)
+        if not self.plugdeny.data:
+            self.plugdeny.data = []
+        # persisted data for allowing of plugins (whitelist)
+        self.plugallow = Persist(datadir + os.sep + 'plugallow', init=False)
+        if not self.plugallow.data:
+            self.plugallow.data = []
+        self.avail = [] # available plugins
+        self.ondisk = [] # plugisn available for reload
+        self.initcalled = [] # plugins which init functions are called
+        self.overloads = {} # plugins to overload
+        self.activated = {}
+        for plug in config['plugdeny']:
+            self.disable(plug)
+
+    def __getitem__(self, item):
+
+        """
+            return plugin.
+
+        """
+
+        if self.plugs.has_key(item):
+            return self.plugs[item]
+        else:
+            return None
+
+    def get(self, item, attr):
+
+        """
+            get attribute of plugin.
+
+            :param item: plugin to get attribute of
+            :type item: string
+            :param attr: attribute to fetch
+            :type attr: string
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.get
+
+        """
+
+        if self.plugs.has_key(item):
+            return getattr(self.plugs[item], attr)
+
+    def whatperms(self):
+
+        """
+            return what permissions are possible.
+
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.whatperms
+
+        """
+
+        result = []
+
+        # search RE callbacks before the commands
+        for i in rebefore.whatperms():
+            if not i in result:
+                result.append(i)
+
+        # search the commands
+        for i in cmnds.whatperms():
+            if not i in result:
+                result.append(i)
+
+        # search RE callbacks after commands
+        for i in reafter.whatperms():
+            if not i in result:
+                result.append(i)
+
+        result.sort()
+        return result
+
+    def exist(self, name):
+
+        """
+            see if plugin exists.
+
+            :param name: name of plugin to check for
+            :type name: string
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.exist
+
+        """
+
+        if self.plugs.has_key(name):
+            return True
+        return False
+
+    def disable(self, name):
+
+        """
+            prevent plugin to be loaded. plugins does get imported but 
+            commands, callbacks, monitors etc are not enabled.
+
+            :param name: name of the plugin to disable
+            :type name: string
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.disable
+
+        """
+
+        try:
+            config['loadlist'].remove(name)
+            config.save()
+            self.plugdeny.data.append(name)
+            self.plugdeny.save()
+            
+        except:
+            pass
+
+    def enable(self, name):
+
+        """
+            enable plugin.
+
+            :param name: name of plugin to enable
+            :type name: string
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.enable
+
+        """
+
+        try:
+
+            if name not in config['loadlist']:
+                config['loadlist'].append(name)
+                config.save()
+
+        except KeyError:
+            pass
+
+        try:
+            self.plugdeny.data.remove(name)
+            self.plugdeny.save()
+
+        except ValueError:
+            pass
+
+    def plugsizes(self):
+
+        """
+            call the size() function in all plugins.
+
+            :rtype: list .. list of plugin sizes
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.plugsizes
+        """
+
+        reslist = []
+        cp = dict(self.plugs)
+        for i, j in cp.iteritems():
+            try:
+                reslist.append("%s: %s" % (i, j.size()))
+            except AttributeError:
+                pass
+        return reslist
+
+    def list(self):
+
+        """
+            list of registered plugins.
+
+            :rtype: list .. list of enabled plugins
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.list
+
+        """
+
+        self.avail.sort()
+        return self.avail
+
+    def plugimport(self, mod, name):
+
+        """
+            import a plugin.
+
+            :param mod: module to import plugin from
+            :type mod: string
+            :param name: name of the plugin to import
+            :type name: string
+            :rtype: module .. the plugin
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.plugimport
+
+        """
+        
+        if name in config['loadlist']:
+            return self.load(mod, name)
+
+    def regplugin(self, mod, name):
+
+        """
+            register plugin.
+
+            :param mod: module to import plugin from
+            :type mod: string
+            :param name: name of the plugin to import
+            :type name: string
+            :rtype: module .. the plugin
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.regplugin
+
+        """
+
+        name = name.lower()
+        mod = mod.lower()
+        modname = mod + '.' + name
+
+        # see if plugin is in deny
+        if name in self.avail:
+            rlog(0, 'plugins', '%s already registered' % name)
+            return
+
+        if name in config['plugdeny']:
+            rlog(0, 'plugins', '%s is in config.plugdeny .. not loading' % name)
+            return
+
+        if name in self.plugdeny.data:
+            rlog(0, 'plugins', '%s.%s in deny .. not loading' % (mod, name))
+            return 0
+
+        if config.has_key('loadlist') and name not in config['loadlist'] and 'gplugs' in modname and name not in self.plugallow.data:
+                rlog(9, 'plugins', 'not loading %s.%s' % (mod, name))
+                return 0
+
+        # if plugin is already registered unload it
+        if self.plugs.has_key(name):
+            rlog(10, 'plugins', 'overloading %s plugin with %s version' % (name, mod))
+            self.unloadnosave(name)
+
+        # create the plugin data dir
+        if hasattr(os, 'mkdir'):
+            if not os.path.isdir(datadir + os.sep + 'plugs'):
+                os.mkdir(datadir + os.sep + 'plugs')
+
+            if not os.path.isdir(datadir + os.sep + 'plugs' + os.sep + name):
+                os.mkdir(datadir + os.sep + 'plugs' + os.sep + name)
+
+        # import the plugin
+        plug = self.plugimport(mod, name)
+
+        if plug:
+            rlog(0, 'plugins', "%s.%s registered" % (mod, name))
+
+            if name not in self.avail:
+                self.avail.append(name)
+
+            return plug
+
+        else:
+            rlog(10, 'plugins', "can't import %s.%s .. try plug-enable" % (mod, name))
+         
+    def showregistered(self):
+
+        """
+            show registered plugins.
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.showregistered
+
+        """
+
+        self.avail.sort()
+        rlog(10, 'plugins', 'registered %s' % ' .. '.join(self.avail))
+        self.overload()
+
+    def regdir(self, dirname, exclude=[]):
+
+        """
+            register a directory.
+
+            :param dirname: directory to import plugins from
+            :type dirname: string
+            :param exclude: plugins to exclude from importing
+            :type exclude: list .. list of plugin names
+            :rtype: list .. list of plugin names that are registered
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.regdir
+
+        """
+
+        threads = []
+        plugs = []
+        for plug in plugnames(dirname):
+            if plug in exclude or plug.startswith('.'):
+                continue
+            try:
+                self.regplugin(dirname, plug)
+                plugs.append(plug)
+            except:
+                handle_exception()
+        self.ondisk.extend(plugs)
+        return plugs
+
+    def regcore(self): 
+
+        """
+            register core plugins.
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.regcore
+
+        """
+
+        self.plugdeny.init([])
+        self.plugallow.init([])
+        avail = [] 
+        plugs = force_import('gozerbot.plugs')
+
+        for i in plugs.__plugs__:
+
+            if i not in avail:
+
+                try:
+                    self.regplugin('gozerbot.plugs', i)
+                except Exception, ex:
+                    handle_exception()
+                else:
+                    avail.append(i)
+
+        self.ondisk.extend(avail)
+
+    def enableall(self):
+
+        """
+            enable all plugins
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.enableall
+
+        """
+
+        for name in self.available():
+            self.enable(name)
+
+    def regplugins(self):
+
+        """
+            register all plugins.
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.regplugins
+
+        """
+
+        self.regcore()
+        avail = []
+
+        # check for myplugs directory
+        if os.path.isdir('myplugs'):
+            avail.extend(self.regdir('myplugs'))  
+
+            for i in os.listdir('myplugs'):
+
+                if i.startswith('.'):
+                    continue
+
+                if os.path.isdir('myplugs' + os.sep + i):
+                    avail.extend(self.regdir('myplugs' + os.sep + i))  
+        else:
+            rlog(10, 'plugins', 'no myplugs directory found')
+
+        # check for gplugs package
+        try:
+            gplugs = gozer_import('gplugs')
+        except ImportError:
+            rlog(20, 'plugins', "no gplugs package found")
+            gplugs = None
+
+        if gplugs:
+
+            for i in gplugs.__plugs__:
+
+                try:
+                    self.regplugin('gplugs', i)
+                    avail.append(i)
+                except Exception, ex:
+                    handle_exception()
+
+        if config.get('db_driver') == "olddb":
+            # check for gplugs package
+            try:
+                gplugs = gozer_import('gplugs.olddb')
+            except ImportError:
+                rlog(20, 'plugins', "no gplugs.old package found")
+                gplugs = None
+
+            if gplugs:
+
+                for i in gplugs.__plugs__:
+
+                    try:
+                        self.regplugin('gplugs.olddb', i)
+                        avail.append(i)
+                    except Exception, ex:
+                        handle_exception()
+        else:
+            # check for gplugs package
+            try:
+                gplugs = gozer_import('gplugs.alchemy')
+            except ImportError:
+                rlog(20, 'plugins', "no gplugs.alchemy package found")
+                gplugs = None
+
+            if gplugs:
+
+                for i in gplugs.__plugs__:
+
+                    try:
+                        self.regplugin('gplugs.alchemy', i)
+                        avail.append(i)
+                    except Exception, ex:
+                        handle_exception()
+
+        self.ondisk.extend(avail)
+        self.readoverload()
+        start_new_thread(self.showregistered, ())
+
+    def readoverload(self):
+
+        """ 
+            see if there is a permoverload file and if so use it to overload
+            permissions based on function name.
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.readoverload
+
+        """
+
+        try:
+            overloadfile = open(datadir + os.sep + 'permoverload', 'r')
+        except IOError:
+            return
+
+        try:
+
+            for i in overloadfile:
+                i = i.strip()
+                splitted = i.split(',')
+
+                try:
+                    funcname = splitted[0].strip()
+                    perms = []
+                    for j in splitted[1:]:
+                        perms.append(j.strip())
+                except IndexError:
+                    rlog(10, 'plugins', "permoverload: can't set perms of %s" \
+% i)
+                    continue
+
+                if not funcname:
+                    rlog(10, 'plugins', "permoverload: no function provided")
+                    continue
+
+                if not perms:
+                    rlog(10, 'plugins', "permoverload: no permissions \
+provided for %s" % funcname)
+                    continue
+
+                self.overloads[funcname] = perms
+
+        except Exception, ex:
+             handle_exception()
+
+    def overload(self):
+
+        """
+            overload functions in self.overloads. 
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.overload
+
+        """
+        for funcname, perms in self.overloads.iteritems():
+
+            if self.permoverload(funcname, perms):
+                rlog(0, 'plugins', '%s permission set to %s' % (funcname, \
+perms))
+
+    def available(self):
+
+        """
+            available plugins not yet registered.
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.available
+
+        """
+
+        self.ondisk.sort()
+        return self.ondisk
+
+    def saveplug(self, plugname):
+
+        """
+            call save() function of plugin.
+
+            :param plugname: name of the plugin to call save() on
+            :type plugname: string
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.saveplug
+        """
+
+        try:
+            self.plugs[plugname].save()
+
+        except AttributeError:
+            pass
+
+        except KeyError:
+            pass
+
+    def save(self):
+
+        """
+            call registered plugins save.
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.save
+ 
+        """
+
+        for plug in self.plugs.values():
+
+            try:
+                plug.save()
+
+            except AttributeError:
+                pass
+
+            except Exception, ex:
+                handle_exception()
+
+    def save_cfg(self):
+
+        """
+            call registered plugins configuration save.
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.save_cfg
+
+        """
+
+        for plug in self.plugs.values():
+            try:
+                cfg = getattr(plug, 'cfg')
+                if isinstance(cfg, PersistConfig):
+                    try:
+                        cfg.save()
+                    except:
+                        handle_exception()
+            except AttributeError:
+                continue
+
+    def save_cfgname(self, name):
+
+        """
+            save plugin persisted config data.
+
+            :param name: name of the plugin to call cfg.save for
+            :type name: string
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.save_cfgname
+        """
+
+        try:
+            plug = self.plugs[name]
+            cfg = getattr(plug, 'cfg')
+
+            if isinstance(cfg, PersistConfig):
+
+                try:
+                    cfg.save()
+                except:
+                    handle_exception()
+
+        except (AttributeError, KeyError):
+            pass
+	
+    def exit(self):
+
+        """
+            call shutdown on all registered plugins. 
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.exit
+
+        """
+
+        self.save()
+        threadlist = []
+
+        # call shutdown on all plugins
+        for name, plug in self.plugs.iteritems():
+
+            try:
+                shutdown = getattr(plug, 'shutdown')
+                thread = start_new_thread(shutdown, ())
+                threadlist.append((name, thread))
+
+                try:
+                    self.initcalled.remove(name)
+                except ValueError:
+                    pass
+
+            except AttributeError:
+                continue
+
+            except Exception, ex:
+                rlog(10, 'plugins', 'error shutting down %s: %s' % (name, str(ex)))
+
+        # join shutdown threads
+        try:
+
+            for name, thread in threadlist:
+                thread.join()
+                rlog(10, 'plugins', '%s shutdown finished' % name)
+        except:
+            handle_exception()
+
+    def getoptions(self, command):
+
+        """
+            return options entry of a command.
+
+            :param command: command name to get options of
+            :type command: string
+            :rtype: dict
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.getoptions
+
+        """
+
+        return cmnds.getoptions(command)
+
+    def getdepend(self, plugname):
+
+        """
+            get plugins the plugin depends on.  NOT USED ANYMORE ..
+
+            we use the __depending__ attribute now which checks for the 
+            reverse case ala what plugins depends on this plugin. code is 
+            in reload().
+
+        """
+
+        # try to import the plugin
+        if plugname in self.plugs:
+            plug = self.plugs[plugname]
+        else:
+            for mod in ['gozerbot.plugs', 'gplugs', 'myplugs']:
+                try:
+                    plug = gozer_import('%s.%s' % (mod, plugname))
+                except ImportError:
+                    continue
+
+        # check for the __depend__ attribute           
+        try: 
+            depends = plug.__depend__
+        except:
+            depends = []
+
+        return depends
+
+    def load(self, mod , name, enable=True):
+        #if name in config['plugdeny']:
+        #     return
+        # force an import of the plugin
+        modname = mod + '.' + name
+        self.down(name)
+        self.unload(name)
+        if enable:
+            self.enable(name)
+        plug = self.plugs[name] = gozer_import(modname)
+        plug.loadtime = time.time()
+        if enable:
+            self.enable(name)
+            self.overload()
+            # call plugins init() function
+            try:
+                rlog(0, 'plugins', 'calling %s init()' % modname)
+                plug.init()
+                self.initcalled.append(modname)
+
+            except (AttributeError, KeyError):
+                pass
+
+            except Exception, ex:
+                rlog(10, 'plugins', '%s module init failed' % name)
+                raise
+
+            rlog(0, 'plugins', 'enabled %s' % name)
+
+        self.activate(name)
+        return plug
+
+    #@loadlocked
+    def reload(self, mod, name, enable=True):
+
+        """
+            reload plugin.
+
+            :param mod: module to import plugin from
+            :type mod: string
+            :param name: name of the plugin to reload
+            :type name: string
+            :param enable: whether plugin should be enabled on reload
+            :type enable: boolean  
+            :rtype: list .. list of names of reloaded plugins
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.reload
+
+        """
+
+        # create the plugin data dir
+        if not os.path.isdir(datadir + os.sep + 'plugs'):
+            os.mkdir(datadir + os.sep + 'plugs')
+
+        if not os.path.isdir(datadir + os.sep + 'plugs' + os.sep + name):
+            os.mkdir(datadir + os.sep + 'plugs' + os.sep + name)
+
+        reloaded = []
+        modname = mod + '.' + name
+
+        # force an import of the plugin
+        plug = self.load(mod, name)
+
+        # recurse the reload function if plugin is a dir
+        try:
+            for p in plug.__plugs__:
+                self.load(modname, p)
+                reloaded.append(p)
+
+        except (KeyError, AttributeError):
+            pass
+
+        rlog(0, 'plugins', 'reloaded plugin %s' % modname)
+        reloaded.append(name)
+        self.plugallow.data.append(name)
+
+        try:
+            self.plugdeny.data.remove(name)
+        except ValueError:
+            pass
+
+        if name not in self.avail:
+            self.avail.append(name)
+
+        # recurse on plugins the depend on this plugin
+        try:
+            depends = plug.__depending__
+
+            for plug in depends:
+                rlog(10, 'plugins', 'loading depending plugin %s (%s)' % (plug, name))
+                self.load(mod, plug, False)
+                reloaded.append(plug)
+
+        except AttributeError:
+            pass
+
+        return reloaded
+
+    def activate(self, plugname):
+        self.activated[plugname] = True
+        try:
+            cmnds.activate(plugname)
+            callbacks.activate(plugname)
+            gn_callbacks.activate(plugname)
+            jcallbacks.activate(plugname)
+            rebefore.activate(plugname)
+            reafter.activate(plugname)
+            saymonitor.activate(plugname)
+            outmonitor.activate(plugname)
+            xmppmonitor.activate(plugname)
+            tests.activate(plugname)
+            outputmorphs.activate(plugname)
+            inputmorphs.activate(plugname)
+        except Exception, ex:
+            handle_exception()
+            return 0
+
+    def down(self, plugname):
+        self.activated[plugname] = False
+        try:
+            cmnds.disable(plugname)
+            callbacks.disable(plugname)
+            gn_callbacks.disable(plugname)
+            jcallbacks.disable(plugname)
+            rebefore.disable(plugname)
+            reafter.disable(plugname)
+            saymonitor.disable(plugname)
+            outmonitor.disable(plugname)
+            xmppmonitor.disable(plugname)
+            tests.disable(plugname)
+            outputmorphs.disable(plugname)
+            inputmorphs.disable(plugname)
+        except Exception, ex:
+            handle_exception()
+            return 0
+
+    def unload(self, plugname):
+
+        """
+            unload plugin.
+
+            :param plugname: name of the plugin to unload
+            :type plugname: string
+            :rtype: list .. list of unloaded plugins
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.unload
+ 
+        """
+
+        # call plugins shutdown function if available
+        unloaded = [plugname, ]
+
+        # recurse if plugin is dir
+        try:
+            plug = self.plugs[plugname]
+
+            for p in plug.__plugs__:
+                if p == plug:
+                    raise Exception("same plugin name as dir name (%s)" % plugname)
+                unloaded.extend(self.unload(p))
+
+        except (KeyError, AttributeError):
+            pass
+
+        # save and unload
+        for plugname in unloaded:
+            self.saveplug(plugname)
+            self.unloadnosave(plugname)
+
+            try:
+                self.avail.remove(plugname)
+
+            except ValueError:
+                pass
+
+        return unloaded
+
+    def unloadnosave(self, plugname):
+
+        """
+            unload plugin without saving.
+
+            :param plugname: name of the plugin to unload
+            :type plugname: string
+            :rtype: list .. list of unloaded plugins
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.unloadnosave
+
+        """
+
+        # call shutdown function
+        try:
+            self.plugs[plugname].shutdown()
+            rlog(10, 'plugins', '%s shutdown called' % plugname)
+
+        except (AttributeError, KeyError):
+            pass
+
+        except Exception, ex:
+            handle_exception()
+
+        # remove from plugallow
+        try:
+            self.plugallow.data.remove(plugname)
+        except (KeyError, ValueError):
+            pass
+
+        # remove from avail list
+        try:
+            self.avail.remove(plugname)
+        except ValueError:
+            pass
+
+        # remove from initcalled list
+        try:
+            self.initcalled.remove(plugname)
+        except ValueError:
+            pass
+
+        # unload commands, RE callbacks, callbacks, monitorsetc.
+        try:
+            cmnds.unload(plugname)
+            callbacks.unload(plugname)
+            gn_callbacks.unload(plugname)
+            jcallbacks.unload(plugname)
+            rebefore.unload(plugname)
+            reafter.unload(plugname)
+            saymonitor.unload(plugname)
+            outmonitor.unload(plugname)
+            xmppmonitor.unload(plugname)
+            tests.unload(plugname)
+            outputmorphs.unload(plugname)
+            inputmorphs.unload(plugname)
+
+            if self.plugs.has_key(plugname):
+                del self.plugs[plugname]
+
+        except Exception, ex:
+            handle_exception()
+            return 0
+
+        rlog(0, 'plugins', '%s unloaded' % plugname)
+        return 1
+
+    def whereis(self, what):
+
+        """
+            locate command.
+
+            :param what: name of command to search
+            :type what: string
+            :rtype: string .. plugin the command is in
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.whereis
+
+        """
+
+        return cmnds.whereis(what)
+
+    def permoverload(self, funcname, perms):
+
+        """
+            overload permission of a function.
+
+            :param funcname: name of function to overload permissions of
+            :type funcname: string
+            :param perms: permissions to overload
+            :type perms: list .. list of permissions
+            :rtype: boolean: whether overload worked or not
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.permoverload
+
+        """
+
+        if not rebefore.permoverload(funcname, perms):
+
+            if not cmnds.permoverload(funcname, perms):
+
+                if not reafter.permoverload(funcname, perms):
+                    return False
+
+        return True
+
+    def woulddispatch(self, bot, ievent):
+
+        """
+            function to determine whether a event would dispatch.
+
+            :param bot: bot on which command is given
+            :type bot: gozerbot.botbase.BotBase
+            :param ievent: the event triggering the command
+            :type ievent: gozerbot.eventbase.EventBase
+            :rtype: boolean .. whether the dispatch should fire
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.woulddispatch
+
+        """
+        #self.needreloadcheck(bot, ievent)
+        (what, command) = self.dispatchtest(bot, ievent)
+
+        #if what and not what.activate:
+        #    return False
+
+        if what and command:
+            return True
+
+        return False
+
+    #@funclocked
+    def dispatchtest(self, bot, ievent, direct=False):
+
+        """
+            return (dispatcher, command) on which command should fire.
+
+            :param bot: bot on which command is given
+            :type bot: gozerbot.botbase.BotBase
+            :param ievent: the event triggering the command
+            :type ievent: gozerbot.eventbase.EventBase
+            :param direct: whether user permission should be checked
+            :type direct: boolean .. when set user permission is NOT checked
+            :rtype: tuple .. (dispatcher, command) tuples
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.dispatchtest
+        """
+
+        # check for ignore
+        if shouldignore(ievent.userhost):
+            return (None, None)
+
+        # check for throttle
+        if ievent.userhost in bot.throttle:
+            return (None, None)
+
+        # set target properly
+        if ievent.txt.find(' | ') != -1:
+            target = ievent.txt.split(' | ')[0]
+        elif ievent.txt.find(' && ') != -1:
+            target = ievent.txt.split(' && ')[0]
+        else:
+            target = ievent.txt
+
+        result = []
+
+        # first check for RE before commands dispatcher
+        com = rebefore.getcallback(target)
+
+        if com and not target.startswith('!'):
+            com.re = True
+            result = [rebefore, com]
+        else:
+
+            # try commands 
+            if ievent.txt.startswith('!'):
+                ievent.txt = ievent.txt[1:]
+
+            aliascheck(ievent)
+            com = cmnds.getcommand(ievent.txt)
+
+            if com:
+                com.re = False
+                result = [cmnds, com]
+                ievent.txt = ievent.txt.strip()
+
+            else:
+
+                # try RE after commands
+                com = reafter.getcallback(target)
+                if com:
+                    com.re = True
+                    result = [reafter, com]
+        if result:
+
+            # check for auto registration
+            if config['auto_register'] and not users.getname(ievent.userhost):
+                if bot.google:
+                    users.add(ievent.userhost , [ievent.userhost, ], ['USER', ])
+                elif not bot.jabber:
+                    users.add("%s!%s" % (ievent.nick, ievent.userhost) , [ievent.userhost, ], ['USER', ])
+                    bot.ratelimit(ievent.userhost, 20)
+                else:
+                    if ievent.groupchat:
+                        users.add(ievent.userhost , [ievent.userhost, ], ['USER', ])
+                        bot.ratelimit(ievent.userhost)
+                    else:
+                        users.add(ievent.stripped , [ievent.stripped, ], ['USER', ])
+                        bot.ratelimit(ievent.stripped, 20)
+
+            # check for anon access
+            if config['anon_enable'] and not 'OPER' in result[1].perms:
+                return result
+
+            # check if command is allowed (all-add command)
+            if com.name in bot.state['allowed'] or getname(com.func) in bot.state['allowed']:
+                return result
+
+            # check for channel permissions
+            try:
+                chanperms = bot.channels[ievent.channel.lower()]['perms']
+
+                for i in result[1].perms:
+                    if i in chanperms and not ievent.msg:
+                        ievent.speed = 1
+                        return result
+
+            except (KeyError, TypeError):
+                pass
+
+            # if direct is set dont check the user database
+            if direct:
+                return result
+
+            # use event.stripped in case of jabber 
+            if bot.jabber and ievent.jabber:
+                if not ievent.groupchat or ievent.jidchange:
+                    if users.allowed(ievent.stripped, result[1].perms):
+                        return result
+
+            # irc users check
+            if users.allowed(ievent.userhost, result[1].perms):
+                return result
+
+        return (None, None)
+
+    def cmnd(self, bot, ievent, timeout=15, response=False, onlyqueues=True):
+
+        """
+            launch command and wait for result.
+
+            :param bot: bot on which command is given
+            :type bot: gozerbot.botbase.BotBase
+            :param ievent: the event triggering the command
+            :type ievent: gozerbot.eventbase.EventBase
+            :param timeout: number of seconds to wait for a result
+            :type timeout: integer
+            :param response: whether to notify user we are running the command
+            :type response: string
+            :rtype: list .. list of results
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.cmnd
+
+        """
+        if response:
+            ievent.reply('launching %s on %s bot' % (ievent.txt, bot.name))
+        #ii = self.clonedevent(bot, ievent)
+        #q = Queue.Queue()
+        #ii.queues.append(q)
+        #ii.onlyqueues = onlyqueues
+        q = Queue.Queue()
+        ievent.queues.append(q)
+        self.trydispatch(bot, ievent)
+        return waitforqueue(q, timeout)
+
+    def waitdispatch(self, bot, ievent, direct=False):
+        
+        """
+            dispatch command and wait for results.
+
+            :param bot: bot on which command is given
+            :type bot: gozerbot.botbase.BotBase
+            :param ievent: the event triggering the command
+            :type ievent: gozerbot.eventbase.EventBase
+            :param direct: whether user permission should be checked
+            :type direct: boolean .. when set user permission is NOT checked
+            :rtype: boolean .. whether dispatch succeeded or not
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.waitdispatch
+
+        """
+        ievent.threaded = True
+        return self.trydispatch(bot, ievent, direct, wait=True)
+
+    def trydispatch(self, bot, ievent, direct=False, wait=False):
+
+        """
+            try to dispatch ievent.
+
+            :param bot: bot on which command is given
+            :type bot: gozerbot.botbase.BotBase
+            :param ievent: the event triggering the command
+            :type ievent: gozerbot.eventbase.EventBase
+            :param direct: whether user permission should be checked
+            :type direct: boolean .. when set user permission is NOT checked
+            :param wait: whether function should wait for results
+            :type wait: boolean
+            :rtype: boolean .. whether dispatch succeeded or not
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.trydispatch
+
+        """
+
+        # test for ignore
+        if shouldignore(ievent.userhost):
+            return 0
+
+        # set printto
+        if ievent.msg:
+            ievent.printto = ievent.nick
+        else:
+            ievent.printto = ievent.channel
+
+        # see if ievent would dispatch
+        # what is rebefore, cmnds of reafter, com is the command object
+        # check if redispatcher or commands object needs to be used
+        #self.needreloadcheck(bot, ievent)
+
+        (what, com) = self.dispatchtest(bot, ievent, direct)
+
+        if what:
+
+            if com.allowqueue:
+                ievent.txt = ievent.txt.replace(' || ', ' | ')
+
+                if ievent.txt.find(' | ') != -1:
+
+                    if ievent.txt[0] == '!':
+                        ievent.txt = ievent.txt[1:]
+                    else:
+                        self.splitpipe(bot, ievent)
+                        return
+
+                elif ievent.txt.find(' && ') != -1:
+                    self.multiple(bot, ievent)
+                    return
+
+            return self.dispatch(what, com, bot, ievent, wait)
+
+    def dispatch(self, what, com, bot, ievent, wait=False):
+
+        """
+            do the actual dispatch of event.
+
+            :param what: the dispatcher to dispatch the command on
+            :type what: gozerbot.redispatcher.REdispatcher or gozerbot.commands.Commands
+            :param com: the command to dispatch
+            :type com: gozerbot.redispatcher.REcallback or gozerbot.commands.Command
+            :param bot: bot on which command is given
+            :type bot: gozerbot.botbase.BotBase
+            :param ievent: the event triggering the command
+            :type ievent: gozerbot.eventbase.EventBase
+            :param wait: whether function should wait for results
+            :type wait: boolean
+            :rtype: boolean .. whether dispatch succeeded or not
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.dispatch
+
+        """
+        if bot.stopped:
+            return False
+
+        # make command options
+        if com.options:
+            makeoptions(ievent, com.options)
+        else:
+            makeoptions(ievent)
+
+        # make arguments and rest
+        makeargrest(ievent)
+        ievent.usercmnd = True
+        rlog(10, 'plugins', 'dispatching %s for %s' % (ievent.command, ievent.userhost))
+
+        # call dispatch
+        what.dispatch(com, bot, ievent, wait)
+        return True
+
+    def clonedevent(self, bot, event):
+
+        """
+            clone a event.
+
+            
+            :param bot: bot on which command is given
+            :type bot: gozerbot.botbase.BotBase
+            :param ievent: the event triggering the command
+            :type ievent: gozerbot.eventbase.EventBase
+            :rtype: gozerbot.eventbase.EventBase
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.clonedevent
+
+        """
+
+        ie = copy.deepcopy(event)
+        return ie
+
+
+    def multiple(self, bot, ievent):
+
+        """
+            execute multiple commands.
+
+
+            :param bot: bot on which command is given
+            :type bot: gozerbot.botbase.BotBase
+            :param ievent: the event triggering the command
+            :type ievent: gozerbot.eventbase.EventBase
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.multiple
+
+        """
+
+        for i in ievent.txt.split(' && '):
+            ie = self.clonedevent(bot, ievent)
+            ie.txt = i
+            #self.needreloadcheck(bot, ievent)
+            self.trydispatch(bot, ie)
+
+    def splitpipe(self, bot, ievent):
+
+        """
+            execute commands in a pipeline.
+
+            :param bot: bot on which command is given
+            :type bot: gozerbot.botbase.BotBase
+            :param ievent: the event triggering the command
+            :type ievent: gozerbot.eventbase.EventBase
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.splitpipe
+
+        """
+
+        origqueues = ievent.queues
+        ievent.queues = []
+        events = []
+        txt = ievent.txt.replace(' || ', ' ##')
+
+        # split commands
+        for i in txt.split(' | '):
+            item = i.replace(' ##', ' | ')
+            ie = self.clonedevent(bot, ievent)
+            ie.userhost = ievent.userhost
+            ie.onlyqueues = True
+            ie.txt = item.strip()
+            #self.needreloadcheck(bot, ie)
+            events.append(ie)
+
+        # loop over events .. chain queues
+        prevq = None
+
+        for i in events[:-1]:
+            q = Queue.Queue()
+            i.queues.append(q)
+            if prevq:
+                i.inqueue = prevq
+            prevq = q
+
+        events[-1].inqueue = prevq
+        events[-1].onlyqueues = False
+
+        if origqueues:
+            events[-1].queues = origqueues
+
+        # check if all commands would dispatch
+        for i in events:
+            if not self.woulddispatch(bot, i):
+                ievent.reply("can't execute %s" % str(i.txt))
+                return
+
+        # do the dispatch
+        for i in events:
+            (what, com) = self.dispatchtest(bot, i)
+            if what:
+                self.dispatch(what, com, bot, i)
+
+    def needreloadcheck(self, bot, event, target=None):
+
+        if cmndtable:
+
+            try: 
+                if target:
+                    rlog(10, 'plugins', 'target set: %s' % target)
+                    cmnd = 'target-set'
+                    plugin = target
+                else:
+                    t = event.txt.split()[0]
+                    cmnd = aliasget(t) or t
+                    plugin = cmndtable[cmnd]
+
+                rlog(10, 'plugins', 'cmnd: %s plugin: %s' % (cmnd, plugin))
+
+                if self.exist(plugin):
+                    return
+
+                try:
+                    self.reload('gozerbot.plugs', plugin)
+                except ImportError, ex:
+
+                    try:
+                        self.reload('gplugs', plugin)
+                    except ImportError, ex:
+                        if config.get('db_driver') == 'olddb':
+                            try:
+                                self.reload('gplugs.olddb', plugin)
+                            except ImportError, ex: pass
+                        else:
+                            try:
+                                self.reload('gplugs.alchemy', plugin)
+                            except ImportError, ex: pass
+                        try:
+                            self.reload('myplugs', plugin)
+                        except ImportError, ex:
+                            return
+
+                rlog(100, 'plugins', 'reloaded %s' % plugin)
+
+            except KeyError, ex:
+                rlog(10, 'plugins', "can't find plugin to reload for %s" % event.txt.split()[0])
+
+
+    def listreload(self, pluglist):
+
+        """
+            reload list of plugins.
+
+            :param pluglist: list of plugin names
+            :type pluglist: list
+            :rtype: list .. list of plugins where reload failed
+
+            .. literalinclude:: ../../gozerbot/plugins.py
+                :pyobject: Plugins.listreload
+
+        """
+
+        failed = []
+
+        # loop over the plugin list and reload them
+        for what in pluglist:
+            splitted = what[:-3].split(os.sep)
+            mod = '.'.join(splitted[:-1])
+
+            if not mod:
+                if config.get('db_driver') == "olddb":
+                    mod = "gplugs.olddb"
+                elif config.get("db_driver") == "alchemy":
+                    mod = "gplugs.alchemy"
+                else:
+                    mod = 'gplugs'
+
+            plug  = splitted[-1]
+
+            # reload the plugin
+            try:
+                self.reload(mod, plug)
+
+            except Exception, ex:
+                failed.append(what)
+
+        return failed
+
+## INIT SECTION
+
+# THE plugins object
+plugins = Plugins()
+
+## END INIT
+
--- gozerbot-0.99.1.orig/build/lib/gozerbot/users.py
+++ gozerbot-0.99.1/build/lib/gozerbot/users.py
@@ -0,0 +1,18 @@
+# gozerbot/users.py
+#
+#
+
+from gozerbot.config import config
+
+if config.get('db_driver') == "olddb":
+    try:
+        import gozerbot.database.db
+        import gozerbot.dbusers
+    except Exception, ex:
+        handle_exception()
+        rlog(100, 'users', 'an error has occured while trying to enable the mysql database')
+        die()
+    users = gozerbot.dbusers.Dbusers()
+else:
+    import gozerbot.sausers as sa
+    users = sa.DbUsers()
--- gozerbot-0.99.1.orig/build/lib/gozerbot/ignore.py
+++ gozerbot-0.99.1/build/lib/gozerbot/ignore.py
@@ -0,0 +1,126 @@
+# gozerbot/ignore.py
+#
+#
+
+""" ignore module. """
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION
+
+# gozerbot imports
+from persist.persist import Persist
+from datadir import datadir
+from periodical import interval
+
+# basic imports
+import time, os, thread
+
+# END IMPORT
+# ==========
+
+# ============
+# LOCK SECTION
+
+# no locks
+
+# END LOCK
+# ========
+
+def addignore(userhost, ttime):
+
+    """
+        add ignore based on userhost .. record time when ignore is set.
+
+        :param userhost: userhost to ignore
+        :type userhost: string
+        :param ttime: duration of the ignore
+        :type ttime: integer
+
+        .. literalinclude:: ../../gozerbot/ignore.py
+            :pyobject: addignore
+
+    """
+
+    global ignore
+
+    ignore[userhost] = int(ttime)
+    timeset[userhost] = time.time()
+    
+def delignore(userhost):
+
+    """
+        remove ignore.
+
+        :param userhost: userhost to remove ignore from
+        :type userhost: string
+        :rtype: boolean .. whether delete was succesfull
+
+        .. literalinclude:: ../../gozerbot/ignore.py
+            :pyobject: delignore
+
+    """
+
+    global ignore
+
+    try:
+        del ignore[userhost]
+        del timeset[userhost]
+        return True
+    except KeyError:
+        return False
+
+def shouldignore(userhost):
+
+    """
+        check if we should ignore.
+
+        :param userhost: userhost to check whether we should ignore it
+        :type userhost: string
+        :rtype: boolean
+
+        .. literalinclude:: ../../gozerbot/ignore.py
+            :pyobject: shouldignore
+
+    """
+
+    try:
+        ignoretime = ignore[userhost]
+        ignoreset = timeset[userhost]
+    except KeyError:
+        return False
+
+    if time.time() - ignoretime < ignoreset:
+        return True
+
+    return False
+
+
+@interval(60)
+def ignorecheck():
+
+    """
+        periodic function to remove users that no longer need to be ignored.
+
+        .. literalinclude:: ../../gozerbot/ignore.py
+            :pyobject: ignorecheck
+
+    """
+
+    for userhost in ignore.keys():
+        if not shouldignore(userhost):
+            delignore(userhost)
+
+
+# ============
+# INIT SECTION
+
+ignore = {}
+timeset = {}
+
+# first call to trigger interval
+ignorecheck()
+
+# END INIT
+# =======
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gozerbot/wait.py
+++ gozerbot-0.99.1/build/lib/gozerbot/wait.py
@@ -0,0 +1,168 @@
+# gozerbot/wait.py
+#
+#
+
+""" wait for ircevent based on ircevent.CMND """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from utils.log import rlog
+from utils.locking import lockdec
+import threads.thr as thr
+
+# basic imports
+import time, thread
+
+# locks
+waitlock = thread.allocate_lock()
+locked = lockdec(waitlock)
+
+class Wait(object):
+
+    """ lists of ircevents to wait for """
+
+    def __init__(self):
+        self.waitlist = []
+        self.ticket = 0
+
+    def register(self, cmnd, catch, queue, timeout=15):
+
+        """ register wait for cmnd. """
+
+        rlog(1, 'wait', 'registering for cmnd ' + cmnd)
+        self.ticket += 1
+        self.waitlist.insert(0, (cmnd, catch, queue, self.ticket))
+        if timeout:
+            # start timeout thread
+            thr.start_new_thread(self.dotimeout, (timeout, self.ticket))
+        return self.ticket
+
+    def check(self, ievent):
+
+        """ check if there are wait items for ievent .. check if 'catch' 
+            matches on ievent.postfix if so put ievent on queue. """
+
+        cmnd = ievent.cmnd
+        for item in self.waitlist:
+            if item[0] == cmnd:
+                if cmnd == "JOIN":
+	            catch = ievent.txt + ievent.postfix
+                else:
+                    catch = ievent.nick + ievent.postfix
+                if item[1] in catch:
+                    ievent.ticket = item[3]
+                    item[2].put_nowait(ievent)
+                    self.delete(ievent.ticket)
+                    rlog(1, 'wait', 'got response for %s' % item[0])
+                    ievent.isresponse = True
+
+    def dotimeout(self, timeout, ticket):
+
+        """ start timeout thread for wait with ticket nr. """
+
+        rlog(1, 'wait', 'starting timeouthread for %s' % str(ticket))
+        time.sleep(float(timeout))
+        self.delete(ticket)
+
+    @locked
+    def delete(self, ticket):
+
+        """ delete wait item with ticket nr. """
+
+        for itemnr in range(len(self.waitlist)-1, -1, -1):
+            if self.waitlist[itemnr][3] == ticket:
+                self.waitlist[itemnr][2].put_nowait(None)
+                del self.waitlist[itemnr]
+                rlog(1, 'wait', 'deleted ' + str(ticket))
+                return 1
+
+class Privwait(Wait):
+
+    """ wait for privmsg .. catch is on nick """
+
+    def register(self, catch, queue, timeout=15):
+
+        """ register wait for privmsg. """
+
+        rlog(1, 'privwait', 'registering for ' + catch)
+        return Wait.register(self, 'PRIVMSG', catch, queue, timeout)
+
+    def check(self, ievent):
+
+        """ check if there are wait items for ievent. """
+
+        for item in self.waitlist:
+            if item[0] == 'PRIVMSG':
+                if ievent.userhost == item[1]:
+                    ievent.ticket = item[3]
+                    item[2].put_nowait(ievent)
+                    self.delete(ievent.ticket)
+                    rlog(1, 'privwait', 'got response for %s' % item[0])
+                    ievent.isresponse = True
+
+class Jabberwait(Wait):
+
+    """ wait object for jabber messages. """
+
+    def register(self, catch, queue, timeout=15):
+
+        """ register wait for privmsg. """
+
+        rlog(1, 'jabberwait', 'registering for %s' % catch)
+        self.ticket += 1
+        self.waitlist.append((catch, queue, self.ticket))
+        if timeout:
+            thr.start_new_thread(self.dotimeout, (timeout, self.ticket))
+        return self.ticket
+
+    def check(self, msg):
+
+        """ check if <msg> is waited for. """
+
+        for teller in range(len(self.waitlist)-1, -1, -1):
+            i = self.waitlist[teller]
+            if i[0] == msg.userhost:
+                msg.ticket = i[2]
+                i[1].put_nowait(msg)
+                self.delete(msg.ticket)
+                rlog(10, 'jabberwait', 'got response for %s' % i[0])
+                msg.isresponse = 1
+
+    @locked
+    def delete(self, ticket):
+
+        """ delete wait item with ticket nr. """
+
+        for itemnr in range(len(self.waitlist)-1, -1, -1):
+            item = self.waitlist[itemnr]
+            if item[2] == ticket:
+                item[1].put_nowait(None)
+                try:
+                    del self.waitlist[itemnr]
+                    rlog(1, 'jabberwait', 'deleted ' + str(ticket))
+                except IndexError:
+                    pass
+                return 1
+
+class Jabbererrorwait(Jabberwait):
+
+    """ wait for jabber errors. """
+
+    def check(self, msg):
+
+        """ check if <msg> is waited for. """
+
+        if not msg.getType() == 'error':
+            return
+
+        errorcode = msg.getErrorCode()
+
+        for teller in range(len(self.waitlist)-1, -1, -1):
+            i = self.waitlist[teller]
+            if i[0] == 'ALL' or i[0] == errorcode:
+                msg.error = msg.getError()
+                msg.ticket = i[2]
+                i[1].put_nowait(msg)
+                self.delete(msg.ticket)
+                rlog(10,'jabbererrorwait','got error response for %s' % i[0])
--- gozerbot-0.99.1.orig/build/lib/gozerbot/stats.py
+++ gozerbot-0.99.1/build/lib/gozerbot/stats.py
@@ -0,0 +1,67 @@
+# gozerbot/stats.py
+#
+#
+
+""" maintain bot stats. """
+
+## IMPORT SECTION
+
+from gozerbot.utils.statdict import Statdict
+
+## END IMPORT
+
+## LOCK SECTION
+
+# no locks
+
+## END LOCK
+
+class GozerStats(object):
+
+    """ dict containing all gozerbot related stats. """
+
+    def __init__(self):
+        self.data = {}
+
+    def init(self, item):
+
+        """ initialize a stats item. """
+
+        self.data[item] = Statdict()
+
+    def up(self, item, issue):
+
+        """ up a stats item. """
+
+        if not self.data.has_key(item):
+            self.init(item)
+        self.data[item].upitem(issue)
+
+    def get(self, item):
+
+        """ return stats item. """
+
+        try:
+            return self.data[item]
+        except KeyError:
+            return 
+
+    def list(self, item):
+
+        """ list all stats belonging to item. """
+
+        if self.data.has_key(item):
+            return self.data[item].keys()
+
+    def all(self):
+
+        """ list all stats items. """
+
+        return self.data.keys()
+
+## INIT SECTION
+
+# the gozerbot stats object
+stats = GozerStats()
+
+## END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/botbase.py
+++ gozerbot-0.99.1/build/lib/gozerbot/botbase.py
@@ -0,0 +1,394 @@
+# gozerbot/botbase.py
+#
+#
+
+""" bot base class. provides data/methods common to all bots. """
+
+# IMPORT SECTION
+
+# gozerbot imports
+from threads.thr import start_new_thread
+from utils.log import rlog
+from less import Less
+from persist.pdol import Pdol
+from utils.dol import Dol
+from utils.lazydict import LazyDict
+from persist.persiststate import PersistState
+from channels import Channels
+from datadir import datadir
+from persist.pdod import Pdod
+from config import config, Config, fleetbotconfigtxt
+from runner import runners_start
+from monitor import Monitor
+from callbacks import callbacks, gn_callbacks
+from cache import userhosts
+from wait import Wait, Privwait
+from eventhandler import mainhandler
+from exit import globalshutdown
+from utils.exception import handle_exception
+from plugins import plugins
+
+# throttle support
+from gozerbot.plugs.throttle import state as throttlestate
+
+# basic imports
+import time, threading, os, types, sys, copy
+
+# END IMPORT
+
+cpy = copy.deepcopy
+
+class BotBase(object):
+
+    """ 
+
+            Base class for all bots. Inherit from this. 
+
+            :param cfg: configuration 
+            :type cfg: dict like
+
+    """
+
+    def __init__(self, name, cfg={}):
+        self.name = name
+        self.encoding = sys.getdefaultencoding()
+
+        # if cfg is not passed on create one
+        if not cfg:
+            cfg = Config(inittxt=fleetbotconfigtxt)
+
+        if not cfg.has_key('dir'):
+           cfg['dir'] = os.getcwd()
+
+        if not cfg.has_key('user'):
+           cfg['user'] = 'gozerbot'
+
+        if not cfg.has_key('type'):
+           cfg['type'] = 'gozernet'
+
+        # set attributes based on config 
+        self.__dict__.update(cfg)
+
+        # if name not set in config file use the directory name
+
+        if not cfg.has_key('name'):
+            if 'fleet' in cfg['dir']:
+                self.name = cfg.dir.split(os.sep)[-1]
+            else:
+                self.name = name
+
+        # default nick to gozerbot
+        if not cfg.has_key('nick'):
+            self.nick = 'gozerbot'
+
+        if not cfg.has_key('server'):
+            self.server = 'server not set'
+
+        try:
+            self.host = cfg['host']
+            if not self.host:
+                self.host = self.user.split('@')[1]
+        except (KeyError, IndexError):
+            try:
+                self.host = self.user.split('@')[1]
+            except (ValueError, IndexError):
+                self.host = 'host not set'
+
+
+        # default port to 0 (use default port)
+        if not cfg.has_key('port'):
+            self.port  = 0
+
+        if not cfg.has_key('ipv6'):
+            self.ipv6  = 0
+        else:
+            self.ipv6 = cfg['ipv6']
+        
+        # make sure bot name is not a directory
+        if '..' in self.name or '/' in self.name:
+            raise Exception('wrong bot name %s' % self.name)
+
+        # set datadir to datadir/fleet/<botname>
+        self.datadir = datadir + os.sep + 'fleet' + os.sep + self.name
+
+        # set datadir to datadir/fleet/<botname>
+        if hasattr(os, 'mkdir'):
+            if not os.path.exists(self.datadir):
+                os.mkdir(self.datadir)
+
+        # bot state
+        self.state = Pdod(self.datadir + os.sep + 'state') # bot state
+
+        # joined channels list .. used to join channels
+        if not self.state.has_key('joinedchannels'):
+            self.state['joinedchannels'] = []
+
+        # allowed commands on the bot
+        if not self.state.has_key('allowed'):
+            self.state['allowed'] = []
+
+        # channels we dont want ops in
+        if not self.state.has_key('no-op'):
+            self.state['no-op'] = []
+
+        # channels we are op in
+        if not self.state.has_key('opchan'):
+            self.state['opchan'] = []
+
+        # the time we joined a channel
+        self.timejoined = {}
+
+        # jabber type doesnt exists anymore .. set type to 'xmpp' instead
+        self.type = self.type or 'gozernet'
+
+        if self.type == 'jabber':
+            self.type = 'xmpp'
+
+        self.networkname = self.server
+        self.jid = "%s@%s" % (self.nick, self.server)
+        self.jids = {}
+        self.shutloop = False
+        self.cfg = cfg # the bots config
+        self.orignick = "" # original nick
+        self.blocking = 1 # use blocking sockets
+        self.lastoutput = 0 # time of last output
+        self.stopped = False # flag to set when bot is to be stopped
+        self.connected = False # conencted flag
+        self.connecting = False # connecting flag
+        self.connectok = threading.Event() # event set when bot has connected
+        self.waitingforconnect = False # flag to indicate we are waiting for connect
+        self.starttime = time.time() # start time of the bot
+        self.nrevents = 0 # number of events processed
+        self.gcevents = 0 # number of garbage collected events
+        self.less = Less(5) # output buffering
+        self.userchannels = Dol() # list of channels a user is in
+        self.channels = Channels(self.datadir + os.sep + 'channels') # channels
+        self.userhosts = PersistState(self.datadir + os.sep + 'userhosts') # userhosts cache
+        self.splitted = [] # list of splitted nicks
+        self.throttle = [] # list of nicks that need to be throttled
+        self.jabber = False # flag is set on jabber bots
+        self.google = False
+        if 'google' in self.host:
+            self.google = True # flag is set on google bots
+        try:
+            import google.appengine.ext 
+            self.google = True
+        except:
+            pass
+        self.callbacks = callbacks
+        self.monitor = Monitor()
+        self.wait = Wait()
+        self.privwait = Privwait()
+        self.error = None
+        
+        # start runners
+        runners_start()
+        #self.monitor.start()
+        
+    def ownercheck(self, ievent, txt=None):
+
+        """ 
+            check whether an event originated from the bot owner. 
+
+            :param ievent: event to check for owner with
+            :param txt: optional txt to report to user when check fails
+            :rtype: 1 or 0
+
+            .. literalinclude:: ../../gozerbot/botbase.py
+                :pyobject: BotBase.ownercheck
+
+        """
+
+        # use owner set in bot's config or else in global config
+        owner = self.cfg['owner'] or config['owner']
+
+        # check if event userhost in in owner .. check lists and string values
+        if type(owner) == types.ListType:           
+            if ievent.userhost in owner:            
+                return 1
+        elif owner == ievent.userhost:              
+            return 1    
+        else:
+            rlog(100, self.name, 'failed owner check %s should be in %s' % (ievent.userhost, owner))
+            if not txt:
+                ievent.reply("only owner (see config file) is allowed to perform this command")
+            else:
+                ievent.reply("only owner (see config file) %s" % txt)
+            return 0
+
+    def save(self):
+
+        """ save bot state. """
+
+        self.channels.save()
+        self.userhosts.save()
+        self.state.save()
+
+    def stop(self):
+
+        """ stop the bot. """
+
+        self.stopped = True
+        rlog(10, self.name, 'stopped')
+
+    def exit(self):
+
+        """ shutdown the bot. overload this. """
+
+        pass
+
+    def connect(self, reconnect=True):
+
+        """ connect the bot to the server. reconnects in the default case. """
+
+        pass
+
+    def say(self, printto, what, event=None, who=None, how='msg', fromm=None, speed=0, groupchat=False):
+        print what
+
+    def whois(self, nick):
+        pass
+
+    def sendraw(self, txt):
+        print txt
+
+    def voice(self, channel, txt):
+        pass
+
+    def action(self, channel, txt):
+        pass
+
+    def _raw(self, txt):
+        print txt
+
+    def settopic(self, channel, txt):
+        pass
+
+    def names(self, channel):
+        pass
+
+    def gettopic(self, channel):
+        pass
+
+    def _dcclisten(self, *args):
+        pass
+
+    def donick(self, nick, save=False, setorig=True):
+        pass
+
+    def fakein(self, txt):
+        pass
+
+    def part(self, channel):
+        pass
+
+    def serveforever(self):
+        self.stopped = False
+        self.shutloop = False
+
+        while not self.stopped and not self.shutloop:
+            try:
+                import asyncore
+                asyncore.poll(timeout=0.01)
+            except ImportError:
+                pass
+            except Exception, ex:
+                handle_exception()
+                globalshutdown()
+                os._exit(1)
+            time.sleep(0.01)
+            mainhandler.handle_one()
+
+    def join(self, channel, password=""):
+        pass
+
+    def joinchannels(self):
+
+        """ join all registered channels. overload this. """
+
+        pass
+
+    def connectwithjoin(self, reconnect=True):
+
+        """ connect to the server and join channels. """
+
+        self.connect(reconnect)
+        self.connectok.wait()
+        start_new_thread(self.joinchannels, ())
+
+    def broadcast(self):
+
+        """ announce a message to all channels. overload this"""
+
+        pass
+
+    def send(self, txt):
+
+        """ send txt to the server. overload this"""
+
+        pass
+
+    def shutdown(self):
+
+        """ close sockets of the bot. overload this"""
+
+        pass
+
+    def domsg(self, msg, response=False, wait=False):
+
+        """ 
+            excecute a message (txt line) on the bot.
+
+            :param msg: text line to execute
+            :type msg: string
+            :rtype: None
+
+            .. literalinclude:: ../../gozerbot/botbase.py
+                :pyobject: BotBase.domsg
+        """ 
+
+        if response:
+             msg.reply('executing %s (%s) on %s bot' % (msg.txt, msg.userhost, self.name))
+
+        from gozerbot.plugins import plugins
+        
+        if wait:
+            plugins.waitdispatch(self, msg)
+        else:
+            plugins.trydispatch(self, msg)
+
+    def ratelimit(self, userhost, cpm=20):
+        try:
+            throttlestate['level'][userhost] = cpm 
+            throttlestate.save()
+            rlog(10, self.name, '%s throttled to %s cpm' % (userhost, cpm))
+        except Exception, ex:
+            rlog(100, self.name, "can't set throttle of %s" % userhost)
+            handle_exception()
+
+    def remoteout(self, request, event):
+        request.wfile.write(event.tojson())
+
+    def doevent(self, event):
+
+        """ 
+            dispatch an event. 
+
+            :param event: event to dispatch.
+            :rtype: None
+
+        """
+
+        if not event:
+            return
+
+        e = cpy(event)
+
+        if event.isremote:
+            rlog(10, self.name, 'remote event .. calling gn_callbacks')
+            gn_callbacks.check(self, e)
+        else:
+            callbacks.check(self, e)
+
+        if event.remotecmnd:
+            plugins.trydispatch(self, event)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/gozerimport.py
+++ gozerbot-0.99.1/build/lib/gozerbot/gozerimport.py
@@ -0,0 +1,97 @@
+# gozerbot/myimport.py
+#
+#
+
+""" use the imp module to import modules. """
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION 
+
+# basic import
+from gozerbot.utils.log import rlog
+from gozerbot.utils.locking import lockdec
+
+import time, sys, imp, os, thread
+
+# END IMPORT 
+# ==========
+
+# ============
+# LOCK SECTION
+
+gozerimportlock = thread.allocate_lock()
+locked = lockdec(gozerimportlock)
+
+# END LOCK
+# ========
+
+#@locked
+def gozer_import(name, path=None):
+
+    """
+        import module <name> with the imp module  .. will reload module is 
+        already in sys.modules.
+
+        :param name: name of the module to import (may contain dots)
+        :type name: string
+        :param path: optional path to search in
+        :type path: string
+        :rtype: module
+
+        .. literalinclude:: ../../gozerbot/gozerimport.py
+            :pyobject: gozer_import
+
+    """
+
+    rlog(1, 'gozerimport', 'importing %s' % name)
+
+    splitted = name.split('.')
+    
+    for plug in splitted:
+        fp, pathname, description = imp.find_module(plug, path)
+        try:
+           result = imp.load_module(plug, fp, pathname, description)
+           try:
+               path = result.__path__
+           except:
+               pass
+        finally:
+            if fp:
+                fp.close()
+
+    if result:
+        return result
+
+#@locked
+def force_import(name):
+
+    """
+        force import of module <name> by replacing it in sys.modules.
+
+        :param name: name of module to import
+        :type name: string
+        :rtype: module
+
+        .. literalinclude:: ../../gozerbot/gozerimport.py
+            :pyobject: force_import
+
+    """
+
+    try:
+        del sys.modules[name]
+    except KeyError:
+        pass
+    plug = gozer_import(name)
+    if plug:
+        sys.modules[name] = plug
+        return plug
+
+# ============
+# INIT SECTION
+
+# no vars
+
+# END INIT
+# ========
--- gozerbot-0.99.1.orig/build/lib/gozerbot/redispatcher.py
+++ gozerbot-0.99.1/build/lib/gozerbot/redispatcher.py
@@ -0,0 +1,394 @@
+# gozerbot/redispatcher.py
+#
+#
+
+""" implement RE (regular expression) dispatcher. """
+
+__copyright__ = 'this file is in the public domain'
+
+## IMPORT SECTION
+
+# gozerbot imports
+from config import config
+from utils.log import rlog
+from utils.trace import calledfrom
+from utils.exception import handle_exception
+from utils.locking import lockdec
+from runner import cmndrunners
+import threads.thr as thr
+
+# basic imports
+import sys, re, copy, types, thread
+
+## END IMPORT
+
+## LOCK SECTION
+
+# locks
+relock = thread.allocate_lock()
+locked = lockdec(relock)
+
+## END LOCK
+
+class RECallback(object):
+
+    """
+         a regular expression callback.
+
+         :param index: index into the callback list
+         :type index: integer
+         :param regex: the regex to match
+         :type regex: string
+         :param func: the callback function
+         :type func: function
+         :param perm: permissions of the callback
+         :type perm: list .. list of permissions
+         :param speed: speed at which the callback should be executed
+         :type speed: integer
+         :param threaded: whether the callback should executed in its own thread
+         :type threaded: boolean
+         :param allowqueue: whether this command is allowed in pipelines
+         :type allowqueue: boolean
+         :param options: options allowed for this command
+         :type options: dict
+
+    """
+
+    def __init__(self, index, regex, func, perm, plugname, speed=5, \
+threaded=True, allowqueue=True, options={}):
+        self.name = thr.getname(func) # name of the callback
+        self.index = index # index into the list
+        self.regex = regex # the RE to match
+        self.compiled = re.compile(regex) # compiled RE
+        self.func = func # the function to call if RE matches
+        # make sure perms is a list
+        if type(perm) == types.ListType:
+            self.perms = list(perm)
+        else:
+            self.perms = [perm, ]
+        # plug name
+        self.plugname = plugname # plugname where RE callbacks is registered
+        self.speed = copy.deepcopy(speed) # speed at which the function runs
+        self.threaded = copy.deepcopy(threaded) # set when run threaade
+        self.allowqueue = copy.deepcopy(allowqueue) # set when pipeline is allowed
+        self.options = dict(options) # options set on the callback
+        self.activate = True
+
+class REDispatcher(object):
+
+    """
+        this is were the regexs callbacks live.
+
+    """
+
+    def __init__(self):
+        self.relist = []
+        
+    def size(self):
+
+        """
+            nr of callbacks.
+
+        """
+
+        return len(self.relist)
+
+    def activate(self, plugname):
+        for i in self.relist:
+            if i.plugname == plugname:
+                i.activate = True
+
+    def disable(self, plugname):
+        for i in self.relist:
+            if i.plugname == plugname:
+                i.activate = False
+
+    def whatperms(self):
+
+        """
+            return possible permissions.
+
+            :rtype: list .. list of possible permissions
+
+            .. literalinclude:: ../../gozerbot/redispatcher.py
+                :pyobject: REDispatcher.whatperms
+
+        """
+
+        result = []
+
+        for i in self.relist:
+            for j in i.perms:
+                if j not in result:
+                    result.append(j)
+
+        return result
+
+    def list(self, perm):
+
+        """
+            list RECallbacks with permission perm.
+
+            :param perm: permission to check for
+            :type perm: string
+            :rtype: list .. list of RECallbacks 
+
+            .. literalinclude:: ../../gozerbot/redispatcher.py
+                :pyobject: REDispatcher.list
+        """
+
+        result = []
+        perm = perm.upper()
+
+        for recom in self.relist:
+            if perm in recom.perms:
+                result.append(recom)
+
+        return result
+
+    def getfuncnames(self, plug):
+
+        """
+            return function names in plugin.
+
+            :param plug: name of the plugin to get callbacks of
+            :type plug: string
+            :rtype: list .. list of function names
+
+            .. literalinclude:: ../../gozerbot/redispatcher.py
+                :pyobject: REDispatcher.getfuncnames
+
+        """
+
+        result = []
+        for i in self.relist:
+            if i.plugname == plug:
+                result.append(i.func.func_name)
+        return result
+        
+    def permoverload(self, funcname, perms):
+
+        """
+            overload permission of function with funcname.
+
+            :param funcname: name of the function to overload
+            :type funcname: string
+            :param perms: permission to overload
+            :type perms: list
+            :rtype: boolean .. whether the overload succeeded
+
+            .. literalinclude:: ../../gozerbot/redispatcher.py
+                :pyobject: REDispatcher.permoverload
+
+        """
+
+        perms = [perm.upper() for perm in perms]
+        got = 0
+
+        for nr in range(len(self.relist)):
+
+            try:
+                if self.relist[nr].func.func_name == funcname:
+                    self.relist[nr].perms = list(perms)
+                    rlog(0, 'redispatcher', '%s function overloaded with %s' \
+% (funcname, perms))
+                    got = 1
+
+            except AttributeError:
+                rlog(10, 'redispatcher', 'permoverload: no %s function' % \
+funcname)
+        if got:
+            return True
+
+        return False
+
+    def add(self, index, regex, func, perm, speed=5, threaded=True, allowqueue=True, options={}):
+
+        """
+            add a regular expression command.
+
+           :param index: index into the callback list
+           :type index: integer
+           :param regex: the regex to match
+           :type regex: string
+           :param func: the callback function
+           :type func: function
+           :param perm: permissions of the callback
+           :type perm: list .. list of permissions
+           :param speed: speed at which the callback should be executed
+           :type speed: integer
+           :param threaded: whether the callback should executed in its own thread
+           :type threaded: boolean
+           :param allowqueue: whether this command is allowed in pipelines
+           :type allowqueue: boolean
+           :param options: options allowed for this command
+           :type options: dict
+
+           .. literalinclude:: ../../gozerbot/redispatcher.py
+               :pyobject: REDispatcher.add
+
+        """
+
+        try:
+            # get plugin name from where callback is added
+            plugname = calledfrom(sys._getframe())
+
+            if config['loadlist'] and plugname not in config['loadlist']:
+                return
+            # add Recallback
+
+            self.relist.append(RECallback(index, regex, func, perm, plugname, \
+speed, threaded, allowqueue, options))
+            # sort of index number
+            self.relist.sort(lambda a, b: cmp(a.index, b.index))
+            rlog(0, 'redispatcher', 'added %s (%s) ' % (regex, plugname))
+
+        finally:
+            pass
+
+    def unload(self, plugname):
+
+        """
+            unload regex commands.
+
+            :param plugname: name of the plugins to unload callbacks from
+            :type plugname: string
+            :rtype: boolean .. whether the unloading succeeded
+
+            .. literalinclude:: ../../gozerbot/redispatcher.py
+                :pyobject: REDispatcher.unload
+
+        """
+
+        got = False
+        try:
+
+            for i in range(len(self.relist)-1, -1 , -1):
+                if self.relist[i].plugname == plugname:
+                    rlog(1, 'redispatcher', 'unloading %s (%s)' % \
+(self.relist[i].regex, plugname))
+                    del self.relist[i]
+                    got = True
+        finally:    
+            pass
+        return got
+
+    def getcallback(self, txt):
+
+        """
+            get re callback if txt matches.
+
+            :param txt: txt to match against the regular expressions
+            :type txt: string
+
+            .. literalinclude:: ../../gozerbot/redispatcher.py
+                :pyobject: REDispatcher.getcallback
+        """
+
+        for i in self.relist:
+
+            try:
+                result = re.search(i.compiled, txt)
+
+                if result:
+                    return i
+
+            except:
+                pass
+
+    def dispatch(self, callback, txt, wait=False):
+
+        """
+            try to dispatch callback on txt.
+ 
+            :param callback: the callback to fire
+            :type callback: RECallback
+            :param txt: txt to match the regular expression
+            :type txt: string
+            :param wait: whether to wait for the result
+            :type wait: boolean
+
+            .. literalinclude:: ../../gozerbot/redispatcher.py
+                :pyobject: REDispatcher.dispatch
+
+        """
+
+        try:
+            result = re.search(callback.compiled, txt)
+
+            if result:
+
+                if callback.threaded:
+                    thread = thr.start_new_thread(callback.func, (txt, result.groups()))
+
+                    if wait:
+                        thread.join()
+
+                else:
+                    cmndrunners.put(callback.plugname, callback.func, txt, \
+result.groups())
+
+                    return 1
+
+        except Exception, ex:
+            handle_exception()
+
+class BotREDispatcher(REDispatcher):
+
+    """
+        dispatcher on Event.
+
+    """
+
+    def dispatch(self, callback, bot, ievent, wait=False):
+
+        """
+            dispatch callback on ircevent.
+
+            :param callback: the callback to fire
+            :type callback: RECallback
+            :param bot: the bot on which the callback was triggered
+            :type bot: gozerbot.botbase.BotBase
+            :param ievent: the event that triggered the callback
+            :type ievent: gozerbot.eventbase.EventBase
+            :rtype: boolean .. whether the dispatch was succesful
+
+            .. literalinclude:: ../../gozerbot/redispatcher.py
+                :pyobject: BotREDispatcher.dispatch
+
+        """
+
+        if not self.activate:
+            return False
+
+        try:
+            result = re.search(callback.compiled, ievent.txt.strip())
+
+            if result:
+                ievent.groups = list(result.groups())                
+
+                if callback.threaded or ievent.threaded:
+                    thread = thr.start_bot_command(callback.func, (bot, ievent))
+
+                    if thread and wait:
+                        thread.join()
+
+                else:
+                    cmndrunners.put(callback.plugname, callback.func, bot, \
+ievent)
+                return True
+
+        except Exception, ex:
+            handle_exception(ievent)
+
+        return False
+
+## INIT SECTION
+
+# dispatcher before commands are checked
+rebefore = BotREDispatcher()
+
+# dispatcher after commands are checked
+reafter = BotREDispatcher()
+
+## END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/eventbase.py
+++ gozerbot-0.99.1/build/lib/gozerbot/eventbase.py
@@ -0,0 +1,602 @@
+# gozerbot/eventbase.py
+#
+#
+
+""" 
+    This module implements the EventBase class from which all other 
+    events inherit. 
+
+    :vars: defaultevent
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION
+
+# gozerbot imports
+from xmpp.core import XMLDict
+from utils.log import rlog
+from utils.generic import stripident, fix_format, fromenc, toenc
+from utils.lazydict import LazyDict
+from gozerbot.stats import stats
+from gozerbot.config import config
+
+# basic imports
+import time, re, types, copy
+
+from simplejson import loads, dumps
+
+# END IMPORT
+# ==========
+
+# ============
+# LOCK SECTION
+
+# no locks
+
+# END LOCK
+# ========
+
+## START 
+
+# used to copy data
+cpy = copy.deepcopy
+
+def makeargrest(event):
+
+    """
+        set arguments and rest attributes of an event.
+
+        :param event: event to manipulate
+
+    """
+
+    # arguments 
+    try:
+        event.args = event.txt.split()[1:]
+    except ValueError:
+        event.args = []
+
+    # txt after command
+    try:
+        cmnd, event.rest = event.txt.split(' ', 1)
+    except ValueError:
+        event.rest = ""   
+
+    # the command 
+    event.command = event.txt.split(' ')[0]
+
+class EventBase(XMLDict):
+
+    """ 
+        Base class for all events. Inherit from this. 
+
+        :param event: event to clone from (optional)
+        :type event: gozerbot.event.EventBase
+        :param bot: bot on which this event occured
+        :type bot: gozerbot.botbase.BotBase
+
+    """
+
+
+    def __init__(self, event={}, bot=None):
+        self.server = ""
+        XMLDict.__init__(self)
+        self.threaded = False
+        self.onlyqueues = False
+        self.orig = event # the original data .. SET BY HANDLER 
+        self.type = 'chat' # type of event
+        self.cbtype = '' # callback type
+        self.jabber = False # set if event is jabber event
+        self.groupchat = False # set if event is groupchat
+        self.botoutput = False # set if event is bot output
+        self.cmnd = None # the event command
+        self.prefix = u"" # txt before the command
+        self.postfix = u"" # txt after the command
+        self.target = u"" # target to give reponse to
+        self.arguments = [] # arguments of event
+        self.nick = u"" # nick of user originating the event 
+        self.user = u""  # user originating the event
+        self.ruserhost = u"" # real userhost 
+        self.userhost = u"" # userhost that might change
+        self.stripped = u"" # stripped JID 
+        self.resource = u"" # resource part of JID
+        self.origin = u"" # source of the event
+        self.origchannel = u"" # original channel
+        self.channel = u"" # channel .. might change
+        self.origtxt = u"" # original txt
+        self.txt = u"" # text .. might change
+        self.command = u"" # the bot command if any
+        self.remoteout = u""
+        self.remotecmnd = False
+        self.usercmnd = False
+        self.alias = u"" # set to alias if one is used
+        self.aliased = u"" # set if commadn is aliased
+        self.time = time.time() # event creation time
+        self.msg = False # set if event is a private message
+        self.args = [] # arguments of command
+        self.rest = u"" # txt following the command
+        self.usercmnd = 0 # set if event is a command
+        self.bot = bot # the bot where the event originated on
+        self.sock = None # socket (set in DCC chat)
+        self.allowqueue = True # allow event to be used in pipeline
+        self.closequeue = True # cloase event queues when execution has ended
+        self.inqueue = None # queue used as input in pipeline
+        self.queues = [] # output queues (only used when set)
+        self.printto = None # target to printto
+        self.speed = 0 # speed with which this event needs to be processed
+        self.groups = None # set if event triggers a RE callback
+        self.cc = u"" # control character
+        self.jid = None # JID of used originating the event
+        self.jidchange = None # set is event changes jid
+        self.conn = None # connection of bot originating the event
+        self.denied = False # set if command is denied
+        self.iscallback = False
+        self.isresponse = False # set if event is a reponse
+        self.isrelay = False
+        self.isremote = False
+        self.isdcc = False # set if event is DCC related
+        self.isctcp = False # set if event is an ACTION
+        self.options = LazyDict() # options dict on the event
+        self.optionset = [] # list of options set
+        self.filter = [] # filter list to use on output
+
+        # wave stuff
+        self.wave = False
+        self.properties = None
+        self.context = None
+        self.eventin = None
+        self.wavelet = None
+
+        # GAE stuff
+        self.google = False
+        self.xmppgae = False
+        self.response = None
+        self.request = None
+
+        # xmpp stuff
+        self.host = self.server
+        self.xml = u""
+        self.realjid = u""
+        self.fromm = u""
+        self.to = u""
+        self.type = u""
+        self.id = 0
+        self.subject = u""
+        self.body = u""
+        self.error = u""
+        self.errorcode = u""
+        self.html = u""
+        self.thread = u""
+        self.x = {}
+
+        if event:
+            self.copyin(event)
+
+        self.toirc() 
+
+        # stats
+        stats.up('events', 'created')
+
+    def __copy__(self):
+        return EventBase(self)
+
+    def __deepcopy__(self, bla):
+        return EventBase(self)
+
+    def toirc(self):
+
+        """
+            set ircevent compat attributes.
+
+            .. literalinclude:: ../../gozerbot/eventbase.py
+                :pyobject: EventBase.toirc
+        """
+
+        self.jidchange = False
+        self.cmnd = 'Message'
+
+        try:
+            self.resource = self.fromm.split('/')[1]
+        except IndexError:
+            pass
+
+        self.channel = self['fromm'].split('/')[0]
+        self.origchannel = self.channel
+        self.nick = self.resource
+
+        #try:
+        #    self.jid = bot.jids[self.channel][self.resource]
+        #    self.jidchange = True
+        #except KeyError:
+        #     pass
+
+        self.jid = self.fromm
+        self.ruserhost = self.jid
+        self.userhost = self.jid
+        self.stripped = self.jid.split('/')[0]
+        self.printto = self.channel
+        self.target = self.printto
+
+        for node in self.subelements:
+            try:
+                self.txt = node.body.data
+            except (AttributeError, ValueError):
+                continue
+
+        self.origtxt = self.txt
+        self.time = time.time()
+
+        if self.type == 'groupchat':
+            self.groupchat = True
+            if self.jidchange:
+                self.userhost = self.stripped
+        else:
+            self.groupchat = False
+            self.userhost = self.stripped
+
+        self.msg = not self.groupchat
+
+    def copyin(self, ievent):
+
+        """
+            copy in an event.
+
+            :param ievent: event to copy in
+            :type ievent: EventBase
+
+            .. literalinclude:: ../../gozerbot/eventbase.py
+                :pyobject: EventBase.copyin
+
+        """
+        self.update(ievent)
+
+        if ievent.has_key('options'):
+            self.options = dict(ievent.options)        
+
+        if ievent.has_key('queues'):
+            self.queues = list(ievent.queues)
+
+        return self
+
+    def filtered(self, txt):
+
+        """
+            see if txt if filtered on this event.
+
+            :param txt: text to check if its filtered
+            :type txt: string
+
+            .. literalinclude:: ../../gozerbot/eventbase.py
+                :pyobject: EventBase.filtered
+
+        """
+
+        if not self.filter:
+            return False
+
+        for filter in self.filter:
+            if filter in txt:
+                return False
+
+        return True
+
+    def parse(self, bot, rawstr):
+
+        """
+            parse raw string into event.  overload this.
+
+            :param bot: bot on which event is triggered
+            :type bot: gozerbot.botbase.BotBase
+            :param rawstr: string as recieved on the socket
+            :type rawstr: string
+
+        """
+
+        pass
+
+    def make_response(self, txt, result=None, nick=None, dot=False, nritems=False, nr=False, fromm=None, private=False, how=''):
+
+
+        # don't reply is result is empty list
+        if result == []:
+            return
+
+        # stats
+        stats.up('events', 'replies')
+        if not how:
+            try:
+                how = self.options['--how']        
+            except KeyError:
+                how = 'msg'
+
+        # init
+        restxt = ""
+        splitted = []
+
+        # make reply if result is a dict
+        if type(result) == types.DictType:
+            for i, j in result.iteritems():
+                if type(j) == types.ListType:
+                    try:
+                        z = ' .. '.join(j)
+                    except TypeError:
+                        z = unicode(j)
+                else:
+                    z = j
+                res = "%s: %s" % (i, z)
+                splitted.append(res)
+                if dot == True:
+                    restxt += "%s%s" % (res, ' .. ')
+                else:
+                    restxt += "%s %s" % (dot or ' ', res)
+            if restxt:
+                if dot == True:
+                    restxt = restxt[:-6]
+                elif dot:
+                    restxt = restxt[:-len(dot)]
+
+        lt = False # set if result is list
+
+        # set vars if result is a list
+        if type(txt) == types.ListType and not result:
+            result = txt
+            origtxt = u""
+            lt = True
+        else:
+            origtxt = txt
+
+        if result:
+            lt = True
+
+        # if queues are set write output to them
+        if self.queues:
+            for i in self.queues:
+                if splitted:
+                    for item in splitted:
+                        i.put_nowait(item)
+                elif restxt:
+                    i.put_nowait(restxt)
+                elif lt:
+                    for j in result:
+                        i.put_nowait(j)
+                else:
+                    i.put_nowait(txt)
+                if self.onlyqueues:
+                    return
+
+        # check if bot is set in event
+        if not self.bot:
+            rlog(10, 'event', 'no bot defined in event')
+            return "no bot is defined in this event"
+
+        # make response
+        pretxt = origtxt
+        if lt and not restxt:
+            res = []
+
+            # check if there are list in list
+
+            for i in result:
+                if type(i) == types.ListType or type(i) == types.TupleType:
+                    try:
+                        res.append(u' .. '.join(i))
+                    except TypeError:
+                        res.extend(i)
+                else:
+                    res.append(i)
+
+            # if nritems is set ..
+            result = res
+            if nritems:
+                if len(result) > 1:
+                    pretxt += "(%s items) .. " % len(result)
+            txtlist = result
+
+            # prepend item number for results
+            if not nr is False:
+                try:
+                    start = int(nr)
+                except ValueError:
+                    start = 0
+                txtlist2 = []
+                teller = start
+                for i in txtlist:
+                    txtlist2.append(u"%s) %s" % (teller, i))
+                    teller += 1
+                txtlist = txtlist2
+
+            # convert results to encoding
+            txtl = []
+            for item in txtlist:
+                txtl.append(toenc(item))
+            txtlist = txtl
+
+            # join result with dot 
+            if dot == True:
+                restxt = ' .. '.join(txtlist)
+            elif dot:
+                restxt = dot.join(txtlist)
+            else:
+                restxt = ' '.join(txtlist)
+
+        # see if txt needs to be prepended
+        if pretxt:
+            try:
+                restxt = pretxt + restxt
+            except TypeError:
+                rlog(10, 'eventbase', "can't add %s and %s" % (str(pretxt), str(restxt)))
+
+        # if txt in result is filtered ignore the reuslt
+        if self.filtered(restxt):
+            return
+
+        if restxt:
+            return restxt
+        else:
+            return "no data found"
+
+    def reply(self, *args, **kwargs):
+
+        """
+            reply to event. this version prints to stdout
+
+            :param txt: txt to reply
+            :type txt: string
+            :param result: result list .. list of items to reply (is prepended to txt)
+            :type result: string    
+            :param nick: nick to reply to
+            :type nick: string
+            :param dot: whether results of result list should be seperated with a dot with ' ..' or the txt passed in as dot argument
+            :type dot: boolean or string
+            :param nritems: whether results should be numbered
+            :type nritems: boolean
+            :param nr: the number to start numerbering the result with
+            :type nr: integer
+            :param fromm: the user sending the reply
+            :type fromm: nick or JID
+            :param private: whether the reply should be in private
+            :type private: boolean
+            :param how: how the reply should be made (msg, notice, ctcp)
+            :type how: string
+
+        """
+        resp = self.make_response(*args, **kwargs)
+
+        if not resp:
+            return
+
+        self.bot.say(self.channel, resp)
+
+    def missing(self, txt):
+
+        """
+            show what arguments are missing.
+
+            :param txt: txt to add to missing response
+            :type txt: string
+
+            .. literalinclude:: ../../gozerbot/eventbase.py
+                :pyobject: EventBase.missing
+
+        """
+
+        stats.up('events', 'missing')
+        if self.origtxt:
+            splitted = self.origtxt.split()
+            if self.bot.nick in splitted[0]:
+                try:
+                    cmnd = splitted[1]
+                except IndexError:
+                    cmnd = splitted[0]
+            elif 'cmnd' in splitted[0]:
+                try:
+                    cmnd = splitted[2]
+                except IndexError:
+                    cmnd = splitted[0]
+            else:
+                if self.msg:
+                    cmnd = splitted[0]
+                else:
+                    if self.aliased:
+                        cmnd = self.aliased
+                    else:
+                        cmnd = splitted[0][1:]
+            self.reply(cmnd + ' ' + txt)
+        else:
+            self.reply('missing origtxt: %s' % txt)
+
+    def ircstr(self):
+
+        """
+             old compat function. use str() now.
+
+        """
+
+        return str(self)
+
+    def handle_error(self, data):
+
+        """
+            function to handler errors. override this.
+
+            :param data: txt describing the error (can be different with inherited classes)
+            :tyoe data: string (can be different with inherited classes)
+
+        """
+
+        rlog(10, self.name.error, 'ERROR: %s' % str(data))
+
+    def done(self, txt=None):
+
+        """
+            reply with the txt 'done'.
+
+            :param txt: txt to prepend to 'done'
+            :type txt: string
+
+        """
+
+        if txt:
+            self.reply('%s done' % txt)
+        else:
+            self.reply('done')
+
+    def tojson(self):
+        new = cpy(self)
+        new.sock = 'setremote'
+        new.bot = 'setremote'
+        new.request = 'setremote'
+        new.response = 'setremote'
+        new.queues = []
+        result = dumps(new)
+        rlog(0, 'eventbase', 'tojson - %s' % str(result))
+        return result
+
+    def fromjsonstring(self, input):
+        temp = loads(input)
+        rlog(10, 'eventbase', str(temp))
+        self.update(temp)
+        return self
+
+    def checkqueues(self, resultlist):
+
+        """ 
+            check if resultlist is to be sent to the queues. if so do it
+
+            :param resultlist: list of results to send to queues
+            :type resultlist: list
+            :rtype: boolean
+
+        """
+
+        if self.queues:
+
+            for queue in self.queues:
+                for item in resultlist:
+                    queue.put_nowait(item)
+
+            return True
+
+    def subelement(self, name):
+       if self.subelements:
+            rlog(10, 'eventbase', "got subelements")
+            for node in self.subelements:
+                try:
+                    attr = getattr(node, name)
+                    rlog(10, 'eventbase', "got subelement %s" % (name, str(attr)))
+                    return attr.data
+                except (AttributeError, TypeError):
+                    continue   
+
+# ============
+# INIT SECTION
+                
+# default event used to initialise events
+defaultevent = EventBase()
+
+
+# END INIT
+# ========
--- gozerbot-0.99.1.orig/build/lib/gozerbot/dbusers.py
+++ gozerbot-0.99.1/build/lib/gozerbot/dbusers.py
@@ -0,0 +1,375 @@
+# gozerbot/dbusers.py
+#
+#
+
+""" bots users for mysql interface"""
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.utils.log import rlog
+from gozerbot.database.db import db
+import types
+
+class Dbusers(object):
+
+    """ users class """
+
+    def __init__(self):
+        self.db = db
+
+    def size(self):
+        """ return nr of users """
+        result = self.db.execute(""" SELECT DISTINCT COUNT(*) FROM userhosts """)
+        if result:
+            return result[0][0]
+
+    def getperms(self, userhost):
+        """ return permission of user"""
+        name = self.getname(userhost)
+        if not name:
+            return ['ANON', ]
+        result = self.db.execute(""" SELECT perm FROM perms WHERE name = %s """, name)
+        res = []
+        for i in result:
+            res.append(i[0])
+        return res
+
+    def exist(self, name):
+        """ see if user with <name> exists """
+        name = name.lower()
+        result = self.db.execute(""" SELECT name,userhost FROM userhosts WHERE name = %s """, name)
+        return result
+
+    def getname(self, userhost):
+        """ get name of user belonging to <userhost> """
+        result = self.db.execute(""" SELECT name FROM userhosts WHERE %s LIKE userhost """, userhost)
+        if result:
+            return result[0][0]
+
+    def add(self, name, userhosts, perms):
+        """ add an user """
+        if type(userhosts) != types.ListType:
+            rlog(10, 'dbusers', 'i need a list of userhosts')
+            return 0
+        for i in userhosts:
+            self.adduserhost(name, i)
+        for i in perms:
+            self.addperm(name, i)
+        rlog(10, 'users', '%s added to user database' % name)
+        return 1
+
+    def adduserhost(self, name, userhost):
+        """ add userhost """
+        name = name.lower()
+        res = None
+        result = self.db.execute(""" INSERT INTO userhosts(name, userhost) values(%s, %s) """, (name, userhost))
+        if result:
+            res = 1
+            rlog(10, 'users', '%s (%s) added to userhosts' % (name, userhost))
+        return res
+
+    def addperm(self, name, perm):
+        """ add permission """
+        name = name.lower()
+        perm = perm.upper()
+        res = None
+        result = self.db.execute(""" INSERT INTO perms(name, perm) values(%s, %s) """, (name, perm))
+        if result:
+            res = 1
+            rlog(10, 'users', '%s perm %s added' % (name, perm))
+        return res
+
+    def addstatus(self, name, status):
+        """ add permission """
+        name = name.lower()
+        status = status.upper()
+        res = None
+        result = self.db.execute(""" INSERT INTO statuses(name, status) values(%s, %s) """, (name, status))
+        if result:
+            res = 1
+            rlog(10, 'users', '%s status %s added' % (name, status))
+        return res
+
+    def addpermit(self, name, who, what):
+        """ add permission """
+        p = '%s %s' % (who, what)
+        res = None
+        result = self.db.execute(""" INSERT INTO permits(name, permit) values(%s, %s) """, (name, p))
+        if result:
+            res = 1
+            rlog(10, 'users', '%s permit %s added' % (name, p))
+        return res
+
+    def delperm(self, name, perm):
+        """ add permission """
+        name = name.lower()
+        perm = perm.upper()
+        result = self.db.execute(""" DELETE FROM perms WHERE name = %s AND perm = %s """, (name, perm))
+        if result:
+            rlog(10, 'users', '%s perm %s deleted' % (name, perm))
+            return result
+
+    def permitted(self, userhost, who, what):
+        """ check if (who,what) is in users permit list """
+        name = self.getname(userhost)
+        res = None
+        if name:
+            result = self.db.execute(""" SELECT permit FROM permits WHERE name = %s """, name)
+            if result:
+                for i in result:
+                    if "%s %s" % (who, what) == i[0]:
+                        res = 1
+        return res
+
+    def names(self):
+        """ get names of all users """
+        res = []
+        result = self.db.execute(""" SELECT DISTINCT name FROM userhosts """)
+        if result:
+            for i in result:
+                res.append(i[0])
+        return res
+
+    def merge(self, name, userhost):
+        """ add userhosts to user with name """
+        name = name.lower()
+        if not self.exist(name):
+            return 0
+        res = None
+        result = self.db.execute(""" INSERT INTO userhosts(userhost, name) VALUES (%s, %s) """, (userhost, name))
+        if result:
+            res = 1
+        return res
+
+    def deluserpermit(self, name, permit):
+        """ delete user with name """
+        name = name.lower()
+        res = None
+        p = '%s %s' % permit
+        return self.db.execute(""" DELETE FROM permits WHERE name = %s AND permit = %s """, (name, p))
+
+    def deluserhost(self, name, userhost):
+        """ delete user with name """
+        name = name.lower()
+        res = None
+        return self.db.execute(""" DELETE FROM userhosts WHERE name = %s AND userhost = %s """, (name, userhost))
+
+    def deluserperms(self, name, perm):
+        """ delete user with name """
+        name = name.lower()
+        res = None
+        return self.db.execute(""" DELETE FROM perms WHERE name = %s AND perm = %s """, (name, perm))
+
+    def deluserstatus(self, name, status):
+        """ delete user with name """
+        name = name.lower()
+        res = None
+        return self.db.execute(""" DELETE FROM statuses WHERE name = %s AND status = %s """, (name, status))
+
+    def deluserstatus(self, name, status):
+        """ delete user with name """
+        name = name.lower()
+        res = None
+        return self.db.execute(""" DELETE FROM statuses WHERE name = %s AND status = %s """, (name, status))
+
+    def delete(self, name):
+        """ delete user with name """
+        name = name.lower()
+        res = None
+        nr1 = self.db.execute(""" DELETE FROM userhosts WHERE name = %s """, name)
+        nr2 = self.db.execute(""" DELETE FROM perms WHERE name = %s """, name)
+        if nr1 and nr2:
+            res = 1
+        return res
+
+    def status(self, userhost, status):
+        """ check if user with <userhost> has <status> set """
+        name = self.getname(userhost)
+        res = None
+        if name:
+            status = status.upper()
+            result = self.db.execute(""" SELECT status FROM statuses WHERE name = %s """, name)
+            if result:
+                for i in result:
+                    if status == i[0]:
+                        res = 1
+        return res
+
+    def gotperm(self, name, perm):
+        """ check if user had permission """
+        name = name.lower()
+        perm = perm.upper()
+        result = self.db.execute(""" SELECT perm FROM perms WHERE name = %s """, name)
+        if result:
+            for i in result:
+                if i[0] == perm:
+                    return True
+
+    def getuserstatuses(self, name):
+        """ check if user had permission """
+        name = name.lower()
+        return self.db.execute(""" SELECT status FROM statuses WHERE name = %s """, name)
+
+    def getuseremail(self, name):
+        """ check if user had permission """
+        name = name.lower()
+        return self.db.execute(""" SELECT email FROM email WHERE name = %s """, name)
+
+    def getuserperms(self, name):
+        """ check if user had permission """
+        name = name.lower()
+        return self.db.execute(""" SELECT perm FROM perms WHERE name = %s """, name)
+
+    def getuserstatus(self, name):
+        """ check if user has status """
+        name = name.lower()
+        status = status.upper()
+        return self.db.execute(""" SELECT status FROM statuses WHERE name = %s """, name)
+
+    def gotstatus(self, name, status):
+        """ check if user has status """
+        name = name.lower()
+        status = status.upper()
+        result = self.db.execute(""" SELECT status FROM statuses WHERE name = %s """, name)
+        if result:
+            for i in result:
+                if status == i[0]:
+                    return True
+
+    def gotuserhost(self, name, userhost):
+        """ check if user has userhost """
+        name = name.lower()
+        result = self.db.execute(""" SELECT userhost FROM userhosts WHERE name = %s """, name)
+        if result:
+            for i in result:
+                if i[0] == userhost:
+                    return True
+
+    def getuserhosts(self, name):
+        """ check if user has userhost """
+        name = name.lower()
+        return self.db.execute(""" SELECT userhost FROM userhosts WHERE name = %s """, name)
+
+    gethosts = getuserhosts
+
+    def gotpermit(self, name, permit):
+        """ check if user permits something """
+        name = name.lower()
+        result = self.db.execute(""" SELECT permit FROM permits WHERE name = %s """, name)
+        if result:
+            for i in result:
+                if "%s %s" % permit == i[0]:
+                    return True
+
+    def getuserpermits(self, name):
+        """ check if user permits something """
+        name = name.lower()
+        return self.db.execute(""" SELECT permit FROM permits WHERE name = %s """, name)
+
+    def allowed(self, userhost, perms, log=True):
+        """ check if user with userhosts is allowed to execute perm command """
+        if not type(perms) == types.ListType:
+            perms = [perms, ]
+        if 'ANY' in perms:
+            return 1
+        res = None
+        name = self.getname(userhost)
+        if not name:
+            if log:
+                rlog(10, 'users', '%s userhost denied' % userhost)
+            return res
+        result = self.db.execute(""" SELECT perm FROM perms WHERE name = %s """, name)
+        if result:
+            for i in result:
+                if i[0] in perms:
+                    res = 1
+        if not res:
+            if log:
+                rlog(10, 'users', "%s perm %s denied" % (userhost, perms))
+        return res
+
+    def getemail(self, name):
+        """ get email of user """
+        name = name.lower()
+        email = None
+        email = self.db.execute(""" SELECT email FROM email WHERE name = %s """, name)
+        if email:
+            return email[0][0]
+
+    def setemail(self, name, email):
+        """ set email of user """
+        res = 0
+        try:
+            result = self.db.execute(""" INSERT INTO email(name, email) VALUES (%s, %s) """, (name, email))
+        except:
+            try:
+                result = self.db.execute(""" UPDATE email SET email = %s WHERE name = %s """, (email, name))
+            except:
+                pass
+        if result:
+            res = 1
+        return res
+
+    def getuserhosts(self, name):
+        """ check if user has userhost """
+        name = name.lower()
+        return self.db.execute(""" SELECT userhost FROM userhosts WHERE name = %s """, name)
+
+
+    def addpermall(self, perm): 
+        """ add permission to all users """
+        perm = perm.upper()
+        for i in self.names():
+            try:
+                self.addperm(i, perm)
+            except:
+                pass
+
+    def delpermall(self, perm):
+        """ delete permission from all users """
+        perm = perm.upper()
+        for i in self.names():
+            try:
+                self.delperm(i, perm)
+            except:
+                pass
+
+    def make_owner(self, userhosts):
+
+        """
+            see if owner already has a user account if not merge otherwise 
+            add.
+
+            :param userhosts: userhosts to inititalize owner with
+            :type userhosts: list or string
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.make_owner
+
+        """
+
+        owner = []
+
+        if type(userhosts) != types.ListType:
+            owner.append(userhosts)
+        else:
+            owner = userhosts
+
+        for userhost in owner:
+            username = self.getname(unicode(userhost))
+
+            if not username:
+                if not self.merge('owner', unicode(userhost)):
+                    self.add('owner', [unicode(userhost), ], ['USER', 'OPER'])
+            elif username != 'owner':
+                self.delete(username)
+                if not self.merge('owner', unicode(userhost)):
+                    self.add('owner', [unicode(userhost), ], ['USER', 'OPER'])
+
+    def usersearch(self, name):
+        name = name.lower()
+        res = []
+        for n in self.names():
+            if name in n.lower(): res.append(n)
+        return res
+ 
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gozerbot/callbacks.py
+++ gozerbot-0.99.1/build/lib/gozerbot/callbacks.py
@@ -0,0 +1,274 @@
+# gozerbot/callbacks.py
+#
+#
+
+""" 
+    bot callbacks .. callbacks occure on registered events. a precondition 
+    function can optionaly be provided to see if the callback should fire. 
+    callback can be executed in a Runner (1 thread that executes more jobs)
+    or in a seperate thread. callbacks are now unified for bot irc and jabber 
+    events.
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.stats import stats
+from gozerbot.threads.thr import getname 
+from config import config
+from utils.log import rlog
+from utils.exception import handle_exception
+from utils.trace import calledfrom
+from utils.generic import makeargrest
+from utils.locking import lockdec
+from utils.dol import Dol
+from threads.thr import start_new_thread, getname
+from runner import cbrunners
+
+# basic imports
+import sys, copy, thread
+
+# END IMPORT
+
+# LOCK SECTION
+
+# locks
+callbacklock = thread.allocate_lock()
+locked = lockdec(callbacklock)
+
+# END LOCKS
+
+class Callback(object):
+
+    """ 
+        class representing a callback.
+
+        :param func: function to execute
+        :param prereq: prerequisite function 
+        :param plugname: plugin to register this callback with 
+        :param kwargs: dict to pass on to the callback 
+        :param threaded: whether the callback should be executed in its own thread
+        :param speed: determines which runnerspool to run this callback on
+
+    """
+
+    def __init__(self, func, prereq, plugname, kwargs, threaded=False, \
+speed=5):
+        self.func = func # the callback function
+        self.prereq = prereq # pre condition function
+        self.plugname = plugname # plugin name
+        self.kwargs = kwargs # kwargs to pass on to function
+        self.threaded = copy.deepcopy(threaded) # run callback in thread
+        self.speed = copy.deepcopy(speed) # speed to execute callback with
+        self.activate = False
+        stats.up('callbacks', 'created')
+
+class Callbacks(object):
+
+    """ 
+        dict of lists containing callbacks.  Callbacks object take care of 
+        dispatching the callbacks based on incoming events. see Callbacks.check()
+
+    """
+
+    def __init__(self):
+
+        # self.cbs holds the dict of list. entry value is the event (string)
+        self.cbs = Dol()
+
+    def size(self):
+
+        """ return number of callbacks. """
+
+        return len(self.cbs)
+
+    def add(self, what, func, prereq=None, kwargs=None, threaded=False, nr=False, speed=5):
+
+        """ 
+            add a callback. 
+
+            :param what: event to fire callback for
+            :param func: function to execute
+            :param prereq: prerequisite function 
+            :param plugname: plugin to register this callback with 
+            :param kwargs: dict to pass on to the callback 
+            :param threaded: whether the callback should be executed in its own thread
+            :param speed: determines which runnerspool to run this callback on
+
+        """
+
+        what = what.upper()
+
+        # get the plugin this callback was registered from
+        plugname = calledfrom(sys._getframe(0))
+
+        # check if plugname is in loadlist .. if not don't add callback
+        if config['loadlist'] and not plugname in config['loadlist']:
+            rlog(-1, plugname, 'not in loadlist .. not adding callback')
+            return
+
+        # see if kwargs is set if not init to {}
+        if not kwargs:
+            kwargs = {}
+
+        # add callback to the dict of lists
+        if nr != False:
+            self.cbs.insert(nr, what, Callback(func, prereq, plugname, kwargs, threaded, speed))
+        else:
+            self.cbs.add(what, Callback(func, prereq, plugname, kwargs, threaded, speed))
+
+        rlog(0, 'callbacks', 'added %s (%s)' % (what, plugname))
+
+    def unload(self, plugname):
+
+        """ unload all callbacks registered in a plugin. """
+
+        unload = []
+
+        # look for all callbacks in a plugin
+        for name, cblist in self.cbs.iteritems():
+            index = 0
+            for item in cblist:
+                if item.plugname == plugname:
+                    unload.append((name, index))
+                index += 1
+
+        # delete callbacks
+        for callback in unload[::-1]:
+            self.cbs.delete(callback[0], callback[1])
+            rlog(1, 'callbacks', 'unloaded %s' % callback[0])
+
+    def disable(self, plugname):
+
+        """ disable all callbacks registered in a plugin. """
+
+        unload = []
+
+        # look for all callbacks in a plugin
+        for name, cblist in self.cbs.iteritems():
+            index = 0
+            for item in cblist:
+                if item.plugname == plugname:
+                    item.activate = False
+
+    def activate(self, plugname):
+
+        """ activate all callbacks registered in a plugin. """
+
+        unload = []
+
+        # look for all callbacks in a plugin
+        for name, cblist in self.cbs.iteritems():
+            index = 0
+            for item in cblist:
+                if item.plugname == plugname:
+                    item.activate = True
+
+    def whereis(self, cmnd):
+
+        """ show where ircevent.CMND callbacks are registered """
+
+        result = []
+        cmnd = cmnd.upper()
+
+        # locate callbacks for CMND
+        for c, callback in self.cbs.iteritems():
+            if c == cmnd:
+                for item in callback:
+                    if not item.plugname in result:
+                        result.append(item.plugname)
+
+        return result
+
+    def list(self):
+
+        """ show all callbacks. """
+
+        result = []
+
+        # loop over callbacks and collect callback functions
+        for cmnd, callbacks in self.cbs.iteritems():
+            for cb in callbacks:
+                result.append(getname(cb.func))
+
+        return result
+
+    def check(self, bot, ievent):
+
+        """ 
+            check for callbacks to be fired. 
+
+            :param bot: bot where event originates from
+            :param ievent: event that needs to be checked
+
+            .. literalinclude:: ../../gozerbot/callbacks.py
+                :pyobject: Callbacks.check
+
+        """
+
+        # check for "ALL" callbacks
+        if self.cbs.has_key('ALL'):
+            for cb in self.cbs['ALL']:
+                stats.up('callbacks', 'ALL')
+                self.callback(cb, bot, ievent)
+
+        cmnd = ievent.cbtype or ievent.cmnd.upper()
+
+        # check for CMND callbacks
+        if self.cbs.has_key(cmnd):
+            for cb in self.cbs[cmnd]:
+                stats.up('callbacks', cmnd)
+                self.callback(cb, bot, ievent)
+
+    def callback(self, cb, bot, ievent):
+
+        """ 
+            do the actual callback with provided bot and ievent as arguments.
+
+            :param cb: the callback to fire
+            :param bot: bot to call the callback on
+            :param ievent: the ievent that triggered the callback
+
+            .. literalinclude:: ../../gozerbot/callbacks.py
+                :pyobject: Callbacks.callback
+
+        """
+
+        try:
+            if not cb.activate:
+                return
+            # see if the callback pre requirement succeeds
+            if cb.prereq:
+                rlog(0, 'callbacks', 'excecuting in loop %s' % str(cb.prereq))
+                if not cb.prereq(bot, ievent):
+                    return
+
+            # check if callback function is there
+            if not cb.func:
+                return
+
+            # log and stats
+            rlog(0, 'callbacks', 'excecuting callback %s' % str(cb.func))
+            stats.up('callbacks', getname(cb.func))
+            stats.up('callbacks', cb.plugname)
+
+            ievent.iscallback = True
+
+            # launcn the callback .. either threaded or dispatched at runners
+            if cb.threaded:
+                start_new_thread(cb.func, (bot, ievent), cb.kwargs)
+            else:
+                cbrunners.put(cb.plugname, cb.func, bot, ievent, **cb.kwargs)
+
+        except Exception, ex:
+            handle_exception()
+
+# INIT SECTION
+
+# callbacks object is the same for ICR and Jabber
+callbacks = jcallbacks = Callbacks()
+gn_callbacks = Callbacks()
+
+# END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/morphs.py
+++ gozerbot-0.99.1/build/lib/gozerbot/morphs.py
@@ -0,0 +1,159 @@
+# gozerbot/morphs.py
+#
+#
+
+""" convert input/output stream. """
+
+## IMPORT SECTION
+
+# gozerbot imports
+from utils.exception import handle_exception
+from utils.trace import calledfrom
+
+# basic imports
+import sys
+
+## END IMPORT
+
+## LOCK SECTION
+
+# no locks
+
+## END LOCK
+
+class Morph(object):
+
+    """
+        transform stream.
+
+        :param func: morphing function
+        :type func: function
+
+    """
+
+    def __init__(self, func):
+        self.plugname = calledfrom(sys._getframe(0))
+        self.func = func
+        self.activate = False
+
+    def do(self, *args, **kwargs):
+
+        """
+            do the morphing.
+
+            .. literalinclude:: ../../gozerbot/morphs.py
+                :pyobject: Morph.do
+        """
+        if not self.activate:
+            return
+
+        try:
+            return self.func(*args, **kwargs)
+        except Exception, ex:
+            handle_exception()
+
+class MorphList(list):
+
+    """ list of morphs. """
+
+    def add(self, func, index=None):
+
+        """
+            add morph.
+
+            :param func: morphing function
+            :type func: function
+            :param index: index into the morphlist
+            :type index: integer
+            :rtype: self
+
+            .. literalinclude:: ../../gozerbot/morphs.py
+                :pyobject: MorphList.add
+
+        """
+
+        if not index:
+            self.append(Morph(func))
+        else:
+            self.insert(index, Moprh(func))
+
+        return self
+
+    def do(self, input, *args, **kwargs):
+
+        """
+            call morphing chain.
+
+            :param input: data to do the morphing on
+            :type input: string
+
+            .. literalinclude:: ../../gozerbot/morphs.py
+                :pyobject: MorphList.do
+
+        """
+
+        for morph in self:
+            input = morph.do(input, *args, **kwargs) or input
+
+        return input
+
+    def unload(self, plugname):
+
+        """
+            unload morhps belonging to plug <plugname>.
+
+            :param plugname: the plugname to unload the morphs from
+            :type plugname: string
+
+            .. literalinclude:: ../../gozerbot/morphs.py
+                :pyobject: MorphList.unload
+
+        """
+
+        for index in range(len(self)-1, -1, -1):
+            if self[index].plugname == plugname:
+                del self[index]
+
+    def disable(self, plugname):
+
+        """
+            disable morhps belonging to plug <plugname>.
+
+            :param plugname: the plugname to unload the morphs from
+            :type plugname: string
+
+            .. literalinclude:: ../../gozerbot/morphs.py
+                :pyobject: MorphList.disable
+
+        """
+
+        for index in range(len(self)-1, -1, -1):
+            if self[index].plugname == plugname:
+                self[index].activate = False
+
+    def activate(self, plugname):
+
+        """
+            activate morhps belonging to plug <plugname>.
+
+            :param plugname: the plugname to unload the morphs from
+            :type plugname: string
+
+            .. literalinclude:: ../../gozerbot/morphs.py
+                :pyobject: MorphList.activate
+
+        """
+
+        for index in range(len(self)-1, -1, -1):
+            if self[index].plugname == plugname:
+                self[index].activate = False
+
+## INIT SECTION
+
+# moprhs used on input
+inputmorphs = MorphList()
+
+# morphs used on output
+outputmorphs = MorphList()
+
+## END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/jsonusers.py
+++ gozerbot-0.99.1/build/lib/gozerbot/jsonusers.py
@@ -0,0 +1,751 @@
+# gozerbot/jsonusers.py
+#
+#
+
+""" bot's users in JSON file.  NOT USED AT THE MOMENT. """
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.datadir import datadir
+from gozerbot.utils.log import rlog
+from gozerbot.utils.generic import stripident, stripidents
+from gozerbot.utils.exception import handle_exception, exceptionmsg
+from gozerbot.utils.generic import die, stripped
+from gozerbot.persist.persist import Persist
+from gozerbot.utils.lazydict import LazyDict
+from gozerbot.config import config
+
+# basic imports
+import re, types, os, time
+
+# END IMPORT
+# ==========
+
+# ============
+# LOCK SECTION
+
+# no locks
+
+# END LOCK
+# ========
+
+
+class JsonUser(Persist):
+
+    """ LazyDict representing a user. """
+
+    def __init__(self, name="", userhosts=[], perms=[], permits=[], status=[], email=[]):
+        Persist.__init__(self, u"users" + os.sep + name)
+        self.data.name = self.data.name or name
+        self.data.userhosts = self.data.userhosts or userhosts
+        self.data.perms = self.data.perms or perms
+        self.data.permits = self.data.permits or permits
+        self.data.status = self.data.status or status
+        self.data.email = self.data.email or email
+
+class JsonUsers(Persist):
+
+    """ class representing all users. """
+
+    def __init__(self, filename, ddir=None):
+        self.datadir = ddir or datadir
+        Persist.__init__(self, filename)
+        if not self.data:
+            self.data = LazyDict()
+        self.data.names = self.data.names or {}
+
+    def all(self):
+
+        """ get all users. """
+
+        result = []
+        for name in self.data['names'].values():
+            result.append(JsonUser(name))
+        return result
+
+    ### Misc. Functions
+    def size(self):
+
+        """ return nr of users. """
+
+        return len(self.data['names'])
+
+    def names(self):
+
+        """ get names of all users. """
+
+        return self.data.names
+
+    def byname(self, name):
+        """ return user by name. """ 
+        try:
+            return JsonUser(name)
+        except KeyError:
+            return
+
+    def merge(self, name, userhost):
+        """ add userhosts to user with name """
+        user = self.byname(name)
+        if user:
+            user.userhosts.append(userhost)
+            self.save()
+            rlog(10, 'users', "%s merged with %s" % (userhost, name))
+            return 1
+
+    def usersearch(self, userhost):
+        """ search for users with a userhost like the one specified """
+
+        result = []
+
+        for u, name in self.data.names.iteritems():
+
+            if userhost in u:
+                result.append((name, u))
+
+        return result
+
+    def getuser(self, userhost):
+        try:
+            return JsonUser(self.data.names[userhost])
+        except KeyError:
+            return 
+
+    ### Check functions
+    def exist(self, name):
+        """ see if user with <name> exists """
+        return self.byname(name)
+
+    def allowed(self, userhost, perms, log=True):
+        """ check if user with userhosts is allowed to execute perm command """
+        if not type(perms) == types.ListType:
+            perms = [perms, ]
+        if 'ANY' in perms:
+            return 1
+        res = None
+        user = self.getuser(userhost)
+        if not user and log:
+            rlog(10, 'users', '%s userhost denied' % userhost)
+            return res
+        else:
+            uperms = set(user.perms)
+            sperms = set(perms)
+            intersection = sperms.intersection(uperms)
+            res = list(intersection) or None
+        if not res and log:
+            rlog(10, 'users', "%s perm %s denied" % (userhost, str(perms)))
+        return res
+
+    def permitted(self, userhost, who, what):
+        """ check if (who,what) is in users permit list """
+        user = self.getuser(userhost)
+        res = None
+        if user:
+            if '%s %s' % (who, what) in user.permits:
+                res = 1
+        return res
+
+    def status(self, userhost, status):
+        """ check if user with <userhost> has <status> set """
+        user = self.getuser(userhost)
+        res = None
+        if user:
+            if status.upper() in user.statuses:
+                res = 1
+        return res
+
+    def gotuserhost(self, name, userhost):
+        """ check if user has userhost """
+        user = self.byname(name)
+        return userhost in user.userhosts
+
+    def gotperm(self, name, perm):
+        """ check if user had permission """
+        user = self.byname(name)
+        if user:
+            return perm.upper() in user.perms
+
+    def gotpermit(self, name, permit):
+        """ check if user permits something.  permit is a (who, what) tuple """
+        user = self.byname(name)
+        if user:
+            return '%s %s' % permit in user.permits
+        
+    def gotstatus(self, name, status):
+        """ check if user has status """
+        user = self.byname(name)
+        return status.upper() in user.statuses
+
+    ### Get Functions
+    def getname(self, userhost):
+        """ get name of user belonging to <userhost> """
+        user = self.getuser(userhost)
+        if user:
+            return user.name
+
+    def gethosts(self, userhost):
+        """ return the userhosts of the user associated with the specified userhost """
+        user = self.getuser(userhost)
+        if user:
+            return user.userhosts
+    
+    def getemail(self, userhost):
+        """ return the email of the specified userhost """
+        user = self.getuser(userhost)
+        if user:
+            if user.email:
+                return user.email[0]
+
+    def getperms(self, userhost):
+        """ return permission of user"""
+        user = self.getuser(userhost)
+        if user:
+            return user.perms
+
+    def getpermits(self, userhost):
+        """ return permits of the specified userhost"""
+        user = self.getuser(userhost)
+        if user:
+            return user.permits
+
+    def getstatuses(self, userhost):
+
+        """
+            return the list of statuses for the specified userhost.
+
+        """
+
+        user = self.getuser(userhost)
+        if user:
+            return user.status
+
+    def getuserhosts(self, name):
+
+        """
+            return the userhosts associated with the specified user.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+            return user.userhosts
+
+    def getuseremail(self, name):
+
+        """
+            get email of user.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+            if user.email:
+                return user.email[0]
+
+    def getuserperms(self, name):
+
+        """
+            return permission of user.
+
+        """
+
+        user = self.byname(name)
+        if user:
+            return user.perms
+
+    def getuserpermits(self, name):
+
+        """
+            return permits of user.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+            return user.permits
+
+    def getuserstatuses(self, name):
+
+        """
+            return the list of statuses for the specified user.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+            return user.status
+
+    def getpermusers(self, perm):
+
+        """
+            return all users that have the specified perm.
+
+        """
+
+        result = []
+
+        for userdata in self.users.values():
+            user = JsonUser(d=userdata)
+
+            if perm.upper() in user.perms:
+                result.append(user.name)
+
+        return result
+
+    def getstatususers(self, status):
+
+        """
+            return all users that have the specified status.
+
+        """
+
+        result = []
+
+        for userdata in self.users.values():
+            user = JsonUser(d=userdata)
+
+            if status in user.status:
+                result.append(user.name)
+
+        return result
+
+    ### Set Functions
+    def setemail(self, name, email):
+
+        """ 
+            set email of user.
+
+        """
+
+        user = self.byname(name)
+        if user:
+            try:
+                user.email.remove(email)
+            except:
+                pass
+            user.email.insert(0, email)
+            self.save()
+            return True
+        return False
+
+    ### Add functions
+    def add(self, name, userhosts, perms):
+
+        """
+            add an user.
+
+        """
+
+        if type(userhosts) != types.ListType:
+            rlog(10, 'jsonusers', 'i need a list of userhosts')
+            return 0
+
+        if not os.path.isdir(self.datadir + os.sep + 'users'):
+            os.mkdir(self.datadir + os.sep + 'users')
+
+        if not os.path.isdir(self.datadir + os.sep + 'users' +  os.sep + name):
+            os.mkdir(self.datadir + os.sep + 'users' +  os.sep + name)
+
+        user = self.byname(name)
+
+        if not user:
+
+            try:
+                newuser = JsonUser(name=name)
+                newuser.userhosts.extend(userhosts)
+                newuser.perms.extend(perms)
+                self.users[name] = newuser
+                self.save()
+            except Exception, ex:
+                rlog(10, 'jsonusers', str(ex))
+                return False
+
+            rlog(10, 'users', '%s %s %s added to user database' % (name, \
+userhosts, perms))
+
+        return True
+
+    def addemail(self, userhost, email):
+
+        """
+            add an email address to the userhost.
+
+        """
+
+        user = self.getuser(userhost)
+
+        if user:
+            user.email.append(email)
+            self.save()
+            rlog(10, 'users', '%s (%s) added to email' % (email, userhost))
+            return 1
+
+    def addperm(self, userhost, perm):
+
+        """
+            add the specified perm to the userhost.
+
+        """
+
+        user = self.getuser(userhost)
+
+        if user:
+            user.perms.append(perm.upper())
+            self.save()
+            rlog(10, 'users', '%s perm %s added' % (userhost, perm))
+            return 1
+
+    def addpermit(self, userhost, permit):
+
+        """
+            add the given (who, what) permit to the given userhost.
+
+        """
+
+        user = self.getuser(userhost)
+
+        if user:
+            #p = '%s %s' % permit
+            user.permits.append(permit)
+            self.save()
+            rlog(10, 'users', '%s permit %s added' % (userhost, p))
+            return 1
+
+    def addstatus(self, userhost, status):
+
+        """
+            add status to given userhost.
+
+        """
+
+        user = self.getuser(userhost)
+
+        if user:
+            user.status.append(status.upper())
+            self.save()
+            rlog(10, 'users', '%s status %s added' % (name, status))
+            return 1
+
+    def adduserhost(self, name, userhost):
+
+        """
+           add userhost.
+
+        """
+
+        user = self.byname(name)
+
+        if not user:
+            user = self.users[name] = User(name=name)
+
+        user.userhosts.append(userhost)
+        self.save(user)
+        rlog(10, 'users', '%s (%s) added to userhosts' % (name, userhost))
+        return 1
+
+    def adduseremail(self, name, email):
+
+        """
+            add email to specified user.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+            user.email.append(email)
+            self.save()
+            rlog(10, 'users', '%s email %s added' % (name, email))
+            return 1
+
+    def adduserperm(self, name, perm):
+
+        """ 
+           add permission.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+            perm = perm.upper()
+            user.perms.append(perm)
+            self.save()
+            rlog(10, 'users', '%s perm %s added' % (name, perm))
+            return 1
+
+    def adduserpermit(self, name, permit):
+
+        """ 
+            add (who, what) permit tuple to sepcified user.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+            p = '%s %s' % permit
+            user.permits.append(p)
+            self.save()
+            rlog(10, 'users', '%s permit %s added' % (name, p))
+            return 1
+
+    def adduserstatus(self, name, status):
+
+        """
+            add status to given user.
+
+        """
+
+        user = byname(name)
+
+        if user:
+            user.status.append(status.upper())
+            self.save()
+            rlog(10, 'users', '%s status %s added' % (name, status))
+            return 1
+
+    def addpermall(self, perm): 
+
+        """
+            add permission to all users.
+
+        """
+
+        for user in self.users.values():
+            user.perms.append(perm.upper())
+
+        self.save()
+
+    ### Delete functions
+
+    def delemail(self, userhost, email):
+
+        """
+            delete email from userhost.
+
+        """
+
+        user = self.getuser(userhost)
+
+        if user:
+
+            if email in user.emails:
+                user.emails.remove(email)
+                self.save()
+                return 1
+
+    def delperm(self, userhost, perm):
+
+        """
+            delete perm from userhost.
+
+        """
+
+        user = self.getuser(userhost)
+        if user:
+            p = perm.upper()
+            if p in user.perms:
+                user.perms.remove(p)
+                self.save()
+                return 1
+
+    def delpermit(self, userhost, permit):
+
+        """
+            delete permit from userhost.
+
+        """
+
+        user = self.getuser(userhost)
+
+        if user:
+            p = '%s %s' % permit
+
+            if p in user.permits:
+                user.permits.remove(p)
+                self.save()
+                return 1
+
+    def delstatus(self, userhost, status):
+
+        """
+            delete status from userhost.
+
+        """
+
+        user = self.getuser(userhost)
+
+        if user:
+            st = status.upper()
+
+            if st in user.status:
+                user.status.remove(st)
+                self.save()
+                return 1
+
+    def delete(self, name):
+
+        """
+            delete user with name.
+
+        """
+
+        del self.users[name]
+        self.save()
+        return 1
+
+    def deluserhost(self, name, userhost):
+
+        """
+            delete the userhost entry.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+
+            if userhost in user.userhosts:
+                user.userhosts.remove(userhost)
+                self.save()
+                rlog(10, 'users', '%s userhost %s deleted' % (name, userhost))
+                return 1
+
+    def deluseremail(self, name, email):
+
+        """
+            delete email.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+
+            if email in user.email:
+                user.email.remove(email)
+                self.save()
+                rlog(10, 'users', '%s email %s deleted' % (name, email))
+                return 1
+
+    def deluserperm(self, name, perm):
+
+        """
+            delete permission.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+            p = perm.upper()
+
+            if p in user.perms:
+                user.perms.remove(p)
+                self.save()
+                rlog(10, 'users', '%s perm %s deleted' % (name, p))
+                return 1
+
+    def deluserpermit(self, name, permit):
+
+        """
+            delete permit.
+
+         """
+
+        user = self.byname(name)
+
+        if user:
+            p = '%s %s' % permit
+
+            if p in user.permits:
+                user.permits.remove(p)
+                self.save()
+                rlog(10, 'users', '%s permit %s deleted' % (name, p))
+                return 1
+
+    def deluserstatus(self, name, status):
+
+        """
+            delete the status from the given user.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+            st = status.upper()
+
+            if st in user.status:
+                user.status.remove(status)
+                self.save()
+                rlog(10, 'users', '%s status %s deleted' % (name, st))
+                return 1
+
+    def delallemail(self, name):
+
+        """
+            Delete all emails for the specified user.
+
+        """
+
+        user = self.byname(name)
+
+        if user:
+            user.email = []
+            self.save()
+            rlog(10, 'users', '%s emails deleted' % (name, ))
+            return 1
+
+    def delpermall(self, perm):
+
+        """
+            delete permission from all users.
+
+        """
+
+        for user in self.users.values():
+            if user.name != 'owner':
+                del user.perms
+
+        self.save()
+        return 1
+
+    def make_owner(self, userhosts):
+
+        """
+            see if owner already has a user account if not merge otherwise add. 
+
+        """
+
+        assert(userhosts)
+        owner = []
+
+        if type(userhosts) != types.ListType:
+            owner.append(userhosts)
+        else:
+            owner = userhosts
+
+        for userhost in owner:
+            username = self.getname(unicode(userhost))
+
+            if not username:
+
+                if not self.merge('owner', unicode(userhost)):
+                    self.add('owner', [unicode(userhost), ], ['USER', 'OPER'])
+
+# ============
+# INIT SECTION
+
+# no vars
+
+# END INIT
+# ========
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gozerbot/sausers.py
+++ gozerbot-0.99.1/build/lib/gozerbot/sausers.py
@@ -0,0 +1,1189 @@
+# gozerbot/users.py
+#
+#
+
+""" bot users """
+
+__copyright__ = 'this file is in the public domain'
+
+## IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.datadir import datadir
+from gozerbot.utils.log import rlog
+from gozerbot.utils.locking import lockdec
+from gozerbot.utils.generic import stripident, stripidents
+from gozerbot.utils.exception import handle_exception, exceptionmsg
+from gozerbot.utils.generic import die, stripped
+from gozerbot.utils.name import stripname
+from gozerbot.persist.persist import Persist
+from gozerbot.config import config
+from gozerbot.jsonusers import JsonUsers
+
+# basic imports
+import re, types, os, time, thread, sqlalchemy
+
+## END IMPORT
+
+## LOCK SECTION
+
+deletelock = thread.allocate_lock()
+deletelocked = lockdec(deletelock)
+
+## END LOCK
+
+# see if we need to use the database or use the jsonusers
+
+if True:
+    if not config['nodb']:
+        from gozerbot.database.samodels import UserHost, User, Perms, Statuses
+        from gozerbot.database.alchemy import Session, query, getuser, byname, eagerload, dblocked
+
+    else:
+        def trans(func, *args, **kwargs):
+            def transaction(*args, **kwargs):
+                func(*args, **kwargs)
+            return transaction
+
+
+class DbUsers(object):
+
+    """
+         sqlalchemy backed users.
+
+    """
+
+    def __init__(self, ddir=None):
+        self.datadir = ddir or datadir
+
+    ### Misc. Functions
+    def size(self):
+
+        """
+            return nr of users.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.size
+        """
+
+        return int(query(User).count())
+        
+    def names(self):
+
+        """
+            get names of all users.
+
+            :rtype: list .. list of usernames
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.names
+
+        """
+        a = query(User).all()
+        return [n.name for n in a]
+
+    @dblocked
+    def merge(self, name, userhost):
+
+        """
+             add userhosts to user with name.
+
+             :param session: the session to act upon
+             :type session: sqllachemy.session.Session
+             :param name: name of the user to merge with
+             :type name: string
+             :param userhost: userhosts to merge 
+             :type userhost: list .. list of userhosts
+             :rtype: boolean .. whether the merge succeeded
+
+             .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.merge
+
+        """
+
+        user = byname(name)
+
+        if user:
+
+            if name not in user.userhosts:
+                #Session.begin()
+                user.userhosts.append(userhost)
+                #Session.commit()
+                #Session.refresh(user)
+                #Session.close()
+                rlog(10, 'users', "%s merged with %s" % (userhost, name))
+                return True
+
+        return False
+
+    def usersearch(self, userhost):
+
+        """
+            search for users with a userhost like the one specified.
+
+            :param userhost: userhost to search for
+            :type userhost: string
+            :rtype: list .. list of (user.name, user.userhost) tuples
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.usersearch
+
+        """
+
+        n = query(UserHost).filter(UserHost.userhost.like('%%%s%%' % userhost)).all()
+        return [(u.name, u.userhost) for u in n]
+
+    ### Check functions
+    def exist(self, name):
+
+        """
+            see if user with <name> exists.
+
+            :param name: name of the user
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.exist
+
+        """
+
+        a = byname(name)
+
+        if a:
+            return True
+
+        return False
+
+    def allowed(self, userhost, perms, log=True):
+
+        """
+            check if user with userhosts is allowed to execute perm command.
+
+            :param userhost: userhost to check
+            :type userhost: string
+            :param perms: the permissions to check            
+            :type perms: list
+            :param log: whether the check should be logged
+            :type log: boolean
+            :rtype: list .. list of matching permissions or None
+ 
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.allowed
+
+        """
+
+        if not type(perms) == types.ListType:
+            perms = [perms, ]
+
+        if 'ANY' in perms:
+            return ['ANY', ]
+
+        res = None
+        user = getuser(userhost)
+
+        if not user:
+
+            if log:
+                rlog(10, 'users', '%s userhost denied' % userhost)
+            return res
+
+        else:
+            uperms = set(user.perms)
+            sperms = set(perms)
+            intersection = sperms.intersection(uperms)
+            res = list(intersection) or None
+
+        if not res and log:
+            rlog(10, 'users', "%s perm %s denied" % (userhost, str(perms)))
+
+        if res and log:
+            rlog(10, 'users', 'allowed %s %s perm' % (userhost, str(perms)))
+
+        return res
+
+    def permitted(self, userhost, who, what):
+
+        """
+            check if (who,what) is in users permit list.
+
+            :param userhost: userhost to check permits for
+            :type userhost: string
+            :param who: who to permit
+            :type who: string
+            :param what: what to allow
+            :type what: string
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.permitted
+        """
+
+        user = getuser(userhost)
+        res = False
+
+        if user:
+            if '%s %s' % (who, what) in user.permits:
+                res = True
+
+        return res
+
+    def status(self, userhost, status):
+
+        """
+            check if user with <userhost> has <status> set.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.status
+
+        """
+
+        user = getuser(userhost)
+        res = False
+
+        if user:
+            if status.upper() in user.statuses:
+                res = True
+
+        return res
+
+    def gotuserhost(self, name, userhost):
+
+        """
+            check if user has userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.gotuserhost
+
+        """
+
+        user = byname(name)
+
+        if user:
+            return userhost in user.userhosts
+
+        return False
+
+    def gotperm(self, name, perm):
+
+        """
+            check if user has permission.
+
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.gotperm
+        """
+
+        user = byname(name)
+
+        if user:
+            return perm.upper() in user.perms
+
+        return False
+
+    def gotpermit(self, name, permit):
+
+        """
+            check if user permits something.  permit is a [who, what] list. 
+
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.gotpermit
+
+        """
+
+        user = byname(name)
+
+        if user:
+            return '%s %s' % permit in user.permits
+
+        return ""
+
+    def gotstatus(self, name, status):
+
+        """
+            check if user has status.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.gotstatus
+
+        """
+
+        user = byname(name)
+        if user:
+            return status.upper() in user.statuses
+
+        return False
+
+    ### Get Functions
+    def getname(self, userhost):
+
+        """
+            get name of user belonging to <userhost>.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getname
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            return str(user.name)
+
+        return ""
+
+    def gethosts(self, userhost):
+
+        """ 
+            return the userhosts of the user associated with the 
+            specified userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.gethosts
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            return list(user.userhosts)
+
+        return []
+    
+    def getemail(self, userhost):
+
+        """
+            return the email of the specified userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getemail
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            if user.email:
+                return str(user.email[0])
+
+        return ""
+
+    def getperms(self, userhost):
+
+        """
+            return permissions of user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getperms
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            return list(user.perms)
+
+        return []
+
+    def getpermits(self, userhost):
+
+        """
+            return permits of the specified userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getpermits
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            return list(user.permits)
+
+        return []
+
+    def getstatuses(self, userhost):
+
+        """
+            return the list of statuses for the specified userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getstatuses
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            return list(user.statuses)
+
+    def getuserhosts(self, name):
+
+        """
+            return the userhosts associated with the specified user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getuserhosts
+        """
+
+        user = byname(name)
+
+        if user:
+            return list(user.userhosts)
+
+    def getuseremail(self, name):
+
+        """
+            get email of user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getuseremail
+
+        """
+
+        user = byname(name)
+
+        if user:
+            if user.email:
+                return str(user.email[0])
+
+    def getuserperms(self, name):
+
+        """
+            return permission of user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getuserperms
+        """
+
+        user = byname(name)
+
+        if user:
+            return list(user.perms)
+
+    def getuserpermits(self, name):
+ 
+        """
+            return permits of user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getuserpermits
+        """
+
+        user = byname(name)
+
+        if user:
+            return list(user.permits)
+
+    def getuserstatuses(self, name):
+
+        """
+            return the list of statuses for the specified user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getuserstatuses
+        """
+
+        user = byname(name)
+
+        if user:
+            return list(user.statuses)
+
+    def getpermusers(self, perm):
+
+        """
+            return all users that have the specified perm.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getpermusers
+
+        """
+        n = query(Perms).filter(Perms.perm==perm.upper()).all()
+        return [user.name for user in n]
+
+    def getstatususers(self, status):
+
+        """
+            return all users that have the specified status.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.getstatususers
+
+        """
+
+        n = query(Statuses).filter(Statuses.status==status.upper()).all()
+        return [user.name for user in n]
+
+    ### Set Functions
+
+    @dblocked
+    def setemail(self, name, email):
+
+        """
+            set email of user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.setemail
+        """
+
+        user = byname(name)
+
+        if user:
+            #Session.begin()
+            try:
+                user.email.remove(email)
+            except:
+                pass
+            user.email.insert(0, email)
+            #Session.refresh(user)
+            #Session.commit()
+            #Session.close()
+            return True
+
+        return False
+
+    ### Add functions
+
+    @dblocked
+    def add(self, name, userhosts, perms):
+
+        """
+            add an user. session argument is provided by @trans
+
+            :param name: name of the user
+            :type name: string
+            :param userhosts: userhosts to add
+            :type userhosts: list .. list of userhosts
+            :param perms: the permissions to add
+            :type perms: list .. list of permissions
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.add
+
+        """
+
+        if type(userhosts) != types.ListType:
+            rlog(10, 'users', 'i need a list of userhosts')
+            return False
+
+        name = stripname(name.lower())
+
+        if not os.path.isdir(self.datadir + os.sep + 'users'):
+            os.mkdir(self.datadir + os.sep + 'users')
+
+        if not os.path.isdir(self.datadir + os.sep + 'users' +  os.sep + name):
+            os.mkdir(self.datadir + os.sep + 'users' +  os.sep + name)
+
+        user = byname(name)
+
+        if not user:
+
+            try:
+                #Session.begin()
+                newuser = User(name=name)
+                newuser.userhosts.extend(userhosts)
+                newuser.perms.extend(perms)
+                Session.add(newuser)
+                #Session.commit()
+                #Session.close()
+            except sqlalchemy.exc.IntegrityError, ex:
+                if 'not unique' in str(ex):
+                    rlog(10, 'users', '%s %s already exists' % (name, userhosts))
+                    Session.close()
+                    return True
+                else:
+                    raise
+            except Exception, ex:
+                raise
+
+            rlog(10, 'users', '%s %s %s added to user database' % (name, userhosts, perms))
+
+        return True
+
+    @dblocked
+    def addemail(self, userhost, email):
+
+        """
+            add an email address to the userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.addemail
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            #Session.begin()
+            user.email.append(email)
+            #Session.refresh(user)
+            #Session.commit()
+            #Session.close()
+            rlog(10, 'users', '%s (%s) added to email' % (email, userhost))
+            return True
+
+        return False
+
+    @dblocked
+    def addperm(self, userhost, perm):
+
+        """
+            add the specified perm to the userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.addperm
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            #Session.begin()
+            user.perms.append(perm.upper())
+            #Session.refresh(user)
+            #Session.commit()
+            #Session.close()
+            rlog(10, 'users', '%s perm %s added' % (userhost, perm))
+            return True
+
+        return False
+
+    @dblocked
+    def addpermit(self, userhost, permit):
+
+        """
+            add the given [who, what] permit to the given userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.addpermit
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            p = '%s %s' % permit
+            #Session.begin()
+            user.permits.append(p)
+            Session.refesh(user)
+            #Session.commit()
+            #Session.close()
+            rlog(10, 'users', '%s permit %s added' % (userhost, p))
+            return True
+
+        return False
+
+    @dblocked
+    def addstatus(self, userhost, status):
+
+        """
+            add status to given userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.addstatus
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            #Session.begin()
+            user.statuses.append(status.upper())
+            #Session.commit()
+            #Session.refresh(user)
+            #Session.close()
+            rlog(10, 'users', '%s status %s added' % (name, status))
+            return True
+
+        return False
+
+    @dblocked
+    def adduserhost(self, name, userhost):
+
+        """
+            add userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.adduserhost
+
+        """
+
+        user = byname(name)
+        #Session.begin()
+        if not user:
+            user = User(name=name)
+            Session.add(user)
+       
+        user.userhosts.append(userhost)
+        #Session.commit()
+        #Session.refresh(user)
+        #Session.close()
+        rlog(10, 'users', '%s (%s) added to userhosts' % (name, userhost))
+        return True
+
+    @dblocked
+    def adduseremail(self, name, email):
+
+        """
+            add email to specified user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.adduseremail
+
+        """
+
+        user = byname(name)
+
+        if user:
+            #Session.begin()
+            user.email.append(email)
+            #Session.commit()
+            #Session.refresh(user)
+            #Session.close()
+            rlog(10, 'users', '%s email %s added' % (name, email))
+            return True
+
+    @dblocked
+    def adduserperm(self, name, perm):
+
+        """
+            add permission.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.adduserperm
+
+        """
+
+        user = byname(name)
+
+        if user:
+            #Session.begin()
+            perm = perm.upper()
+            user.perms.append(perm)
+            #Session.commit()
+            #Session.refresh(user)
+            #Session.close()
+            rlog(10, 'users', '%s perm %s added' % (name, perm))
+            return True
+
+        return False
+
+    @dblocked
+    def adduserpermit(self, name, who, permit):
+
+        """ 
+            add (who, what) permit tuple to specified user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.adduserpermit
+
+        """
+
+        user = byname(name)
+
+        if user:
+            p = '%s %s' % (who, permit)
+            #Session.begin()
+            user.permits.append(p)
+            #Session.commit()
+            #Session.refresh(user)
+            #Session.close()
+            rlog(10, 'users', '%s permit %s added' % (name, p))
+            return True
+
+        return False
+
+    @dblocked
+    def adduserstatus(self, name, status):
+
+        """
+            add status to given user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.adduserstatus
+
+        """
+
+        user = byname(name)
+
+        if user:
+            #Session.begin()
+            user.statuses.append(status.upper())
+            #Session.commit()
+            #Session.refresh(user)
+            #Session.close()
+            rlog(10, 'users', '%s status %s added' % (name, status))
+            return True
+
+        return False
+
+    @dblocked
+    def addpermall(self, perm): 
+
+        """
+            add permission to all users.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.addpermall
+        """
+
+        users = query(User).all()
+
+        if users:
+            #Session.begin()
+            for user in users:
+                user.perms.append(perm.upper())
+                #Session.refresh(user)
+            #Session.commit()
+            #Session.close()
+
+    ### Delete functions
+
+    @dblocked
+    def delemail(self, userhost, email):
+
+        """
+            delete email from userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.delemail
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            if email in user.emails:
+                #Session.begin()
+                user.emails.remove(email)
+                #Session.commit()
+                #Session.refresh(user)
+                #Session.close()
+                return True
+
+        return False
+
+    @dblocked
+    def delperm(self, userhost, perm):
+
+        """
+            delete perm from userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.delperm
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            p = perm.upper()
+
+            if p in user.perms:
+                #Session.begin()
+                user.perms.remove(p)
+                #Session.commit()
+                #Session.refresh(user)
+                #Session.close()
+                return True
+
+        return False
+            
+    @dblocked
+    def delpermit(self, userhost, permit):
+
+        """
+            delete permit from userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.delpermit
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            p = '%s %s' % permit
+
+            if p in user.permits:
+                #Session.begin()
+                user.permits.remove(p)
+                #Session.commit()
+                #Session.refresh(user)
+                #Session.close()
+                return True
+
+        return False
+
+    @dblocked
+    def delstatus(self, userhost, status):
+
+        """
+            delete status from userhost.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.delstatus
+
+        """
+
+        user = getuser(userhost)
+
+        if user:
+            st = status.upper()
+
+            if st in user.statuses:
+                #Session.begin()
+                user.statuses.remove(st)
+                #Session.commit()
+                #Session.refresh(user)
+                #Session.close()
+                return True
+
+        return False
+
+    @dblocked
+    def delete(self, name):
+
+        """ 
+            delete user with name. 
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.delete
+
+        """
+        name = stripname(name)
+        user = byname(name)
+
+        if user:
+            rlog(10, 'users', "deleting %s" % name)
+            #Session.begin()
+            Session.delete(user)
+            #Session.commit()
+            #Session.close()
+            return True
+
+        return False
+
+    @dblocked
+    def deluserhost(self, name, userhost):
+
+        """
+            delete the userhost entry.
+
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.deluserhost
+        """
+
+        user = byname(name)
+
+        if user:
+            if userhost in user.userhosts:
+                #Session.begin()
+                user.userhosts.remove(userhost)
+                #Session.refresh(user)
+                #Session.commit()
+                #Session.close()
+                rlog(10, 'users', '%s userhost %s deleted' % (name, userhost))
+                return True
+
+        return False
+
+    @dblocked
+    def deluseremail(self, name, email):
+
+        """
+            delete email.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.deluseremail
+
+        """
+
+        user = byname(name)
+
+        if user:
+            if email in user.email:
+                #Session.begin()
+                user.email.remove(email)
+                #Session.refresh(user)
+                #Session.commit()
+                #Session.close()
+                rlog(10, 'users', '%s email %s deleted' % (name, email))
+                return True
+
+        return False
+
+    @dblocked
+    def deluserperm(self, name, perm):
+
+        """
+             delete permission.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.deluserperm
+
+        """
+
+        user = byname(name)
+
+        if user:
+            p = perm.upper()
+
+            if p in user.perms:
+                #Session.begin()
+                user.perms.remove(p)
+                #Session.refresh(user)
+                #Session.commit()
+                #Session.close()
+                rlog(10, 'users', '%s perm %s deleted' % (name, p))
+                return True
+
+        return False
+
+    @dblocked
+    def deluserpermit(self, name, permit):
+
+        """
+            delete permit.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.deluserpermit
+
+        """
+
+        user = byname(name)
+
+        if user:
+            p = '%s %s' % permit
+
+            if p in user.permits:
+                #Session.begin()
+                user.permits.remove(p)
+                #Session.refresh(user)
+                #Session.commit()
+                #Session.close()
+                rlog(10, 'users', '%s permit %s deleted' % (name, p))
+                return True
+
+        return False
+
+    @dblocked
+    def deluserstatus(self, name, status):
+
+        """
+            delete the status from the given user.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.deluserstatus
+
+        """
+
+        user = byname(name)
+
+        if user:
+            st = status.upper()
+
+            if st in user.statuses:
+                #Session.begin()
+                user.statuses.remove(status)
+                #Session.refresh(user)
+                #Session.commit()
+                #Session.close()
+                rlog(10, 'users', '%s status %s deleted' % (name, st))
+                return True
+
+        return False
+
+    @dblocked
+    def delallemail(self, name):
+
+        """
+            Delete all emails of the specified user.
+
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.delallemail
+
+        """
+
+        user = byname(name)
+
+        if user:
+            #Session.begin()
+            user.email = []
+            #Session.refresh(user)
+            #Session.commit()
+            #Session.close()
+            rlog(10, 'users', '%s emails deleted' % (name, ))
+            return True
+
+        return False
+
+    @dblocked
+    def delpermall(self, perm):
+
+        """
+            delete permission from all users.
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.delpermall
+
+        """
+
+        users = query(User).options(eagerload('perms')).all()
+
+        for user in users:
+
+            if user.name != 'owner':
+
+                try:
+                    #Session.begin()
+                    user.perms.remove(perm)
+                    #Session.refresh(user)
+                    #Session.commit()
+                    #Session.close()
+                except ValueError:
+                    pass
+
+        return True
+
+    def make_owner(self, userhosts):
+
+        """
+            see if owner already has a user account if not merge otherwise 
+            add.
+
+            :param userhosts: userhosts to inititalize owner with
+            :type userhosts: list or string
+
+            .. literalinclude:: ../../gozerbot/users.py
+                :pyobject: DbUsers.make_owner
+
+        """
+
+        owner = []
+
+        if type(userhosts) != types.ListType:
+            owner.append(userhosts)
+        else:
+            owner = userhosts
+
+        for userhost in owner:
+            username = self.getname(unicode(userhost))
+
+            if not username:
+                if not self.merge('owner', unicode(userhost)):
+                    self.add('owner', [unicode(userhost), ], ['USER', 'OPER'])
+            elif username != 'owner':
+                self.delete(username)
+                if not self.merge('owner', unicode(userhost)):
+                    self.add('owner', [unicode(userhost), ], ['USER', 'OPER'])
+               
+## INIT SECTION
+
+# default to database
+
+if not config['nodb']:
+    users = DbUsers()
+else:
+    # otheriwse use json users
+    users = JsonUsers(datadir + os.sep + (config['jsonuser'] or 'users.json'))
+
+## END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/periodical.py
+++ gozerbot-0.99.1/build/lib/gozerbot/periodical.py
@@ -0,0 +1,567 @@
+# gozerbot/periodical.py
+#
+#
+
+__author__ = "Wijnand 'tehmaze' Modderman - http://tehmaze.com"
+__license__ = "BSD License"
+
+## IMPORT SECTION
+
+# gozerbot imports
+
+from utils.exception import handle_exception
+from utils.trace import calledfrom, whichmodule
+from utils.locking import lockdec
+from utils.log import rlog
+from utils.timeutils import strtotime
+import threads.thr as thr
+
+# basic imorts
+import datetime, sys, time, thread, types
+
+## END IMPORT
+
+## LOCK SECTION
+# locks and vars
+plock    = thread.allocate_lock()
+locked   = lockdec(plock)
+pidcount = 0
+
+# END LOCK
+
+class JobError(Exception):
+
+    """
+        job error exception.
+
+    """
+
+    pass
+
+class Job(object):
+
+    """
+        job to be scheduled.
+
+    """
+
+    group = ''
+    pid   = -1
+
+    def __init__(self):
+        global pidcount
+        pidcount += 1
+        self.pid = pidcount
+
+    def id(self):
+
+        """
+            return job id.
+
+        """
+
+        return self.pid
+
+    def member(self, group):
+
+        """
+             check for group membership.
+
+             :param group: group to check for
+             :type group: string
+             :rtype: boolean
+
+        """
+
+        return self.group == group
+
+    def do(self):
+        # try the callback
+        try:
+            self.func(*self.args, **self.kw)
+        except Exception, ex:
+            handle_exception()
+
+class JobAt(Job):
+
+    """
+        job to run at a specific time/interval/repeat.
+
+        :param start: start time
+        :type start: int, float or string
+        :param interval: time between alarms
+        :type interval: integer
+        :param repeat: number of repeats
+        :type interval: integer
+        :param func: the function to execute
+        :type func: function
+
+    """
+
+    def __init__(self, start, interval, repeat, func, *args, **kw):
+        Job.__init__(self)
+        self.func = func
+        self.args = args
+        self.kw = kw
+        self.repeat = repeat
+        self.description = ""
+        self.counts = 0
+
+        # check start time format
+        if type(start) in [types.IntType, types.FloatType]:
+            self.next = float(start)
+        elif type(start) in [types.StringType, types.UnicodeType]:
+            d = strtotime(start)
+            if d and d > time.time():
+                self.next = d
+            else:
+                raise JobError("invalid date/time")
+
+        if type(interval) in [types.IntType]:
+            d = datetime.timedelta(days=interval)
+            self.delta = d.seconds
+        else:
+            self.delta = interval
+
+    def __repr__(self):
+
+        """
+            return a string representation of the JobAt object.
+
+        """
+
+        return '<JobAt instance next=%s, interval=%s, repeat=%d, function=%s>' % (str(self.next),
+            str(self.delta), self.repeat, str(self.func))
+
+    def check(self):
+
+        """
+            run check to see if job needs to be scheduled.
+
+            .. literalinclude:: ../../gozerbot/periodical.py
+                :pyobject: JobAt.check
+
+        """
+
+        if self.next <= time.time():
+            rlog(0, 'periodical', 'running %s - %s' % (str(self.func), self.description))
+            self.func(*self.args, **self.kw)
+            self.next += self.delta
+            self.counts += 1
+            if self.repeat > 0 and self.counts >= self.repeat:
+                return False # remove this job
+        return True
+
+class JobInterval(Job):
+
+    """
+        job to be scheduled at certain interval.
+
+        :param interval: time between alarms
+        :type interval: integer
+        :param repeat: number of repeats
+        :type interval: integer
+        :param func: the function to execute
+        :type func: function
+
+    """
+
+    def __init__(self, interval, repeat, func, *args, **kw):
+        Job.__init__(self)
+        self.func = func
+        self.args = args
+        self.kw = kw
+        self.repeat = int(repeat)
+        self.counts = 0
+        self.interval = float(interval)
+        self.description = ""
+        self.next = time.time() + self.interval
+        self.group = None
+        rlog(-10, 'periodical', 'scheduled next run of %s in %d seconds' % \
+(str(self.func), self.interval))
+
+    def __repr__(self):
+        return '<JobInterval instance next=%s, interval=%s, repeat=%d, group=%s, \
+function=%s>' % (str(self.next), str(self.interval), self.repeat, self.group,
+str(self.func))
+
+    def check(self):
+
+        """
+            run check to see if job needs to be scheduled.
+
+            .. literalinclude:: ../../gozerbot/periodical.py
+                :pyobject: JobInterval.check
+        """
+
+        if self.next <= time.time():
+            rlog(0, 'periodical', 'running %s - %s' % (str(self.func), self.description))
+            self.next = time.time() + self.interval
+            thr.start_new_thread(self.do, ())
+            self.counts += 1
+            if self.repeat > 0 and self.counts >= self.repeat:
+                return False # remove this job
+        return True
+
+
+class Periodical(object):
+
+    """
+         periodical scheduler.
+
+    """
+
+    SLEEPTIME = 1 # smallest interval possible
+
+    def __init__(self):
+        self.jobs = []
+        self.running = []
+        self.run = True
+
+    def start(self):
+
+        """
+            start the periodical scheduler.
+
+            .. literalinclude:: ../../gozerbot/periodical.py
+                :pyobject: Periodical.start
+        """
+
+        thr.start_new_thread(self.checkloop, ())
+
+    def addjob(self, sleeptime, repeat, function, description="" , *args, **kw): 
+
+        """
+            add a periodical job.
+
+            :param sleeptime: sleeptime between intervals
+            :type sleeptime: float
+            :param repeat: number of times to repeat 
+            :type repeat: integer
+            :param function: function to execute
+            :type function: function
+            :param description: description of the periodical job
+            :type description: string
+
+            .. literalinclude:: ../../gozerbot/periodical.py
+                 :pyobject: Periodical.addjob
+
+        """
+
+        job = JobInterval(sleeptime, repeat, function, *args, **kw)
+        job.group = calledfrom(sys._getframe())
+        job.description = str(description) or whichmodule()
+        self.jobs.append(job)
+        return job.pid
+
+    def changeinterval(self, pid, interval):
+ 
+        """
+             change interval of of peridical job.
+
+             :param pid: id op the periodical job
+             :type pid: integer
+             :param interval: interval to set 
+             :type interval: integer
+
+             .. literalinclude:: ../../gozerbot/periodical.py
+                 :pyobject: Periodical.changeinterval
+        """
+
+        for i in periodical.jobs:
+
+            if i.pid == pid:
+                i.interval = interval
+                i.next = time.time() + interval
+
+    def looponce(self):
+        for job in self.jobs:
+
+            if job.next <= time.time():
+                self.runjob(job)
+
+    def checkloop(self):
+
+        """
+            main loop of the periodical scheduler.
+
+            .. literalinclude:: ../../gozerbot/periodical.py
+                :pyobject: Periodical.checkloop
+
+        """
+
+        while self.run:
+
+            for job in self.jobs:
+
+                if job.next <= time.time():
+                    self.runjob(job)
+
+            time.sleep(self.SLEEPTIME)
+
+    def runjob(self, job):
+
+        """
+            run a periodical job
+
+            :param job: the job to be runned 
+            :type job: Job
+
+            .. literalinclude:: ../../gozerbot/periodical.py
+                :pyobject: Periodical.runjob
+
+        """
+
+        if not job.check():
+            self.killjob(job.id())
+        else:
+            self.running.append(job)
+
+    def kill(self):
+
+        '''
+            kill all jobs invoked by another module.
+
+            .. literalinclude:: ../../gozerbot/periodical.py
+               :pyobject: Periodical.kill
+        '''
+
+        group = calledfrom(sys._getframe())
+        self.killgroup(group)
+
+    def killgroup(self, group):
+
+        '''
+            kill all jobs with the same group.
+
+            :param group: the group of jobs to kill
+            :type group: string
+
+            .. literalinclude:: ../../gozerbot/periodical.py
+                :pyobject: Periodical.killgroup
+
+        '''
+
+        def shoot():
+
+            """ knock down all jobs belonging to group. """
+
+            deljobs = [job for job in self.jobs if job.member(group)]
+
+            for job in deljobs:
+                self.jobs.remove(job)
+
+                try:
+                    self.running.remove(job)
+                except ValueError:
+                    pass
+
+            rlog(5, 'periodical', 'killed %d jobs for %s' % (len(deljobs), \
+group))
+
+            del deljobs
+
+        shoot() # *pow* you're dead ;)
+
+    def killjob(self, jobId):
+
+        '''
+            kill one job by its id.
+
+            :param jobId: the id of the job to kill
+            :type jobId: integer
+            :rtype: integer .. number of jobs killed
+
+            .. literalinclude:: ../../gozerbot/periodical.py
+                :pyobject: Periodical.killjob
+        '''
+
+        def shoot():
+            deljobs = [x for x in self.jobs if x.id() == jobId]
+            numjobs = len(deljobs)
+            for job in deljobs:
+                self.jobs.remove(job)
+                try:
+                    self.running.remove(job)
+                except ValueError:
+                    pass
+            del deljobs
+            return numjobs
+
+        return shoot() # *pow* you're dead ;)
+
+
+def interval(sleeptime, repeat=0):
+
+    """
+        interval decorator.
+
+        :param sleeptime: time to sleep
+        :type sleeptime: integer
+        :param repeat: number of times to repeat the job
+        :type repeat: integet
+
+        .. literalinclude:: ../../gozerbot/periodical.py
+            :pyobject: interval
+
+    """
+
+    group = calledfrom(sys._getframe())
+
+    def decorator(function):
+        decorator.func_dict = function.func_dict
+
+        def wrapper(*args, **kw):
+            job = JobInterval(sleeptime, repeat, function, *args, **kw)
+            job.group = group
+            job.description = whichmodule()
+            periodical.jobs.append(job)
+            rlog(-15, 'periodical', 'new interval job %d with sleeptime %d' % \
+(job.id(), sleeptime))
+
+        return wrapper
+
+    return decorator
+
+def at(start, interval=1, repeat=1):
+
+    """
+        at decorator.
+
+        :param start: start time of the periodical job
+        :type start: integer, float or string
+        :param interval: time between jobs
+        :type sleeptime: integer
+        :param repeat: number of times to repeat the job
+        :type repeat: integet
+
+        .. literalinclude:: ../../gozerbot/periodical.py
+            :pyobject: at
+
+    """
+
+    group = calledfrom(sys._getframe())
+
+    def decorator(function):
+        decorator.func_dict = function.func_dict
+
+        def wrapper(*args, **kw):
+            job = JobAt(start, interval, repeat, function, *args, **kw)
+            job.group = group
+            job.description = whichmodule()
+            periodical.jobs.append(job)
+
+        wrapper.func_dict = function.func_dict
+        return wrapper
+
+    return decorator
+
+def persecond(function):
+
+    """
+        per second decorator.
+
+        :param function: function to execute every second
+        :type function: function
+
+        .. literalinclude:: ../../gozerbot/periodical.py
+            :pyobject: persecond
+    """
+
+    minutely.func_dict = function.func_dict
+    group = calledfrom(sys._getframe())
+
+    def wrapper(*args, **kw):
+        job = JobInterval(1, 0, function, *args, **kw)
+        job.group = group
+        job.description = whichmodule()
+        periodical.jobs.append(job)
+        rlog(-15, 'periodical', 'new interval job %d running per second' % \
+job.id())
+
+    return wrapper
+
+def minutely(function):
+
+    """
+        minute decorator.
+
+        :param function: function to execute every minute
+        :type function: function
+
+        .. literalinclude:: ../../gozerbot/periodical.py
+            :pyobject: minutely
+
+    """
+
+    minutely.func_dict = function.func_dict
+    group = calledfrom(sys._getframe())
+
+    def wrapper(*args, **kw):
+        job = JobInterval(60, 0, function, *args, **kw)
+        job.group = group
+        job.description = whichmodule()
+        periodical.jobs.append(job)
+        rlog(-15, 'periodical', 'new interval job %d running minutely' % \
+job.id())
+
+    return wrapper
+
+def hourly(function):
+
+    """
+        hour decorator.
+
+        :param function: function to execute every hour
+        :type function: function
+
+        .. literalinclude:: ../../gozerbot/periodical.py
+            :pyobject: hourly
+
+    """
+
+    rlog(-15, 'periodical', '@hourly(%s)' % str(function))
+    hourly.func_dict = function.func_dict
+    group = calledfrom(sys._getframe())
+
+    def wrapper(*args, **kw):
+        job = JobInterval(3600, 0, function, *args, **kw)
+        job.group = group
+        job.description = whichmodule()
+        rlog(-15, 'periodical', 'new interval job %d running hourly' % job.id())
+        periodical.jobs.append(job)
+
+    return wrapper
+
+def daily(function):
+
+    """
+        day decorator.
+
+        :param function: function to execute every hour
+        :type function: function
+
+        .. literalinclude:: ../../gozerbot/periodical.py
+            :pyobject: daily
+
+    """
+
+    rlog(-15, 'periodical', '@daily(%s)' % str(function))
+    daily.func_dict = function.func_dict
+    group = calledfrom(sys._getframe())
+
+    def wrapper(*args, **kw):
+        job = JobInterval(86400, 0, function, *args, **kw)
+        job.group =  group
+        job.description = whichmodule()
+        periodical.jobs.append(job)
+        rlog(-15, 'periodical', 'new interval job %d running daily' % job.id())
+
+    return wrapper
+
+## INIT SECTION
+
+# the periodical scheduler
+periodical = Periodical()
+
+## END INIT
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gozerbot/exit.py
+++ gozerbot-0.99.1/build/lib/gozerbot/exit.py
@@ -0,0 +1,73 @@
+# gozerbot/exit.py
+#
+#
+
+""" gozerbot's finaliser """
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION
+
+
+# gozerbot imports
+from utils.log import rlog
+from utils.trace import whichmodule
+from eventhandler import mainhandler
+from plugins import plugins
+from fleet import fleet
+from persist.persist import saving
+from runner import runners_stop
+from gozerbot.config import config
+
+# basic imports
+import atexit, os, time, sys
+
+# END IMPORT
+# ==========
+
+# ============
+# LOCK SECTION
+
+# no locks
+
+# END LOCK
+# ========
+
+def globalshutdown():
+
+    """
+        shutdown the bot.
+
+        .. literalinclude:: ../../gozerbot/exit.py
+            :pyobject: globalshutdown
+
+    """
+
+    rlog(10, 'GOZERBOT', 'SHUTTING DOWN')
+
+    try:
+        os.remove('gozerbot.pid')
+    except:
+        pass
+
+    try:
+        runners_stop()
+        rlog(10, 'gozerbot', 'shutting down fleet')
+        fleet.exit()
+        rlog(10, 'gozerbot', 'shutting down plugins')
+        plugins.exit()
+        rlog(10, 'GOZERBOT', 'done')
+        os._exit(0)
+
+    except Exception, ex:
+        rlog(10, 'gozerbot.exit', 'exit error %s:' % str(ex))
+
+# ============
+# INIT SECTION
+
+# register shutdown function
+#atexit.register(globalshutdown)
+
+# END INIT
+# ========
--- gozerbot-0.99.1.orig/build/lib/gozerbot/channels.py
+++ gozerbot-0.99.1/build/lib/gozerbot/channels.py
@@ -0,0 +1,136 @@
+# gozerbot/channels.py
+#
+#
+
+""" 
+    channel related data. implemented with a persisted dict of dicts. 
+    
+    :example:
+
+        key = channels[event.channel]['key']
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# IMPORT SECTION
+# gozerbot imports
+from persist.pdod import Pdod
+
+# END IMPORT
+
+class Channels(Pdod):
+
+    """ 
+        channels class .. per channel data. 
+
+        :param fname: filename to persist the data to
+        :type fname: string
+
+    """
+
+    def __init__(self, fname):
+
+        # call base constructor
+        Pdod.__init__(self, fname)
+
+        # make sure attributes are initialised
+        for j in self.data.values():
+            if not j.has_key('perms'):
+                j['perms'] = []
+            if not j.has_key('autovoice'):
+                j['autovoice'] = 0
+
+    def __setitem__(self, a, b):
+
+        # if item is not in dict initialise it to empty dict
+        if not self.data.has_key(a):
+           self.data[a] = {}
+
+        # assign data
+        self.data[a] = b 
+
+    def getchannels(self):
+
+        """
+            return channels.
+
+        .. literalinclude:: ../../gozerbot/channels.py
+            :pyobject: Channels.getchannels
+
+        """
+
+        result = [] # list of channels found
+
+        # loop over channels
+        for channel in self.data.keys():
+            channel = channel.strip()
+            if channel not in result:
+                result.append(channel)
+
+        return result
+
+    def getchannelswithkeys(self):
+
+        """
+            return channels with keys.
+
+            .. literalinclude:: ../../gozerbot/channels.py
+                :pyobject: Channels.getchannelswithkeys
+
+        """
+
+        result = []
+
+        # loop over channels gathering channel name and key
+        for channel in self.data.keys():
+            channel = channel.strip()
+            try:
+                key = self.data[channel]['key']
+                if not channel + ' ' + key in result:
+                    result.append(channel + ' ' + key)
+            except KeyError:
+                if channel not in result:
+                    result.append(channel)
+
+        return result
+
+    def getkey(self, channel):
+
+        """ 
+            return key of channel if set.
+
+            :param channel: channel to get key from
+            :type channel: string
+
+            .. literalinclude:: ../../gozerbot/channels.py
+                :pyobject: Channels.getkey
+
+        """
+
+        try:
+            key = self.data[channel]['key']
+        except:
+            key = None
+
+        return key
+
+    def getnick(self, channel):
+
+        """ 
+            return bot nick of channel if set.
+
+            :param channel: channel to get key from
+            :type channel: string
+
+            .. literalinclude:: ../../gozerbot/channels.py
+                :pyobject: Channels.getnick
+
+        """
+
+        try:
+            nick = self.data[channel]['nick']
+        except:
+            nick = None
+
+        return nick
--- gozerbot-0.99.1.orig/build/lib/gozerbot/tests.py
+++ gozerbot-0.99.1/build/lib/gozerbot/tests.py
@@ -0,0 +1,326 @@
+# gozerbot/tests.py
+#
+#
+
+""" gozerbot tests framework. """
+
+## IMPORT SECTION
+
+# gozerbot imports
+from config import config
+from threads.thr import start_new_thread
+from utils.locking import lockdec
+from utils.log import rlog
+from utils.trace import calledfrom, whichmodule
+from utils.exception import exceptionmsg
+from utils.dol import Dol
+from eventbase import EventBase
+
+# basic imports
+import sys, re, thread, copy, time, threading, random
+
+## END IMPORT
+
+# used to copy attributes
+cpy = copy.deepcopy
+
+## LOCK SECTION
+
+# locks
+testlock = threading.RLock()
+locked = lockdec(testlock)
+
+## END LOCK
+
+class Test(object):
+
+    """ a test object. """
+
+    def __init__(self, execstring="", expect="", descr="", where="", fakein=""):
+        self.plugin = calledfrom(sys._getframe(1))
+        if not self.plugin:
+            self.plugin = calledfrom(sys._getframe(2))
+        self.descr = cpy(descr)
+        self.execstring = cpy(execstring)
+        self.expect = cpy(expect)
+        self.response = ""
+        self.groups = []
+        self.error = ""
+        self.where = cpy(where)
+        self.fakein = cpy(fakein)
+        self.start = None
+        self.end = None
+        self.prev = None
+        self.activate = False
+        
+    def __str__(self):
+        return "test %s (%s) %s ==> %s (%s)" % (self.descr, self.where, self.execstring, self.response, self.error)
+
+    def begin(self):
+        if self.start:
+            self.start()
+        return self
+
+    def run(self, bot, event):
+
+        """ run the test on bot with event. """
+
+        if not self.activate:
+            return
+
+        if config['loadlist'] and self.plugin not in config['loadlist']:
+            return
+
+        mevent = copy.deepcopy(event)
+        mevent.onlyqueues = False
+        mevent.channel = '#dunkbots'
+        bot.userhosts['bottest'] = 'bottest@test'
+        bot.userhosts['mtest'] = 'mekker@test'
+        bot.userhosts['exec'] = 'exec@gozerbot'
+        if 'exec@gozerbot' not in bot.state['joinedchannels']:
+            bot.state['joinedchannels'].append('exec@gozerbot')
+        bot.channels['exec@gozerbot'] = {}
+        if '#dunkbots' not in bot.state['joinedchannels']:
+            bot.state['joinedchannels'].append('#dunkbots')
+        bot.channels['#dunkbots'] = {'cc': '!'}
+        self.error = ""
+        self.response = ""
+        self.groups = []
+        origexec = self.execstring
+        origexpect = self.expect
+        if self.start:
+            self.start()
+            return self
+        if self.end:
+            self.end()
+            return self
+        if self.fakein:
+            bot.fakein(self.fakein)
+            return self
+        if self.prev and self.prev.groups:
+            try:
+                execstring = self.execstring % self.prev.groups
+                self.execstring = execstring
+            except TypeError:
+                pass
+            try:
+                expect = self.expect % self.prev.groups
+                self.expect = expect
+            except TypeError:
+                pass
+
+        self.execstring = self.execstring.replace('{{ me }}', mevent.nick)
+        mevent.txt = mevent.origtxt = str(self.execstring)
+        rlog(100, 'tests', 'launching %s' % mevent.txt)
+
+        from gozerbot.plugins import plugins
+        self.response = plugins.cmnd(bot, mevent)
+
+        if self.response and self.expect:
+            self.expect = self.expect.replace('{{ me }}', mevent.nick)
+            expects = self.expect.split('|')
+            got = False
+            for expect in expects:
+                regex = re.compile(expect)
+                result = regex.search(str(self.response))
+
+                if result:
+                    got = True
+                    break
+
+            if not got:
+                self.error = 'invalid response'
+            else:
+                self.groups = result.groups() 
+
+        self.execstring = origexec
+        self.expect = origexpect
+
+        return self
+
+class Tests(object):
+
+    """ collection of all tests. """
+
+    def __init__(self):
+        self.tests = []
+        self.err = Dol()
+        self.toolate = Dol()
+        self.teller = 0
+
+    #@locked
+    def add(self, execstr, expect=None, descr="", fakein=""):
+
+        """ add a test. """
+
+        where = whichmodule(1)
+        if not where:
+            where = whichmodule(2)
+        if not where:
+            where = whichmodule(3)
+        test = Test(execstr, expect, descr, where, fakein)
+        self.tests.append(test)
+        return self
+
+    #@locked
+    def fakein(self, execstr, expect=None, descr=""):
+
+        """ call bot.fakein(). """ 
+
+        where = whichmodule(1)
+        if not where:
+            where = whichmodule(2)
+        if not where:
+            where = whichmodule(3)
+        test = Test(execstr, expect, descr, where, execstr)
+        test.where = where
+        self.tests.append(test)
+        return self
+
+    def start(self, func):
+
+        """ optional start function. """
+        where = whichmodule(1)
+        if not where:
+            where = whichmodule(2)
+        if not where:
+            where = whichmodule(3)
+        test = Test()
+        test.start = func
+        test.where = where
+        test.execstring = 'start'
+        self.tests.append(test)
+        return self
+
+    def end(self, func):
+
+        """ optional end function. """
+
+        where = whichmodule(1)
+        if not where:
+            where = whichmodule(2)
+        if not where:
+            where = whichmodule(3)
+        test = Test()
+        test.end = func
+        test.where = where
+        test.execstring = 'end'
+        self.tests.append(test)
+        return self
+
+    def unload(self, plugname):
+
+        """ unload tests. """
+
+        for i in range(len(self.tests)-1, -1, -1):
+            if self.tests[i].plugin == plugname:
+                del self.tests[i]
+
+        return self
+
+    def activate(self, plugname):
+
+        """ activate tests. """
+
+        for i in range(len(self.tests)-1, -1, -1):
+            if self.tests[i].plugin == plugname:
+                self.tests[i].activate = True
+
+        return self
+
+    def disable(self, plugname):
+
+        """ unload tests. """
+
+        for i in range(len(self.tests)-1, -1, -1):
+            if self.tests[i].plugin == plugname:
+                self.tests[i].activate = False
+
+        return self
+
+    def dorun(self, bot, event, tests, where, plug=None):
+        teller = 0
+        err = {}
+        toolate = []
+        prev = None
+        for test in tests:
+            if event.rest and event.rest not in test.plugin:
+                continue
+            if prev: 
+                test.prev = prev
+            prev = test
+            if test.expect:
+                teller += 1
+            try:
+                starttime = time.time()
+                self.teller += 1
+                e = copy.deepcopy(event)
+                result = test.run(bot, e)
+                finished = time.time()
+                if finished - starttime > 10:
+                    self.toolate[test.execstring] = finished - starttime
+                if not result:
+                    continue
+                if not result.error:
+                    event.reply("OK %s (%s) ==> %s" % (test.execstring, test.where, result.response))
+                else:
+                    self.err[test.execstring] = test
+                    event.reply('ERROR %s (%s): %s ==> %s (%s)' % (test.error, test.where, test.execstring, test.response, test.expect))
+            except Exception, ex:
+                test.error = exceptionmsg()
+                self.err[test.execstring] = test
+                event.reply(test.error)
+
+        return self
+
+    def dotests(self, bot, event, threaded=False, plug=None):
+
+        """ fire all tests. """
+
+        #event = EventBase(eventin)
+        groups = Dol()
+
+        for test in self.tests:
+            groups.add(test.where, test)
+
+        threads = []
+        testlist = []
+
+        for where, tests in groups.iteritems():
+            testlist.append((where, tests))
+
+        random.shuffle(testlist)
+
+        for t in testlist:
+            where, tests = t
+            if plug and plug not in where:
+                continue
+            event.reply("running tests on %s" % where)
+            if threaded:
+                thread = start_new_thread(self.dorun, (bot, event, tests, where, plug))
+                threads.append(thread)
+            else:
+                self.dorun(bot, event, tests, where, plug)
+
+        for thread in threads:
+            thread.join()
+
+        event.done()
+
+    def sleep(self, seconds):
+
+        """ sleep nr of seconds. """
+
+        time.sleep(seconds)
+        return self
+
+## INIT SECTION
+
+# expect is for examples
+
+expect = {}
+
+# the tests
+tests = Tests()
+
+## END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/__init__.py
+++ gozerbot-0.99.1/build/lib/gozerbot/__init__.py
@@ -0,0 +1,45 @@
+# gozerbot package
+#
+#
+
+""" gozerbot core package. """
+
+__copyright__ = 'this file is in the public domain'
+
+__version__ = "0.99.1"
+
+__all__ = ['aliases', 'database', 'ignore', 'periodical', 'tests', \
+'botbase',  'datadir', 'persist', 'threads', \
+'cache', 'eventbase', 'irc', 'plughelp', 'users', \
+'callbacks', 'eventhandler', 'jabber', 'plugins', 'utils', \
+'channels', 'examples', 'jsonusers', 'plugs', 'wait', \
+'commands', 'exit', 'less', 'redispatcher', \
+'compat', 'fleet', 'monitor', 'rest', \
+'config', 'morphs', 'runner', 'wave', \
+'contrib', 'gozerimport', 'partyline', 'stats', 'utils', 'reboot', 'xmpp']
+
+# ==============
+# IMPORT SECTION
+
+from eggs import loadegg
+import os
+
+# END IMPORT
+# ==========
+
+# ============
+# LOCK SECTION
+
+# no locks
+
+# END LOCK
+# ========
+
+# ============
+# INIT SECTION
+
+loadegg('simplejson', [os.getcwd(), os.getcwd() + os.sep + 'gozernest'], log=False)
+loadegg('sqlalchemy', [os.getcwd(), os.getcwd() + os.sep + 'gozernest'], log=False)
+
+# END INIT
+# ========
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gozerbot/commands.py
+++ gozerbot-0.99.1/build/lib/gozerbot/commands.py
@@ -0,0 +1,579 @@
+# gozerbot/commands.py
+#
+#
+
+""" 
+
+    This module implements the commands a user can give. It also contains 
+    the global cmnds object to which all commands are added.
+
+    example:
+
+    ::
+
+        cmnds.add('hello', handle_hello, 'USER')
+
+
+    :var cmnds: global commands object
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.stats import stats
+from utils.generic import makeoptions
+from eventbase import defaultevent
+from config import config
+from utils.log import rlog
+from utils.trace import calledfrom
+from utils.exception import handle_exception
+from utils.locking import lockdec
+from runner import cmndrunners
+from threads.thr import start_new_thread, start_bot_command
+
+# basic imports
+import sys, re, copy, types, thread
+
+# END IMPORT
+
+# LOCK SECTION
+
+# command lock
+commandlock = thread.allocate_lock()
+locked = lockdec(commandlock)
+
+# END LOCK
+
+class Command(object):
+
+    """
+        implements a command.
+
+        :param func: the function to call when a commands gets triggered
+        :param perm: permissions the command needs before it gets fired
+        :type perm: list
+        :param plugname: the plugin this commands is implemented in
+        :type param: string
+        :param threaded: determines if the command has to be run in its own thread
+        :type threaded: False or True
+        :param allowqueue: determines if output of this commands can be used in pipeline queues
+        :type threaded: False or True
+        :param options: options for this command
+        :type options: dict
+
+    """
+
+    def __init__(self, func, perm, plugname, speed=5, threaded=False, allowqueue=True, options={'--speed': 5, '--chan': '', '--filter': '', '--how': 'msg'}):
+
+        self.name = str(func) # function name is string representation of the function 
+        self.func = func # function to call
+
+        # make sure permission(s) are stored in a list
+        if type(perm) == types.ListType:
+            self.perms = list(perm)
+        else:
+            self.perms = [perm, ]
+
+        self.plugname = plugname # plugin name
+        self.speed = copy.deepcopy(speed) # speed to execute command with
+        self.threaded = copy.deepcopy(threaded) # set if threaded exec is required
+        self.allowqueue = copy.deepcopy(allowqueue) # set if command is allowed to be used in pipeline
+        self.options = dict(options) # options set in the command 
+        self.activate = True
+        
+class Commands(dict):
+
+    """ 
+        the commands object is a dict containing the commands. dict key is the 
+        command (1 word).
+
+    """
+
+    def __setitem__(self, name, value):
+
+        """ set command. """
+
+        dict.__setitem__(self, name, value)
+
+    def __delitem__(self, name):
+
+        """ delete command. """
+
+        dict.__delitem__(self, name)
+
+    def size(self):
+
+        """
+            nr of commands.
+
+            :rtype: integer
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.size
+
+        """
+
+        return len(self)
+
+    def activate(self, plugname):
+        cp = dict(self)
+        for i in cp.values():
+            if i.plugname == plugname:
+                i.activate = True
+
+    def disable(self, plugname):
+        cp = dict(self)
+        for i in cp.values():
+            if i.plugname == plugname:
+                i.activate = False
+
+    def whatperms(self):
+
+        """
+            return all possible permissions.
+
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.whatperms
+
+        """
+
+        result = []
+
+        # loop over the commands and collect all possible permissions
+        cp = dict(self)
+        for i in cp.values():
+            for j in i.perms:
+                if j not in result:
+                    result.append(j)
+
+        return result
+
+    def list(self, perm):
+
+        """
+            list commands with permission perm.
+
+            :param perm: the permission
+            :type perm: string
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.list
+
+        """
+
+        result = []
+
+        # make sure perm is a list
+        if type(perm) != types.ListType:
+            perm = perm.upper()
+            perms = [perm, ]
+        else:
+            perms = perm
+
+        # loop over commands collecting all command having permission
+        cp = dict(self)
+        for name, cmnd in cp.items():
+            for i in perms:
+                if i in cmnd.perms:
+                    result.append(name)
+
+        return result
+
+    def getfuncnames(self, plug):
+
+        """
+            get all function names of commands in a plugin.
+
+            :param plug: plugname
+            :type plug: string
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.getfuncnames
+
+        """
+
+        result = []
+
+        # collect function names 
+        cp = dict(self)
+        for i in cp.values():
+            if i.plugname == plug:
+                result.append(i.func.func_name)
+
+        return result
+
+    def getoptions(self, command):
+
+        """
+            get options of a command.
+
+            :param command: the command to get options for
+            :type command: string
+            :rtype: dict
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.getoptions
+
+        """
+
+        cp = dict(self)
+        for name, cmnd in cp.iteritems():
+            if name == command:
+                return makeoptions(defaultevent, cmnd.options)
+
+    #@locked
+    def permoverload(self, name, perms):
+
+        """
+             overload permission of function with funcname.
+
+            :param name: name of command to overload permission of
+            :type name: string
+            :param perms: permission to overload the command with
+            :type perms: list
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.permoverload
+
+        """
+
+        # make sure all perms are uppercase
+        perms = [perm.upper() for perm in perms]
+
+        # overload the command with given permissions
+        for com in self.values():
+            try:
+                if com.func.func_name == name:
+                    com.perms = perms
+                    return True
+            except AttributeError:
+                rlog(10, 'commands', "permoverload: no %s function" % name)
+        return False
+
+    #@locked
+    def add(self, cmnd, func, perm, speed=5, threaded=False, allowqueue=True, options={'--speed': 5, '--chan': '', '--filter': '', '--how': 'msg'}):
+	
+        """
+            add a command.
+
+            :param func: the function to call when a commands gets triggered
+            :param perm: permissions the command needs before it gets fired
+            :type perm: list
+            :param plugname: the plugin this commands is implemented in
+            :type param: string
+            :param threaded: determines if the command has to be run in its own thread
+            :type threaded: boolean
+            :param allowqueue: determines if output of this commands can be used in pipeline queues
+            :type threaded: boolean
+            :param options: options for this command
+            :type options: dict
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.add
+
+        """
+
+        # plugin where the command is added
+        plugname = calledfrom(sys._getframe(0))
+        # check if plugin is in loadlist .. if not dont register command. 
+        if config['loadlist'] and plugname not in config['loadlist']:
+            rlog(1, 'commands', 'NOT LOADING %s' % plugname)
+            return
+
+        rlog(-3, 'commands', 'added %s (%s) ' % (cmnd, plugname))
+
+        # add command
+        self[cmnd.lower()] = Command(func, perm, plugname, speed, threaded, allowqueue, options)
+        self[cmnd.lower()].name = cmnd.lower()
+
+    def apropos(self, txt, perms=[]):
+
+        """
+            search for command.
+
+            :param txt: txt to search commands with
+            :type txt: string
+            :param perms: contain permission that must match first
+            :type perms: list
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.apropos
+
+        """
+
+        result = []
+
+        #  loop over commands collecting all commands that contain given txt
+        cp = dict(self)
+        for name, cmnd in cp.iteritems():
+            if perms:
+                go = False
+                for i in perms:
+                    if i in cmnd.perms:
+                        go = True
+                if not go:
+                    continue                
+            if re.search(txt, name):
+                result.append(name)
+
+        return result
+
+    #@locked
+    def unload(self, plugname):
+
+        """
+            unload plugin commands.
+
+            :param plugname: name of the plugin that needs to be unloaded
+            :type plugname: string
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.unload
+
+        """
+
+        results = []
+
+        # look for the commands registerd in plugin
+        for name, cmnd in self.iteritems():
+            if cmnd.plugname == plugname:
+                results.append(name)
+
+        got = False
+
+        # remove commands
+        for name in results:
+
+            try:
+                del self[name]
+                rlog(-3, 'commands', 'unloaded %s (%s)' % (name, plugname))
+                got = True
+            except KeyError:
+                got = False
+
+        if got:
+            return True
+
+    def whereis(self, command):
+
+        """
+            locate plugin a command is registered in.
+
+            :param command: command to search for
+            :type command: string
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.whereis
+
+        """
+
+        result = []
+
+        # find plugin 
+        cp = dict(self)
+        for name, cmnd in cp.iteritems():
+            if name == command:
+                if not cmnd.plugname in result:
+                    result.append(cmnd.plugname)
+
+        return result
+
+    def perms(self, name):
+
+        """
+            get permission of command.
+
+            :param command: command to lookup permissions for
+            :type command: string
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.perms
+
+        """
+
+        name = name.lower()
+
+        if self.has_key(name):
+            return self[name].perms
+        else:
+            return []
+
+    #@locked
+    def setperm(self, command, perm):
+
+        """
+            set permission of command.
+
+            :param command: command to set permission of
+            :type command: string
+            :param perm: the permission
+            :type perm: string
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.setperm
+
+        """
+
+        command = command.lower()
+        perm = perm.upper()
+
+        if self.has_key(command):
+            if perm not in self[command].perms:
+                self[command].perms.append(perm)
+            return True
+        return False
+
+    def getcommand(self, txt):
+
+        """
+            return command matching txt.
+
+            :param txt: txt to match commands against
+            :type txt: string
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.getcommand
+
+        """
+
+        textlist = txt.split()
+
+        if not textlist:
+            return None
+
+        cmnd = textlist[0].lower()
+        if self.has_key(cmnd):
+            com = self[cmnd] # the command
+            return com
+        else:
+            return None
+
+    def options(self, command):
+
+        """
+            return options dict of command.
+
+            :param command: the command to get the options of
+            :type command: string
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.options
+
+        """
+
+        try:
+            return self[command].options
+        except KeyError:
+            return 
+
+    def getcommands(self, plugin):
+
+        """
+            get all commands of a plugin.
+
+            :param plugin: the plugin to get commands of
+            :type plugin: string
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.getcommands
+
+        """
+
+        result = []
+        
+        tmp = dict(self)
+        for name, cmnd in tmp.iteritems():
+            if cmnd.plugname == plugin:
+                result.append(name)
+
+        return result
+
+    #@locked
+    def dispatch(self, com, txt, wait=False):
+
+        """
+            dispatch command.
+
+            :param com: the command object to dispatch with
+            :type com: Command
+
+            .. literalinclude:: ../../gozerbot/commands.py
+                :pyobject: Commands.dispatch
+
+        """
+
+        if com.threaded:
+            thread = start_new_thread(com.func, (txt, ))
+            if wait:
+                thread.join()
+        else:
+            cmndrunners[10-com.speed].put(com.name, com.func, txt)
+        return 1
+
+class Botcommands(Commands):
+
+    """
+        commands for the bot .. dispatch with (bot, ircevent) as arguments. 
+
+    """
+
+    #@locked
+    def dispatch(self, com, bot, ievent, wait=False):
+
+        """
+             dispatch on event passing bot and ievent as arguments.
+
+             :param com: the command object
+             :type com: gozerbot.commands.Command
+             :param bot: the bot this command is given on
+             :type bot: gozerbot.botbase.BotBase
+             :param ievent: the event triggering this command
+             :rtype: boolean
+
+             .. literalinclude:: ../../gozerbot/commands.py
+                 :pyobject: Botcommands.dispatch
+
+        """
+
+        if not com.activate:
+            return False
+
+        if bot.stopped:
+            return False
+
+        #ievent = copy.deepcopy(ieventin)
+
+        # stats
+        stats.up('cmnds', com.name)
+        stats.up('cmnds', com.plugname)
+        stats.up('cmnds', 'speed%s' % com.speed)
+
+        # execute command
+        if com.threaded or ievent.threaded:
+            thread = start_bot_command(com.func, (bot, ievent))
+            #if thread and wait:
+            #    thread.join()
+        else:	
+            speed = ievent.speed or com.speed
+            ievent.speed = speed
+            cmndrunners.put(com.name, com.func, bot, ievent)
+        return True
+
+# INIT SECTION
+
+cmnds = Botcommands()
+
+# END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/eventhandler.py
+++ gozerbot-0.99.1/build/lib/gozerbot/eventhandler.py
@@ -0,0 +1,192 @@
+# gozerbot/eventhandler.py
+#
+#
+
+"""
+    event handler. use to dispatch function in main loop.
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION
+
+# gozerbot imports
+from utils.exception import handle_exception
+from utils.log import rlog
+from utils.locking import lockdec
+from threads.thr import start_new_thread
+
+# basic imports
+import Queue, thread
+
+# END IMPORT
+# ==========
+
+# ============
+# LOCK SECTION
+
+# locks
+handlerlock = thread.allocate_lock()
+locked = lockdec(handlerlock)
+
+# END LOCK
+# ========
+
+## START
+
+class Eventhandler(object):
+
+    """
+        events are handled in 11 queues with different priorities:
+        queue0 is tried first queue10 last.
+
+    """
+
+    def __init__(self):
+        self.sortedlist = []
+        self.queues = {}
+
+        for i in range(11):
+            self.queues[i] = Queue.Queue()
+            self.sortedlist.append(i)
+
+        self.sortedlist.sort()
+        self.go = Queue.Queue()
+        self.stopped = False
+        self.running = False
+        self.nooutput = False
+
+    def start(self):
+
+        """
+            start the eventhandler thread.
+
+            .. literalinclude:: ../../gozerbot/eventhandler.py
+                   :pyobject: Eventhandler.start
+
+        """
+
+        self.stopped = False
+
+        if not self.running:
+            start_new_thread(self.handleloop, ())
+            self.running = True
+
+    def stop(self):
+
+        """
+            stop the eventhandler thread.
+
+            .. literalinclude:: ../../gozerbot/eventhandler.py
+                :pyobject: Eventhandler.stop
+
+        """
+
+        self.running = False
+        self.stopped = True
+        self.go.put('Yihaaa')
+
+    def put(self, speed, func, *args, **kwargs):
+
+        """
+             put item on the queue.
+
+             .. literalinclude:: ../../gozerbot/eventhandler.py
+                 :pyobject: Eventhandler.put
+
+        """
+
+        self.queues[10-speed].put_nowait((func, args, kwargs))
+        self.go.put('go')
+
+    def getready(self):
+
+        """
+            check queues from available functions to execute.
+
+            .. literalinclude:: ../../gozerbot/eventhandler.py
+                :pyobject: Eventhandler.getready
+
+        """
+
+        ready = []
+
+        for i in self.sortedlist:
+            if self.queues[i].qsize():
+                ready.append(i)
+                break
+
+        return ready
+
+    def handle_one(self):
+
+        """
+            do 1 loop over ready queues.
+
+            .. literalinclude:: ../../gozerbot/eventhandler.py
+                :pyobject: Eventhandler.handle_one
+
+        """
+
+        ready = self.getready()
+
+        for i in ready:
+            self.dispatch(self.queues[i])
+
+    def handleloop(self):
+
+        """
+            thread that polls the queues for items to dispatch.
+
+            .. literalinclude:: ../../gozerbot/eventhandler.py
+                :pyobject: Eventhandler.handleloop
+
+        """
+
+        rlog(0, 'eventhandler', 'starting handle thread')
+
+        while not self.stopped:
+            self.go.get()
+            self.handle_one()
+
+        rlog(0, 'eventhandler', 'stopping %s' % str(self))
+
+    def dispatch(self, queue):
+
+        """
+            dispatch functions from provided queue.
+
+            .. literalinclude:: ../../gozerbot/eventhandler.py
+                :pyobject: Eventhandler.dispatch
+
+        """
+
+
+        try:
+            todo = queue.get_nowait()
+        except Queue.Empty:
+            return
+
+        try:
+            (func, args, kwargs) = todo
+            func(*args, **kwargs)
+        except ValueError:
+            try:
+                (func, args) = todo
+                func(*args)
+            except ValueError:
+                (func, ) = todo
+                func()
+
+        except:
+            handle_exception()
+
+# INIT SECTION
+
+# handler to use in main prog
+mainhandler = Eventhandler()
+
+
+# END INIT
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gozerbot/runner.py
+++ gozerbot-0.99.1/build/lib/gozerbot/runner.py
@@ -0,0 +1,172 @@
+# jsb/runner.py
+#
+#
+
+""" threads management to run jobs. """
+
+## jsb imports
+
+from gozerbot.threads.thr import getname, start_new_thread, start_bot_command
+from gozerbot.utils.generic import handle_exception
+from gozerbot.utils.trace import callstack
+from gozerbot.threads.threadloop import RunnerLoop
+from gozerbot.utils.log import rlog
+
+## basic imports
+
+import Queue
+import time
+import thread
+import random
+import logging
+import sys
+
+## Runner class
+
+class Runner(RunnerLoop):
+
+    """
+        a runner is a thread with a queue on which jobs can be pushed. 
+        jobs scheduled should not take too long since only one job can 
+        be executed in a Runner at the same time.
+
+    """
+
+    def __init__(self, name="runner", doready=True):
+        RunnerLoop.__init__(self, name)
+        self.working = False
+        self.starttime = time.time()
+        self.elapsed = self.starttime
+        self.finished = time.time()
+        self.doready = doready
+
+    def handle(self, descr, func, *args, **kwargs):
+        """ schedule a job. """
+        self.working = True
+        name = getname(str(func))
+        try:
+            #rlockmanager.acquire(getname(str(func)))
+            name = getname(str(func))
+            self.name = name
+            rlog(10, "runner", 'running %s: %s' % (descr, name))
+            self.starttime = time.time()
+            func(*args, **kwargs)
+            self.finished = time.time()
+            self.elapsed = self.finished - self.starttime
+            #if self.elapsed > 3:
+                #logging.debug('ALERT %s %s job taking too long: %s seconds' % (descr, str(func), self.elapsed))
+        except Exception, ex: handle_exception()
+        #finally: rlockmanager.release()
+        self.working = False
+
+## BotEventRunner class
+
+class BotEventRunner(Runner):
+
+    def handle(self, descr, func, bot, ievent, *args, **kwargs):
+        """ schedule a bot command. """
+        try:
+            self.starttime = time.time()
+            #lockmanager.acquire(getname(str(func)))
+            name = getname(str(func))
+            self.name = name
+            self.working = True
+            rlog(10, "runner", "now running %s" % name)
+            func(bot, ievent, *args, **kwargs)
+
+            for queue in ievent.queues:
+                queue.put_nowait(None)
+
+            self.finished = time.time()
+            self.elapsed = self.finished - self.starttime
+            #if self.elapsed > 3:
+            #    logging.info('ALERT %s %s job taking too long: %s seconds' % (descr, str(func), self.elapsed))
+            #if ievent.iscommand: ievent.ready()
+            #if not ievent.type == "OUTPUT" and not ievent.dontclose: ievent.ready()
+            #time.sleep(0.001)
+        except Exception, ex:
+            handle_exception(ievent)
+        #finally: lockmanager.release(getname(str(func)))
+        self.working = False
+        self.name = "finished"
+
+## Runners class
+
+class Runners(object):
+
+    """ runners is a collection of runner objects. """
+
+    def __init__(self, max=100, runnertype=Runner, doready=True):
+        self.max = max
+        self.runners = []
+        self.runnertype = runnertype
+        self.doready = doready
+
+    def runnersizes(self):
+        """ return sizes of runner objects. """
+        result = []
+        for runner in self.runners: result.append("%s - %s" % (runner.queue.qsize(), runner.name))
+        return result
+
+    def stop(self):
+        """ stop runners. """
+        for runner in self.runners: runner.stop()
+
+    def start(self):
+        """ overload this if needed. """
+        pass
+ 
+    def put(self, *data):
+        """ put a job on a free runner. """
+        #logging.debug("size is %s" % len(self.runners))
+        for runner in self.runners:
+            if not runner.queue.qsize():
+                runner.put(*data)
+                return
+        runner = self.makenew()
+        runner.put(*data)
+         
+    def running(self):
+        """ return list of running jobs. """
+        result = []
+        for runner in self.runners:
+            if runner.queue.qsize(): result.append(runner.nowrunning)
+        return result
+
+    def makenew(self):
+        """ create a new runner. """
+        runner = None
+        for i in self.runners:
+            if not i.queue.qsize(): return i
+        if len(self.runners) < self.max:
+            runner = self.runnertype(self.doready)
+            runner.start()
+            self.runners.append(runner)
+        else: runner = random.choice(self.runners)
+        return runner
+
+    def cleanup(self):
+        """ clean up idle runners. """
+        #if not len(self.runners): logging.debug("nothing to clean")
+        for index in range(len(self.runners)-1, -1, -1):
+            runner = self.runners[index]
+            #logging.debug("cleanup %s" % runner.name)
+            if not runner.queue.qsize():
+                try: runner.stop() ; del self.runners[index]
+                except IndexError: pass
+                except: handle_exception()
+            #else: logging.info("now running: %s" % runner.nowrunning)
+
+## global runners
+
+cmndrunners = defaultrunner = longrunner = Runners(50, BotEventRunner)
+cbrunners = Runners(100, BotEventRunner, doready=False)
+waitrunners = Runners(10, Runner)
+
+## runners_start
+
+def runners_start():
+    pass
+
+def runners_stop():
+    pass
--- gozerbot-0.99.1.orig/build/lib/gozerbot/config.py
+++ gozerbot-0.99.1/build/lib/gozerbot/config.py
@@ -0,0 +1,425 @@
+# gozerbot/config.py
+#
+#
+
+""" 
+    gozerbot config module. 
+
+    :var config: default config object
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# IMPORT SECTION
+
+# gozerbot imports
+from utils.exception import handle_exception
+from utils.log import rlog
+
+# simplejson imports
+
+from simplejson import loads, dumps
+
+# basic imports
+import os, types, thread, logging
+
+# END IMPORT
+
+class Config(dict):
+
+    """ 
+        config class is a dict containing json strings. is writable to file 
+        and human editable.
+
+        :param ddir: datadir where the config file lives
+        :type ddir: string
+        :param filename: filename of the config file
+        :type filename: string
+        :param inittxt: initial txt to fill the config file with
+        :type inittxt: string
+      
+    """
+
+    def __init__(self, ddir=None, filename=None, inittxt=None, verbose=False, *args, **kw):
+        dict.__init__(self, *args, **kw)
+        self.jsondb = None
+        self.dir = ddir or 'gozerdata'
+        self.filename = filename or 'config'
+        self.cfile = self.dir + os.sep + self.filename
+
+        if hasattr(os, 'mkdir'):
+            #  check if provided dir exists if not create it
+            if not os.path.exists(self.dir):
+                os.mkdir(self.dir)
+
+            # see if initial data has to be written
+            if inittxt and not os.path.exists(self.cfile):
+                self.write_init(inittxt)
+
+        self.configlist = []
+        self.lock = thread.allocate_lock()
+        self.load(verbose)
+
+    def __getitem__(self, item):
+        if not self.has_key(item):
+            return None
+        else:
+            return dict.__getitem__(self, item)
+
+    def set(self, item, value):
+        dict.__setitem__(self, item, value)
+        self.save()
+
+    def load(self, verbose=False):
+
+        """
+            load the config file.
+
+            .. literalinclude:: ../../gozerbot/config.py
+                :pyobject: Config.load
+
+        """
+
+        self.reload()
+
+        if self.filename == 'mainconfig':
+            self.setdefault('owner', [])
+            self.setdefault('loglevel', 10)
+            self.setdefault('loglist',  [])
+            self.setdefault('resource', 'gozerbot')
+            self.setdefault('quitmsg', "http://gozerbot.googlecode.com")
+            self.setdefault('mask', "700")
+            self.setdefault('debug', 0)
+            self.setdefault('nodb', 0)
+            self.setdefault('plugdeny', [])
+            self.setdefault('db_driver', 'olddb')
+            self.setdefault('dbtype', "sqlite")
+            self.setdefault('dbname', "db/main.db")
+            self.setdefault('dbhost', "localhost")
+            self.setdefault('dbuser', "bart")
+            self.setdefault('dbpasswd', "mekker2")
+            self.setdefault('loadlist', ["alias", "all", "at", "chanperm", "choice", "code", "core", "count", "fleet", "googletalk", "grep", "ignore", "irc", "jabber", "job", "misc", "nickcapture", "nickserv", "not", "quote", "reload", "rest", "reverse", "size", "sort", "tail", "tell", "to", "underauth", "uniq", "user", "userstate", "stats", "throttle"])
+            self.setdefault('dotchars',  " .. ")
+            self.setdefault('floodallow', 1)
+            self.setdefault('auto_register', 0)
+
+        elif 'fleet' in self.dir:
+            self.setdefault("enable", 1)
+            self.setdefault("type", "irc")
+            self.setdefault("owner", [])
+            self.setdefault("user", "")
+            self.setdefault("nick", "gozerbot")
+            self.setdefault("server", "")
+            self.setdefault("host", "")
+            self.setdefault("password", "")
+            self.setdefault("port", 0)
+            self.setdefault("ssl", 0)
+            self.setdefault("ipv6", 0)
+            self.setdefault("username", "gozerbot")
+            self.setdefault("realname", "GOZERBOT")
+            self.setdefault("defaultcc", "!")
+            self.setdefault("quitmsg", "http://gozerbot.googlecode.com")
+            self.setdefault("bindhost", "")
+            self.setdefault("nolimiter", 0)
+            self.setdefault("nickservpass", "")
+            self.setdefault("nickservtxt", ["set unfiltered on", ])
+            self.setdefault("auto_register", 0)
+            self.setdefault("stripident", 0)   
+            self.setdefault("loadlist", [])    
+
+        import gozerbot
+        self['version'] = "GOZERBOT %s " % gozerbot.__version__
+        self['version'] += "RELEASE"
+
+        if verbose:
+            rlog(10, 'config', str(self))
+
+    def save(self):
+
+        """
+            save the config file.
+
+            :rtype: integer .. number of lines saved
+
+            .. literalinclude:: ../../gozerbot/config.py
+                :pyobject: Config.save
+
+
+        """
+
+        written = []
+        curitem = None
+
+        try:
+
+            self.lock.acquire()
+
+            # read existing config file if available
+            try:
+                self.configlist = open(self.cfile, 'r').readlines()
+            except IOError:
+                self.configlist = []
+
+            # make temp file
+            configtmp = open(self.cfile + '.tmp', 'w')
+            teller = 0
+
+            # write header if not already there
+            if not self.configlist:
+                configtmp.write('# %s\n\n' % self.cfile)
+
+            # loop over original lines replacing updated data
+            for line in self.configlist:
+                teller += 1
+
+                # skip comment
+                if line.startswith('#'):
+                    configtmp.write(line)
+                    continue
+
+                # take part after the =
+                try:
+                    keyword = line.split('=')[0].strip()
+                    curitem = keyword
+                except IndexError:
+                    configtmp.write(line)
+                    continue
+
+                # write JSON string of data
+                if self.has_key(keyword):
+                    configtmp.write('%s = %s\n' % (keyword, dumps(self[keyword])))
+                    written.append(keyword)
+                else:
+                    configtmp.write(line)
+
+            # write data not found in original config file
+            for keyword, value in self.iteritems():
+                if keyword in written:
+                    continue
+                curitem = keyword
+                configtmp.write('%s = %s\n' % (keyword, dumps(value)))
+
+            # move temp file to original
+            configtmp.close()
+            try:
+                os.rename(self.cfile + '.tmp', self.cfile)
+            except WindowsError:
+                # no atomic operation supported on windows! error is thrown when destination exists
+                os.remove(self.cfile)
+                os.rename(self.cfile + '.tmp', self.cfile)
+            self.lock.release()
+            return teller
+
+        except Exception, ex:
+            print "ERROR WRITING %s CONFIG FILE: %s .. %s" % (self.cfile, str(ex), curitem)
+            try:
+                self.lock.release()
+            except:
+                pass
+            return
+
+    def reload(self):
+
+        """
+            reload the config file.
+
+            .. literalinclude:: ../../gozerbot/config.py
+                :pyobject: Config.reload
+
+
+        """
+
+        curline = ""
+
+        # read file and set config values to loaded JSON entries
+        try:
+
+            # open file
+            f = open(self.cfile, 'r')
+
+            # loop over data in config file            
+            for line in f:
+                curline = line
+                line = line.strip()
+                if not line or line.startswith('#'):
+                    continue
+                else:
+                    key, value = line.split('=', 1)
+                    self[key.strip()] = loads(unicode(value.strip()))
+
+        except IOError:
+            pass
+        except Exception, ex:
+            print "ERROR READING %s CONFIG FILE: %s .. %s" % (self.cfile, str(ex), curline)
+
+    def write_init(self, txt):
+
+        """ 
+            write initial version of the config file .. mainconfig or fleet
+            config.
+
+            :param txt: txt to write to config file
+            :type txt: string
+
+            .. literalinclude:: ../../gozerbot/config.py
+                :pyobject: Config.write_init
+
+
+        """
+        if hasattr(os, 'mkdir'):
+            # check if datadir is there .. if not create it
+            if not os.path.isdir(self.dir):
+                os.mkdir(self.dir)
+
+            # check if config file is already there .. if not init it 
+            if not os.path.isfile(self.cfile):
+                cfgfile = open(self.cfile, 'w')
+                cfgfile.write(txt)
+                cfgfile.close()
+
+
+mainconfigtxt = """# gozerbot config
+#
+#
+# TAKE NOTE THAT FORMAT IS IN JSON NOW SO USE " not '
+
+# GLOBAL OWNER
+
+# example: owner = ["~bart@127.0.0.1"] (include ident if needed)
+owner = []
+
+# logging level
+loglevel = 10
+
+# list of plugins to log
+loglist = []
+
+# quit message
+quitmsg = "http://gozerbot.googlecode.com"
+
+# botterdata dir mask
+mask = "700"
+
+# enable debugging
+debug = 0
+
+# database stuff
+
+nodb = 0
+db_driver = "olddb"
+dbtype = "sqlite"
+dbname = "db/main.db"
+dbhost = "localhost"  
+dbuser = "bart"
+dbpasswd = "mekker2"
+
+# json backstore
+
+#jsonuser = "users.json"
+
+# loadlist
+loadlist = ["alias", "all", "at", "chanperm", "choice", "code", "core", "count", "fleet", "googletalk", "grep", "ignore", "irc", "jabber", "job", "misc", "nickcapture", "nickserv", "not", "quote", "reload", "rest", "reverse", "size", "sort", "tail", "tell", "to", "underauth", "uniq", "user", "userstate", "plug", "test", "stats", "inform", "admin", "throttle", "mysqlkeepalive", "gozernet"]
+
+# chars used to seperate result
+dotchars = " .. "
+
+# nr of lines before flood protect kicks in
+
+floodallow = 2
+
+# auto register new users 
+
+auto_register = 0
+
+# resource used by xmpp bot (global)
+resource = "gozerbot"
+
+"""
+
+
+""" init txt for fleet config """
+
+
+fleetbotconfigtxt = """# gozerbot fleet bot config
+#
+#
+# TAKE NOTE THAT FORMAT IS IN JSON NOW SO USE " not '
+
+## MAIN STUFF
+
+# set to 0 to disable
+enable = 1
+
+# set type to jabber or irc
+type = "irc"
+
+# owner (irc/jabber)
+owner = []
+
+## CONNECTION STUFF
+
+# user (jabber) .. needs to be full JID because server is taken from it
+user = "botter@jsonbot.org"
+
+# nick (irc)
+nick = "gozerbot"
+
+# server (irc)
+server = ""
+
+# host (jabber) .. server to connect to
+host = ""
+
+# password (irc and jabber)
+password = ""
+
+# port (irc and jabber) .. 0 uses default value
+port = 0
+
+# ssl (irc)
+ssl = 0
+
+# use ipv6 (irc)
+ipv6 = 0
+
+# bots username (irc)
+username = "gozerbot"
+
+# bots realname (irc)
+realname = "GOZERBOT"
+
+## OTHER STUFF
+
+# default control character
+defaultcc = "!"
+
+# quit message
+quitmsg = "http://gozerbot.googlecode.com"
+
+# bindhost .. uncomment to enable
+bindhost = ""
+
+# disable limiter (irc)
+nolimiter = 0
+
+# nickserv .. set pass to enable nickserv ident (irc)
+nickservpass = ""
+nickservtxt = ["set unfiltered on"]
+
+# allow every command except OPER commands
+auto_register = 0
+
+# strip ident string
+stripident = 0
+
+loadlist = []
+
+"""
+
+# INIT SECTION
+
+# main config object
+config = Config(filename='mainconfig', inittxt=mainconfigtxt)
+
+# END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/examples.py
+++ gozerbot-0.99.1/build/lib/gozerbot/examples.py
@@ -0,0 +1,113 @@
+# gozerbot/examples.py
+#
+#
+
+"""
+    examples is a dict of example objects.
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION
+
+
+# basic imports
+import re
+
+# END IMPORT
+# ==========
+
+# ============
+# LOCK SECTION
+
+# no locks
+
+# END LOCK
+# ========
+
+class Example(object):
+
+    """
+        an example.
+
+        :param descr: description of the example
+        :type descr: string
+        :param ex: the example
+        :type ex: string
+
+    """
+
+    def __init__(self, descr, ex):
+        self.descr = descr
+        self.example = ex
+
+class Examples(dict):
+
+    """
+        examples object is a dict.
+
+    """
+
+    def add(self, name, descr, ex):
+
+        """
+            add description and example.
+
+            :param name: name of the example
+            :type name: string
+            :param descr: description of the example
+            :type descr: string
+            :param ex: the example
+            :type ex: string
+
+            .. literalinclude:: ../../gozerbot/examples.py
+                :pyobject: Examples.add
+
+        """
+
+        self[name.lower()] = Example(descr, ex)
+
+    def size(self):
+ 
+        """
+            return size of examples dict.
+
+            :rtype: integer
+
+            .. literalinclude:: ../../gozerbot/examples.py
+                :pyobject: Examples.size
+
+        """
+
+        return len(self.keys())
+
+    def getexamples(self):
+
+        """
+            get all examples in list.
+
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/examples.py
+                :pyobject: Examples.getexamples
+        """
+
+        result = []
+        for i in self.values():
+            ex = i.example.lower()
+            exampleslist = re.split('\d\)', ex)
+            for example in exampleslist:
+                if example:
+                    result.append(example.strip())
+        return result
+
+# ============
+# INIT SECTION
+
+# main examples object
+examples = Examples()
+
+# END INIT
+# ========
--- gozerbot-0.99.1.orig/build/lib/gozerbot/aliases.py
+++ gozerbot-0.99.1/build/lib/gozerbot/aliases.py
@@ -0,0 +1,135 @@
+# gozerbot/aliases.py
+#
+#
+
+""" 
+    command aliases. this module contains the aliases of commands. aliases
+    are stored in the gozerdata/aliases.new json file. 
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+### IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.persist.persist import Persist
+from gozerbot.datadir import datadir
+from gozerbot.utils.locking import lockdec
+# basic import
+import os, thread
+
+### END IMPORT
+
+## LOCK SECTION
+
+aliaslock = thread.allocate_lock()
+aliaslocked = lockdec(aliaslock)
+
+#@aliaslocked
+def aliasreverse(what):
+
+    """ get the reverse of an alias. 
+
+        :param what: alias to get command for
+        :type what: string
+
+        .. literalinclude:: ../../gozerbot/aliases.py
+            :pyobject: aliasreverse
+    """
+
+    for i, j in aliases.data.iteritems():
+        if what == j:
+            return i
+
+#@aliaslocked
+def aliascheck(ievent):
+
+    """ check if alias is available.
+
+        :param ievent: event to check for aliases
+
+        .. literalinclude:: ../../gozerbot/aliases.py
+            :pyobject: aliascheck
+    """
+
+    try:
+
+        cmnd = ievent.txt.split()[0]
+        alias = aliases.data[cmnd]
+        ievent.txt = ievent.txt.replace(cmnd, alias, 1)
+        ievent.alias = alias
+        ievent.aliased = cmnd
+
+    except (IndexError, KeyError):
+        pass
+
+@aliaslocked
+def aliassave():
+
+    """ save aliases to json file. 
+
+        .. literalinclude:: ../../gozerbot/aliases.py
+            :pyobject: aliassave
+    """
+
+    aliases.save()
+
+@aliaslocked
+def aliasset(fromm, to):
+
+    """ set an alias. 
+
+        :param from: alias to set
+        :type from: string
+        :param to: command to alias 
+        :type to: string
+
+        .. literalinclude:: ../../gozerbot/aliases.py
+            :pyobject: aliasset
+    """
+
+    aliases.data[fromm] = to
+
+@aliaslocked
+def aliasdel(fromm):
+
+    """ delete an alias.
+
+        :param fromm: alias to delete
+        :type fromm: string
+
+        .. literalinclude:: ../../gozerbot/aliases.py
+            :pyobject: aliasdel
+    """
+
+    try:
+
+        del aliases.data[fromm]
+        return 1
+
+    except KeyError:
+        pass
+
+def aliasget(fromm):
+
+    """ retrieve an alias. 
+
+        :param fromm: alias to get command for
+        :type fromm: string
+
+        .. literalinclude:: ../../gozerbot/aliases.py
+            :pyobject: aliasget
+    """
+
+    if aliases.data.has_key(fromm): 
+        return aliases.data[fromm]
+
+### INIT SECTION
+
+# the aliases object
+aliases = Persist(datadir + os.sep + 'aliases.new', init=False)
+if not aliases.data:
+    aliases.data = {}
+
+### END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/admin.py
+++ gozerbot-0.99.1/build/lib/gozerbot/admin.py
@@ -0,0 +1,19 @@
+# gozerbot/admin.py
+#
+#
+
+""" gozerbot admin related funtions. """
+
+
+from simplejson import loads
+
+try:
+    cmndtable = loads(open('gozerdata' + os.sep + 'run' + os.sep + 'cmndtable').read())
+except:
+    cmndtable = {}
+
+try:
+    pluginlist = loads(open('gozerdata' + os.sep + 'run' + os.sep + 'pluginlist').read())
+except:
+    pluginlist = []
+
--- gozerbot-0.99.1.orig/build/lib/gozerbot/datadir.py
+++ gozerbot-0.99.1/build/lib/gozerbot/datadir.py
@@ -0,0 +1,57 @@
+# gozerbot/datadir.py
+# -*- coding: utf-8 -*-
+#
+
+""" 
+    :mod: `gozerbot.datadir` -- the datadir of the bot
+
+    .. data::
+        datadir .. points to the datadir of the bot
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# IMPORT SECTION
+
+# basic imports
+import re, os
+
+# END IMPORT
+
+def makedirs(ddir=None):
+
+    """
+        make subdirs in datadir. users, db, fleet, pgp, plugs and old.
+
+        .. literalinclude:: ../../gozerbot/datadir.py
+            :pyobject: makedirs
+
+    """
+
+    ddir = ddir or datadir
+    curdir = os.getcwd()
+
+    if not os.path.isdir(ddir):
+        os.mkdir(ddir)
+    if not os.path.isdir(ddir + '/run/'):
+        os.mkdir(ddir + '/run/')
+    if not os.path.isdir(ddir + '/users/'):
+        os.mkdir(ddir + '/users/')
+    if not os.path.isdir(ddir + '/db/'):
+        os.mkdir(ddir + '/db/')
+    if not os.path.isdir(ddir + '/fleet/'):
+        os.mkdir(ddir + '/fleet/')
+    if not os.path.isdir(ddir + '/pgp/'):
+        os.mkdir(ddir + '/pgp/')
+    if not os.path.isdir(ddir + '/plugs/'):
+        os.mkdir(ddir + '/plugs/')
+    if not os.path.isdir(ddir + '/old/'):
+        os.mkdir(ddir + '/old/')
+
+# INIT SECTION
+
+# the datadir
+datadir = 'gozerdata'
+
+# END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/reboot.py
+++ gozerbot-0.99.1/build/lib/gozerbot/reboot.py
@@ -0,0 +1,74 @@
+# gozerbot/utils/reboot.py
+#
+#
+
+"""
+     reboot code. 
+
+"""
+
+## IMPORT SECTION
+
+from gozerbot.fleet import fleet
+from gozerbot.config import config
+
+from simplejson import dump
+
+import os, sys, pickle, tempfile
+
+## END IMPORT 
+
+## LOCK SECTION
+
+# no locks
+
+## END LOCK
+
+def reboot():
+
+    """
+        reboot the bot.
+
+        .. literalinclude:: ../../gozerbot/reboot.py
+            :pyobject: reboot
+
+    """
+
+    fleet.exit()
+    os.execl(sys.argv[0], *sys.argv)
+
+def reboot_stateful(bot, ievent, fleet, partyline):
+    """
+        reboot the bot, but keep the connections.
+
+        :param bot: bot on which the reboot command is given
+        :type bot: gozerbot.botbase.BotBase	
+        :param ievent: event that triggered the reboot
+        :type ievent: gozerbot.eventbase. EventBase
+        :param fleet: the fleet of the bot
+        :type fleet: gozerbot.fleet.Fleet
+        :param partyline: partyline of the bot
+        :type partyline: gozerbot.partyline.PartyLine
+
+        .. literalinclude:: ../../gozerbot/reboot.py
+            :pyobject: reboot_stateful
+
+    """
+    config.reload()
+    session = {'bots': {}, 'name': bot.name, 'channel': ievent.channel, 'partyline': []}
+
+    for i in fleet.bots:
+        session['bots'].update(i._resumedata())
+
+    session['partyline'] = partyline._resumedata()
+    sessionfile = tempfile.mkstemp('-session', 'gozerbot-')[1]
+    dump(session, open(sessionfile, 'w'))
+    fleet.save()
+    fleet.exit(jabber=True)
+    os.execl(sys.argv[0], sys.argv[0], '-r', sessionfile)
+
+## INIT SECTION
+
+# no vars
+
+## END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/fleet.py
+++ gozerbot-0.99.1/build/lib/gozerbot/fleet.py
@@ -0,0 +1,654 @@
+# gozerbot/fleet.py
+#
+#
+
+""" fleet is a list of bots. """
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION
+
+# gozerbot imports
+
+from gozerbot.datadir import datadir
+from utils.exception import handle_exception
+from utils.generic import waitforqueue
+from utils.log import rlog
+from utils.locking import lockdec
+from threads.thr import start_new_thread, threaded
+from config import Config, fleetbotconfigtxt, config
+from users import users
+from plugins import plugins
+from simplejson import load
+
+# basic imports
+
+import Queue, os, types, threading, time, pickle, glob, logging, shutil, thread
+
+# END IMPORT
+
+# ============
+# LOCK SECTION
+
+fleetlock = thread.allocate_lock()
+fleetlocked = lockdec(fleetlock)
+
+# END LOCK
+# ========
+
+## START
+
+class FleetBotAlreadyExists(Exception):
+    pass
+
+
+class Fleet(object):
+
+    """
+        a fleet contains multiple bots (list of bots). used the datadir
+        set in gozerbot/datadir.py
+
+    """
+
+    def __init__(self):
+        self.datadir = datadir + os.sep + 'fleet'
+        if hasattr(os, 'mkdir'):
+            if not os.path.exists(self.datadir):
+                os.mkdir(self.datadir)
+        self.startok = threading.Event()
+        self.bots = []
+
+    def getfirstbot(self):
+
+        """
+            return the main bot of the fleet.
+
+            :rtype: gozerbot.botbase.BotBase
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.getfirstbot
+
+        """
+        self.startok.wait()
+        return self.bots[0]
+
+    def getfirstjabber(self):
+
+        """
+            return the first jabber bot of the fleet.
+
+            :rtype: gozerbot.botbase.BotBase
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.getfirstjabber
+
+        """
+
+        self.startok.wait()
+
+        for bot in self.bots:
+            if bot.type == 'xmpp':
+               return bot
+        
+    def size(self):
+
+        """
+             return number of bots in fleet.
+
+             :rtype: integer
+
+             .. literalinclude:: ../../gozerbot/fleet.py
+                 :pyobject: Fleet.size
+
+        """
+
+        return len(self.bots)
+
+    def resume(self, sessionfile):
+
+        """
+            resume bot from session file.
+
+            :param sessionfile: filename of the session data file
+            :type sessionfile: string
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.resume
+        """
+
+        # read JSON session file
+        session = load(open(sessionfile))
+
+        #  resume bots in session file
+        for name in session['bots'].keys():
+            reto = None
+            if name == session['name']:
+                reto = session['channel']
+            start_new_thread(self.resumebot, (name, session['bots'][name], reto))
+
+        # allow 5 seconds for bots to resurrect
+        time.sleep(5)
+
+        # set start event
+        self.startok.set()
+
+    def makebot(self, name, cfg=None):
+
+        """
+            create a bot .. use configuration if provided.
+
+            :param name: the name of the bot
+            :type name: string
+            :param cfg: configuration file for the bot
+            :type cfg: gozerbot.config.Config
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.makebot
+
+        """
+
+        if self.byname(name):
+            raise FleetBotAlreadyExists("there is already a %s bot in the fleet" % name)
+
+        rlog(10, 'fleet', 'making bot')
+        bot = None
+
+        # if not config create a default bot
+        if not cfg:
+            cfg = Config(self.datadir + os.sep + name, 'config', inittxt=fleetbotconfigtxt)
+            cfg.save()
+
+        # create bot based on type 
+        if cfg['type'] == 'irc':
+            from gozerbot.irc.bot import Bot
+            bot = Bot(name, cfg)
+        elif cfg['type'] == 'xmpp' or cfg['type'] == 'jabber':
+            from gozerbot.xmpp.bot import Bot
+            bot = Bot(name, cfg)
+        elif cfg['type'] == 'gozernet':
+            from gozerbot.gozernet.bot import GozerNetBot
+            bot = GozerNetBot(name, cfg)
+        else:
+            rlog(10, 'fleet', '%s .. unproper type: %s' % (cfg['name'], cfg['type']))
+
+        # set bot name and initialize bot
+        if bot:
+            cfg['name'] = bot.name = name
+            self.initbot(bot)
+            return bot
+
+        # failed to created the bot
+        raise Exception("can't make %s bot" % name)
+
+    def resumebot(self, botname, data={}, printto=None):
+
+        """
+            resume individual bot.
+
+            :param botname: name of the bot to resume
+            :type botname: string
+            :param data: resume data
+            :type data: dict
+            :param printto: whom to reply to that resuming is done
+            :type printto: nick or JID
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.resumebot
+
+        """
+
+        # see if we need to exit the old bot
+        oldbot = self.byname(botname)
+        if oldbot:
+            oldbot.exit()
+
+        # recreate config file of the bot
+        cfg = Config(datadir + os.sep + 'fleet' + os.sep + botname, 'config')
+
+        # make the bot and resume (IRC) or reconnect (Jabber)
+        bot = self.makebot(botname, cfg)
+        rlog(100, 'fleet', 'bot made: %s' % str(bot))
+
+        if bot:
+            if oldbot:
+                self.replace(oldbot, bot)
+            else:
+                self.bots.append(bot)
+
+            if not bot.jabber:
+                bot._resume(data, printto)
+            else:
+                start_new_thread(bot.connectwithjoin, ())
+
+    def start(self, botlist=[], enable=False):
+
+        """
+            startup the bots.
+
+            :param botlist: list of bots to start .. if not provided the bots in the gozerdata/fleet dir will be used
+            :type botlist: list
+            :param enable: whether the bot should be enabled 
+            :type enable: boolean
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.start
+
+        """
+
+        # scan the fleet datadir for bots
+        dirs = []
+        got = []
+        for bot in botlist:
+            dirs.append(self.datadir + os.sep + bot)
+
+        if not dirs:
+            dirs = glob.glob(self.datadir + os.sep + "*")
+
+        for fleetdir in dirs:
+
+            if fleetdir.endswith('fleet'):
+                continue
+
+            rlog(10, 'fleet', 'found bot: ' + fleetdir)
+            cfg = Config(fleetdir, 'config')
+
+            if not cfg:
+                rlog(10, 'fleet', "can't read %s config file" % fleetdir)
+                continue
+
+            name = fleetdir.split(os.sep)[-1]
+
+            if not name:
+                rlog(10, 'fleet', "can't read botname from %s config file" % \
+fleetdir)
+                continue
+
+            if not enable and not cfg['enable']:
+                rlog(10, 'fleet', '%s bot is disabled' % name)
+                continue
+            else:
+                rlog(10, 'fleet', '%s bot is enabled' % name)
+
+            if not name in fleetdir:
+                rlog(10, 'fleet', 'bot name in config file doesnt match dir name')
+                continue
+
+            try:
+                bot = self.makebot(name, cfg)
+            except FleetBotAlreadyExists:
+                rlog(10, 'fleet', 'there is already a fleetbot with the name %s' % name)
+                continue
+
+            if bot:
+                self.addbot(bot)
+                start_new_thread(bot.connectwithjoin, ())
+                got.append(bot)
+
+        # set startok event
+        self.startok.set()
+
+        return got
+
+    def save(self):
+
+        """
+            save fleet data and call save on all the bots.
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.save
+
+        """
+
+        for i in self.bots:
+
+            try:
+                i.save()
+            except Exception, ex:
+                handle_exception()
+
+    def avail(self):
+
+        """
+            show available fleet bots.
+
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.avail
+
+        """
+
+        return os.listdir(self.datadir)
+
+    def list(self):
+
+        """
+            return list of bot names.
+
+            :rtype: list
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.list
+
+        """
+
+        result = []
+
+        for i in self.bots:
+            result.append(i.name)
+
+        return result
+
+    def stopall(self):
+
+        """ 
+            call stop() on all fleet bots.
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.stopall
+
+        """
+
+        for i in self.bots:
+
+            try:
+                i.stop()
+            except:
+                pass
+
+    def byname(self, name):
+
+        """
+            return bot by name.
+
+            :param name: name of the bot
+            :type name: string
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.byname
+
+        """
+
+        for i in self.bots:
+            if name == i.name:
+                return i
+
+    def replace(self, name, bot):
+
+        """
+            replace bot with a new bot.
+
+            :param name: name of the bot to replace
+            :type name: string
+            :param bot: bot to replace old bot with
+            :type bot: gozerbot.botbase.BotBase
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                 :pyobject: Fleet.replace
+
+        """
+
+        for i in range(len(self.bots)):
+            if name == self.bots[i].name:
+                self.bots[i] = bot
+                return
+
+    def initbot(self, bot):
+
+        """
+            initialise a bot.
+
+            :param bot: bot to initialise
+            :type bot: gozerbot.botbase.BotBase
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.initbot
+
+        """
+
+        if bot not in self.bots:
+
+            if not os.path.exists(self.datadir + os.sep + bot.name):
+                os.mkdir(self.datadir + os.sep + bot.name)
+
+            if type(bot.cfg['owner']) == types.StringType or type(bot.cfg['owner']) == types.UnicodeType:
+                bot.cfg['owner'] = [bot.cfg['owner'], ]
+                bot.cfg.save()
+
+            users.make_owner(config['owner'] + bot.cfg['owner'])
+            rlog(10, 'fleet', 'added bot: ' + bot.name)
+
+    @fleetlocked
+    def addbot(self, bot):
+
+        """
+            add a bot to the fleet .. remove all existing bots with the 
+            same name.
+
+            :param bot: bot to add
+            :type bot: gozerbot.botbase.BotBase
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.addbot
+            
+        """
+
+        if bot:
+
+            for i in range(len(self.bots)-1, -1, -1):
+                if self.bots[i].name == bot.name:
+                    rlog(10, 'fleet', 'removing %s from fleet' % bot.name)
+                    del self.bots[i]
+
+            rlog(10, 'fleet', 'adding %s' % bot.name)
+            self.bots.append(bot)
+            return True
+
+        return False
+
+    def connect(self, name):
+
+        """
+            connect bot to the server.
+
+            :param name: name of the bot
+            :type name: string
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.connect
+
+        """
+
+        for i in self.bots:
+
+            if i.name == name:
+                got = i.connect()
+
+                if got:
+                    start_new_thread(i.joinchannels, ())
+                    return True
+                else:
+                    return False
+
+    @fleetlocked
+    def delete(self, name):
+
+        """
+            delete bot with name from fleet.
+
+            :param name: name of bot to delete
+            :type name: string
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.delete
+
+        """
+
+        for i in self.bots:
+
+            if i.name == name:
+                i.exit()
+                self.remove(i)
+                i.cfg['enable'] = 0
+                i.cfg.save()
+                rlog(10, 'fleet', '%s disabled' % i.name)
+                return True
+
+        return False
+
+
+    def remove(self, bot):
+
+        """
+            delete bot by object.
+
+            :param bot: bot to delete
+            :type bot: gozerbot.botbase.BotBase
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                 :pyobject: Fleet.remove
+
+        """
+
+        try:
+            self.bots.remove(bot)
+            return True
+        except ValueError:
+            return False
+
+    def exit(self, name=None, jabber=False):
+
+        """
+            call exit on all bots. if jabber=True only jabberbots will exit.
+
+            :param name: name of the bot to exit. if not provided all bots will exit.
+            :type name: string
+            :param jabber: flag to set when only jabberbots should exit
+            :type jabber: boolean
+            :rtype: boolean
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.exit
+
+        """
+        
+        if not name:
+            threads = []
+
+            for i in self.bots:
+                if jabber and not i.jabber:
+                    pass
+                else:
+                    threads.append(start_new_thread(i.exit, ()))
+
+            for thr in threads:
+                thr.join()
+
+            return
+
+
+        for i in self.bots:
+
+            if i.name == name:
+                try:
+                    i.exit()
+                except:
+                    handle_exception()
+                self.remove(i)
+                return True
+
+        return False
+
+    def cmnd(self, event, name, cmnd):
+ 
+        """
+            do command on a bot.
+
+            :param event: event to pass on to the dispatcher
+            :type event: gozerbot.event.EventBase
+            :param name: name of the bot to pass on to the dispatcher
+            :type name: string
+            :param cmnd: command to execute on the fleet bot
+            :type cmnd: string
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.cmnd
+
+        """
+
+        bot = self.byname(name)
+
+        if not bot:
+            return 0
+
+        from gozerbot.eventbase import EventBase
+        j = plugins.clonedevent(bot, event)
+        j.onlyqueues = True
+        j.txt = cmnd
+        q = Queue.Queue()
+        j.queues = [q]
+        j.speed = 3
+        start_new_thread(plugins.trydispatch, (bot, j))
+        result = waitforqueue(q)
+
+        if not result:
+            return
+
+        res = ["<%s>" % bot.name, ]
+        res += result
+        event.reply(res)
+
+    def cmndall(self, event, cmnd):
+
+        """
+            do a command on all bots.
+
+            :param event: event to pass on to dispatcher
+            :type event: gozerbot.eventbase.EventBase
+            :param cmnd: the command string to execute
+            :type cmnd: string
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.cmndall
+
+        """
+
+        threads = []
+
+        for i in self.bots:
+            thread = start_new_thread(self.cmnd, (event, i.name, cmnd))
+            threads.append(thread)
+
+        for i in threads:
+            i.join()
+
+    def broadcast(self, txt):
+
+        """
+            broadcast txt to all bots.
+
+            :param txt: text to broadcast on all bots
+            :type txt: string
+
+            .. literalinclude:: ../../gozerbot/fleet.py
+                :pyobject: Fleet.broadcast
+
+        """
+
+        for i in self.bots:
+            i.broadcast(txt)
+
+# ============
+# INIT SECTION
+
+
+# main fleet object
+fleet = Fleet()
+
+# END INIT
+# ========
--- gozerbot-0.99.1.orig/build/lib/gozerbot/eggs.py
+++ gozerbot-0.99.1/build/lib/gozerbot/eggs.py
@@ -0,0 +1,188 @@
+# gozerbot/eggs.py
+#
+#
+
+""" 
+
+    :mod: `gozerbot.eggs` -- eggs related functions
+
+    this module is used to load the eggs on which gozerbot depends from 
+    specified dir .. most of the time this is the gozernest dir.
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# IMPORT SECTION
+
+import os, sys
+from utils.exception import handle_exception
+from utils.log import rlog
+
+# END IMPORT
+
+mainenv = None
+
+def init(eggdir, log=False):
+
+    """
+        make sure setuptools is available.
+
+        :param eggdir: directory to scan for eggs
+        :type eggdir: string
+        :param log: whether to log the registration of the setuptools egg
+        :type log: True or False
+
+        .. literalinclude:: ../../gozerbot/eggs.py
+            :pyobject: init
+
+    """
+
+    try:
+        import setuptools
+    except ImportError, ex:
+        try:
+            sys.path.insert(0, eggdir)
+            for egg in os.listdir(eggdir):
+                if egg.startswith('setuptools'):
+                    log and rlog(10, 'eggs', 'loaded %s' % egg)
+                    sys.path.insert(0, eggdir + os.sep + egg)
+        except OSError:
+            pass
+
+latest = {}
+    
+def enable_egg(env, egg, log=True):
+
+    """
+        search for the latest version of an  egg in the enviroment and put 
+        it on sys.path.
+
+        :param env: the environment to search the egg in
+        :type env: pkg_resources.Environment
+        :param egg: egg to load or find a newer version for
+        :param log: determine if we should log the enabling of the egg
+
+        .. literalinclude:: ../../gozerbot/eggs.py
+            :pyobject: enable_egg
+
+    """
+
+    try:
+        from pkg_resources import DistributionNotFound, VersionConflict, working_set, parse_requirements, require
+         
+        if not latest.has_key(egg.project_name):
+            latest[egg.project_name] = egg
+
+        req = egg.as_requirement()
+        reqstr = str(req)
+        reqq = parse_requirements([reqstr.replace('==', '>='), ])
+        for e in working_set.resolve(reqq, mainenv):
+            if e.location not in sys.path:
+                env.add(e)
+                working_set.add(e)
+                working_set.add_entry(e.location)
+                latest[egg.project_name] = e
+                sys.path.insert(0, egg.location)
+                log and rlog(3, 'eggs', 'loaded %s' % e)
+            else:
+                log and rlog(3, 'eggs', '%s already on path' % e)
+    except DistributionNotFound, ex:
+        env.add(egg)
+        working_set.add(egg)
+        working_set.add_entry(egg.location)
+        latest[egg.project_name] = egg
+        sys.path.insert(0, egg.location)
+        log and rlog(3, 'eggs', 'loaded %s' % egg)
+    except VersionConflict, ex:
+        if egg > ex[0]:
+            env.add(egg)
+            working_set.add_entry(egg.location)
+            working_set.add(egg)
+            latest[egg.project_name] = egg
+            sys.path.insert(0, egg.location)
+            log and rlog(3, 'eggs', 'override %s' % egg)
+
+def loadegg(name, eggdirs=['gozernest',], log=True):
+
+    """
+        scan eggdir for a egg matching `name`.
+
+        :param name: piece of txt which should be in the egg projectname
+        :type name: string
+        :param eggdirs: directories to search in
+        :type eggdirs: list
+        :param log: boolean which indicates whether loading should be logged
+        :type log: boolean
+
+        .. literalinclude:: ../../gozerbot/eggs.py
+            :pyobject: loadegg
+
+    """
+
+    try:
+        from pkg_resources import find_distributions, Environment
+        global mainenv
+
+        for eggdir in eggdirs:
+            if mainenv:
+                mainenv += Environment(eggdir)
+            else:
+                mainenv = Environment(eggdir)
+            eggs = find_distributions(eggdir)
+            for egg in eggs:
+               if name.lower() in egg.project_name.lower():
+                    enable_egg(mainenv, egg, log)
+
+    except ImportError: 
+        return
+    except Exception, ex:
+        handle_exception()
+
+def loadeggs(eggdir, log=True):
+
+    """
+        load all eggs in a directory.
+
+        :param eggdir: directory to load eggs from
+        :type eggdir: string
+
+        .. literalinclude:: ../../gozerbot/eggs.py
+            :pyobject: loadeggs
+
+    """
+
+    rlog(3, 'eggs', 'scanning %s' % eggdir)
+    try:
+        from pkg_resources import find_distributions, Environment
+        global mainenv
+
+        if mainenv:
+            mainenv += Environment(eggdir)
+        else:
+            mainenv = Environment(eggdir)
+        eggs = find_distributions(eggdir)
+        for egg in eggs:
+            if not egg.project_name.startswith('setuptools'):
+                enable_egg(mainenv, egg, log)
+
+    except ImportError:
+        return
+    except Exception, ex:
+        handle_exception()
+
+    res = []
+    for name, egg in latest.iteritems():
+        res.append("%s: %s" % (name, egg.version))
+
+    rlog(3, 'eggs', 'loaded: %s' % ' .. '.join(res))
+
+
+# INIT SECTION
+
+
+# first search for setuptools and load it
+init(os.getcwd())
+init(os.getcwd() + os.sep + 'gozernest')
+
+# END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/persistconfig.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/persistconfig.py
@@ -0,0 +1,420 @@
+# gozerbot/persistconfig.py
+#
+#
+
+""" allow data to be pickled to disk .. creating the persisted object
+    restores data
+    
+usage:
+    !plug-cfg			->	shows list of all config
+    !plug-cfg key value		->	sets value to key
+    !plug-cfg key		->	shows list of key
+    !plug-cfg key add value	->	adds value to list
+    !plug-cfg key remove value	->	removes value from list
+    !plug-cfg key clear		-> 	clears entire list
+    !plug-cfgsave		->	force save configuration to disk
+    
+todo:
+    - plugin api (more work needed?)
+    
+"""
+
+__copyright__ = 'this file is in the public domain'
+__author__ = 'Bas van Oostveen'
+
+from gozerbot.utils.log import rlog
+from gozerbot.utils.trace import calledfrom
+from gozerbot.compat.persist import Persist
+from gozerbot.commands import cmnds, Command
+from gozerbot.examples import examples
+from gozerbot.datadir import datadir
+import sys, os, types, time
+
+class Option(object):
+
+    def __init__(self, value, desc, perm, example, name, exposed):
+        assert isinstance(name, str), "Option.self.name must be a string"
+        self.value = value
+        self.desc = desc
+        self.perm = perm
+        self.example = example
+        self.name = name.lower()
+        self.exposed = exposed
+
+    def __casattr__(self, name, val):
+        # Update option if needed
+        if not hasattr(self, name):
+            setattr(self, name, val)
+            return True
+        else:
+            #if val and getattr(self, name)!=val: # old style
+            if val != None and type(getattr(self, name)) != type(val):
+                setattr(self, name, val)
+                return True
+            return False
+
+    def check(self, key, plugname, value, desc, perm, example, name, exposed):
+        upd = False
+        # maybe checking value is too much here
+        if self.__casattr__("value", value): upd = True
+        if self.__casattr__("example", example): upd = True
+        if self.__casattr__("name", name): upd = True
+        if self.__casattr__("perm", perm): upd = True
+        if self.__casattr__("exposed", exposed): upd = True
+        if self.name == None:
+            self.name = "%s-cfg-%s" % (plugname, str(key))
+            upd = True
+        return upd
+
+    def __lt__(self, other):
+        return self.value < other
+
+    def __le__(self, other):
+        return self.value <= other
+
+    def __eq__(self, other):
+        return self.value == other
+
+    def __ne__(self, other):
+        return self.value != other
+
+    def __gt__(self, other):
+        return self.value >= other
+
+    def __ge__(self, other):
+        return self.value >= other
+
+class LazyValueDict(object):
+
+    """ emulates the normal Persist.data (key, value) dict """
+
+    def __init__(self, cfg):
+        self.__cfg = cfg
+
+    def __len__(self):
+        return len(self.__persistData)
+
+    def __getitem__(self, key):
+        return self.__cfg.data[key].value
+
+    def __setitem__(self, key, value):
+        if not self.__cfg.data.has_key(key) or not \
+isinstance(self.__cfg.data[key], Option):
+            name = "%s-cfg-%s" % (self.__cfg.plugname, str(key))
+            self.__cfg.define(value, "", 'OPER', "", name, exposed=False)
+        self.__cfg.set(key, value)
+
+    def __delitem__(self, key):
+        raise Exception("Direct deletion not supported, use \
+persistConfig.undefine()")
+
+    def __iter__(self):
+        return self.__cfg.data.__iter__()
+
+    def iterkeys(self):
+        return self.__iter__()
+
+    def __contains__(self, item):
+        return self.__cfg.data.has_key(item)
+
+class PersistConfigError(Exception): pass
+
+class PersistConfig(Persist):
+
+    """ persist plugin configuration and create default handlers """
+
+    def __init__(self):
+        self.__basename__ = self.__class__.__name__
+        self.plugname = calledfrom(sys._getframe())
+        Persist.__init__(self, os.path.join(datadir, "%s-config" % \
+self.plugname), {})
+        self.__callbacks = {}
+        cmndname = "%s-cfg" % self.plugname
+        rlog(-3, 'persistconfig', 'added command %s (%s)' % (cmndname, \
+self.plugname))
+        cmnds[cmndname] = Command(self.cmnd_cfg, 'OPER', self.plugname, \
+threaded=True)	
+        examples.add(cmndname, "plugin configuration", cmndname)
+        cmndnamesave = cmndname + "save"
+        cmnds[cmndnamesave] = Command(self.cmnd_cfgsave, 'OPER', \
+self.plugname, threaded=True)	
+        examples.add(cmndnamesave, "save plugin configuration", cmndnamesave)
+
+    def __getattribute__(self, name):
+        # make sure the attribute data is not called from Persist or 
+        # PersistConfig returning a persist compatible (key, value) dict 
+        # instead of the rich persistconfig
+        cf = calledfrom(sys._getframe())
+        ## (key, option(value, ...)) is only for persistconfig internal usage.
+        if name == "data" and cf != "persistconfig" and cf != "persist" and \
+cf != self.__basename__:
+            # intercept data block, return a clean dict with lazy binding 
+            # to option.value
+            return LazyValueDict(self)
+        return super(PersistConfig, self).__getattribute__(name)
+
+    def handle_callback(self, event, key, value=None):
+        if self.__callbacks.has_key((key, event)):
+            cb, extra_data = self.__callbacks[(key, event)]
+            if callable(cb):
+                cb(key, value, event, extra_data)
+            else:
+                rlog(5, 'persistconfig', 'invalid callback for %s %s' % (key, \
+event))
+                del self.__callbacks[(key, event)]
+
+    ### cmnds
+
+    def show_cfg(self, bot, ievent):
+        s = []
+        for key, option in sorted(self.data.items()):
+            if not isinstance(option, Option):
+                rlog(5, 'persistconfig', 'Option %s is not a valid option' % \
+key)
+                continue
+            if not option.exposed:
+                continue
+            v = option.value
+            if type(v) in [str, unicode]:
+                v = '"'+v+'"'
+            v = str(v)
+            s.append("%s=%s" % (key, v))
+        ievent.reply("options: " + ' .. '.join(s))
+
+    def cmnd_cfgsave(self, bot, ievent):
+        self.save()
+        ievent.reply("config saved")
+	
+    def cmnd_cfg_edit(self, bot, ievent, args, key, option):
+        if type(option.value) == types.ListType:
+	    if args[0].startswith("[") and args[-1].endswith("]"):
+		values = []
+		for v in ' '.join(args)[1:-1].replace(", ", ",").split(","):
+		    if v[0]=='"' and v[-1]=='"':
+			# string
+			v = v.replace('"', '')
+		    elif v[0]=="'" and v[-1]=="'":
+			# string
+			v = v.replace("'", "")
+		    elif '.' in v:
+			# float
+			try:
+			    v = float(v)
+			except ValueError:
+			    ievent.reply("invalid long literal: %s" % v)
+			    return
+		    else:
+			# int
+			try:
+			    v = int(v)
+			except ValueError:
+			    ievent.reply("invalid int literal: %s" % v)
+			    return
+		    values.append(v)
+                self.set(key, values)
+                ievent.reply("%s set %s" % (key, values))
+		return
+            command = args[0]
+            value = ' '.join(args[1:])
+            if command == "clear":
+                self.clear(key)
+                ievent.reply("list empty")
+            elif command == "add":
+                self.append(key, value)
+                ievent.reply("%s added %s" % (key, value))
+            elif command == "remove" or command == "del":
+                try:
+                    self.remove(key, value)
+                    ievent.reply("%s removed" % str(value))
+                except ValueError:
+                    ievent.reply("%s is not in list" % str(value))
+            else:
+                ievent.reply("invalid command")
+            return
+        else:
+            value = ' '.join(args)
+            try:
+                value = type(option.value)(value)
+            except:
+                pass
+            if type(value) == type(option.value):
+                self.set(key, value)
+                ievent.reply("%s set" % key)
+            elif type(value) == types.LongType and \
+type(option.value) == types.IntType:
+                # allow upscaling from int to long
+                self.set(key, value)
+                ievent.reply("%s set" % key)
+            else:
+                ievent.reply("value %s (%s) is not of the same type as %s \
+(%s)" % (value, type(value), option.value, type(option.value)))
+    
+    def cmnd_cfg(self, bot, ievent):
+        if not ievent.args:
+            self.show_cfg(bot, ievent)
+            return
+        argc = len(ievent.args)
+        key = ievent.args[0]
+        try:
+            option = self.data[key]
+        except KeyError:
+            ievent.reply("%s option %s not found" % (self.plugname, key))
+            return
+        if not isinstance(option, Option):
+            rlog(5, 'persistconfig', 'Option %s is not a valid option' % key)
+            return
+        if not option.exposed:
+            return
+        if argc == 1:
+            ievent.reply(str(option.value))
+            return
+        self.cmnd_cfg_edit(bot, ievent, ievent.args[1:], key, option)
+
+    def generic_cmnd(self, key):
+        def func(bot, ievent):
+            try:
+                option = self.data[key]
+            except KeyError:
+                ievent.reply("%s not found" % key)
+                # need return ?
+            if not isinstance(option, Option):
+                rlog(5, 'persistconfig', 'Option %s is not a valid option' % \
+key)
+                return
+            if ievent.args:
+                value = ' '.join(ievent.args)
+                try:
+                    value = type(option.value)(value)
+                except:
+                    pass
+                self.cmnd_cfg_edit(bot, ievent, ievent.args, key, option)
+            else:
+                ievent.reply(str(option.value))
+        return func
+
+    ### plugin api
+
+    def define(self, key, value=None, desc="plugin option", perm='OPER', \
+example="", name=None, exposed=True):
+        if name:
+            name = name.lower()
+        if not self.data.has_key(key):
+            if name == None:
+                name = "%s-cfg-%s" % (self.plugname, str(key))
+            option = Option(value, desc, perm, example, name, exposed)
+            self.data[key] = option
+            self.save()
+        else:
+            option = self.data[key]
+            # if unpickled option is not of class Option recreate the option
+            # also if the type of value has changed recreate the option
+            # exception if value got upgraded from int to long, then nothing 
+            # has to be changed
+            if not isinstance(option, Option):
+                if name == None:
+                    name = "%s-cfg-%s" % (self.plugname, str(key))
+                if type(value) == type(option):
+                    value = option
+                option = Option(value, desc, perm, example, name, exposed)
+                self.data[key] = option
+                self.save()
+            else:
+                if type(option.value) == types.LongType and \
+type(value) == types.IntType:
+                    value = long(value)
+                if option.check(key, self.plugname, value, desc, perm, \
+example, name, exposed):
+                    self.data[key] = option
+                    self.save()
+	
+    def undefine(self, key, throw=False):
+        try:
+            option = self.data[key]
+            if option.exposed:
+                if cmnds.has_key(option.name):
+                    del cmnds[option.name]
+                if examples.has_key(option.name):
+                    del examples[option.name]
+            del self.data[key]
+            self.save()
+            return True
+        except KeyError, e:
+            if throw:
+                raise
+        return False
+
+    def checkoption(self, key):
+        if not isinstance(self.data[key], Option):
+            raise PersistConfigError("Option %s is not a valid option" % key)
+        return True
+
+    def set(self, key, value, throw=False):
+        if type(value)==unicode:
+            value = str(value)
+        try:
+            self.checkoption(key)
+        except (KeyError, PersistConfigError):
+            if throw:
+                raise
+            self.define(key, value)
+            self.handle_callback('change', key, value)
+        else:
+            self.data[key].value = value
+            self.handle_callback('change', key, value)
+            self.save()
+
+    def append(self, key, value):
+        self.checkoption(key)
+        self.data[key].value.append(value)
+        self.save()
+        self.handle_callback('change', key, value)
+        self.handle_callback('add', key, value)
+
+    def remove(self, key, value):
+        self.checkoption(key)
+        self.data[key].value.remove(value)
+        self.save()
+        self.handle_callback('change', key, value)
+        self.handle_callback('remove', key, value)
+
+    def clear(self, key):
+        self.checkoption(key)
+        self.data[key].value = []
+        self.save()
+        self.handle_callback('change', key, [])
+        self.handle_callback('clear', key)
+
+    def get(self, key, default=None):
+        try:
+            return self.data[key].value
+        except KeyError:
+            return default
+
+    def has_key(self, key):
+        return self.data.has_key(key)
+
+    def callback(self, key, event, callback, extra_data=None):
+        callbacks = ["change", "add", "remove", "clear"]
+        if not event in callbacks:
+            raise PersistConfigError("Unsupported callback event %s" % event)
+        self.__callbacks[(key, event)] = (callback, extra_data)
+    
+    def syncold(self, filename, remove=False):
+        """ sync with old config data """
+        if os.path.isfile(filename):
+            synckey = "persistconfig-syncold"
+            oldconfig = Persist(filename)
+            if not oldconfig.data.has_key(synckey):
+                rlog(10, 'persistconfig', "syncing old config %s with \
+persistconfig" % filename)
+                for i, j in oldconfig.data.iteritems():
+                    if i == synckey:
+                        continue
+                    if j and not self.get(i):
+                        self.set(i, oldconfig.data[i])
+                oldconfig.data[synckey] = time.localtime()
+                oldconfig.save()
+            del oldconfig
+            if remove:
+                os.unlink(filename)
+
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/persist.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/persist.py
@@ -0,0 +1,64 @@
+# gozerbot/persist.py
+#
+#
+
+""" allow data to be pickled to disk .. creating the persisted object
+    restores data
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.utils.log import rlog
+import cPickle, thread, os, copy
+
+saving = []
+stopsave = 0
+
+class Persist(object):
+
+    """ persist data attribute to pickle file """
+
+    def __init__(self, filename, default=None):
+        rlog(1, 'compat-persist', 'reading %s' % filename)
+        self.fn = filename
+        self.lock = thread.allocate_lock()
+        self.data = None
+        # load data from pickled file
+        try:
+            datafile = open(filename, 'r')
+        except IOError:
+            if default != None:
+                self.data = copy.deepcopy(default)
+            return
+        try:
+            self.data = cPickle.load(datafile)
+            datafile.close()
+        except:
+            if default != None:
+                self.data = copy.deepcopy(default)
+            else:
+                rlog(100, 'compat-persist', 'ERROR: %s' % filename)
+                raise
+
+    def save(self):
+        """ save persist data """
+        if stopsave:
+            rlog(100, 'compat-persist', 'stopping mode .. not saving %s' % self.fn)
+            return
+        try:
+            saving.append(str(self.fn))
+            self.lock.acquire()
+            # first save to temp file and when done rename
+            tmp = self.fn + '.tmp'
+            try:
+                datafile = open(tmp, 'w')
+            except IOError:
+                rlog(100, 'compat-persist', "can't save %s" % self.fn)
+                return
+            cPickle.dump(self.data, datafile)
+            datafile.close()
+            os.rename(tmp, self.fn)
+            rlog(10, 'compat-persist', '%s saved' % self.fn)
+        finally:
+            saving.remove(self.fn)
+            self.lock.release()
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/users.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/users.py
@@ -0,0 +1,246 @@
+# gozerbot/users.py
+#
+#
+
+""" bot's users """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.datadir import datadir
+from gozerbot.utils.log import rlog
+from gozerbot.utils.generic import stripident, stripidents
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.generic import die, stripped
+from gozerbot.compat.persist import Persist
+from gozerbot.config import config
+import re, types, os
+
+config.load()
+
+class User(object):
+
+    """ repesents a user """
+
+    def __init__(self, name, userhosts, perms):
+        self.name = str(name)
+        self.userhosts = list(userhosts)
+        self.perms = list(perms)
+        self.email = ""
+        self.permit = []
+        self.status = []
+        self.passwd = ""
+        self.allowed = []
+        self.notallowed = []
+        self.tempuserhosts = []
+        self.userdata = {}
+
+    def __str__(self):
+        return "name: %s userhosts: %s perms: %s email: %s status: %s \
+allowed: %s notallowed: %s tempusershosts: %s permit: %s" % (self.name, \
+self.userhosts, self.perms, self.email, self.status, self.allowed, \
+self.notallowed, self.tempuserhosts, self.permit)
+
+class Users(Persist):
+
+    """ holds multiple users """
+
+    def __init__(self, filename):
+        self.userhosts = {}
+        self.masks = {}
+        self.compiled = {}
+        Persist.__init__(self, filename)
+        if not self.data:
+            self.data = []
+        for i in self.data:
+            for j in i.userhosts:
+                self.adduserhost(j, i)
+
+    def adduserhost(self, userhost, user):
+        """ add userhost/mask """
+        if '?' in userhost or '*' in userhost:
+            tmp = re.escape(userhost)
+            tmp = tmp.replace('\?','.')
+            tmp = tmp.replace('\*','.*?')
+            regex = re.compile(tmp)
+            self.compiled[regex] = user
+            self.masks[userhost] = regex
+        else:
+            self.userhosts[userhost] = user
+
+    def deluserhost(self, userhost):
+        """ del userhost/mask """
+        try:
+            if '?' in userhost or '*' in userhost:
+                regex = self.masks[userhost]
+                del self.compiled[regex]
+                del self.masks[userhost]
+            else:
+                del self.userhosts[userhost]
+            return 1
+        except KeyError:
+            return 0
+            
+    def exist(self, name):
+        """ see if user with username exists """
+        name = name.lower()
+        for i in self.data:
+            if i.name == name:
+                return 1
+
+    def getperms(self, userhost):
+        """ get permissions """
+        user = self.getuser(userhost)
+        if user:
+            return user.perms
+        else:
+            return ['ANON', ]
+
+    def getuser(self, userhost):
+        """ get user for which userhost matches """
+        userhost = stripident(userhost)
+        if userhost in self.userhosts:
+            return self.userhosts[userhost]
+        else:
+            for i in self.compiled:
+                if re.search(i, userhost):
+                    return self.compiled[i]
+        for user in self.data:
+            for i in user.userhosts:
+                if i == userhost or i == stripped(userhost):
+                    return user
+        return None
+
+    def gotperm(self, name, perm):
+        user = self.byname(name)
+        if not user:
+            return 0
+        if perm in user.perms:
+            return 1
+
+    def size(self):
+        """ return nr of users """
+        return len(self.data)
+
+    def add(self, name, userhosts, perms):
+        """ add user """
+        self.addnosave(name, userhosts, perms)
+        self.save()
+        return 1
+
+    def addnosave(self, name, userhosts, perms):
+        """ add user without saving """
+        name = name.lower()
+        for item in self.data:
+            if item.name == name:
+                return 0
+        userhosts = stripidents(userhosts)
+        # add user
+        user = User(name, userhosts, perms)
+        self.data.append(user)
+        rlog(10, 'users', 'added user %s %s with perms %s' % (name, \
+userhosts, perms))
+        for i in userhosts:
+            self.adduserhost(i, user)
+        return 1
+
+    def permitted(self, userhost, who, what):
+        """ check if (who,what) is in users permit list """
+        user = self.getuser(userhost)
+        if not user:
+            return 0
+        if (who, what) in user.permit:
+            return 1
+
+    def names(self):
+        """ get names of all users """
+        result = []
+        for item in self.data:
+            result.append(item.name)
+        return result
+
+    def getname(self, userhost):
+        """ get name of user with userhost """
+        item = self.getuser(userhost)
+        if item:
+            return item.name
+        else:
+            return None
+
+    def byname(self, name):
+        """ return user with name """
+        name = name.lower()
+        for item in self.data:
+            if item.name.lower() == name:
+                return item
+        return None
+
+    def merge(self, name, userhost):
+        """ add userhosts to user with name """
+        name = name.lower()
+        for item in self.data:
+            if item.name == name:
+                userhost = stripident(userhost)
+                item.userhosts.append(userhost)
+                self.adduserhost(userhost, item)
+                self.save()
+                rlog(10, 'users', 'merged %s (%s) with %s' % (name, \
+userhost, item.name))
+                return 1
+        return None
+
+    def delete(self, name):
+        """ delete user with name """
+        data = self.data
+        name = name.lower()
+        got = 0
+        for itemnr in range(len(data)-1, -1, -1):
+            if data[itemnr].name == name:
+                for i in data[itemnr].userhosts:
+                    self.deluserhost(i)
+                del data[itemnr]
+                got = 1
+        if got:
+            self.save()
+            return 1
+        return None
+
+    def allowed(self, userhost, perms, log=True):
+        """ check if user with userhosts is allowed to execute perm command """
+        if type(perms) != types.ListType:
+            perms = [perms, ]
+        if 'ANY' in perms:
+            return 1
+        item = self.getuser(userhost)
+        if not item:
+            if log:
+                rlog(10, 'users', '%s userhost denied' % userhost)
+            return 0
+        for i in perms:
+            if i in item.perms:
+                return 1
+        if log:
+            rlog(10, 'users', '%s perm %s denied' % (userhost, perms))
+        return 0
+
+    def status(self, userhost, status):
+        """ check if user has status set """
+        status = status.upper()
+        item = self.getuser(userhost)
+        if not item:
+            return 0
+        if status in item.status:
+            return 1
+        return 0
+
+    def getemail(self, name):
+        """ return email of user """
+        user = self.byname(name)
+        return user.email
+        
+    def setemail(self, name, email):
+        """ set email of user """
+        user = self.byname(name)
+        user.email = email
+        self.save()
+        return 1
+        
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/karma.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/karma.py
@@ -0,0 +1,270 @@
+# plugs/karma.py
+#
+#
+
+""" karma plugin """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.redispatcher import rebefore
+from gozerbot.datadir import datadir
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.log import rlog
+from gozerbot.utils.locking import lockdec
+from gozerbot.utils.statdict import Statdict
+from gozerbot.aliases import aliases
+from gozerbot.plughelp import plughelp
+from gozerbot.config import config
+import thread, pickle, time, os
+
+plughelp.add('karma', 'maintain karma of items .. use ++ to raise karma by 1 \
+or use -- to lower by 1 .. reason might be given after a "#"')
+
+savelist = []
+
+class Karma:
+
+    """ holds karma data """
+
+    def __init__(self, ddir):
+        rlog(0, 'karma', 'reading %s' % datadir + os.sep + 'karma')
+        self.datadir = ddir
+        self.lock = thread.allocate_lock()
+        try:
+            karmafile = open(ddir + os.sep + 'karma', 'r')
+            self.karma = pickle.load(karmafile)
+            karmafile.close()
+        except:
+            self.karma = {}
+        try:
+            reasonupfile = open(ddir + os.sep + 'reasonup', 'r')
+            self.reasonup = pickle.load(reasonupfile)
+            reasonupfile.close()
+        except:
+            self.reasonup = {}
+        try:
+            reasondownfile = open(ddir + os.sep + 'reasondown', 'r')
+            self.reasondown = pickle.load(reasondownfile)
+            reasondownfile.close()
+        except:
+            self.reasondown = {}
+        try:
+            whoupfile = open(ddir + os.sep + 'whoup', 'r')
+            self.whoup = pickle.load(whoupfile)
+            whoupfile.close()
+        except:
+            self.whoup = {}
+        try:
+            whodownfile = open(ddir + os.sep + 'whodown', 'r')
+            self.whodown = pickle.load(whodownfile)
+            whodownfile.close()
+        except:
+            self.whodown = {}
+
+    def size(self):
+        return len(self.karma)
+        
+    def save(self):
+        """ save karma data """
+        try:
+            self.lock.acquire()
+            karmafile = open(self.datadir + os.sep + 'karma', 'w')
+            pickle.dump(self.karma, karmafile)
+            karmafile.close()
+            rlog(1, 'karma', '%s karma saved' % self.datadir)
+            reasonupfile = open(self.datadir + os.sep + 'reasonup', 'w')
+            pickle.dump(self.reasonup, reasonupfile)
+            reasonupfile.close()
+            rlog(1, 'karma', '%s reasonup saved' % self.datadir)
+            reasondownfile = open(self.datadir + os.sep + 'reasondown', 'w')
+            pickle.dump(self.reasondown, reasondownfile)
+            reasondownfile.close()
+            rlog(1, 'karma', '%s reasondown saved' % self.datadir)
+            whoupfile = open(self.datadir + os.sep + 'whoup', 'w')
+            pickle.dump(self.whoup, whoupfile)
+            whoupfile.close()
+            rlog(1, 'karma', '%s whoup saved' % self.datadir)
+            whodownfile = open(self.datadir + os.sep + 'whodown', 'w')
+            pickle.dump(self.whoup, whodownfile)
+            whodownfile.close()
+            rlog(1, 'karma', '%s whodown saved' % self.datadir)
+        finally:
+            self.lock.release()
+
+    def add(self, item, value):
+        """ set karma value of item """
+        self.karma[item.lower()] = value
+
+    def delete(self, item):
+        """ delete karma item """
+        item = item.lower()
+        try:
+            del self.karma[item]
+            return 1
+        except KeyError:
+            return 0
+
+    def get(self, item):
+        """ get karma of item """
+        item = item.lower()
+        if self.karma.has_key(item):
+            return self.karma[item]
+        else:
+            return None
+
+    def addwhy(self, item, updown, reason):
+        """ add why of karma up/down """
+        item = item.lower()
+        if not self.karma.has_key(item):
+            return 0
+        reason = reason.strip()
+        if updown == 'up':
+            if self.reasonup.has_key(item):
+                self.reasonup[item].append(reason)
+            else:
+                self.reasonup[item] = [reason]
+        elif updown == 'down':
+            if self.reasondown.has_key(item):
+                self.reasondown[item].append(reason)
+            else:
+                self.reasondown[item] = [reason]
+            
+    def upitem(self, item, reason=None):
+        """ up a karma item with/without reason """
+        item = item.lower()
+        if self.karma.has_key(item):
+            self.karma[item] += 1
+        else:
+            self.karma[item] = 1
+        if reason:
+            reason = reason.strip()
+            if self.reasonup.has_key(item):
+                self.reasonup[item].append(reason)
+            else:
+                self.reasonup[item] = [reason]
+
+    def down(self, item, reason=None):
+        """ lower a karma item with/without reason """
+        item = item.lower()
+        if self.karma.has_key(item):
+            self.karma[item] -= 1
+        else:
+            self.karma[item] = -1
+        if reason:
+            reason = reason.strip()
+            if self.reasondown.has_key(item):
+                self.reasondown[item].append(reason)
+            else:
+                self.reasondown[item] = [reason]
+
+    def whykarmaup(self, item):
+        """ get why of karma ups """
+        item = item.lower()
+        if self.reasonup.has_key(item):
+            return self.reasonup[item]
+
+    def whykarmadown(self, item):
+        """ get why of karma downs """
+        item = item.lower()
+        if self.reasondown.has_key(item):
+            return self.reasondown[item]
+
+    def setwhoup(self, item, nick):
+        """ set who upped a karma item """
+        item = item.lower()
+        if self.whoup.has_key(item):
+            self.whoup[item].append(nick)
+        else:
+            self.whoup[item] = [nick]
+
+    def setwhodown(self, item, nick):
+        """ set who lowered a karma item """
+        item = item.lower()
+        if self.whodown.has_key(item):
+            self.whodown[item].append(nick)
+        else:
+            self.whodown[item] = [nick]
+
+    def getwhoup(self, item):
+        """ get list of who upped a karma item """
+        item = item.lower()
+        try:
+            return self.whoup[item]
+        except KeyError:
+            return None
+
+    def getwhodown(self, item):
+        """ get list of who downed a karma item """
+        item = item.lower()
+        try:
+            return self.whodown[item]
+        except KeyError:
+            return None
+
+    def good(self, limit=10):
+        """ show top 10 of karma items """
+        statdict = Statdict()
+        for i in self.karma.keys():
+            if i.startswith('quote '):
+                continue
+            statdict.upitem(i, value=self.karma[i])
+        return statdict.top(limit=limit)
+
+    def bad(self, limit=10):
+        """ show lowest 10 of negative karma items """
+        statdict = Statdict()
+        for i in self.karma.keys():
+            if i.startswith('quote '):
+                continue
+            statdict.upitem(i, value=self.karma[i])
+        return statdict.down(limit=limit)
+
+    def quotegood(self, limit=10):
+        """ show top 10 of karma items """
+        statdict = Statdict()
+        for i in self.karma.keys():
+            if not i.startswith('quote '):
+                continue
+            statdict.upitem(i, value=self.karma[i])
+        return statdict.top(limit=limit)
+
+    def quotebad(self, limit=10):
+        """ show lowest 10 of negative karma items """
+        statdict = Statdict()
+        for i in self.karma.keys():
+            if not i.startswith('quote '):
+                continue
+            statdict.upitem(i, value=self.karma[i])
+        return statdict.down(limit=limit)
+
+    def search(self, item):
+        """ search karma items """
+        result = []
+        item = item.lower()
+        for i, j in self.karma.iteritems():
+            if item in i:
+                result.append((i, j))
+        return result
+
+    def whatup(self, nick):
+        """ show what items where upped by nick """
+        nick = nick.lower()
+        statdict = Statdict()
+        for i, j in self.whoup.iteritems():
+            for z in j:
+                if nick == z:
+                    statdict.upitem(i)
+        return statdict.top()
+
+    def whatdown(self, nick):
+        """ show what items where lowered by nick """
+        nick = nick.lower()
+        statdict = Statdict()
+        for i, j in self.whodown.iteritems():
+            for z in j:
+                if nick == z:
+                    statdict.upitem(i)
+        return statdict.top()
+
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/dbusers.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/dbusers.py
@@ -0,0 +1,264 @@
+# gozerbot/dbusers.py
+#
+#
+
+""" bots users for mysql interface"""
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.utils.log import rlog
+from gozerbot.database.db import Db
+import types
+
+class Dbusers(object):
+
+    """ users class """
+
+    def __init__(self):
+        self.db = Db()
+
+    def size(self):
+        """ return nr of users """
+        result = self.db.execute(""" SELECT DISTINCT COUNT(*) FROM userhosts \
+""")
+        if result:
+            return result[0][0]
+
+    def getperms(self, userhost):
+        """ return permission of user"""
+        name = self.getname(userhost)
+        if not name:
+            return ['ANON', ]
+        result = self.db.execute(""" SELECT perm FROM perms WHERE name = %s \
+""", name)
+        res = []
+        for i in result:
+            res.append(i[0])
+        return res
+
+    def exist(self, name):
+        """ see if user with <name> exists """
+        name = name.lower()
+        result = self.db.execute(""" SELECT name,userhost FROM userhosts WHERE \
+name = %s """, name)
+        return result
+
+    def getname(self, userhost):
+        """ get name of user belonging to <userhost> """
+        result = self.db.execute(""" SELECT name FROM userhosts WHERE \
+%s LIKE userhost """, userhost)
+        if result:
+            return result[0][0]
+
+    def add(self, name, userhosts, perms):
+        """ add an user """
+        if type(userhosts) != types.ListType:
+            rlog(10, 'dbusers', 'i need a list of userhosts')
+            return 0
+        for i in userhosts:
+            self.adduserhost(name, i)
+        for i in perms:
+            self.addperm(name, i)
+        rlog(10, 'users', '%s added to user database' % name)
+        return 1
+
+    def adduserhost(self, name, userhost):
+        """ add userhost """
+        name = name.lower()
+        res = None
+        result = self.db.execute(""" INSERT INTO userhosts(name, userhost) \
+values(%s, %s) """, (name, userhost))
+        if result:
+            res = 1
+            rlog(10, 'users', '%s (%s) added to userhosts' % (name, userhost))
+        return res
+
+    def addperm(self, name, perm):
+        """ add permission """
+        name = name.lower()
+        perm = perm.upper()
+        res = None
+        result = self.db.execute(""" INSERT INTO perms(name, perm) \
+values(%s, %s) """, (name, perm))
+        if result:
+            res = 1
+            rlog(10, 'users', '%s perm %s added' % (name, perm))
+        return res
+
+    def delperm(self, name, perm):
+        """ add permission """
+        name = name.lower()
+        perm = perm.upper()
+        result = self.db.execute(""" DELETE FROM perms WHERE name = %s AND \
+perm = %s """, (name, perm))
+        if result:
+            rlog(10, 'users', '%s perm %s deleted' % (name, perm))
+            return result
+
+    def permitted(self, userhost, who, what):
+        """ check if (who,what) is in users permit list """
+        name = self.getname(userhost)
+        res = None
+        if name:
+            result = self.db.execute(""" SELECT permit FROM permits WHERE \
+name = %s """, name)
+            if result:
+                for i in result:
+                    if "%s %s" % (who, what) == i[0]:
+                        res = 1
+        return res
+
+    def names(self):
+        """ get names of all users """
+        res = []
+        result = self.db.execute(""" SELECT DISTINCT name FROM userhosts """)
+        if result:
+            for i in result:
+                res.append(i[0])
+        return res
+
+    def merge(self, name, userhost):
+        """ add userhosts to user with name """
+        name = name.lower()
+        if not self.exist(name):
+            return 0
+        res = None
+        result = self.db.execute(""" INSERT INTO userhosts(userhost, name) \
+VALUES (%s, %s) """, (userhost, name))
+        if result:
+            res = 1
+        return res
+
+    def delete(self, name):
+        """ delete user with name """
+        name = name.lower()
+        res = None
+        nr1 = self.db.execute(""" DELETE FROM userhosts WHERE name = %s \
+""", name)
+        nr2 = self.db.execute(""" DELETE FROM perms WHERE name = %s \
+""", name)
+        if nr1 and nr2:
+            res = 1
+        return res
+
+    def status(self, userhost, status):
+        """ check if user with <userhost> has <status> set """
+        name = self.getname(userhost)
+        res = None
+        if name:
+            status = status.upper()
+            result = self.db.execute(""" SELECT status FROM statuses WHERE \
+name = %s """, name)
+            if result:
+                for i in result:
+                    if status == i[0]:
+                        res = 1
+        return res
+
+    def gotperm(self, name, perm):
+        """ check if user had permission """
+        name = name.lower()
+        perm = perm.upper()
+        result = self.db.execute(""" SELECT perm FROM perms WHERE \
+name = %s """, name)
+        if result:
+            for i in result:
+                if i[0] == perm:
+                    return True
+
+    def gotstatus(self, name, status):
+        """ check if user has status """
+        name = name.lower()
+        status = status.upper()
+        result = self.db.execute(""" SELECT status FROM statuses WHERE \
+name = %s """, name)
+        if result:
+            for i in result:
+                if status == i[0]:
+                    return True
+
+    def gotuserhost(self, name, userhost):
+        """ check if user has userhost """
+        name = name.lower()
+        result = self.db.execute(""" SELECT userhost FROM userhosts WHERE \
+name = %s """, name)
+        if result:
+            for i in result:
+                if i[0] == userhost:
+                    return True
+
+    def gotpermit(self, name, permit):
+        """ check if user permits something """
+        name = name.lower()
+        result = self.db.execute(""" SELECT permit FROM permits WHERE \
+name = %s """, name)
+        if result:
+            for i in result:
+                if "%s %s" % permit == i[0]:
+                    return True
+
+    def allowed(self, userhost, perms, log=True):
+        """ check if user with userhosts is allowed to execute perm command """
+        if not type(perms) == types.ListType:
+            perms = [perms, ]
+        if 'ANY' in perms:
+            return 1
+        res = None
+        name = self.getname(userhost)
+        if not name:
+            if log:
+                rlog(10, 'users', '%s userhost denied' % userhost)
+            return res
+        result = self.db.execute(""" SELECT perm FROM perms WHERE \
+name = %s """, name)
+        if result:
+            for i in result:
+                if i[0] in perms:
+                    res = 1
+        if not res:
+            if log:
+                rlog(10, 'users', "%s perm %s denied" % (userhost, perms))
+        return res
+
+    def getemail(self, name):
+        """ get email of user """
+        name = name.lower()
+        email = None
+        email = self.db.execute(""" SELECT email FROM email WHERE name = %s \
+""", name)
+        if email:
+            return email[0][0]
+
+    def setemail(self, name, email):
+        """ set email of user """
+        res = 0
+        try:
+            result = self.db.execute(""" INSERT INTO email(name, email) \
+VALUES (%s, %s) """, (name, email))
+        except:
+            try:
+                result = self.db.execute(""" UPDATE email SET email = %s \
+WHERE name = %s """, (email, name))
+            except:
+                pass
+        if result:
+            res = 1
+        return res
+
+    def addpermall(self, perm): 
+        """ add permission to all users """
+        perm = perm.upper()
+        for i in self.names():
+            try:
+                self.addperm(i, perm)
+            except:
+                pass
+
+    def delpermall(self, perm):
+        """ delete permission from all users """
+        perm = perm.upper()
+        for i in self.names():
+            try:
+                self.delperm(i, perm)
+            except:
+                pass
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/pdod.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/pdod.py
@@ -0,0 +1,75 @@
+# gozerbot/pdod.py
+#
+#
+
+""" pickled dicts of dicts """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.utils.locking import lockdec
+from persist import Persist
+import thread
+
+pdodlock = thread.allocate_lock()
+locked = lockdec(pdodlock)
+ 
+class Pdod(Persist):
+
+    """ pickled dicts of dicts """
+
+    def __init__(self, filename):
+        Persist.__init__(self, filename)
+        if not self.data:
+            self.data = {}
+
+    def __getitem__(self, name):
+        """ return item with name """
+        if self.data.has_key(name):
+            return self.data[name]
+
+    @locked
+    def save(self):
+        Persist.save(self)
+
+    @locked
+    def __delitem__(self, name):
+        """ delete name item """
+        if self.data.has_key(name):
+            return self.data.__delitem__(name)
+
+    @locked
+    def __setitem__(self, name, item):
+        """ set name item """
+        self.data[name] = item
+
+    def __contains__(self, name):
+        return self.data.__contains__(name)
+
+    @locked
+    def setdefault(self, name, default):
+        """ set default of name """
+        return self.data.setdefault(name, default)
+
+    def has_key(self, name):
+        """ has name key """
+        return self.data.has_key(name)
+
+    def has_key2(self, name1, name2):
+        """ has [name1][name2] key """
+        if self.data.has_key(name1):
+            return self.data[name1].has_key(name2)
+
+    def get(self, name1, name2):
+        """ get data[name1][name2] """
+        try:
+            result = self.data[name1][name2]
+            return result
+        except KeyError:
+            return None
+
+    @locked
+    def set(self, name1, name2, item):
+        """ set name, name2 item """
+        if not self.data.has_key(name1):
+            self.data[name1] = {}
+        self.data[name1][name2] = item
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/__init__.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/__init__.py
@@ -0,0 +1,32 @@
+# gozerbot package
+#
+#
+
+""" gozerbot compatibility package. """
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION
+
+from gozerbot.eggs import loadegg
+import os
+
+# END IMPORT
+# ==========
+
+# ============
+# LOCK SECTION
+
+# no locks
+
+# END LOCK
+# ========
+
+# ============
+# INIT SECTION
+
+loadegg('feedparser', [os.getcwd(), os.getcwd() + os.sep + 'gozernest'], log=False)
+
+# END INIT
+# ========
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/config.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/config.py
@@ -0,0 +1,313 @@
+# gozerbot/config.py
+#
+#
+
+""" this is where the config dict lives .. use pickle to persist config data
+    .. use this pickle on start until the config file has changed  """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.datadir import datadir
+import os, pickle, subprocess
+
+# version string
+ver = 'GOZERBOT 0.8.1.1 RELEASE'
+
+def diffdict(dictfrom, dictto):
+    """ check for differences between two dicts """
+    temp = {}
+    for i in dictto.iteritems():
+        if dictfrom.has_key(i[0]):
+            if dictfrom[i[0]] != i[1]:
+                temp.setdefault(i[0], i[1])
+        else:
+            temp.setdefault(i[0], i[1])
+    return temp
+
+class Config(dict):
+
+    """ config object is a dict """
+
+    def __init__(self, ddir, *args, **kw):
+        dict.__init__(self, *args, **kw)
+        self.dir = str(ddir)
+        self['dbtype'] = 'mysql'
+
+    def __getitem__(self, item):
+        """ get config item .. return None if not available"""
+        if not self.has_key(item):
+            return None
+        else:
+            return dict.__getitem__(self, item)
+
+    def set(self, item, value):
+        """ set a config item """
+        dict.__setitem__(self, item, value)
+        self.save()
+
+    def load(self):
+        """ load the config file """
+        frompickle = {}
+        picklemodtime = None
+        # first do reload of the data/config file
+        self.reload()
+        # see if there is a configpickle
+        try:
+            picklemodtime = os.stat(self.dir + os.sep + 'configpickle')[8]
+            configpickle = open(self.dir + os.sep + 'configpickle', 'r')
+            frompickle = pickle.load(configpickle)
+            configpickle.close()
+        except OSError:
+            return
+        except:
+            pass
+        # see if data/config is more recent than the configpickle
+        configmodtime = os.stat(self.dir + os.sep + 'config')[8]
+        if picklemodtime and picklemodtime > configmodtime:
+            # if so update the config dict with the pickled data
+            # a = diffdict(self, frompickle)
+            self.update(frompickle)
+        # set version
+        if self['dbenable']:
+            self['version'] = ver + ' ' + self['dbtype'].upper()
+        else:
+            self['version'] = ver
+    
+    def save(self):
+        """ save config data to pickled file """
+        picklefile = open(self.dir + os.sep + 'configpickle', 'w')
+        pickle.dump(self, picklefile)
+        picklefile.close()
+
+    def reload(self):
+        """ use execfile to reload data/config """
+        try:
+            execfile(self.dir + os.sep + 'config', self)
+        except IOError:
+            self.defaultconfig()
+        # remove builtin data
+        try:
+            del self['__builtins__']
+        except:
+            pass
+        # set version
+        if self['dbenable']:
+            self['version'] = ver + ' ' + self['dbtype'].upper()
+        else:
+            self['version'] = ver
+
+    def defaultconfig(self):
+        """ init default config values if no config file is found """
+        self['loglevel'] = 100
+        self['jabberenable'] = 0
+        self['ircdisable'] = 0
+        self['stripident'] = 1
+        self['owneruserhost'] = ['bart@127.0.0.1', ]
+        self['nick'] = 'gozerbot'
+        self['server'] = 'localhost'
+        self['port'] = 6667
+        self['ipv6'] = 0
+        self['username'] = 'gozerbot'
+        self['realname'] = 'GOZERBOT'
+        self['defaultcc'] = "!"
+        self['nolimiter'] = 0
+        self['quitmsg'] = 'http://gozerbot.org'
+        self['dbenable'] = 0
+        self['udp'] = 0
+        self['partyudp'] = 0
+        self['mainbotname'] = 'main'
+        self['addonallow'] = 0
+        self['allowedchars'] = []
+
+configtxt = """# config
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerdata dir umask
+umask = 0700
+
+# logging level .. the higher this value is the LESS the bot logs
+loglevel = 10
+
+## jabber section:
+
+jabberenable = 0
+jabberowner = 'bartholo@localhost'
+jabberhost = 'localhost'
+jabberuser = 'gozerbot@localhost'
+jabberpass = 'pass'
+jabberoutsleep = 0.1
+
+## irc section:
+
+ircdisable = 0
+
+# stripident .. enable stripping of ident from userhost
+stripident = 1
+
+# userhost of owner .. make sure this matches your client's userhost
+# if it doesn't match you will get an userhost denied message when you
+# try to send commands to the bot
+owneruserhost = ['bart@127.0.0.1', ]
+
+# the nick the bot tries to use, only used if no nick is set
+# otherwise the bot will use the last nick used by the !nick command
+nick = 'gozerbot'
+
+# alternick
+#alternick = 'gozerbot2'
+
+# server to connect to
+server = 'localhost'
+
+# irc port to connect to 
+port = 6667
+
+# ircd password for main bot
+#password = 'bla'
+
+# ipv6
+ipv6 = 0
+
+# bindhost .. uncomment and edit to use
+#bindhost = 'localhost'
+
+# bots username
+username = 'gozerbot'
+
+# realname
+realname = 'GOZERBOT'
+
+# default control character
+defaultcc = "!"
+
+# no limiter
+nolimiter = 0
+
+# quit message
+quitmsg = 'http://gozerbot.org'
+
+# nickserv .. set pass to enable nickserv ident
+nickservpass = ""
+nickservtxt = ['set unfiltered on', ]
+
+## if you want to use a database:
+
+dbenable = 0 # set to 1 to enable
+dbtype = 'mysql' # one of mysql or sqlite
+dbname = "gb_db"
+dbhost = "localhost"
+dbuser = "bart"
+dbpasswd = "mekker2"
+dboldstyle = False # set to True if mysql database is <= 4.1
+
+## if you want to use udp:
+
+# udp
+udp = 0 # set to 1 to enable
+partyudp = 0
+udpipv6 = 0
+udphost = 'localhost'
+udpport = 5500
+udpmasks = ['192.168*', ]
+udpallow = ['127.0.0.1', ]
+udpallowednicks = ['#dunkbots', 'dunker']
+udppassword = 'mekker'
+udpseed = "" # set this to 16 char wide string if you want to encrypt the data
+udpstrip = 1 # strip all chars < char(32)
+udpsleep = 0 # sleep in sendloop .. can be used to delay packet traffic
+
+# tcp
+tcp = 0 # set to 1 to enable
+partytcp = 0
+tcpipv6 = 0
+tcphost = 'localhost'
+tcpport = 5500 
+tcpmasks = ['192.168*', ]
+tcpallow = ['127.0.0.1', ]
+tcpallowednicks = ['#dunkbots', 'dunker', 'dunker@jabber.xs4all.nl']
+tcppassword = 'mekker'
+tcpseed = "bla1234567890bla"
+# set this to 16 char wide string if you want to encrypt the data
+tcpstrip = 1
+tcpsleep = 0   
+
+## other stuff:
+
+# plugin server 
+pluginserver = 'http://gozerbot.org'
+
+# upgradeurl .. only needed if mercurial repo changed
+#upgradeurl = 'http://gozerbot.org/hg/gozerbot'
+
+# mail related
+mailserver = None
+mailfrom = None
+
+# collective boot server
+collboot = "gozerbot.org:8088"
+
+# name of the main bot
+mainbotname = 'main'
+
+# allowed character for strippedtxt
+allowedchars = []
+
+# set to 1 to allow addons
+addonallow = 0
+
+# enable loadlist
+loadlist = 0
+"""
+
+def writeconfig():
+    """ wtite default config file to datadir/config """
+    if not os.path.isfile(datadir + os.sep + 'config'):
+        cfgfile = open(datadir + os.sep + 'config', 'w')
+        cfgfile.write(configtxt)
+        cfgfile.close()
+
+loadlist = """
+core
+misc
+irc
+not
+grep
+reverse
+count
+chanperm
+choice
+fleet
+ignore
+upgrade
+job
+reload
+rest
+tail
+user
+googletalk
+all
+at
+backup
+install
+reload
+tell
+reverse
+to
+underauth
+userstate
+alias
+nickserv
+"""
+
+def writeloadlist():
+    """ write loadlist to datadir """
+    if not os.path.isfile(datadir + os.sep + 'loadlist'):
+        cfgfile = open(datadir + os.sep + 'loadlist', 'w')
+        cfgfile.write(loadlist)
+        cfgfile.close()
+
+# create the config dict and load it from file
+#config = Config(datadir)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/todo.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/todo.py
@@ -0,0 +1,172 @@
+# plugs/todo.py
+#
+#
+
+from gozerbot.compat.persist import Persist
+import time
+
+class Todoitem:
+
+    """ a todo item """
+
+    def __init__(self, name, descr, ttime=None, duration=None, warnsec=None, \
+priority=None, num=0):
+        self.name = name
+        self.time = ttime
+        self.duration = duration
+        self.warnsec = warnsec
+        self.descr = descr
+        self.priority = priority
+        self.num = num
+
+    def __str__(self):
+        return "name: %s num: %d time: %s duration: %s warnsec: %s \
+description: %s priority: %s" % (self.name, self.num, \
+time.ctime(self.time), self.duration, self.warnsec, self.descr, self.priority)
+
+class Todolist:
+
+    """ a dict faking list of todo items .. index is number """
+
+    def __init__(self):
+        self.max = 0
+        self.data = {}
+
+    def __len__(self):
+        return len(self.data)
+
+    def __getitem__(self, num):
+        return self.data[num]
+
+    def __delitem__(self, num):
+        del self.data[num]
+
+    def __iter__(self):
+        tmplist = self.data.values()
+        tmplist.sort(lambda x, y: cmp(x.priority, y.priority), reverse=True)
+        return tmplist.__iter__()
+
+    def append(self, item):
+        """ add todo item """
+        self.max += 1
+        item.num = self.max
+        self.data[self.max] = item
+
+    def __str__(self):
+        return str(self.data)
+
+
+class Todo(Persist):
+
+    """ Todoos """
+
+    def __init__(self, filename):
+        Persist.__init__(self, filename)
+        if not self.data:
+            return
+        for key in self.data.keys():
+            todoos = self.data[key]
+            for (k, v) in todoos.data.items():
+                v.num = k
+            newd = Todolist()
+            for i in todoos:
+                newd.append(i)
+            self.data[key] = newd
+
+    def size(self):
+        """ return number of todo entries """
+        return len(self.data)
+
+    def get(self, name):
+        """ get todoos of <name> """
+        if self.data.has_key(name):
+            return self.data[name]
+
+    def add(self, name, txt, ttime, warnsec=0):
+        """ add a todo """
+        name = name.lower()
+        if not self.data.has_key(name):
+            self.data[name] = Todolist()
+        self.data[name].append(Todoitem(name, txt.strip(), ttime, \
+warnsec=0-warnsec))
+        self.save()
+        return len(self.data[name])
+
+    def addnosave(self, name, txt, ttime):
+        """ add but don't save """
+        name = name.lower()
+        if not self.data.has_key(name):
+            self.data[name] = Todolist()
+        self.data[name].append(Todoitem(name, txt, ttime))
+
+    def reset(self, name):
+        name = name.lower()
+        if self.data.has_key(name):
+           self.data[name] = Todolist()
+        self.save()
+
+    def delete(self, name, nr):
+        """ delete todo item """
+        if not self.data.has_key(name):
+            return 0
+        todoos = self.data[name]
+        try:
+            if todoos[nr].warnsec:
+                alarmnr = 0 - todoos[nr].warnsec
+                if alarmnr > 0:
+                    alarms.delete(alarmnr)
+            del todoos[nr]
+        except KeyError:
+            return 0
+        self.save()
+        return 1
+
+    def toolate(self, name):
+        """ show if there are any time related todoos that are too late """
+        now = time.time()
+        teller = 0
+        for i in self.data[name]:
+            if i.time < now:
+                teller += 1
+        return teller
+
+    def timetodo(self, name):
+        """ show todoos with time field set """
+        result = []
+        if not self.data.has_key(name):
+            return result
+        for i in self.data[name]:
+            if i.time:
+                result.append(i)
+        return result
+
+    def withintime(self, name, time1, time2):
+        """ show todoos within time frame """
+        result = []
+        if not self.data.has_key(name):
+            return result
+        for i in self.data[name]:
+            if i.time >= time1 and i.time < time2:
+                result.append(i)
+        return result
+
+    def setprio(self, who, itemnr, prio):
+        """ set priority of todo item """
+        try:
+            todoitems = self.get(who)
+            todoitems[itemnr].priority = prio
+            self.save()
+            return 1
+        except (KeyError, TypeError):
+            pass
+
+    def settime(self, who, itemnr, ttime):
+        """ set time of todo item """
+        try:
+            todoitems = self.get(who)
+            todoitems[itemnr].time = ttime
+            self.save()
+            return 1
+        except (KeyError, TypeError):
+            pass
+
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/quote.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/quote.py
@@ -0,0 +1,114 @@
+# plugs/quote.py
+#
+#
+
+from gozerbot.compat.persist import Persist
+
+class Quoteitem(object):
+
+    """ object representing a quote """
+
+    def __init__(self, idnr, txt, nick=None, userhost=None, ttime=None):
+        self.id = idnr
+        self.txt = txt
+        self.nick = nick
+        self.userhost = userhost
+        self.time = ttime
+
+class Quotes(Persist):
+
+    """ list of quotes """
+
+    def __init__(self, fname):
+        Persist.__init__(self, fname)
+        if not self.data:
+            self.data = []
+
+    def size(self):
+        """ return nr of quotes """
+        return len(self.data)
+
+    def add(self, nick, userhost, quote):
+        """ add a quote """
+        id = nextid.next('quotes')
+        item = Quoteitem(id, quote, nick, userhost, \
+time.time())
+        self.data.append(item)
+        self.save()
+        return id
+
+    def addnosave(self, nick, userhost, quote, ttime):
+        """ add quote but don't call save """
+        id = nextid.next('quotes')
+        item = Quoteitem(nextid.next('quotes'), quote, nick, userhost, ttime)
+        self.data.append(item)
+        return id
+
+    def delete(self, quotenr):
+        """ delete quote with id == nr """
+        for i in range(len(self.data)):
+            if self.data[i].id == quotenr:
+                del self.data[i]
+                self.save()
+                return 1
+
+    def random(self):
+        """ get random quote """
+        if not self.data:
+            return None
+        quotenr = random.randint(0, len(self.data)-1)
+        return self.data[quotenr]
+
+    def idquote(self, quotenr):
+        """ get quote by id """
+        for i in self.data:
+            if i.id == quotenr:
+                return i
+
+    def whoquote(self, quotenr):
+        """ get who quoted the quote """
+        for i in self.data:
+            if i.id == quotenr:
+                return (i.nick, i.time)
+
+    def last(self, nr=1):
+        """ get last quote """
+        return self.data[len(self.data)-nr:]
+
+    def search(self, what):
+        """ search quotes """
+        if not self.data:
+            return []
+        result = []
+        andre = re.compile('and', re.I)
+        ands = re.split(andre, what)
+        got = 0
+        for i in self.data:
+            for item in ands:
+                if i.txt.find(item.strip()) == -1:
+                    got = 0
+                    break  
+                got = 1
+            if got:                  
+                result.append(i)
+        return result
+
+    def searchlast(self, what, nr=1):
+        """ search quotes backwards limit to 1"""
+        if not self.data:
+            return []
+        result = []
+        andre = re.compile('and', re.I)
+        ands = re.split(andre, what)
+        got = 0
+        for i in self.data[::-1]:
+            for item in ands:
+                if i.txt.find(item.strip()) == -1:
+                    got = 0
+                    break  
+                got = 1
+            if got:                  
+                result.append(i)
+                got = 0
+        return result
+
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/rss.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/rss.py
@@ -0,0 +1,1124 @@
+# plugs/rss.py
+#
+#
+
+"""the rss mantra is of the following:
+
+as OPER:
+
+. add a url with rss-add
+. start the watcher with rss-watch
+
+now the user can start the bot sending messages of the feed to him with
+rss-start. if an OPER gives a rss-start command in a channel data will be
+send to the channel.
+ """
+
+__copyright__ = 'this file is in the public domain'
+__gendocfirst__ = ['rss-add', 'rss-watch', 'rss-start']
+__gendocskip__ = ['rss-dump', ]
+
+from gozerbot.compat.persist import Persist
+from gozerbot.utils.url import geturl2
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.log import rlog
+from gozerbot.utils.locking import lockdec
+from gozerbot.utils.generic import strippedtxt, fromenc
+from gozerbot.utils.url import striphtml, useragent
+from gozerbot.utils.rsslist import rsslist
+from gozerbot.utils.statdict import Statdict
+from gozerbot.fleet import fleet
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.datadir import datadir
+from gozerbot.utils.dol import Dol
+from gozerbot.compat.pdod import Pdod
+from gozerbot.compat.pdol import Pdol
+from gozerbot.plughelp import plughelp
+from gozerbot.periodical import periodical
+from gozerbot.aliases import aliasset
+from gozerbot.users import users
+import feedparser
+import gozerbot.threads.thr as thr
+import time, os, types, thread, socket, xml
+
+plughelp.add('rss', 'manage rss feeds')
+
+savelist = []
+
+def txtindicts(result, d):
+    """ return lowlevel values in (nested) dicts """
+    for j in d.values():
+        if type(j) == types.DictType:
+            txtindicts(result, j) 
+        else:
+            result.append(j)
+
+def checkfordate(data, date):
+    for item in data:
+        try:
+            d = item['updated']
+        except KeyError:
+            continue
+        if date == d:
+            return True
+    return False
+
+rsslock = thread.allocate_lock()
+locked = lockdec(rsslock)
+
+class RssException(Exception):
+    pass
+
+class Rss301(RssException):
+    pass
+
+class RssStatus(RssException):
+    pass
+
+class RssBozoException(RssException):
+    pass
+
+class RssNoSuchItem(RssException):
+    pass
+
+class Rssitem(object):
+
+    """ item that contains rss data """
+
+    def __init__(self, name, url, itemslist, watchchannels=[], \
+sleeptime=30*60):
+        self.name = name
+        self.url = url
+        self.itemslist = list(itemslist)
+        self.watchchannels = list(watchchannels)
+        self.sleeptime = int(sleeptime)
+        self.running = 0
+        self.stoprunning = 0
+        self.botname = None
+
+    def __str__(self):
+        return "name=%s url=%s itemslist=%s watchchannels=%s sleeptime=%s \
+running=%s" % (self.name, self.url, str(self.itemslist), \
+str(self.watchchannels), str(self.sleeptime), self.running)
+
+class Rssdict(Persist):
+
+    """ dict of rss entries """
+
+    def __init__(self, filename):
+        Persist.__init__(self, filename)
+        if not self.data:
+            self.data = {}
+        if self.data.has_key('itemslists'):
+            del self.data['itemslists']
+        self.itemslists = Pdol(filename + '.itemslists')
+        self.handlers = {}
+        self.results = {}
+        self.jobids = {}
+        self.rawresults = {}
+        self.results = Dol()
+        self.modified = {}
+        self.etag = {}
+        self.markup = Pdod(filename + '.markup')
+
+    def size(self):
+        """ return number of rss entries """
+        return len(self.data)
+
+    @locked
+    def add(self, name, url):
+        """ add rss item """
+        rlog(10, 'rss', 'adding %s %s' % (name, url))
+        self.data[name] = Rssitem(name, url, ['title', ])
+        self.save()
+
+    @locked
+    def delete(self, name):
+        """ delete rss item by name """
+        target = None
+        for j, i in self.data.iteritems():
+           if i.name == name:
+               target = i
+        if target:
+            try:
+                target.running = 0
+                del self.data[name]
+                self.save()
+            except:
+                pass
+
+    def byname(self, name):
+        """ return rss item by name """
+        try:
+            return self.data[name]
+        except:
+            return
+
+    def getdata(self, name):
+        """ get data of rss feed """
+        rssitem = self.byname(name)
+        if rssitem == None:
+            raise RssNoSuchItem("no %s rss item found" % name)
+        try:
+            modified = self.modified[name]
+        except KeyError:
+            modified = None
+        try:
+            etag = self.etag[name]
+        except KeyError:
+            etag = None
+        result = feedparser.parse(rssitem.url, modified=modified, etag=etag, \
+agent=useragent())
+        if result and result.has_key('bozo_exception'):
+            rlog(1, 'rss', '%s bozo_exception: %s' % (name, \
+result['bozo_exception']))
+            #raise RssStatus(result['bozo_exception'])
+        try:
+            status = result.status
+        except AttributeError:
+            status = 200
+        if status != 200 and status != 301 and status != 302 and status != 304:
+            raise RssStatus(status)
+        try:
+            self.modified[name] = result.modified
+        except AttributeError:
+            pass
+        try:
+            self.etag[name] = result.etag
+        except AttributeError:
+            pass
+        if status == 304:
+            return self.rawresults[name]
+        else:
+            self.rawresults[name] = result.entries
+        return result.entries
+
+class Rsswatcher(Rssdict):
+
+    """ rss watchers """ 
+
+    def __init__(self, filename):
+        Rssdict.__init__(self, filename)
+        
+    def sync(self, name):
+        result = self.getdata(name)
+        if result:
+            self.results[name] = result
+
+    def changeinterval(self, name, interval):
+        periodical.changeinterval(self.jobids[name], interval)
+
+    @locked
+    def startwatchers(self):
+        """ start watcher threads """
+        for j, i in self.data.iteritems():
+            if i.running:
+                thr.start_new_thread(self.watch, (i.name, ))
+
+    @locked
+    def stopwatchers(self):
+        """ stop all watcher threads """
+        for j, i in self.data.iteritems():
+            if i.running:
+                i.stoprunning = 1
+        periodical.killgroup('rss')
+
+    def dowatch(self, name, sleeptime=1800):
+        rssitem = self.byname(name)
+        if not rssitem:
+            rlog(10, 'rss', "no %s rss item available" % name)
+            return
+        while 1:
+            try:
+                self.watch(name)
+            except Exception, ex:
+                rlog(100, 'rss', '%s feed error: %s' % (name, str(ex)))
+                rlog(100, 'rss', '%s sleeping %s seconds for retry' % \
+(name, sleeptime))
+                time.sleep(sleeptime)
+                if not rssitem.running:
+                    break
+            else:
+                break
+
+    def makeresult(self, name, target, data):
+        res = []
+        for j in data:
+            tmp = {}
+            if not self.itemslists[(name, target)]:
+                return []
+            for i in self.itemslists[(name, target)]:
+                try:
+                    tmp[i] = unicode(j[i])
+                except KeyError:
+                    continue
+            res.append(tmp)
+        return res
+
+    def watch(self, name):
+        """ start a watcher thread """
+        # get basic data
+        rlog(10, 'rss', 'trying %s rss feed watcher' % name)
+        try:
+            result = self.getdata(name)
+        except RssException, ex:
+            rlog(10, 'rss', "%s error: %s" % (name, str(ex)))
+            result = []
+        rssitem = self.byname(name)
+        if not rssitem:
+            raise RssNoItem()
+        # poll every sleeptime seconds
+        self.results[name] = result
+        pid = periodical.addjob(rssitem.sleeptime, 0, self.peek, name, name)
+        self.jobids[name] = pid
+        rlog(10, 'rss', 'started %s rss watch' % name)
+
+    def makeresponse(self, name, res, channel, sep="\002||\002"):
+        # loop over result to make a response
+        result = ""
+        itemslist = self.itemslists[(name, channel)]
+        if not itemslist:
+            rssitem = self.byname(name)
+            if not rssitem:
+                return "no %s rss item" % name
+            else:
+                self.itemslists.extend((name, channel), rssitem.itemslist)
+                self.itemslists.save()
+        for j in res:
+            resultstr = ""
+            for i in self.itemslists[(name, channel)]:
+                try:
+                    item = unicode(j[i])
+                    if not item:
+                        continue
+                    if item.startswith('http://'):
+                        resultstr += "<%s> - " % item
+                    else:
+                        resultstr += "%s - " % striphtml(item)
+                except KeyError:
+                    continue
+            resultstr = resultstr[:-3]
+            if resultstr:
+                result += "%s %s " % (resultstr, sep)
+        return result[:-6]
+
+    def peek(self, name, *args):
+        rssitem = self.byname(name)
+        if not rssitem or not rssitem.running or rssitem.stoprunning:
+            return
+        try:
+            try:
+                res = self.getdata(name)
+            except socket.timeout:
+                rlog(10, 'rss', 'socket timeout of %s' % name)
+                return
+            except RssException, ex:
+                rlog(10, 'rss', '%s error: %s' % (name, str(ex)))
+                return
+            if not res:
+                return
+            res2 = []
+            for j in res:
+                try:
+                    d = j['date']
+                except KeyError:
+                    if j not in self.results[name]:
+                        self.results[name].append(j)
+                        res2.append(j)
+                else:
+                    if not checkfordate(self.results[name], d):
+                        self.results[name].append(j)
+                        res2.append(j)
+            if not res2:
+                return
+            for item in rssitem.watchchannels:
+                try:
+                    (botname, channel) = item
+                except:
+                    rlog(10, 'rss', '%s is not in the format \
+(botname,channel)' % str(item))
+                bot = fleet.byname(botname)
+                if not bot:
+                    continue
+                if self.markup.get((name, channel), 'all-lines'):
+                    for i in res2:
+                        response = self.makeresponse(name, [i, ], channel)
+                        bot.say(channel, "\002%s\002: %s" % \
+(rssitem.name, response), fromm=rssitem.name)
+                else:
+                    sep =  self.markup.get((name, channel), 'seperator')
+                    if sep:
+                        response = self.makeresponse(name, res2, channel, \
+sep=sep)
+                    else:
+                        response = self.makeresponse(name, res2, channel)
+                    bot.say(channel, "\002%s\002: %s" % (rssitem.name, \
+response), fromm=rssitem.name)
+        except Exception, ex:
+            handle_exception(txt=name)
+
+    @locked
+    def stopwatch(self, name):
+        """ stop watcher thread """
+        for i, j in self.data.iteritems():
+            if i == name:
+                j.running = 0
+                try:
+                    del self.results[name]
+                except KeyError:
+                    pass
+                self.save()
+                try:
+                    periodical.killjob(self.jobids[i])
+                except KeyError:
+                    pass
+                return 1
+
+    @locked
+    def list(self):
+        """ return of rss names """
+        feeds = self.data.keys()
+        return feeds
+
+    @locked
+    def runners(self):	
+        """ show names/channels of running watchers """
+        result = []
+        for j, i in self.data.iteritems():
+            if i.running == 1 and not i.stoprunning: 
+                result.append((i.name, i.watchchannels))
+        return result
+
+    @locked
+    def feeds(self, botname, channel):
+        """ show names/channels of running watcher """
+        result = []
+        for j, i in self.data.iteritems():
+            if (botname, channel) in i.watchchannels:
+                result.append(i.name)
+        return result
+
+    @locked
+    def url(self, name):
+        """ return url of rssitem """
+        for j, i in self.data.iteritems():
+            if i.name == name:
+                return i.url
+
+    def scan(self, name):
+        """ scan a rss url for used xml items """
+        try:
+            result = self.getdata(name)
+        except RssException, ex:
+            rlog(10, 'rss', '%s error: %s' % (name, str(ex)))
+            return
+        if not result:
+            return
+        keys = []
+        for item in self.rawresults[name]:
+             for key in item.keys():
+                 keys.append(key)            
+        statdict = Statdict()
+        for key in keys:
+            statdict.upitem(key)
+        return statdict.top()  
+
+    def search(self, name, item, search):
+        res = []
+        for result in self.rawresults[name]:
+            try:
+                title = result['title']
+                txt = result[item]
+            except KeyError:
+                continue
+            if search in title.lower():
+                if txt:
+                   res.append(txt)
+        return res
+
+    def searchall(self, item, search):
+        res = []
+        for name, results in self.rawresults.iteritems():
+            for result in results:
+                try:
+                    title = result['title']
+                    txt = result[item]
+                except KeyError:
+                    continue
+                if search in title.lower():
+                    if txt:
+                        res.append("%s: %s" % (name, txt))
+        return res
+
+    def all(self, name, item):
+        res = []
+        for result in self.rawresults[name]:
+            try:
+                txt = result[item]
+            except KeyError:
+                continue
+            if txt:
+                res.append(txt)
+        return res
+
+watcher = Rsswatcher(datadir + os.sep + 'old' + os.sep + 'rss')
+
+def init(): 
+    """ called after plugin import """
+    thr.start_new_thread(watcher.startwatchers, ())
+    return 1
+
+def size():
+    """ return number of watched rss entries """
+    return watcher.size()
+
+def shutdown():
+    """ called before plugin import """
+    watcher.stopwatchers()
+    return 1
+    
+def handle_rssadd(bot, ievent):
+    """ rss-add <name> <url> .. add a rss item """
+    try:
+        (name, url) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <url>')
+        return
+    watcher.add(name, url)
+    ievent.reply('rss item added')
+
+cmnds.add('rss-add', handle_rssadd, 'OPER')
+examples.add('rss-add', 'rss-add <name> <url> to the rsswatcher', 'rss-add \
+gozerbot http://gozerbot.org/hg/gozerbot/?cmd=changelog;style=rss')
+
+def handle_rssdel(bot, ievent):
+    """ rss-del <name> .. delete a rss item """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    if watcher.byname(name):
+        watcher.stopwatch(name)
+        watcher.delete(name)
+        ievent.reply('rss item deleted')
+    else:
+        ievent.reply('there is no %s rss item' % name)
+
+cmnds.add('rss-del', handle_rssdel, 'OPER')
+examples.add('rss-del', 'rss-del <name> .. remove <name> from the \
+rsswatcher', 'rss-del mekker')
+
+def handle_rsswatch(bot, ievent):
+    """ rss-watch <name> .. start watcher thread """
+    if not ievent.channel:
+        ievent.reply('no channel provided')
+    try:
+        name, sleepsec = ievent.args
+    except ValueError:
+        try:
+            name = ievent.args[0]
+            sleepsec = 1800
+        except IndexError:
+            ievent.missing('<name> [secondstosleep]')
+            return
+    try:
+        sleepsec = int(sleepsec)
+    except ValueError:
+        ievent.reply("time to sleep needs to be in seconds")
+        return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss object" % name)
+        return
+    got = None
+    if not rssitem.running:
+        rssitem.sleeptime = sleepsec
+        rssitem.running = 1
+        rssitem.stoprunning = 0
+        got = True
+        watcher.save()
+        try:
+            watcher.watch(name)
+        except Exception, ex:
+            ievent.reply(str(ex))
+            return
+    if got:
+        watcher.save()
+        ievent.reply('watcher started')
+    else:
+        ievent.reply('already watching %s' % name)
+
+cmnds.add('rss-watch', handle_rsswatch, 'OPER')
+examples.add('rss-watch', 'rss-watch <name> [seconds to sleep] .. go \
+watching <name>', '1) rss-watch gozerbot 2) rss-watch gozerbot 600')
+
+def handle_rssstart(bot, ievent):
+    """ rss-start <name> .. start a rss feed to a user """
+    if not ievent.rest:
+       ievent.missing('<feed name>')
+       return
+    name = ievent.rest
+    rssitem = watcher.byname(name)
+    if bot.jabber:
+        target = ievent.userhost
+    else:
+        if users.allowed(ievent.userhost, ['OPER', ]) and not ievent.msg:
+            target = ievent.channel
+        else:
+            target = ievent.nick
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss object" % name)
+        return
+    if not rssitem.running:
+        ievent.reply('%s watcher is not running' % name)
+        return
+    if (bot.name, target) in rssitem.watchchannels:
+        ievent.reply('we are already monitoring %s on (%s,%s)' % \
+(name, bot.name, target))
+        return
+    rssitem.watchchannels.append((bot.name, target))
+    for item in rssitem.itemslist:
+        watcher.itemslists.adduniq((name, target), item)
+    watcher.save()
+    ievent.reply('%s started' % name)
+
+cmnds.add('rss-start', handle_rssstart, ['RSS', 'USER'])
+examples.add('rss-start', 'rss-start <name> .. start a rss feed \
+(per user/channel) ', 'rss-start gozerbot')
+
+def handle_rssstop(bot, ievent):
+    """ rss-start <name> .. start a rss feed to a user """
+    if not ievent.rest:
+       ievent.missing('<feed name>')
+       return
+    name = ievent.rest
+    rssitem = watcher.byname(name)
+    if bot.jabber:
+        target = ievent.userhost
+    else:
+        if users.allowed(ievent.userhost, ['OPER', ]) and not ievent.msg:
+            target = ievent.channel
+        else:
+            target = ievent.nick
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss feed" % name)
+        return
+    if not rssitem.running:
+        ievent.reply('%s watcher is not running' % name)
+        return
+    if not (bot.name, target) in rssitem.watchchannels:
+        ievent.reply('we are not monitoring %s on (%s,%s)' % \
+(name, bot.name, target))
+        return
+    rssitem.watchchannels.remove((bot.name, target))
+    watcher.save()
+    ievent.reply('%s stopped' % name)
+
+cmnds.add('rss-stop', handle_rssstop, ['RSS', 'USER'])
+examples.add('rss-stop', 'rss-stop <name> .. stop a rss feed \
+(per user/channel) ', 'rss-stop gozerbot')
+
+def handle_rsschannels(bot, ievent):
+    """ rss-channels <name> .. show channels of rss feed """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing("<name>") 
+        return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss object" % name)
+        return
+    if not rssitem.watchchannels:
+        ievent.reply('%s is not in watch mode' % name)
+        return
+    result = []
+    for i in rssitem.watchchannels:
+        result.append(str(i))
+    ievent.reply("channels of %s: " % name, result, dot=True)
+
+cmnds.add('rss-channels', handle_rsschannels, 'OPER')
+examples.add('rss-channels', 'rss-channels <name> .. show channels', \
+'rss-channels gozerbot')
+
+def handle_rssaddchannel(bot, ievent):
+    """ rss-addchannel <name> [<botname>] <channel> .. add a channel to \
+        rss item """
+    try:
+        (name, botname, channel) = ievent.args
+    except ValueError:
+        try:
+            (name, channel) = ievent.args
+            botname = bot.name
+        except ValueError:
+            try:
+                name = ievent.args[0]
+                botname = bot.name
+                channel = ievent.channel
+            except IndexError:
+                ievent.missing('<name> [<botname>] <channel>')
+                return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss object" % name)
+        return
+    if not rssitem.running:
+        ievent.reply('%s watcher is not running' % name)
+        return
+    if (botname, channel) in rssitem.watchchannels:
+        ievent.reply('we are already monitoring %s on (%s,%s)' % \
+(name, botname, channel))
+        return
+    rssitem.watchchannels.append((botname, channel))
+    watcher.save()
+    ievent.reply('%s added to %s rss item' % (channel, name))
+
+cmnds.add('rss-addchannel', handle_rssaddchannel, 'OPER')
+examples.add('rss-addchannel', 'rss-addchannel <name> [<botname>] <channel> \
+..add <channel> or <botname> <channel> to watchchannels of <name>', \
+'1) rss-addchannel gozerbot #dunkbots 2) rss-addchannel gozerbot main \
+#dunkbots')
+
+def handle_rssadditem(bot, ievent):
+    try:
+        (name, item) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <item>')
+        return
+    if bot.jabber or users.allowed(ievent.userhost, ['OPER', ]):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    if not watcher.byname(name):
+        ievent.reply("we don't have a %s feed" % name)
+        return
+    watcher.itemslists.adduniq((name, target), item)
+    watcher.itemslists.save()
+    #watcher.sync(name)
+    ievent.reply('%s added to (%s,%s) itemslist' % (item, name, target))
+
+cmnds.add('rss-additem', handle_rssadditem, ['RSS', 'USER'])
+examples.add('rss-additem', 'add a token to the itemslist (per user/channel)',\
+ 'rss-additem gozerbot link')
+
+def handle_rssdelitem(bot, ievent):
+    try:
+        (name, item) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <item>')
+        return
+    if users.allowed(ievent.userhost, ['OPER', 'RSS']):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    if not watcher.byname(name):
+        ievent.reply("we don't have a %s feed" % name)
+        return
+    try:
+        watcher.itemslists.remove((name, target), item)
+        watcher.itemslists.save()
+    except RssNoSuchItem:
+        ievent.reply("we don't have a %s rss feed" % name)
+        return
+    ievent.reply('%s removed from (%s,%s) itemslist' % (item, name, target))
+
+cmnds.add('rss-delitem', handle_rssdelitem, ['RSS', 'USER'])
+examples.add('rss-delitem', 'remove a token from the itemslist \
+(per user/channel)', 'rss-delitem gozerbot link')
+
+def handle_rssmarkup(bot, ievent):
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    if users.allowed(ievent.userhost, ['OPER', ]):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    try:
+        ievent.reply(str(watcher.markup[(name, target)]))
+    except KeyError:
+        pass
+
+cmnds.add('rss-markup', handle_rssmarkup, ['RSS', 'USER'])
+examples.add('rss-markup', 'show markup list for a feed (per user/channel)', \
+'rss-markup gozerbot')
+
+def handle_rssaddmarkup(bot, ievent):
+    try:
+        (name, item, value) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <item> <value>')
+        return
+    if users.allowed(ievent.userhost, ['OPER', ]):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    try:
+        watcher.markup.set((name, target), item, value)
+        watcher.markup.save()
+        ievent.reply('%s added to (%s,%s) markuplist' % (item, name, target))
+    except KeyError:
+        ievent.reply("no (%s,%s) feed available" % (name, target))
+
+cmnds.add('rss-addmarkup', handle_rssaddmarkup, ['RSS', 'USER'])
+examples.add('rss-addmarkup', 'add a markup option to the markuplist \
+(per user/channel)', 'rss-addmarkup gozerbot noseperator 1')
+
+def handle_rssdelmarkup(bot, ievent):
+    try:
+        (name, item) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <item>')
+        return
+    if users.allowed(ievent.userhost, ['OPER', 'RSS']):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    try:
+        del watcher.markup[(name, target)][item]
+    except (KeyError, TypeError):
+        ievent.reply("can't remove %s from %s feed's markup" %  (item, name))
+        return
+    watcher.markup.save()
+    ievent.reply('%s removed from (%s,%s) markuplist' % (item, name, target))
+
+cmnds.add('rss-delmarkup', handle_rssdelmarkup, ['RSS', 'USER'])
+examples.add('rss-delmarkup', 'remove a markup option from the markuplist \
+(per user/channel)', 'rss-delmarkup gozerbot noseperator')
+
+def handle_rssdelchannel(bot, ievent):
+    """ rss-delchannel <name> [<botname>] <channel> .. delete channel \
+        from rss item """
+    botname = None
+    try:
+        (name, botname, channel) = ievent.args
+    except ValueError:
+        try:
+            (name, channel) = ievent.args
+            botname = bot.name
+        except ValueError:
+            try:
+                name = ievent.args[0]
+                botname = bot.name
+                channel = ievent.channel
+            except IndexError:
+                ievent.missing('<name> [<botname>] [<channel>]')
+                return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss object" % name)
+        return
+    if (botname, channel) not in rssitem.watchchannels:
+        ievent.reply('we are not monitoring %s on (%s,%s)' % \
+(name, botname, channel))
+        return
+    rssitem.watchchannels.remove((botname, channel))
+    ievent.reply('%s removed from %s rss item' % (channel, name))
+    watcher.save()
+
+cmnds.add('rss-delchannel', handle_rssdelchannel, 'OPER')
+examples.add('rss-delchannel', 'rss-delchannel <name> [<botname>] \
+[<channel>] .. delete <channel> or <botname> <channel> from watchchannels of \
+<name>', '1) rss-delchannel gozerbot #dunkbots 2) rss-delchannel gozerbot \
+main #dunkbots')
+
+def handle_rssstopwatch(bot, ievent):
+    """ rss-stopwatch <name> .. stop a watcher thread """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    rssitem = watcher.byname(name)
+    if not rssitem:
+        ievent.reply("there is no %s rssitem" % name)
+        return
+    if not watcher.stopwatch(name):
+        ievent.reply("can't stop %s watcher" % name)
+        return
+    ievent.reply('stopped %s rss watch' % name)
+
+cmnds.add('rss-stopwatch', handle_rssstopwatch, 'OPER')
+examples.add('rss-stopwatch', 'rss-stopwatch <name> .. stop polling <name>', \
+'rss-stopwatch gozerbot')
+
+def handle_rsssleeptime(bot, ievent):
+    """ rss-sleeptime <name> .. get sleeptime of rss item """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss item" % name)
+        return
+    try:
+        ievent.reply('sleeptime for %s is %s seconds' % (name, \
+str(rssitem.sleeptime)))
+    except AttributeError:
+        ievent.reply("can't get sleeptime for %s" % name)
+
+cmnds.add('rss-sleeptime', handle_rsssleeptime, 'OPER')
+examples.add('rss-sleeptime', 'rss-sleeptime <name> .. get sleeping time \
+for <name>', 'rss-sleeptime gozerbot')
+
+def handle_rsssetsleeptime(bot, ievent):
+    """ rss-setsleeptime <name> <seconds> .. set sleeptime of rss item """
+    try:
+        (name, sec) = ievent.args
+        sec = int(sec)
+    except ValueError:
+        ievent.missing('<name> <seconds>')
+        return
+    if sec < 60:
+        ievent.reply('min is 60 seconds')
+        return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss item" % name)
+        return
+    rssitem.sleeptime = sec
+    if rssitem.running:
+        watcher.changeinterval(name, sec)
+    watcher.save()
+    ievent.reply('sleeptime set')
+
+cmnds.add('rss-setsleeptime', handle_rsssetsleeptime, 'OPER')
+examples.add('rss-setsleeptime', 'rss-setsleeptime <name> <seconds> .. set \
+sleeping time for <name> .. min 60 sec', 'rss-setsleeptime gozerbot 600')
+
+def handle_rssget(bot, ievent):
+    """ rss-get <name> .. fetch rss data """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss item" % name)
+        return
+    try:
+        result = watcher.getdata(name)
+    except Exception, ex:
+        ievent.reply('%s error: %s' % (name, str(ex)))
+        return
+    response = watcher.makeresponse(name, result, ievent.channel)
+    if response:
+        ievent.reply("results of %s: %s" % (name, response))
+    else:
+        ievent.reply("can't match watcher data")
+
+cmnds.add('rss-get', handle_rssget, ['RSS', 'USER', 'ANON'])
+examples.add('rss-get', 'rss-get <name> .. get data from <name>', \
+'rss-get gozerbot')
+
+def handle_rssrunning(bot, ievent):
+    """ rss-running .. show which watchers are running """
+    result = watcher.runners()
+    resultlist = []
+    teller = 1
+    for i in result:
+        resultlist.append("%s %s" % (i[0], i[1]))
+    if resultlist:
+        ievent.reply("running rss watchers: ", resultlist, nr=1)
+    else:
+        ievent.reply('nothing running yet')
+
+cmnds.add('rss-running', handle_rssrunning, ['RSS', 'USER'])
+examples.add('rss-running', 'rss-running .. get running rsswatchers', \
+'rss-running')
+
+def handle_rsslist(bot, ievent):
+    """ rss-list .. return list of rss items """
+    result = watcher.list()
+    result.sort()
+    if result:
+        ievent.reply("rss items: ", result, dot=True)
+    else:
+        ievent.reply('no rss items yet')
+
+cmnds.add('rss-list', handle_rsslist, ['RSS', 'USER', 'ANON'])
+examples.add('rss-list', 'get list of rss items', 'rss-list')
+
+def handle_rssurl(bot, ievent):
+    """ rss-url <name> .. return url of rss item """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    result = watcher.url(name)
+    ievent.reply('url of %s: %s' % (name, result))
+
+cmnds.add('rss-url', handle_rssurl, ['RSS', 'USER', 'ANON'])
+examples.add('rss-url', 'rss-url <name> .. get url from rssitem with \
+<name>', 'rss-url gozerbot')
+
+def handle_rssitemslist(bot, ievent):
+    """ rss-itemslist <name> .. show itemslist of rss item """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    try:
+        itemslist = watcher.itemslists[(name, ievent.channel.lower())]
+    except KeyError:
+        ievent.reply("no itemslist set for (%s, %s)" % (name, \
+ievent.channel.lower()))
+        return
+    ievent.reply("itemslist of (%s, %s): " % (name, ievent.channel.lower()), \
+itemslist, dot=True)
+
+cmnds.add('rss-itemslist', handle_rssitemslist, ['RSS', 'USER'])
+examples.add('rss-itemslist', 'rss-itemslist <name> .. get itemslist of \
+<name> ', 'rss-itemslist gozerbot')
+
+def handle_rssscan(bot, ievent):
+    """ rss-scan <name> .. scan rss item for used xml items """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    if not watcher.byname(name):
+        ievent.reply('no %s feeds available' % name)
+        return
+    try:
+        result = watcher.scan(name)
+    except Exception, ex:
+        ievent.reply(str(ex))
+        return
+    if result == None:
+        ievent.reply("can't get data for %s" % name)
+        return
+    res = []
+    for i in result:
+        res.append("%s=%s" % i)
+    ievent.reply("tokens of %s: " % name, res)
+
+cmnds.add('rss-scan', handle_rssscan, 'OPER')
+examples.add('rss-scan', 'rss-scan <name> .. get possible items of <name> ', \
+'rss-scan gozerbot')
+
+def handle_rsssync(bot, ievent):
+    """ rss-sync <name> .. sync rss item data """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    try:
+        result = watcher.sync(name)
+        ievent.reply('%s synced' % name)
+    except Exception, ex:
+        ievent.reply("%s error: %s" % (name, str(ex)))
+
+cmnds.add('rss-sync', handle_rsssync, 'OPER')
+examples.add('rss-sync', 'rss-sync <name> .. sync data of <name>', \
+'rss-sync gozerbot')
+
+def handle_rssfeeds(bot, ievent):
+    """ rss-feeds <channel> .. show what feeds are running in a channel """
+    try:
+        channel = ievent.args[0]
+    except IndexError:
+        channel = ievent.printto
+    try:
+        result = watcher.feeds(bot.name, channel)
+        if result:
+            ievent.reply("feeds running in %s: " % channel, result, dot=True)
+        else:
+            ievent.reply('%s has no feeds running' % channel)
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+
+cmnds.add('rss-feeds', handle_rssfeeds, ['USER', 'RSS'])
+examples.add('rss-feeds', 'rss-feeds <name> .. show what feeds are running \
+in a channel', '1) rss-feeds 2) rss-feeds #dunkbots')
+
+def handle_rsslink(bot, ievent):
+    try:
+        feed, rest = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<feed> <words to search>')
+        return
+    rest = rest.strip().lower()
+    try:
+        res = watcher.search(feed, 'link', rest)
+        if not res:
+            res = watcher.search(feed, 'feedburner:origLink', rest)
+        if res:
+            ievent.reply(res, dot=" \002||\002 ")
+    except KeyError:
+        ievent.reply('no %s feed data available' % feed)
+        return
+
+cmnds.add('rss-link', handle_rsslink, ['RSS', 'USER'])
+examples.add('rss-link', 'give link of item which title matches search key', \
+'rss-link gozerbot gozer')
+
+def handle_rssdescription(bot, ievent):
+    try:
+        feed, rest = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<feed> <words to search>')
+        return
+    rest = rest.strip().lower()
+    res = ""
+    try:
+        ievent.reply(watcher.search(feed, 'description', rest), \
+dot=" \002||\002 ")
+    except KeyError:
+        ievent.reply('no %s feed data available' % feed)
+        return
+
+cmnds.add('rss-description', handle_rssdescription, ['RSS', 'USER'])
+examples.add('rss-description', 'give description of item which title \
+matches search key', 'rss-description gozerbot gozer')
+
+def handle_rssall(bot, ievent):
+    try:
+        feed = ievent.args[0]
+    except IndexError:
+        ievent.missing('<feed>')
+        return
+    try:
+        ievent.reply(watcher.all(feed, 'title'), dot=" \002||\002 ")
+    except KeyError:
+        ievent.reply('no %s feed data available' % feed)
+        return
+
+cmnds.add('rss-all', handle_rssall, ['RSS', 'USER'])
+examples.add('rss-all', "give titles of a feed", 'rss-all gozerbot')
+
+def handle_rsssearch(bot, ievent):
+    try:
+        txt = ievent.args[0]
+    except IndexError:
+        ievent.missing('<txt>')
+        return
+    try:        
+        ievent.reply(watcher.searchall('title', txt), dot=" \002||\002 ")
+    except KeyError:
+        ievent.reply('no %s feed data available' % feed)
+        return
+
+cmnds.add('rss-search', handle_rsssearch, ['RSS', 'USER'])
+examples.add('rss-search', "search titles of all current feeds", \
+'rss-search goz')
+
+def handle_rssdump(bot, ievent):
+    try:
+        ievent.reply(str(watcher.rawresults[ievent.rest]))
+    except Exception, ex:
+        ievent.reply(str(ex))
+
+cmnds.add('rss-dump', handle_rssdump, 'OPER')
+examples.add('rss-dump', 'dump cached rss data', 'rss-dump')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/compat/pdol.py
+++ gozerbot-0.99.1/build/lib/gozerbot/compat/pdol.py
@@ -0,0 +1,72 @@
+# gozerbot/pdol.py
+#
+#
+
+""" pickled dict of lists """
+
+__copyright__ = 'this file is in the public domain'
+
+from persist import Persist
+ 
+class Pdol(Persist):
+
+    """ pickled dict of lists """
+
+    def __init__(self, fname):
+        Persist.__init__(self, fname)
+        if not self.data:
+            self.data = {}
+
+    def __iter__(self, name):
+        return self.data[name].__iter__()
+ 
+    def __getitem__(self, item):
+        if self.data.has_key(item):
+            return self.data[item]
+
+    def __delitem__(self, item):
+        if self.data.has_key(item):
+            self.data.__delitem__(item)
+            return 1
+
+    def __setitem__(self, item, what):
+        if self.data.has_key(item):
+            self.data[item].append(what)
+        else:
+            self.data[item] = [what]
+        return 1
+
+    def add(self, item, what):
+        """ add what to items list """
+        return self.__setitem__(item, what)
+
+    def adduniq(self, item, what):
+        """ add what to items list if item not yet added """
+        if not self.data.has_key(item):
+            self.new(item)
+        if what not in self.data[item]:
+            return self.__setitem__(item, what)
+
+    def get(self, item):
+        """ get items list """
+        return self.__getitem__(item)
+
+    def new(self, what):
+        """ reset list of what """
+        self.data[what] = []
+
+    def delete(self, item, what):
+        """ remove what from item's list """
+        del self.data[item][what]
+
+    def extend(self, item, what):
+        if not self.data.has_key(item):
+            self.new(item)
+        self.data[item].extend(what)
+
+    def remove(self, item, what):
+        try:
+            self.data[item].remove(what)
+            return 1
+        except (ValueError, KeyError):
+            return 0
--- gozerbot-0.99.1.orig/build/lib/gozerbot/threads/thr.py
+++ gozerbot-0.99.1/build/lib/gozerbot/threads/thr.py
@@ -0,0 +1,163 @@
+# gozerbot/thr.py
+#
+#
+
+""" own threading wrapper. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.stats import stats
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.log import rlog
+from gozerbot.utils.locking import lockdec
+from gozerbot.config import config
+
+# basic imports
+import threading, re, time, thread
+
+dontshowthreads = ['Periodical.runjob', ]
+
+# regular expression to determine thread name
+methodre = re.compile('method\s+(\S+)', re.I)
+funcre = re.compile('function\s+(\S+)', re.I)
+
+threadlock = thread.allocate_lock()
+locked = lockdec(threadlock)
+
+class Botcommand(threading.Thread):
+
+    """ thread for running bot commands. """
+
+    def __init__(self, group, target, name, args, kwargs):
+        threading.Thread.__init__(self, None, target, name, args, kwargs)
+        self.name = name
+        self.ievent = args[1]
+        self.setDaemon(True)
+
+    def join(self):
+        threading.Thread.join(self)
+
+    def run(self):
+
+        """ run the bot command. """
+
+        try:
+            rlog(10, 'thr', 'running bot command thread %s' % self.name) 
+            stats.up('threads', self.name)
+            result = threading.Thread.run(self)
+
+            if self.ievent.closequeue:
+                rlog(4, 'thr', 'closing queue for %s' % self.ievent.userhost)
+                for i in self.ievent.queues:
+                    i.put_nowait(None)
+
+        except Exception, ex:
+            handle_exception(self.ievent)
+            time.sleep(0.1)
+
+class Thr(threading.Thread):
+
+    """ thread wrapper. """
+
+    def __init__(self, group, target, name, args, kwargs):
+        threading.Thread.__init__(self, None, target, name, args, kwargs)
+        rlog(-14, 'thr', 'running %s .. args: %s' % (name, args))
+        self.setDaemon(True)
+        self.name = name
+        time.sleep(0.001)
+
+    def join(self):
+        threading.Thread.join(self)
+
+    def run(self):
+        """ run the thread. """
+        try:
+            if self.name not in dontshowthreads:
+                rlog(-4, 'thr', 'running thread %s' % self.name) 
+            stats.up('threads', self.name)
+            threading.Thread.run(self)
+        except Exception, ex:
+            handle_exception()
+            time.sleep(1)
+
+def getname(func):
+
+    """ get name of function/method. """
+
+    name = ""
+
+    method = re.search(methodre, str(func))
+    if method:
+        name = method.group(1)
+    else: 
+        function = re.search(funcre, str(func))
+        if function:
+            name = function.group(1)
+        else:
+            name = str(func)
+    return name
+
+#@locked
+def start_new_thread(func, arglist, kwargs=None):
+
+    """ start a new thread .. set name to function/method name."""
+
+    if not kwargs:
+        kwargs = {}
+
+    try:
+        name = getname(func)
+
+        if not name:
+            name = 'noname'
+
+        thread = Thr(None, target=func, name=name, args=arglist, \
+kwargs=kwargs)
+
+        rlog(-1, 'thr', 'starting %s thread' % str(func))
+
+        thread.start()
+        return thread
+
+    except:
+        handle_exception()
+        time.sleep(1)
+
+#@locked
+def start_bot_command(func, arglist, kwargs={}):
+
+    """ start a new thread .. set name to function/method name. """
+
+    if not kwargs:
+        kwargs = {}
+
+    try:
+        name = getname(func)
+
+        if not name:
+            name = 'noname'
+
+        thread = Botcommand(group=None, target=func, name=name, args=arglist, \
+kwargs=kwargs)
+
+        rlog(-1, 'thr', 'starting %s thread' % str(func))
+
+        thread.start()
+        return thread
+
+    except:
+        handle_exception()
+        time.sleep(1)
+
+def threaded(func):
+
+    """ threading decorator. """
+
+    def threadedfunc(*args, **kwargs):
+        if config['PAE']:
+            func(*args, **kwargs)
+        else:
+            start_new_thread(func, args, kwargs)
+
+    return threadedfunc
--- gozerbot-0.99.1.orig/build/lib/gozerbot/threads/threadloop.py
+++ gozerbot-0.99.1/build/lib/gozerbot/threads/threadloop.py
@@ -0,0 +1,135 @@
+# gozerbot/threads/threadloop.py
+#
+#
+
+""" class to implement start/stoppable threads. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.utils.log import rlog
+from gozerbot.config import config
+from gozerbot.utils.exception import handle_exception
+
+# core thread import
+from thr import start_new_thread
+
+# basic imports
+import Queue, time
+
+class ThreadLoop(object):
+
+    """ implement startable/stoppable threads. """
+
+    def __init__(self, name="", queue=None):
+        self.name = name or 'idle'
+        self.stopped = False
+        self.running = False
+        self.outs = []
+        self.queue = queue or Queue.Queue()
+        self.nowrunning = "none"
+
+    def _loop(self):
+        rlog(0, "threadloop", 'starting threadloop')
+        while not self.stopped:
+            try:
+                self.running = True
+                try:
+                    data = self.queue.get_nowait()
+                except Queue.Empty:
+                    if self.stopped:
+                        break
+                    time.sleep(0.1)
+                    continue
+
+                if self.stopped:
+                    break
+
+                if not data:
+                    break
+                rlog(0, self.name, 'running %s' % str(data))
+                self.handle(*data)
+            except Exception, ex: handle_exception()
+
+        self.running = False
+        rlog(0, self.name, 'stopping threadloop')
+
+    def put(self, *data):
+
+        """ put data on task queue. """
+
+        self.queue.put_nowait(data)
+
+    def start(self):
+
+        """ start the thread. """
+
+        if not self.running:
+            start_new_thread(self._loop, ())
+
+    def stop(self):
+
+        """ stop the thread. """
+
+        self.stopped = True
+        self.running = False
+        self.queue.put(None)
+
+    def handle(self, *args, **kwargs):
+
+        """ overload this. """
+
+        pass
+
+class RunnerLoop(ThreadLoop):
+
+    """ dedicated threadloop for bot commands/callbacks. """
+
+
+    def _loop(self):
+        rlog(0, "runnerloop", 'starting threadloop')
+        self.running = True
+
+        while not self.stopped:
+
+            try:
+                data = self.queue.get()
+            except Queue.Empty:
+                if self.stopped:
+                    break
+                time.sleep(0.1)
+                continue
+
+            if self.stopped:
+                break
+
+            if not data:
+                break
+
+            self.nowrunning = data[0]
+            rlog(0, 'runnerloop', 'now running %s' % self.nowrunning)
+            self.handle(*data)
+
+        self.running = False
+        rlog(0, 'runnerloop', 'stopping threadloop')
+
+class ThreadSleeper(ThreadLoop):
+
+    def __init__(self, name="", timeout=1800):
+        ThreadLoop.__init__(self, name)
+        self.timeout = timeout
+
+    def _loop(self):
+        rlog(0, 'threadsleeper', 'starting threadloop')
+        self.running = True
+
+        while not self.stopped:
+            time.sleep(self.timeout)
+
+            if self.stopped:
+                break
+            rlog(-1, self.name, 'running')
+            self.handle()
+
+        self.running = False
+        rlog(0, 'threadsleeper', 'stopping threadloop')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/xmpp/bot.py
+++ gozerbot-0.99.1/build/lib/gozerbot/xmpp/bot.py
@@ -0,0 +1,1125 @@
+# gozerbot/xmpp/bot.py
+#
+#
+
+""" jabber bot definition """
+
+__copyright__ = 'this file is in the public domain'
+
+## IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.users import users
+from gozerbot.utils.log import rlog
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.trace import whichmodule
+from gozerbot.utils.locking import lockdec
+from gozerbot.utils.generic import waitforqueue, toenc, fromenc, jabberstrip, getrandomnick
+from gozerbot.config import config
+from gozerbot.persist.pdod import Pdod
+from gozerbot.utils.dol import Dol
+from gozerbot.datadir import datadir
+from gozerbot.channels import Channels
+from gozerbot.less import Less
+from gozerbot.ignore import shouldignore
+from gozerbot.callbacks import jcallbacks
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.fleet import fleet
+from gozerbot.botbase import BotBase
+
+# xmpp imports
+from presence import Presence
+from message import Message
+from iq import Iq
+from core import XMLStream
+from monitor import xmppmonitor
+from wait import XMPPWait, XMPPErrorWait
+from jid import JID, InvalidJID
+
+# basic imports
+import time, Queue, os, threading, thread, types, xml, re, hashlib
+
+## END IMPORT
+
+## LOCK SECTION
+
+# locks
+outlock = thread.allocate_lock()
+inlock = thread.allocate_lock()
+connectlock = thread.allocate_lock()
+outlocked = lockdec(outlock)
+inlocked = lockdec(inlock)
+connectlocked = lockdec(connectlock)
+
+## END LOCK
+
+class Bot(XMLStream, BotBase):
+
+    """
+        xmpp bot class.
+
+        :param name: name of the xmpp bot
+        :type name: string
+        :param cfg: config file for the bot
+        :type config: gozerbot.config.Config
+        :rtype: None
+
+    """
+
+    def __init__(self, name, cfg={}):
+        BotBase.__init__(self, name, cfg)
+
+        if not self.port:
+            self.port = 5222
+
+        if not self.host:
+            raise Exception("host not set in %s xmpp bot" % self.name)
+
+        self.username = self.user.split('@')[0]
+        XMLStream.__init__(self, self.host, self.port, self.name)   
+        self.type = 'xmpp'
+        self.outqueue = Queue.Queue()
+        self.sock = None
+        self.me = self.user
+        self.jid = self.me
+        self.lastin = None
+        self.test = 0
+        self.connecttime = 0
+        self.connection = None
+        self.privwait = XMPPWait()
+        self.errorwait = XMPPErrorWait()
+        self.monitor = xmppmonitor
+        self.jabber = True
+        self.connectok = threading.Event()
+        self.jids = {}
+        self.topics = {}
+        self.timejoined = {}
+        self.channels409 = []
+
+        if not self.state.has_key('ratelimit'):
+            self.state['ratelimit'] = 0.05
+
+        if self.port == 0:
+            self.port = 5222
+
+        self.monitor.start()
+    
+    def _resumedata(self):
+
+        """
+             return data needed for resuming.
+
+             .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                 :pyobject: Bot._resumedata
+
+        """
+
+        return {self.name: [self.server, self.user, self.password, self.port]}
+
+    def _outputloop(self):
+
+        """
+            loop to take care of output to the server.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot._outputloop
+
+        """
+
+        rlog(10, self.name, 'starting outputloop')
+        lastsend = time.time()
+        charssend = 0
+
+        while not self.stopped:
+            time.sleep(0.01)
+            what = self.outqueue.get()
+
+            if self.stopped or what == None:
+                 break
+
+            if charssend + len(what) < 1000:
+
+                try:
+                    self._raw(what)
+                except Exception, ex:
+                    self.error = str(ex)
+                    handle_exception
+                    continue
+
+                lastsend = time.time()
+                charssend += len(what)
+
+            else:
+
+                if time.time() - lastsend > 1:
+
+                    try:
+                        self._raw(what)
+                    except Exception, ex:
+                        handle_exception()
+                        continue
+
+                    lastsend = time.time()
+                    charssend = len(what) 
+                    continue
+
+                charssend = 0
+                sleeptime = self.cfg['jabberoutsleep'] or config['jabberoutsleep']
+
+                if not sleeptime:
+                    sleeptime = 1
+
+                rlog(10, self.name, 'jabberoutsleep .. sleeping %s seconds' % sleeptime)
+                time.sleep(sleeptime)
+
+                try:
+                    self._raw(what)
+                except Exception, ex:
+                    handle_exception()
+
+        rlog(10, self.name, 'stopping outputloop .. %s' % (self.error or 'no error set'))
+
+    def _keepalive(self):
+
+        """ 
+             keepalive method .. send empty string to self every 3 minutes.
+
+             .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                 :pyobject: Bot._keepalive
+
+        """
+
+        nrsec = 0
+        
+
+
+        while not self.stopped:
+            time.sleep(1)
+            nrsec += 1
+
+            if nrsec < 180:
+                continue
+            else:
+                nrsec = 0
+
+            self.sendpresence()
+
+    def sendpresence(self):
+        """
+            send presence based on status and status text
+            set by user
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                 :pyobject: Bot.sendpresence
+
+        """
+
+        if self.state.has_key('status') and self.state['status']:
+            status = self.state['status']
+        else:
+            status = ""
+        if self.state.has_key('show') and self.state['show']:
+            show = self.state['show']
+        else:
+            show = ""
+        rlog(4, self.name, 'keepalive: %s - %s' % (show, status))
+        if show and status:
+            p = Presence({'to': self.me, 'show': show, 'status': status}, self)
+        elif show:
+            p = Presence({'to': self.me, 'show': show }, self)
+        elif status:
+            p = Presence({'to': self.me, 'status': status}, self)
+        else:
+            p = Presence({'to': self.me }, self)
+
+        self.send(p)
+
+    def _keepchannelsalive(self):
+
+        """
+            channels keep alive method.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot._keepchannelsalive
+
+        """
+
+        nrsec = 0
+        p = Presence({'to': self.me, 'txt': '' }, self)
+
+        while not self.stopped:
+            time.sleep(1)
+            nrsec += 1
+
+            if nrsec < 600:
+                continue
+            else:
+                nrsec = 0
+
+            for chan in self.state['joinedchannels']:
+
+                if chan not in self.channels409:
+                    p = Presence({'to': chan}, self)
+                    self.send(p)
+
+    def connect(self, reconnect=True):
+
+        """
+            connect the xmpp server.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.connect
+
+        """
+
+
+        if self.stopped:
+            rlog(100, self.name, 'bot is stopped .. not connecting')
+            return
+        try:
+            if not XMLStream.connect(self):
+                rlog(10, self.name, 'connect to %s:%s failed' % (self.host, self.port))
+                return
+            else:
+                rlog(10, self.name, 'connected')
+            self.logon(self.user, self.password)
+            start_new_thread(self._outputloop, ())
+            start_new_thread(self._keepalive, ())
+            #start_new_thread(self._keepchannelsalive, ())
+            self.requestroster()
+            self._raw("<presence/>")
+            self.connectok.set()
+            self.sock.settimeout(None)
+            return True
+        except Exception, ex:
+            handle_exception()
+            if reconnect:
+                self.reconnect()
+
+    def logon(self, user, password):
+
+        """
+            logon the xmpp server.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.logon
+
+        """
+
+        iq = self.initstream()
+        if not self.auth(user, password, iq.id):
+            if self.register(user, password):
+                time.sleep(5)
+                self.auth(user, password)
+            else:
+                self.exit()
+                return
+        XMLStream.logon(self)
+ 
+    def initstream(self):
+
+        """
+             send initial string sequence to the xmpp server.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.initstream
+
+        """
+
+
+        rlog(10, self.name, 'starting initial stream sequence')
+        self._raw("""<stream:stream to='%s' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams'>""" % (self.user.split('@')[1], )) 
+        result = self.connection.read()
+        iq = self.loop_one(result)
+        rlog(3, self.name, "initstream: %s" % result)
+        return iq
+
+    def register(self, jid, password):
+
+        """
+            register the jid to the server.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.register
+
+        """
+
+        try:
+            resource = jid.split("/")[1]
+        except IndexError:
+            resource = "gozerbot"
+        rlog(10, self.name, 'registering %s' % jid)
+        self._raw("""<iq type='get'><query xmlns='jabber:iq:register'/><username>%s</username></iq>""" % jid.split("@")[0])
+        #self._raw("""<iq type='get' id='reg1' />""")
+        result = self.connection.read()
+        #rlog(3, self.name, 'register: %s' % result)
+        iq = self.loop_one(result)
+        if not iq:
+            rlog(10, self.name, "unable to register")
+            return
+        rlog(3, self.name, 'register: %s' % str(iq))
+        self._raw("""<iq type='set'><query xmlns='jabber:iq:register'><username>%s</username><resource>%s</resource><password>%s</password></query></iq>""" % (jid.split('@')[0], resource, password))
+        result = self.connection.read()
+        rlog(3, self.name, 'register: %s' % result)
+        if not result:
+            return False
+        iq = self.loop_one(result)
+        if not iq:
+            rlog(10, self.name, "can't decode data: %s" % result)
+            return False
+        rlog(3, self.name, 'register: %s' % result)
+        if iq.error:
+            rlog(10, self.name, 'REGISTER FAILED: %s' % iq.error)
+            if iq.error.code == "405":
+                rlog(10, self.name, "this server doesn't allow registration by the bot, you need to create an account for it yourself")
+            else:
+                rlog(10, self.name, result)
+            self.error = iq.error
+            return False
+        rlog(10, self.name, 'register ok')
+        return True
+
+    def auth(self, jid, password, digest=""):
+
+        """
+            auth against the xmpp server.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.auth
+
+        """
+
+        rlog(10, self.name, 'authing %s' % jid)
+        name = jid.split('@')[0]
+        rsrc = self.cfg['resource'] or config['resource'] or 'gozerbot';
+        self._raw("""<iq type='get'><query xmlns='jabber:iq:auth'><username>%s</username></query></iq>""" % name)
+        result = self.connection.read()
+        iq = self.loop_one(result)
+        rlog(3, self.name, 'auth:' + result)
+        if ('digest' in result) and digest:
+            s = hashlib.new('SHA1')
+            s.update(digest)
+            s.update(password)
+            d = s.hexdigest()
+            self._raw("""<iq type='set'><query xmlns='jabber:iq:auth'><username>%s</username><digest>%s</digest><resource>%s</resource></query></iq>""" % (name, d, rsrc))
+        else:
+            self._raw("""<iq type='set'><query xmlns='jabber:iq:auth'><username>%s</username><resource>%s</resource><password>%s</password></query></iq>""" % (name, rsrc, password))
+        result = self.connection.read()
+        iq = self.loop_one(result)
+        if not iq:
+            rlog(10, self.name, 'auth failed: %s' % result)
+            return False        
+        rlog(3, self.name, 'auth: ' + result)
+        if iq.error:
+            rlog(10, self.name, 'AUTH FAILED: %s' % iq.error)
+            if iq.error.code == "401":
+                rlog(10, self.name, "wrong user or password (or user not known)")
+            else:
+                rlog(10, self.name, result)
+            self.error = iq.error
+            return False
+        rlog(10, self.name, 'auth ok')
+        return True
+
+    def requestroster(self):
+
+        """
+            request roster from xmpp server.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.requestroster
+
+        """
+
+        self._raw("<iq type='get'><query xmlns='jabber:iq:roster'/></iq>")
+
+    def disconnectHandler(self, ex):
+
+        """
+            disconnect handler.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.disconnectHandler
+
+        """
+
+        rlog(100, self.name, "disconnected: %s" % str(ex)) 
+
+        if not self.stopped:
+            self.reconnect()
+        else:
+            self.exit()
+
+    def joinchannels(self):
+
+        """
+            join all already joined channels.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.joinchannels
+
+        """
+
+
+        for i in self.state['joinedchannels']:
+            key = self.channels.getkey(i)
+            nick = self.channels.getnick(i)
+            result = self.join(i, key, nick)
+            if result == 1:
+                rlog(10, self.name, 'joined %s' % i)
+            else:
+                rlog(10, self.name, 'failed to join %s: %s' % (i, result))
+
+    def broadcast(self, txt):
+
+        """
+            broadcast txt to all joined channels.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.broadcast
+
+        """
+
+        for i in self.state['joinedchannels']:
+            self.say(i, txt)
+
+    def handle_iq(self, data):
+
+        """
+            iq handler .. overload this when needed.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.handle_iq
+
+        """
+
+        pass
+
+    def handle_message(self, data):
+
+        """
+            message handler.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.handle_message
+
+        """
+
+        if self.test:
+            return
+ 
+        m = Message(data, self)
+
+        if data.type == 'groupchat' and data.subject:
+            self.topiccheck(m)
+            nm = Message(m, bot=self)
+            jcallbacks.check(self, nm)
+            return
+
+        if data.get('x').xmlns == 'jabber:x:delay':
+            rlog(5, self.name, "ignoring delayed message")
+            return
+
+        self.privwait.check(m)
+
+        if m.isresponse:
+            return
+
+        if m.groupchat:
+            m.msg = False
+
+        jid = None
+        m.origjid = m.jid
+
+        for node in m.subelements:
+            try:
+                m.jid = node.x.item.jid 
+            except (AttributeError, TypeError):
+                continue
+
+        #if not m.txt:
+        #    return
+        if self.me in m.fromm:
+            return 0
+
+        #if m.groupchat and self.nick == m.resource:
+        #    return 0
+        go = 0
+
+        try:
+            cc = self.channels[m.channel]['cc']
+        except (TypeError, KeyError):
+            cc = config['defaultcc'] or '!'
+
+        try:
+            channick = self.channels[m.channel]['nick']
+        except (TypeError, KeyError):
+            channick = self.nick
+
+        if m.msg and not config['noccinmsg']:
+            go = 1
+        if not m.txt:
+            go = 0
+        elif m.txt[0] in cc:
+            go = 1
+        elif m.txt.startswith("%s: " % channick):
+            m.txt = m.txt.replace("%s: " % channick, "")
+            go = 1
+        elif m.txt.startswith("%s, " % channick):
+            m.txt = m.txt.replace("%s, " % channick, "")
+            go = 1
+
+        if m.txt and m.txt[0] in cc:
+            m.txt = m.txt[1:]
+
+        if go:
+            try:
+                from gozerbot.plugins import plugins
+                if plugins.woulddispatch(self, m):
+                    m.usercmnd = True
+                plugins.trydispatch(self, m)
+            except:
+                handle_exception()
+
+        try:
+            if m.type == 'error':
+                if m.code:
+                    rlog(10, self.name + '.error', str(m))
+                self.errorwait.check(m)
+                self.errorHandler(m)
+        except Exception, ex:
+            handle_exception()
+
+        mm = Message(m, self)
+        jcallbacks.check(self, mm)
+
+    def errorHandler(self, event):
+
+        """
+            error handler .. calls the errorhandler set in the event.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.errorHandler
+
+        """
+
+        try:
+            event.errorHandler()
+        except AttributeError:
+            rlog(10, self.name, 'unhandled error: %s' % event)
+
+    def handle_presence(self, data):
+
+        """
+            presence handler.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.handle_presence
+
+        """
+
+        p = Presence(data, self)
+        frm = p.fromm
+        nickk = ""
+        nick = p.nick
+
+        if self.me in p.userhost:
+            return 0
+
+        if nick:
+            self.userhosts.data[nick] = str(frm)
+            nickk = nick
+
+        jid = None
+
+        for node in p.subelements:
+            try:
+                jid = node.x.item.jid 
+            except (AttributeError, TypeError):
+                continue
+
+        if nickk and jid:
+            channel = p.channel
+            if not self.jids.has_key(channel):
+                self.jids[channel] = {}
+            self.jids[channel][nickk] = jid
+            self.userhosts.data[nickk] = str(jid)
+            rlog(0, self.name, 'setting jid of %s (%s) to %s' % (nickk, \
+ channel, jid))
+
+        if p.type == 'subscribe':
+            pres = Presence({'to': p.fromm, 'type': 'subscribed'}, self)
+            self.send(pres)
+            pres = Presence({'to': p.fromm, 'type': 'subscribe'}, self)
+            self.send(pres)
+
+        nick = p.resource
+
+        if p.type != 'unavailable':
+            self.userchannels.adduniq(nick, p.channel)
+            p.joined = True
+            p.type = 'available'
+        elif self.me in p.userhost:
+            try:
+                del self.jids[p.channel]
+                rlog(0, self.name, 'removed %s channel jids' % p.channel)
+            except KeyError:
+                pass
+        else:
+            try:
+                del self.jids[p.channel][p.nick]
+                rlog(0, self.name, 'removed %s jid' % p.nick)
+            except KeyError:
+                pass
+
+        pp = Presence(p, self)
+        jcallbacks.check(self, pp)
+
+        if p.type == 'error':
+            for node in p.subelements:
+                try:
+                    err = node.error.code
+                except (AttributeError, TypeError):
+                    err = 'no error set'
+                try:
+                    txt = node.text.data
+                except (AttributeError, TypeError):
+                    txt = ""
+            if err:
+                rlog(10, self.name + '.error', "%s: %s"  % (err, txt))
+
+            self.errorwait.check(p)
+
+            try:
+                method = getattr(self,'handle_' + err)
+                # try to call method
+                try:
+                    method(p)
+                except:
+                    handle_exception()
+            except AttributeError:
+                # no command method to handle event
+                pass
+
+    def reconnect(self):
+
+        """
+            reconnect to the server.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.reconnect
+
+        """
+
+        if self.stopped:
+            rlog(100, self.name, 'bot is stopped .. not reconnecting')
+            return
+
+        rlog(100, self.name, 'reconnecting .. sleeping 15 seconds')
+        self.exit()
+        time.sleep(15)
+        newbot = Bot(self.name, self.cfg)
+
+        if newbot.connect():
+            self.name += '.old'
+            newbot.joinchannels()
+            fleet.replace(self.name, newbot)
+            return True
+
+        return False
+
+
+    def send(self, what):
+
+        """
+            send stanza to the server.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.send
+
+        """
+
+        try:
+            to = what['to']
+        except (KeyError, TypeError):
+            rlog(10, self.name, "can't determine where to send %s to" % what)
+            return
+
+        try:
+            jid = JID(to)
+        except (InvalidJID, AttributeError):
+            rlog(10, self.name, "invalid jid %s .. %s" % (str(to), str(what)))
+            return
+
+        try:
+            del what['from']
+            #del what['fromm']
+        except KeyError:
+            pass
+
+        try:
+            xml = what.toxml()
+            if not xml:
+                raise Exception("can't convert %s to xml .. bot.send()" % what) 
+        except (AttributeError, TypeError):
+            handle_exception()
+            return
+            #raise Exception("can't convert %s to xml .. bot.send()" % what) 
+           
+        self.outqueue.put(toenc(xml))
+        self.monitor.put(self, what)
+
+    def sendnocb(self, what):
+
+        """
+            send to server without calling callbacks/monitors.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.sendnocb
+
+        """
+
+        try:
+            xml = what.toxml()
+        except AttributeError:
+            xml = what
+        self.outqueue.put(toenc(xml))
+
+    def action(self, printto, txt, fromm=None, groupchat=True):
+
+        """
+            send an action.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.action
+
+        """
+
+        txt = "/me " + txt
+
+        if self.google:
+            fromm = self.me
+
+        if printto in self.state['joinedchannels'] and groupchat:
+            message = Message({'to': printto, 'txt': txt, 'type': 'groupchat'}, self)
+        else:
+            message = Message({'to': printto, 'txt': txt}, self)
+
+        if fromm:
+            message.fromm = fromm
+
+        self.send(message)
+        
+    def say(self, printto, txt, fromm=None, groupchat=True, speed=5, type="normal", how=''):
+
+        """
+            say txt to channel/JID.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.say
+
+        """
+
+        txt = jabberstrip(txt)
+
+        if self.google:
+            fromm = self.me
+
+        if printto in self.state['joinedchannels'] and groupchat:
+            message = Message({'to': printto, 'body': txt, 'type': 'groupchat'}, self)
+        else:
+            message = Message({'to': printto, 'body': txt, 'type': 'chat'}, self)
+
+        if fromm:
+            message.fromm = fromm
+        else:
+            message.fromm = self.me
+
+        self.send(message)
+
+    def saynocb(self, printto, txt, fromm=None, groupchat=True, speed=5, type="normal", how=''):
+
+        """
+             say txt to channel/JID without calling callbacks/monitors.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.saynocb
+
+        """
+
+        txt = jabberstrip(txt)
+
+        #if self.google:
+        #    fromm = self.me
+
+        if printto in self.state['joinedchannels'] and groupchat:
+            message = Message({'to': printto, 'body': txt, 'type': 'groupchat'}, self)
+        else:
+            message = Message({'to': printto, 'body': txt}, self)
+
+        if fromm:
+            message.fromm = fromm
+        else:
+            message.fromm = self.me
+
+        self.send(message)
+
+    def userwait(self, msg, txt):
+
+        """
+            wait for user response.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.userwait
+
+        """
+
+        msg.reply(txt)
+        queue = Queue.Queue()
+        self.privwait.register(msg, queue)
+        result = queue.get()
+
+        if result:
+            return result.txt
+
+    def save(self):
+
+        """
+            save bot's state.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.save
+
+        """
+
+        self.state.save()
+
+    def quit(self):
+
+        """
+            send unavailable presence.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.quit
+
+        """
+
+        presence = Presence({'type': 'unavailable'}, self)
+
+        for i in self.state['joinedchannels']:
+            presence.to = i
+            self.send(presence)
+
+        presence = Presence({'type': 'unavailable'}, self)
+        presence['from'] = self.me
+        self.send(presence)
+        time.sleep(1)
+        
+    def exit(self):
+
+        """
+            exit the bot.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.exit
+
+        """
+
+        self.quit()
+        self.stopped = 1
+        self.outqueue.put_nowait(None)
+        self.save()
+        time.sleep(3)
+        rlog(10, self.name, 'exit')
+
+    def join(self, channel, password=None, nick=None):
+
+        """
+            join conference.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.join
+
+        """
+
+        if '#' in channel:
+            return
+
+        try:
+            if not nick:
+                nick = channel.split('/')[1]
+        except IndexError:
+            nick = self.nick
+
+        channel = channel.split('/')[0]
+
+        if not self.channels.has_key(channel):
+            # init channel data
+            self.channels.setdefault(channel, {})
+
+        # setup error wait
+        q = Queue.Queue()
+        self.errorwait.register("409", q, 3)
+        self.errorwait.register("401", q, 3)
+        self.errorwait.register("400", q, 3)
+
+        # do the actual join
+        presence = Presence({'to': channel + '/' + nick}, self)
+
+        if password:
+             presence.x.password = password             
+#            passnode = Node('password')
+#            passnode.addData(password)
+#            presence.addChild(name='x', namespace='http://jabber.org/protocol/muc', \
+#payload=[passnode, ])
+
+        self.send(presence)
+        errorobj = waitforqueue(q, 3)
+
+        if errorobj:
+            err = errorobj[0].error
+            rlog(100, self.name, 'error joining %s: %s' % (channel, err))
+            if err >= '400':
+                if channel not in self.channels409:
+                    self.channels409.append(channel)
+            return err
+
+        self.timejoined[channel] = time.time()
+        chan = self.channels[channel]
+        # if password is provided set it
+        chan['nick'] = nick
+
+        if password:
+            chan['key'] = password
+
+        # check for control char .. if its not there init to !
+        if not chan.has_key('cc'):
+            chan['cc'] = config['defaultcc'] or '!'
+
+        if not chan.has_key('perms'):
+            chan['perms'] = []
+
+        self.channels.save()
+
+        if channel not in self.state['joinedchannels']:
+            self.state['joinedchannels'].append(channel)
+
+        if channel in self.channels409:
+            self.channels409.remove(channel)
+
+        self.state.save()
+        return 1
+
+    def part(self, channel):
+ 
+        """
+            leave conference.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.part
+
+        """
+
+        if '#' in channel:
+            return
+
+        presence = Presence({'to': channel}, self)
+        presence.type = 'unavailable'
+        self.send(presence)
+
+        if channel in self.state['joinedchannels']:
+            self.state['joinedchannels'].remove(channel)
+
+        self.state.save()
+        return 1
+
+    def outputnolog(self, printto, what, how, who=None, fromm=None):
+
+        """
+            do output but don't log it.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.outputnolog
+
+        """
+
+        if fromm and shouldignore(fromm):
+            return
+
+        self.saynocb(printto, what)
+
+    def topiccheck(self, msg):
+
+        """
+            check if topic is set.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.topiccheck
+
+        """
+
+        if msg.groupchat:
+            try:
+                topic = msg.subject
+                if not topic:
+                    return None
+                self.topics[msg.channel] = (topic, msg.userhost, time.time())
+                rlog(0, self.name, 'topic of %s set to %s' % \
+(msg.channel, topic))
+            except AttributeError:
+                return None
+
+    def settopic(self, channel, txt):
+
+        """
+            set topic.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.settopic
+
+        """
+
+        pres = Message({'to': channel, 'subject': txt}, self)
+        pres.type = 'groupchat'
+        self.send(pres)
+
+    def gettopic(self, channel):
+
+        """
+            get topic.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.gettopic
+
+        """
+
+        try:
+            topic = self.topics[channel]
+            return topic
+        except KeyError:
+            return None
+
+    def domsg(self, msg):
+
+        """
+            dispatch an msg on the bot.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.domsg
+
+        """
+
+        from gozerbot.plugins import plugins
+        plugins.trydispatch(self, msg)
+
+    def sendraw(self, data):
+
+        """
+             compat function.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/bot.py
+                :pyobject: Bot.sendraw
+
+        """
+
+        self._raw(data)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/xmpp/monitor.py
+++ gozerbot-0.99.1/build/lib/gozerbot/xmpp/monitor.py
@@ -0,0 +1,41 @@
+# gozerbot/xmpp/monitor.py
+#
+#
+
+""" monitors .. call callback on bot output. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.utils.exception import handle_exception
+from gozerbot.monitor import Monitor
+from gozerbot.config import config
+from gozerbot.eventbase import EventBase
+from message import Message
+
+class XMPPmonitor(Monitor):
+
+    """ monitor jabber output """
+
+    def handle(self, bot, event):
+
+        """ fire jabber monitor callbacks. """
+
+        try:
+            #event.fromm = event['from'] = event.to
+            e = Message()
+            e.copyin(event)
+            e.isreply = True
+            e.iscmnd = True
+            e.remotecmnd = True
+            e.remoteout = bot.jid
+            e.channel = event.to
+            e.fromm = e['from'] = bot.jid
+            e.nick = bot.nick
+            e.botoutput = True
+            Monitor.handle(self, bot, e)
+        except AttributeError:
+            handle_exception()
+
+# xmpp monitor
+xmppmonitor = XMPPmonitor('xmppmonitor')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/xmpp/core.py
+++ gozerbot-0.99.1/build/lib/gozerbot/xmpp/core.py
@@ -0,0 +1,677 @@
+# gozerbot/xmpp/core.py
+#
+#
+
+"""
+    this module contains the core xmpp handling functions.
+
+"""
+
+
+## IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.datadir import datadir
+from gozerbot.config import Config, config
+from gozerbot.utils.generic import toenc, jabberstrip
+from gozerbot.utils.log import rlog
+from gozerbot.utils.lazydict import LazyDict
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.locking import lockdec
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.utils.trace import whichmodule
+
+# dom imports
+from gozerbot.contrib.xmlstream import NodeBuilder, XMLescape
+
+# for exceptions
+import  xml.parsers.expat
+
+from namespace import attributes, subelements
+
+# basic imports
+import socket, os, time, copy, logging, thread
+
+## END IMPORT
+
+## LOCK SECTION
+
+# locks
+outlock = thread.allocate_lock()   
+inlock = thread.allocate_lock()
+connectlock = thread.allocate_lock()
+outlocked = lockdec(outlock)
+inlocked = lockdec(inlock)  
+connectlocked = lockdec(connectlock) 
+
+## END LOCK
+
+class XMLDict(LazyDict):
+
+
+    """
+        dictionairy to store xml stanza attributes.
+
+        :params input: optional dict to init with
+        :type input: dict
+
+    """
+
+    def __init__(self, input={}):
+
+        if input == None:
+            LazyDict.__init__(self)
+        else:
+            LazyDict.__init__(self, input)
+
+        try:
+            self['fromm'] = self['from']
+        except (KeyError, TypeError):
+            self['fromm'] = ''
+
+    def __getattr__(self, name):
+
+        """
+            override getattribute so nodes in payload can be accessed.
+
+        """
+
+        if not self.has_key(name) and self.has_key('subelements'):
+
+            for i in self['subelements']:
+
+                if name in i:
+                    return i[name]
+
+        return LazyDict.__getattr__(self, name, default="")
+
+    def get(self, name):
+
+        """
+            get a attribute by name.
+
+            :param name: name of the attribute
+            :type name: string
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                :pyobject: XMLDict.get
+
+        """
+
+        if self.has_key('subelements'):
+
+            for i in self['subelements']:
+
+                if name in i:
+
+                    return i[name]
+
+        if self.has_key(name):
+
+            return self[name]
+
+        return LazyDict()
+
+    def toxml(self):
+
+        """
+            convert the dictionary to xml.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+               :pyobject: XMLDict.toxml
+        """
+
+        res = dict(self)
+
+        if not res:
+            raise Exception("%s .. toxml() can't convert empty dict" % self.name)
+
+        rlog(-1, self.name, u"toxml input: %s" % res)
+        elem = self['element']
+        main = "<%s" % self['element']
+
+        for attribute in attributes[elem]: 
+
+            if attribute in res:
+
+                if res[attribute]:
+                    main += u" %s='%s'" % (attribute, XMLescape(res[attribute]))
+
+                continue
+
+        main += ">"
+        gotsub = False
+
+        if res.has_key('txt'):
+
+            if res['txt']:
+
+                main += u"<body>%s</body>" % XMLescape(res['txt'])
+                gotsub = True
+
+        for subelement in subelements[elem]:
+
+            try:
+                data = res[subelement]
+
+                if data:
+                    main += "<%s>%s</%s>" % (subelement, XMLescape(data), subelement)
+                    gotsub = True
+
+            except KeyError:
+                pass
+
+        if gotsub:
+
+            main += "</%s>" % elem
+
+        else:
+
+            main = main[:-1]
+            main += "/>"
+
+        return main
+
+    def str(self):
+
+        """
+            convert to string.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                :pyobject: XMLDict.str
+        """
+
+        result = ""
+        elem = self['element']
+        for item, value in dict(self).iteritems():
+            if item in attributes[elem] or item in subelements[elem] or item == 'txt':
+                result += "%s='%s' " % (item, value)
+        return result
+ 
+class XMLStream(NodeBuilder):
+
+
+    """
+        XMLStream.
+
+        :param host: host to connect to
+        :type host: string
+        :param port: port to connect to
+        :type port: int
+        :param name: name of the xmlstream
+        :type name: string
+
+    """
+
+    def __init__(self, host, port, name='gozerxmpp'):
+        # start sets these
+        self.name = name
+        # the connection
+        self.connection = None
+        self.stop = False
+        # parse state
+        self.result = LazyDict()
+        self.final = LazyDict()
+        self.subelements = []
+        self.reslist = []
+        self.cur = u""
+        self.tags = []
+        self.host = host
+        self.port = port
+        # handlers
+        self.handlers = LazyDict()
+        self.addHandler('message', self.handle_message)
+        self.addHandler('presence', self.handle_presence)
+        self.addHandler('iq', self.handle_iq)
+        self.addHandler('stream:stream', self.handle_stream)
+        self.addHandler('stream:error', self.handle_streamerror)
+        self.addHandler('stream:features', self.handle_streamfeatures)
+
+    def handle_stream(self, data):
+
+        """
+            default stream error handler.
+
+        """
+
+        rlog(2, self.name, "STREAM: %s" % data)
+
+    def handle_streamerror(self, data):
+
+        """
+            default stream error handler.
+
+        """
+
+        rlog(10, self.name, "STREAMERROR: %s" % data)
+
+    def handle_streamfeatures(self, data):
+
+        """
+            default stream error handler.
+
+        """
+
+        rlog(2, self.name, "STREAMFEATURES: %s" % data)
+         
+    def addHandler(self, namespace, func):
+
+        """
+            add a namespace handler.
+
+            :param namespace: namespace to register handler for
+            :type namespace: string
+            :param func: handler function
+            :type func: function or method
+
+        """
+
+        self.handlers[namespace] = func
+
+    def delHandler(self, namespace):
+
+        """
+            delete a namespace handler.
+
+            :param namespace: namespace to delete handler for
+            :type namespace: string
+
+        """
+
+        del self.handlers[namespace]
+
+    def getHandler(self, namespace):
+
+        """
+            get a namespace handler.
+
+            :param namespace: namespace get handler for
+            :type namespace: string
+
+        """
+
+        try:
+            return self.handlers[namespace]
+        except KeyError:
+            return None
+
+    def loop_one(self, data):
+
+        """
+            handle one xml stanza.
+
+            :param data: data as received on the socket
+            :type data: string
+            :rtype: gozerbot.utils.lazydict.LazyDict
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                :pyobject: XMLStream.loop_one
+
+        """
+
+        NodeBuilder.__init__(self)
+        self._dispatch_depth = 2
+
+        try:
+            self._parser.Parse(data.strip())
+
+        except xml.parsers.expat.ExpatError, ex: 
+            if 'not well-formed' in str(ex):  
+                rlog(10, self.name, "data is not well formed: %s" % str(data))
+                return {}
+            rlog(10, self.name, "ALERT: %s - %s" % (str(ex), data))
+            #raise
+        except Exception, ex:
+            handle_exception()
+            return {}
+
+        return self.finish(data)
+
+    @inlocked
+    def _doprocess(self):
+
+        """
+             proces all incoming data.
+
+             .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                 :pyobject: XMLStream._doprocess
+        """
+
+        rlog(10, self.name, 'starting readloop')
+        self.buffer = ""
+
+        while not self.stopped:
+
+            try:
+                data = self.connection.read()
+
+                if data == "":
+                    rlog(10, self.name, 'remote disconnected')
+                    self.error = 'disconnected'
+                    self.disconnectHandler(Exception('remote %s disconnected' %  self.host))
+                    break
+
+                if data:
+                    self.buffer += data
+                else:
+                    continue
+
+                self.buffer = self.buffer.strip()
+
+                rlog(6, self.name, u'trying: %s' % self.buffer)
+
+                #if self.buffer.endswith('</presence>') or self.buffer.endswith('</message>') or self.buffer.endswith('</iq>'):
+
+                if not self.loop_one(self.buffer):
+                    rlog(10, self.name, 'failed to process %s' % self.buffer)
+                else:
+                    self.buffer = ""
+
+            except xml.parsers.expat.ExpatError, ex:
+                rlog(10, self.name, u"%s: %s" % (str(ex), data))
+                self.buffer = ""
+                self.error = str(ex)
+                self.disconnectHandler(ex)
+                break
+
+            except Exception, ex:
+                handle_exception()
+                self.error = str(ex)
+                self.disconnectHandler(ex)
+                break
+
+        rlog(10, self.name, 'stopping readloop .. %s' % (self.error or 'error not set'))
+
+    def _raw(self, stanza):
+
+        """
+            output a xml stanza to the socket.
+
+            :param stanza: stanza to send to the socket
+            :type stanza: string
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                :pyobject: XMLStream._raw
+
+        """
+
+        try:
+
+            if self.stopped:
+                rlog(10, self.name, 'bot is stopped .. not sending')
+                return
+
+            what = toenc(jabberstrip(stanza.strip()), self.encoding)
+
+            if not what.endswith('>') or not what.startswith('<'):
+                rlog(100, self.name, 'invalid stanza: %s' % what)
+                return
+
+            if what.startswith('<stream') or what.startswith('<message') or what.startswith('<presence') or what.startswith('<iq'):
+
+                try:
+                    self.connection.send(what + u"\r\n")
+                except AttributeError:
+                    self.connection.write(what)
+                rlog(5, self.name, "_raw: %s" % what)
+
+            else:
+                rlog(100, self.name, 'invalid stanza: %s' % what)
+
+        except socket.error, ex:
+
+            if 'Broken pipe' in str(ex):
+                rlog(10, self.name, 'broken pipe .. ignoring')
+                time.sleep(0.01)
+                return
+            self.error = str(ex)
+            handle_exception()
+
+        except Exception, ex:
+            self.error = str(ex)
+            handle_exception()
+
+    def connect(self):
+
+        """
+            connect to the server.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                :pyobject: XMLStream.connect
+        """
+
+        if self.stopped:
+            rlog(10, self.name, 'bot is stopped not connecting to %s' % self.host)
+            return
+
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.sock.settimeout(30)
+
+        if not self.port:
+            self.port = 5222
+
+        if self.server:
+            self.host = self.server
+        rlog(10, self.name, "connecting to %s:%s" % (self.host, self.port))
+        self.sock.connect((self.host, self.port))
+        self.sock.setblocking(False)
+        self.sock.settimeout(60)
+        time.sleep(1) 
+        rlog(10, self.name, "starting stream")
+        self.sock.send('<stream:stream to="%s" xmlns="jabber:client" xmlns:stream="http://etherx.jabber.org/streams" version="1.0">\r\n' % self.user.split('@')[1])
+        time.sleep(3)
+        result = self.sock.recv(1500)
+        rlog(3, self.name, result)
+        #iq = self.loop_one(result)
+        #self.id = iq.id
+        self.sock.send('<starttls xmlns="urn:ietf:params:xml:ns:xmpp-tls"/>\r\n')
+        time.sleep(3)
+        rlog(3, self.name, self.sock.recv(1500))
+        self.sock.settimeout(60)
+        return self.dossl()
+
+    def dossl(self):
+
+        try:
+            import ssl
+            self.connection = ssl.wrap_socket(self.sock)
+        except ImportError:
+            self.connection = socket.ssl(self.sock)
+
+        if self.connection:
+            return True
+        else:
+            return False
+
+    def logon(self):
+        """
+            called upon logon on the server.
+
+        """
+
+        start_new_thread(self._doprocess, ())
+
+    def finish(self, data):
+
+        """
+            finish processing of an xml stanza.
+
+            :param data: data which has been used to process the data
+            :type data: string
+            :rtype: gozerbot.utils.lazydict.LazyDict
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                :pyobject: XMLStream.finish
+
+        """
+
+        self.final['subelements'] = self.subelements
+
+        if self.tags:
+            element = self.tags[0]
+            rlog(3, self.name, "setting element: %s" % element)
+        else:
+            element = 'presence'
+
+        self.final['element'] = element
+        method = self.getHandler(element)
+
+        if method:
+
+            try:
+                result = XMLDict(self.final)
+                result.bot = self
+                result.orig = data
+                result.jabber = True
+                method(result) 
+
+            except Exception, ex:
+                handle_exception()
+                result = {}
+
+        else:
+            rlog(10, self.name, "can't find handler for %s" % element)
+            result = {}
+
+        self.final = {}
+        self.reslist = []
+        self.tags = []
+        self.subelements = []
+        return result
+
+    def unknown_starttag(self,  tag, attrs):
+
+        """
+            handler called by the self._parser on start of a unknown start tag.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                :pyobject: XMLStream.unknown_starttag
+
+        """
+
+        NodeBuilder.unknown_starttag(self, tag, attrs)
+        self.cur = tag
+        if not self.tags:
+            self.final.update(attrs)
+        else:
+            self.result[tag] = attrs
+        self.tags.append(tag)
+ 
+    def unknown_endtag(self,  tag):
+
+        """ 
+            handler called by the self._parser on start of a unknown endtag.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                :pyobject: XMLStream.unknown_endtag
+
+        """
+
+        NodeBuilder.unknown_endtag(self, tag)
+        self.result = {}
+        self.cur = u""
+        
+    def handle_data(self, data):
+
+        """
+            node data handler.
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                :pyobject: XMLStream.handle_data
+
+        """
+
+        NodeBuilder.handle_data(self, data)
+
+    def dispatch(self, dom):
+
+        """
+            dispatch a dom to the appropiate handler.
+
+            :param dom: the dom to be dispatched
+
+            .. literalinclude:: ../../../gozerbot/xmpp/core.py
+                :pyobject: XMLStream.dispatch
+
+        """
+
+        res = LazyDict()
+        parentname = dom.getName()
+        data = dom.getData()
+
+        if data:
+            self.final[parentname] = data
+
+            if parentname == 'body':
+                self.final['txt'] = data
+
+        attrs = dom.getAttributes()
+        ns = dom.getNamespace()
+        res[parentname] = LazyDict()
+        res[parentname]['data'] = data
+        res[parentname].update(attrs) 
+
+        if ns:
+            res[parentname]['xmlns'] = ns
+
+        for child in dom.getChildren():  
+            name = child.getName()
+            data = child.getData()
+
+            if data:
+                self.final[name] = data
+
+            attrs = child.getAttributes()
+            ns = child.getNamespace()
+            res[parentname][name] = LazyDict()
+            res[parentname][name]['data'] = data
+            res[parentname][name].update(attrs) 
+            self.final.update(attrs)
+
+            if ns:
+                res[parentname][name]['xmlns'] = ns
+
+        self.subelements.append(res)
+
+    def exit(self):
+
+        """
+            stop the stream handling.
+
+        """
+
+        self.stopped = True
+
+
+    def reconnect(self):
+
+        """
+            reconnect to the server.
+
+        """
+
+        rlog(10, self.name, 'reconnect')
+        self.exit()
+        rlog(10, self.name, 'sleeping 15 seconds')
+        time.sleep(15)
+        return self.connect()
+
+    def disconnectHandler(self, ex):
+
+        """
+            handler called on disconnect.
+
+            :param ex: exception leading to the disconnect
+            :type ex: Exception
+
+        """
+
+        self.stop = True
+        rlog(10, self.name, 'disconnected: %s' % str(ex))
+        self.reconnect()
+
+## INIT SECTION
+
+# no vars
+
+## END INIT
--- gozerbot-0.99.1.orig/build/lib/gozerbot/xmpp/wait.py
+++ gozerbot-0.99.1/build/lib/gozerbot/xmpp/wait.py
@@ -0,0 +1,88 @@
+# gozerbot/xmpp/wait.py
+#
+#
+
+""" wait for ircevent based on ircevent.CMND """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.utils.log import rlog
+from gozerbot.utils.locking import lockdec
+import gozerbot.threads.thr as thr
+
+# xmpp imports
+from gozerbot.wait import Wait
+
+# basic imports
+import time, thread
+
+# locks
+waitlock = thread.allocate_lock()
+locked = lockdec(waitlock)
+
+class XMPPWait(Wait):
+
+    """ wait object for jabber messages. """
+
+    def register(self, catch, queue, timeout=15):
+
+        """ register wait for privmsg. """
+
+        rlog(1, 'xmpp-wait', 'registering for %s' % catch)
+        self.ticket += 1
+        self.waitlist.append((catch, queue, self.ticket))
+        if timeout:
+            thr.start_new_thread(self.dotimeout, (timeout, self.ticket))
+        return self.ticket
+
+    def check(self, msg):
+
+        """ check if <msg> is waited for. """
+
+        for teller in range(len(self.waitlist)-1, -1, -1):
+            i = self.waitlist[teller]
+            if i[0] == msg.userhost:
+                msg.ticket = i[2]
+                i[1].put_nowait(msg)
+                self.delete(msg.ticket)
+                rlog(10, 'xmpp-wait', 'got response for %s' % i[0])
+                msg.isresponse = 1
+
+    @locked
+    def delete(self, ticket):
+
+        """ delete wait item with ticket nr. """
+
+        for itemnr in range(len(self.waitlist)-1, -1, -1):
+            item = self.waitlist[itemnr]
+            if item[2] == ticket:
+                item[1].put_nowait(None)
+                try:
+                    del self.waitlist[itemnr]
+                    rlog(1, 'xmpp-wait', 'deleted ' + str(ticket))
+                except IndexError:
+                    pass
+                return 1
+
+class XMPPErrorWait(XMPPWait):
+
+    """ wait for jabber errors. """
+
+    def check(self, msg):
+
+        """ check if <msg> is waited for. """
+
+        if not msg.type == 'error':
+            return
+
+        errorcode = msg.error
+
+        for teller in range(len(self.waitlist)-1, -1, -1):
+            i = self.waitlist[teller]
+            if i[0] == 'ALL' or i[0] == errorcode:
+                msg.error = msg.error
+                msg.ticket = i[2]
+                i[1].put_nowait(msg)
+                self.delete(msg.ticket)
+                rlog(10,'xmpp-errorwait','got error response for %s' % i[0])
--- gozerbot-0.99.1.orig/build/lib/gozerbot/xmpp/presence.py
+++ gozerbot-0.99.1/build/lib/gozerbot/xmpp/presence.py
@@ -0,0 +1,50 @@
+# gozerbot/xmpp/presence.py
+#
+#
+
+""" Presence. """
+
+# gozerbot imports
+from gozerbot.eventbase import EventBase
+from gozerbot.utils.trace import whichmodule
+from gozerbot.utils.log import rlog
+
+# xmpp imports
+from core import XMLDict
+
+# basic imports
+import time
+ 
+class Presence(EventBase):
+
+    def __init__(self, nodedict={}, bot=None):
+        rlog(2, whichmodule(1), 'PRESENCE: ' + str(nodedict))
+        EventBase.__init__(self, nodedict, bot)
+        self.element = 'presence'
+
+    def toirc(self):
+        """ set ircevent compatible attributes """
+        self.cmnd = 'Presence'
+
+        try:
+            self.nick = self.fromm.split('/')[1]
+        except (AttributeError, IndexError):
+            self.nick = ""
+
+        self.jid = self.jid or self.fromm
+        self.ruserhost = self.jid
+        self.userhost = str(self.jid)
+        self.resource = self.nick
+        self.stripped = self.jid.split('/')[0]
+        self.channel = self.fromm.split('/')[0]
+        self.printto = self.channel
+        self.origtxt = self.txt
+        self.time = time.time()
+        
+        if self.type == 'groupchat':
+            self.groupchat = True
+        else:
+            self.groupchat = False
+
+        if self.txt:
+            makeargrest(self)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/xmpp/namespace.py
+++ gozerbot-0.99.1/build/lib/gozerbot/xmpp/namespace.py
@@ -0,0 +1,18 @@
+# gozerbot/xmpp/namespace.py
+#
+#
+
+# CONSTANTS
+
+attributes = {}
+subelements = {}
+
+attributes['message'] = ['type', 'from', 'to', 'id']
+subelements['message'] = ['subject', 'body', 'error', 'html', 'thread', 'x']
+
+attributes['presence'] = ['type', 'from', 'to', 'id']
+subelements['presence'] = ['show', 'status', 'priority', 'x']
+
+
+attributes['iq'] = ['type', 'from', 'to', 'id']
+subelements['iq'] = ['query', 'error']
--- gozerbot-0.99.1.orig/build/lib/gozerbot/xmpp/message.py
+++ gozerbot-0.99.1/build/lib/gozerbot/xmpp/message.py
@@ -0,0 +1,277 @@
+# gozerbot/xmpp/message.py
+#
+#
+
+""" jabber message definition .. types can be normal, chat, groupchat, 
+    headline or  error
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.log import rlog
+from gozerbot.utils.trace import whichmodule
+from gozerbot.utils.generic import toenc, fromenc, jabberstrip, makeargrest
+from gozerbot.utils.locking import lockdec
+from gozerbot.eventbase import EventBase
+from gozerbot.config import config
+
+# xmpp imports
+from core import XMLDict
+
+# basic imports
+import types, time, thread
+
+# locks
+replylock = thread.allocate_lock()
+replylocked = lockdec(replylock)
+
+if config['dotchars']:
+    dotchars = config['dotchars']
+else:
+    dotchars = ' .. '
+
+class Message(EventBase):
+
+    """ jabber message object. """
+
+    def __init__(self, nodedict={}, bot=None):
+        EventBase.__init__(self, nodedict, bot)
+        self.element = "message"
+        self.jabber = True
+        rlog(2, whichmodule(1), 'MESSAGE: ' + str(self))
+
+    def __copy__(self):
+        return Message(self, self.bot)
+
+    def __deepcopy__(self, bla):
+        return Message(self, self.bot)
+
+                 
+    #@replylocked
+    def reply(self, txt, result=None, nick=None, dot=False, nritems=False, nr=False, fromm=None, private=False):
+
+        """ reply txt. """
+
+        if result == []:
+            return
+
+        restxt = ""
+
+        if type(result) == types.DictType:
+
+            for i, j in result.iteritems():
+                if type(j) == types.ListType:
+                    try:
+                        z = dotchars.join(j)
+                    except TypeError:
+                        z = unicode(j)
+                else:
+                    z = j
+                if dot == True:
+                    restxt += "%s: %s %s " % (i, z, dotchars)
+                elif dot:
+                    restxt += "%s: %s %s " % (i, z, dot)
+                else:
+                    restxt += "%s: %s " % (i, z)
+
+            if restxt:
+                if dot == True:
+                    restxt = restxt[:-6]
+                elif dot:
+                    restxt = restxt[:-len(dot)]
+        lt = False
+
+        if type(txt) == types.ListType and not result:
+            result = txt
+            origtxt = ""
+            lt = True
+        else:
+            origtxt = txt
+
+        if result:
+            lt = True
+
+        if self.queues:
+            for i in self.queues:
+                if lt:
+                    for j in result:
+                        i.put_nowait(j)
+                else:
+                    i.put_nowait(txt)
+            if self.onlyqueues:
+                return
+
+        pretxt = origtxt
+
+        if lt and not restxt:
+            res = []
+            for i in result:
+                if type(i) == types.ListType or type(i) == types.TupleType:
+                    try:
+                        res.append(dotchars.join(i))
+                    except TypeError:
+                        res.append(unicode(i))
+                else:
+                    res.append(i)
+            result = res
+            if nritems:
+                if len(txt) > 1:
+                    pretxt = "(%s items) .. " % len(result)
+            txtlist = [unicode(i) for i in result]
+            if not nr is False:
+                try:
+                    start = int(nr)
+                except ValueError:
+                    start = 0
+                txtlist2 = []
+                teller = start
+                for i in txtlist:
+                    txtlist2.append("%s) %s" % (teller, i))
+                    teller += 1
+                txtlist = txtlist2
+            if dot == True:
+                restxt = dotchars.join(txtlist)
+            elif dot:
+                restxt = dot.join(txtlist)
+            else:
+                restxt = ' '.join(txtlist)
+
+        if pretxt:
+            restxt = pretxt + restxt
+
+        txt = jabberstrip(restxt)
+
+        if not txt:
+            return
+
+        what = txt
+        txtlist = []
+        start = 0
+        end = 900
+        length = len(what)
+
+        for i in range(length/end+1):
+            endword = what.find(' ', end)
+            if endword == -1:
+                endword = end
+            txtlist.append(what[start:endword])
+            start = endword
+            end = start + 900
+
+        size = 0
+
+        # see if we need to store output in less cache
+        if len(txtlist) > 1:
+            self.bot.less.add(self.userhost, txtlist)
+            size = len(txtlist) - 1
+            result = txtlist[:1][0]
+            if size:
+                result += " (+%s)" % size
+        else:
+            result = txtlist[0]
+
+        if self.filtered(result):
+            return
+
+        try:
+            to = self.options['--to']
+        except KeyError:
+            to = None
+
+        outtype = self.type
+
+        if to and to in self.bot.state['joinedchannels']:
+            outtype = 'groupchat' 
+            self.groupchat = True
+            self.msg = False
+
+        repl = Message({'from': self.me, 'to': to or self.jid, 'type': outtype, 'txt': result})
+
+        if self.groupchat:
+            if self.resource == self.bot.nick:
+                return
+            if to:
+                pass
+            elif nick:
+                repl.type = 'chat'
+            elif private:
+                repl.to = self.userhost
+            elif self.printto:
+                repl.to = self.printto
+            else:
+                repl.to = self.channel
+
+        #repl['from'] = self.bot.me
+
+        if nick:
+            repl.type = 'normal'
+        elif not repl.type:
+            repl.type = 'chat'
+
+        self['bot'].send(repl)
+
+    def toirc(self):
+
+        """ set ircevent compat attributes. """
+
+        self.jidchange = False
+        self.cmnd = 'Message'
+
+        try:
+            self.resource = self.fromm.split('/')[1]
+        except IndexError:
+            pass
+
+        self.channel = self['fromm'].split('/')[0]
+        self.origchannel = self.channel
+        self.nick = self.resource
+
+        try:
+            if self.bot:
+                self.jid = self.bot.jids[self.channel][self.resource]
+                self.jidchange = True
+            else:
+                self.jid = self.fromm
+        except KeyError:
+            self.jid = self.fromm
+
+        self.ruserhost = self.jid
+        self.userhost = self.jid
+        self.stripped = self.jid.split('/')[0]
+        self.printto = self.channel
+
+        for node in self.subelements:
+            try:
+                self.txt = node.body.data
+            except (AttributeError, ValueError):
+                continue
+        self.origtxt = self.txt
+        self.time = time.time()
+
+        if self.type == 'groupchat':
+            self.groupchat = True
+            if self.jidchange:
+                self.userhost = self.stripped
+        else:
+            self.groupchat = False
+            self.userhost = self.stripped
+
+        self.msg = not self.groupchat
+
+    def errorHandler(self):
+        try:
+            code = self.get('error').code
+        except Exception, ex:
+            handle_exception()
+        try:
+            method = getattr(self, "handle_%s" % code)
+            if method:
+                rlog(10, 'message', 'dispatching error to handler %s' % str(method))
+                method(self)
+        except AttributeError, ex:
+            rlog(10, 'message', 'unhandled error %s' % code)
+        except:
+            handle_exception()
+
--- gozerbot-0.99.1.orig/build/lib/gozerbot/xmpp/__init__.py
+++ gozerbot-0.99.1/build/lib/gozerbot/xmpp/__init__.py
@@ -0,0 +1 @@
+
--- gozerbot-0.99.1.orig/build/lib/gozerbot/xmpp/iq.py
+++ gozerbot-0.99.1/build/lib/gozerbot/xmpp/iq.py
@@ -0,0 +1,56 @@
+# gozerbot/xmpp/presence.py
+#
+#
+
+""" Iq. """
+
+# gozerbot imports
+from gozerbot.eventbase import EventBase
+from gozerbot.utils.trace import whichmodule
+from gozerbot.utils.log import rlog
+
+# xmpp imports
+from core import XMLDict
+
+# basic imports
+import time
+ 
+class Iq(EventBase):
+
+    def __init__(self, nodedict={}, bot=None):
+        rlog(2, whichmodule(1), 'IQ: ' + str(nodedict))
+        EventBase.__init__(self, nodedict, bot)
+        self['element'] = 'iq'
+ 
+    def toirc(self):
+        """ set ircevent compatible attributes """
+        self.cmnd = 'Iq'
+        self.conn = None
+        self.arguments = []
+
+        try:
+            self.nick = self.fromm.split('/')[1]
+        except (AttributeError, IndexError):
+            pass
+
+        self.jid = self.jid or self.fromm
+        self.ruserhost = self.jid
+        self.userhost = str(self.jid)
+        self.resource = self.nick
+        self.stripped = self.jid.split('/')[0]
+        self.channel = self.fromm.split('/')[0]
+        self.printto = self.channel
+        self.origtxt = self.txt
+        self.time = time.time()
+        self.msg = None
+        self.rest = ' '.join(self.args)
+        self.sock = None
+        self.speed = 5
+        if self.type == 'groupchat':
+            self.groupchat = True
+        else:
+            self.groupchat = False
+        if self.txt:
+            makeargrest(self)
+        self.joined = False
+        self.denied = False
--- gozerbot-0.99.1.orig/build/lib/gozerbot/xmpp/jid.py
+++ gozerbot-0.99.1/build/lib/gozerbot/xmpp/jid.py
@@ -0,0 +1,36 @@
+# gozerbot/xmpp/JID.py
+#
+#
+
+class InvalidJID(BaseException):
+
+    pass
+
+class JID(object):
+
+    def __init__(self, str):
+        if not str:
+            self.full = ""
+            self.user = ""
+            self.userhost = ""
+            self.host = ""
+            self.resource = ""
+            return
+        if not self.validate(str):
+            raise InvalidJID(str)
+        self.full = str
+        self.user = self.full.split('@')[0]
+        self.userhost = self.full.split('/')[0]
+        try:
+             self.host = self.userhost.split('@')[1]
+        except (IndexError, ValueError):
+            raise InvalidJID(str)
+            
+        try:
+            self.resource = self.full.split('/')[1]
+        except (IndexError, ValueError):
+            self.resource = u""
+
+    def validate(self, s):
+        if not '#' in s:
+            return True
--- gozerbot-0.99.1.orig/build/lib/gozerbot/persist/persistconfig.py
+++ gozerbot-0.99.1/build/lib/gozerbot/persist/persistconfig.py
@@ -0,0 +1,294 @@
+# gozerbot/persistconfig.py
+#
+#
+
+""" allow data to be pickled to disk .. creating the persisted object
+    restores data.
+    
+usage:
+    !plug-cfg			->	shows list of all config
+    !plug-cfg key value		->	sets value to key
+    !plug-cfg key		->	shows list of key
+    !plug-cfg key add value	->	adds value to list
+    !plug-cfg key remove value	->	removes value from list
+    !plug-cfg key clear		-> 	clears entire list
+    !plug-cfgsave		->	force save configuration to disk
+    
+todo:
+    - plugin api (more work needed?)
+    
+"""
+
+__copyright__ = 'this file is in the public domain'
+__author__ = 'Bas van Oostveen'
+
+# gozerbot imports
+from gozerbot.utils.log import rlog
+from gozerbot.utils.trace import calledfrom
+from gozerbot.commands import cmnds, Command
+from gozerbot.examples import examples
+from gozerbot.datadir import datadir
+from gozerbot.persist.persist import Persist
+from gozerbot.config import Config, config
+
+# basic imports
+import sys, os, types, time
+
+class PersistConfigError(Exception): pass
+
+class PersistConfig(Config):
+
+    """ persist plugin configuration and create default handlers. """
+
+    def __init__(self):
+        self.hide = []
+        self.plugname = calledfrom(sys._getframe())
+        Config.__init__(self, datadir + os.sep + 'plugs' + os.sep + self.plugname, "config")
+
+        if self.plugname not in config['loadlist']:
+             return
+
+        cmndname = "%s-cfg" % self.plugname
+        rlog(-3, 'persistconfig', 'added command %s (%s)' % (cmndname, \
+self.plugname))
+        cmnds[cmndname] = Command(self.cmnd_cfg, 'OPER', self.plugname, \
+threaded=True)	
+        examples.add(cmndname, "plugin configuration", cmndname)
+        cmndnamesave = cmndname + "save"
+        cmnds[cmndnamesave] = Command(self.cmnd_cfgsave, 'OPER', \
+self.plugname, threaded=True)	
+        examples.add(cmndnamesave, "save plugin configuration", cmndnamesave)
+
+    ### cmnds
+
+    def show_cfg(self, bot, ievent):
+
+        """ show config options. """
+
+        s = []
+
+        for key, optionvalue in sorted(self.iteritems()):
+            if key in self.hide:
+                continue
+            v = optionvalue
+            if type(v) in [str, unicode]:
+                v = '"'+v+'"'
+            v = str(v)
+            s.append("%s=%s" % (key, v))
+
+        ievent.reply("options: " + ' .. '.join(s))
+
+    def cmnd_cfgsave(self, bot, ievent):
+
+        """ save config. """
+
+        self.save()
+        ievent.reply("config saved")
+	
+    def cmnd_cfg_edit(self, bot, ievent, args, key, optionvalue):
+
+        """ edit config values. """
+
+        if not self.has_key(key):
+            ievent.reply('option %s is not defined' % key)
+            return
+
+        if key in self.hide:
+            return
+
+        if type(optionvalue) == types.ListType:
+
+	    if args[0].startswith("[") and args[-1].endswith("]"):
+		values = []
+
+		for v in ' '.join(args)[1:-1].replace(", ", ",").split(","):
+		    if v[0]=='"' and v[-1]=='"':
+			# string
+			v = v.replace('"', '')
+		    elif v[0]=="'" and v[-1]=="'":
+			# string
+			v = v.replace("'", "")
+		    elif '.' in v:
+			# float
+			try:
+			    v = float(v)
+			except ValueError:
+			    ievent.reply("invalid long literal: %s" % v)
+			    return
+		    else:
+			# int
+			try:
+			    v = int(v)
+			except ValueError:
+			    ievent.reply("invalid int literal: %s" % v)
+			    return
+		    values.append(v)
+
+                self.set(key, values)
+                self.save()
+                ievent.reply("%s set %s" % (key, values))
+		return
+
+            command = args[0]
+            value = ' '.join(args[1:])
+
+            if command == "clear":
+                self.clear(key)
+                self.save()
+                ievent.reply("list empty")
+            elif command == "add":
+                self.append(key, value)
+                self.save()
+                ievent.reply("%s added %s" % (key, value))
+            elif command == "remove" or command == "del":
+                try:
+                    self.remove(key, value)
+                    self.save()
+                    ievent.reply("%s removed" % str(value))
+                except ValueError:
+                    ievent.reply("%s is not in list" % str(value))
+            else:
+                ievent.reply("invalid command")
+            return
+
+        else:
+            value = ' '.join(args)
+
+            try:
+                value = type(optionvalue)(value)
+            except:
+                pass
+
+            if type(value) == type(optionvalue):
+                self.set(key, value)
+                self.save()
+                ievent.reply("%s set" % key)
+            elif type(value) == types.LongType and \
+type(option.value) == types.IntType:
+                # allow upscaling from int to long
+                self.set(key, value)
+                self.save()
+                ievent.reply("%s set" % key)
+            else:
+                ievent.reply("value %s (%s) is not of the same type as %s \
+(%s)" % (value, type(value), optionvalue, type(optionvalue)))
+    
+    def cmnd_cfg(self, bot, ievent):
+
+        """ the config (cfg) command. """
+
+        if not ievent.args:
+            self.show_cfg(bot, ievent)
+            return
+
+        argc = len(ievent.args)
+        key = ievent.args[0]
+
+        try:
+            optionvalue = self[key]
+        except KeyError:
+            ievent.reply("%s option %s not found" % (self.plugname, key))
+            return
+
+        if key in self.hide:
+            return
+
+        if argc == 1:
+            ievent.reply(str(optionvalue))
+            return
+
+        self.cmnd_cfg_edit(bot, ievent, ievent.args[1:], key, optionvalue)
+
+    def generic_cmnd(self, key):
+
+        """ command for editing config values. """
+
+        def func(bot, ievent):
+
+            try:
+                optionvalue = self[key]
+            except KeyError:
+                ievent.reply("%s not found" % key)
+                # need return ?
+
+            if not isinstance(option, Option):
+                rlog(5, 'persistconfig', 'Option %s is not a valid option' % \
+key)
+                return
+
+            if ievent.args:
+                value = ' '.join(ievent.args)
+                try:
+                    value = type(optionvalue)(value)
+                except:
+                    pass
+                self.cmnd_cfg_edit(bot, ievent, ievent.args, key, optionvalue)
+            else:
+                ievent.reply(str(optionvalue))
+
+        return func
+
+    ### plugin api
+
+    def define(self, key, value=None, desc="plugin option", perm='OPER', \
+example="", name=None, exposed=True):
+
+        """ define initial value. """
+
+        if name:
+            name = name.lower()
+
+        if not exposed:
+            self.hide.append(key)
+
+        if not self.has_key(key):
+            if name == None:
+                name = "%s-cfg-%s" % (self.plugname, str(key))
+            self[key] = value
+	
+    def undefine(self, key, throw=False):
+
+        """ remove a key. """
+
+        try:
+            del self[key]
+            return True
+        except KeyError, e:
+            if throw:
+                raise
+
+        self.save()
+        return False
+
+    def set(self, key, value, throw=False):
+
+        """ set a key's value. """
+
+        self[key] = value
+
+    def append(self, key, value):
+
+        """ append a value. """
+
+        self[key].append(value)
+
+    def remove(self, key, value):
+
+        """ remove a value. """
+
+        self[key].remove(value)
+
+    def clear(self, key):
+
+        """ clear a value. """
+
+        self[key] = []
+
+    def get(self, key, default=None):
+
+        """ get value of key. """
+
+        try:
+            return self[key]
+        except KeyError:
+            return default
--- gozerbot-0.99.1.orig/build/lib/gozerbot/persist/persist.py
+++ gozerbot-0.99.1/build/lib/gozerbot/persist/persist.py
@@ -0,0 +1,156 @@
+# gozerbot/persist.py
+#
+#
+
+""" allow data to be written to disk in JSON format. creating the persisted 
+    object restores data.
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.stats import stats
+from gozerbot.utils.locking import lockdec
+from gozerbot.utils.log  import rlog
+from gozerbot.utils.trace import calledfrom
+from gozerbot.utils.lazydict import LazyDict
+from gozerbot.datadir import datadir
+from gozerbot.config import config
+from simplejson import load, dump, loads, dumps
+
+# basic imports
+import pickle, thread, os, copy, sys, types
+
+saving = []
+stopsave = 0
+
+persistlock = thread.allocate_lock()
+persistlocked = lockdec(persistlock)
+
+if True:
+
+    class Persist(object):
+
+        """ persist data attribute to JSON file. """
+
+        def __init__(self, filename, default=None, init=True):
+
+            """ Persist constructor """
+
+            self.fn = filename # filename to save to
+            self.lock = thread.allocate_lock() # lock used when saving)
+            self.data = LazyDict() # attribute to hold the data
+
+            if init:
+
+                if default == None:
+                    default = LazyDict()
+
+                self.init(default)
+
+        @persistlocked
+        def init(self, default={}):
+
+            """ initialize the data. """
+
+            rlog(0, 'persist', 'reading %s' % self.fn)
+
+            # see if file exists .. if not initialize data to default
+            try:
+                datafile = open(self.fn, 'r')
+
+            except IOError, ex:
+
+                if not 'No such file' in str(ex):
+                    rlog(10, 'persist', 'failed to read %s: %s' % (self.fn, str(ex)))
+
+                    self.data = copy.deepcopy(default)
+                    raise
+                else:
+                    return
+
+            # load the JSON data into attribute
+            try:
+                self.data = load(datafile)
+                datafile.close()
+                stats.up('persist', 'load') 
+
+                if type(self.data) == types.DictType:
+
+                    d = LazyDict()
+                    d.update(self.data)
+                    self.data = d
+
+            except Exception, ex:
+                rlog(100, 'persist', 'ERROR: %s' % self.fn)
+                raise
+
+        @persistlocked
+        def save(self):
+
+            """ persist data attribute. """
+
+            if stopsave:
+                rlog(100, 'persist', 'stopping mode .. not saving %s' % self.fn)
+                return
+
+            # save data
+            try:
+                #self.lock.acquire()
+                saving.append(str(self.fn))
+                tmp = self.fn + '.tmp' # tmp file to save to
+
+                # first save to temp file and when done rename
+                try:
+                    datafile = open(tmp, 'w')
+
+                except IOError, ex:
+                    rlog(100, 'persist', "can't save %s: %s" % (self.fn, str(ex)))
+                    return
+
+                # dump JSON to file
+                #cp = copy.copy(self.data)
+                dump(self.data, datafile)
+                datafile.close()
+
+                try:
+                    os.rename(tmp, self.fn)
+
+                except WindowsError:
+                    # no atomic operation supported on windows! error is thrown when destination exists
+                    os.remove(self.fn)
+                    os.rename(tmp, self.fn)
+
+                stats.up('persist', 'saved')
+                rlog(10, 'persist', '%s saved' % self.fn)
+
+            finally:
+                saving.remove(self.fn)
+                #self.lock.release()
+
+
+class PlugPersist(Persist):
+
+    """ persist plug related data. """
+
+    def __init__(self, filename, default=None):
+
+        # retrieve plugname where object is constructed
+        plugname = calledfrom(sys._getframe())
+
+        # call base constructor with appropiate filename
+        Persist.__init__(self, datadir + os.sep + 'plugs' + os.sep + plugname + os.sep + filename, default)
+
+
+class LazyDictPersist(Persist):
+
+    """ persisted lazy dict. """
+
+    def __init__(self, default={}):
+
+        # called parent constructor
+        Persist.__init__(self)
+
+        # if data not initialised set it to a LazyDict
+        if not self.data:
+            self.data = LazyDict(default)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/persist/persiststate.py
+++ gozerbot-0.99.1/build/lib/gozerbot/persist/persiststate.py
@@ -0,0 +1,68 @@
+# gozerbot/persiststate.py
+#
+#
+
+""" persistent state classes """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.utils.trace import calledfrom
+from gozerbot.utils.log import rlog
+from gozerbot.datadir import datadir
+from persist import Persist
+import types, os, sys
+
+class PersistState(Persist):
+
+    """ base persitent state class """
+
+    def __init__(self, filename):
+        Persist.__init__(self, filename, {})
+        self.types = dict((i, type(j)) for i, j in self.data.iteritems())
+
+    def __getitem__(self, key):
+
+        """ get state item. """
+
+        return self.data[key]
+
+    def __setitem__(self, key, value):
+
+        """ set state item. """
+
+        self.data[key] = value
+
+    def define(self, key, value):
+
+        """ define a state item. """
+
+        if not self.data.has_key(key) or type(value) != self.types[key]:
+            if type(value) == types.StringType:
+                value = unicode(value)
+            if type(value) == types.IntType:
+                value = long(value)
+            self.data[key] = value
+
+class PlugState(PersistState):
+
+    """ state for plugins. """
+
+    def __init__(self):
+        self.plugname = calledfrom(sys._getframe())
+        rlog(1, 'persiststate', 'initialising %s' % self.plugname)
+        PersistState.__init__(self, datadir + os.sep + 'plugs' + os.sep + self.plugname + os.sep + 'state')
+
+class ObjectState(PersistState):
+
+    """ state for usage in constructors. """
+
+    def __init__(self):
+        PersistState.__init__(self, datadir + os.sep + calledfrom(sys._getframe(1))+'.state')
+
+class UserState(PersistState):
+
+    """ state for users. """
+
+    def __init__(self, username):
+        self.datadir = datadir + os.sep + 'users' + os.sep + username
+        PersistState.__init__(self, self.datadir + os.sep + 'state')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/persist/pdod.py
+++ gozerbot-0.99.1/build/lib/gozerbot/persist/pdod.py
@@ -0,0 +1,75 @@
+# gozerbot/pdod.py
+#
+#
+
+""" pickled dicts of dicts """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.utils.locking import lockdec
+from persist import Persist
+import thread
+
+pdodlock = thread.allocate_lock()
+locked = lockdec(pdodlock)
+ 
+class Pdod(Persist):
+
+    """ pickled dicts of dicts """
+
+    def __init__(self, filename):
+        Persist.__init__(self, filename)
+        if not self.data:
+            self.data = {}
+
+    def __getitem__(self, name):
+        """ return item with name """
+        if self.data.has_key(name):
+            return self.data[name]
+
+    #@locked
+    def save(self):
+        Persist.save(self)
+
+    #@locked
+    def __delitem__(self, name):
+        """ delete name item """
+        if self.data.has_key(name):
+            return self.data.__delitem__(name)
+
+    #@locked
+    def __setitem__(self, name, item):
+        """ set name item """
+        self.data[name] = item
+
+    def __contains__(self, name):
+        return self.data.__contains__(name)
+
+    #@locked
+    def setdefault(self, name, default):
+        """ set default of name """
+        return self.data.setdefault(name, default)
+
+    def has_key(self, name):
+        """ has name key """
+        return self.data.has_key(name)
+
+    def has_key2(self, name1, name2):
+        """ has [name1][name2] key """
+        if self.data.has_key(name1):
+            return self.data[name1].has_key(name2)
+
+    def get(self, name1, name2):
+        """ get data[name1][name2] """
+        try:
+            result = self.data[name1][name2]
+            return result
+        except KeyError:
+            return None
+
+    #@locked
+    def set(self, name1, name2, item):
+        """ set name, name2 item """
+        if not self.data.has_key(name1):
+            self.data[name1] = {}
+        self.data[name1][name2] = item
--- gozerbot-0.99.1.orig/build/lib/gozerbot/persist/pdol.py
+++ gozerbot-0.99.1/build/lib/gozerbot/persist/pdol.py
@@ -0,0 +1,72 @@
+# gozerbot/pdol.py
+#
+#
+
+""" pickled dict of lists """
+
+__copyright__ = 'this file is in the public domain'
+
+from persist import Persist
+ 
+class Pdol(Persist):
+
+    """ pickled dict of lists """
+
+    def __init__(self, fname):
+        Persist.__init__(self, fname)
+        if not self.data:
+            self.data = {}
+
+    def __iter__(self, name):
+        return self.data[name].__iter__()
+ 
+    def __getitem__(self, item):
+        if self.data.has_key(item):
+            return self.data[item]
+
+    def __delitem__(self, item):
+        if self.data.has_key(item):
+            self.data.__delitem__(item)
+            return 1
+
+    def __setitem__(self, item, what):
+        if self.data.has_key(item):
+            self.data[item].append(what)
+        else:
+            self.data[item] = [what]
+        return 1
+
+    def add(self, item, what):
+        """ add what to items list """
+        return self.__setitem__(item, what)
+
+    def adduniq(self, item, what):
+        """ add what to items list if item not yet added """
+        if not self.data.has_key(item):
+            self.new(item)
+        if what not in self.data[item]:
+            return self.__setitem__(item, what)
+
+    def get(self, item):
+        """ get items list """
+        return self.__getitem__(item)
+
+    def new(self, what):
+        """ reset list of what """
+        self.data[what] = []
+
+    def delete(self, item, what):
+        """ remove what from item's list """
+        del self.data[item][what]
+
+    def extend(self, item, what):
+        if not self.data.has_key(item):
+            self.new(item)
+        self.data[item].extend(what)
+
+    def remove(self, item, what):
+        try:
+            self.data[item].remove(what)
+            return 1
+        except (ValueError, KeyError):
+            return 0
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/textutils.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/textutils.py
@@ -0,0 +1,34 @@
+import cgi
+import re
+import htmlentitydefs
+
+def unescape_charref(ref): 
+    name = ref[2:-1] 
+    base = 10 
+    if name.startswith("x"): 
+        name = name[1:] 
+        base = 16 
+    return unichr(int(name, base)) 
+def replace_entities(match): 
+    ent = match.group() 
+    if ent[1] == "#": 
+        return unescape_charref(ent) 
+    repl = htmlentitydefs.name2codepoint.get(ent[1:-1]) 
+    if repl is not None: 
+        repl = unichr(repl) 
+    else: 
+        repl = ent 
+    return repl 
+
+def html_unescape(data): 
+    '''
+    Unescape (numeric) HTML entities.
+    '''
+    return re.sub(r"&#?[A-Za-z0-9]+?;", replace_entities, data) 
+
+def html_escape(data):
+    '''
+    Escape HTML entities.
+    '''
+    return cgi.escape(data)
+
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/url.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/url.py
@@ -0,0 +1,259 @@
+# gozerbot/utils/url.py
+#
+#
+
+""" generic functions """
+
+__copyright__ = 'this file is in the public domain'
+
+from log import rlog
+from generic import fromenc
+from gozerbot.datadir import datadir
+from gozerbot.config import config
+import time, sys, re, traceback, Queue, urllib, urllib2, urlparse, socket
+import random, os, sgmllib, thread, types, httplib, StringIO
+import htmlentitydefs, tempfile, cgi
+
+try:
+    import chardet
+except ImportError:
+    chardet = None
+
+class istr(str):
+    pass
+
+def useragent():
+    """ provide useragent string """
+    (name, version) = config['version'].split()[0:2]
+    return 'Mozilla/5.0 (compatible; %s %s; http://gozerbot.googlecode.com)' % \
+(name, version)
+
+class CBURLopener(urllib.FancyURLopener):
+
+    """ our URLOpener """
+
+    def __init__(self, version, *args):
+        if version:
+            self.version = version
+        else:
+            self.version = useragent()
+        urllib.FancyURLopener.__init__(self, *args)
+
+def geturl(url, version=None):
+    """ fetch an url """
+    urllib._urlopener = CBURLopener(version)
+    rlog(10, 'url', 'fetching %s' % url)
+    result = urllib.urlopen(url)
+    tmp = result.read()
+    result.close()
+    return tmp
+
+def geturl2(url, decode=False):
+    """ use urllib2 to fetch an url """
+    rlog(10, 'url', 'fetching %s' % url)
+    request = urllib2.Request(url)
+    request.add_header('User-Agent', useragent())
+    opener = urllib2.build_opener()
+    result = opener.open(request)
+    tmp = result.read()
+    info = result.info() # add header information to .info attribute
+    result.close()
+    if decode:
+        encoding = get_encoding(tmp)
+        rlog(0, 'url', '%s encoding: %s' % (url, encoding))
+        res = istr(fromenc(tmp, encoding, url))
+    else:
+        res = istr(tmp)
+    res.info = info
+    return res
+
+def geturl3(url, myheaders={}, postdata={},keyfile='', certfile="", port=80):
+    return geturl2(url)
+
+def geturl4(url, myheaders={}, postdata={}, keyfile="", certfile="", port=80):
+    headers = {'Content-Type': 'text/html', \
+'Accept': 'text/plain; text/html', 'User-Agent': useragent()}
+    headers.update(myheaders)
+    # parse URL components
+    urlparts = urlparse.urlparse(url)
+    try:
+       port = int(urlparts[1].split(':')[1])
+       host = urlparts[1].split(':')[0]
+    except:
+       host = urlparts[1]
+    # set up HTTP connection
+    if keyfile:
+        connection = httplib.HTTPSConnection(host, port, keyfile, \
+certfile)
+    elif 'https' in urlparts[0]:
+        connection = httplib.HTTPSConnection(host, port)
+    else:
+        connection = httplib.HTTPConnection(host, port)
+    # make the request
+    if type(postdata) == types.DictType:
+        postdata = urllib.urlencode(postdata)
+    rlog(10, 'url', 'fetching %s' % url)
+    connection.request('GET', urlparts[2])
+    # read the response and clean up
+    return connection.getresponse()
+
+
+def posturl(url, myheaders, postdata, keyfile=None, certfile="",port=80):
+    """ very basic HTTP POST url retriever """
+    # build headers
+    headers = {'Content-Type': 'application/x-www-form-urlencoded', \
+'Accept': 'text/plain; text/html', 'User-Agent': useragent()}
+    headers.update(myheaders)
+    # parse URL components
+    urlparts = urlparse.urlparse(url)
+    # set up HTTP connection
+    if keyfile:
+        connection = httplib.HTTPSConnection(urlparts[1], port, keyfile, \
+certfile)
+    else:
+        connection = httplib.HTTPConnection(urlparts[1])
+    # make the request
+    if type(postdata) == types.DictType:
+        postdata = urllib.urlencode(postdata)
+    rlog(10, 'url', 'fetching %s' % url)
+    connection.request('POST', urlparts[2], postdata, headers)
+    # read the response and clean up
+    return connection.getresponse()
+
+def deleteurl(url, myheaders={}, postdata={}, keyfile="", certfile="", port=80):
+    """ very basic HTTP POST url retriever """
+    # build headers
+    headers = {'Content-Type': 'application/x-www-form-urlencoded', \
+'Accept': 'text/plain; text/html', 'User-Agent': useragent()}
+    headers.update(myheaders)
+    # parse URL components
+    urlparts = urlparse.urlparse(url)
+    # set up HTTP connection
+    if keyfile and certfile:
+        connection = httplib.HTTPSConnection(urlparts[1], port, keyfile, \
+certfile)
+    else:
+        connection = httplib.HTTPConnection(urlparts[1])
+    # make the request
+    if type(postdata) == types.DictType:
+        postdata = urllib.urlencode(postdata)
+    rlog(10, 'url', 'fetching %s' % url)
+    connection.request('DELETE', urlparts[2], postdata, headers)
+    # read the response and clean up
+    return connection.getresponse()
+
+def puturl(url, myheaders={}, postdata={}, keyfile="", certfile="", port=80):
+    """ very basic HTTP POST url retriever """
+    # build headers
+    headers = {'Content-Type': 'application/x-www-form-urlencoded', \
+'Accept': 'text/plain; text/html', 'User-Agent': useragent()}
+    headers.update(myheaders)
+    # parse URL components
+    urlparts = urlparse.urlparse(url)
+    # set up HTTP connection
+    if keyfile:
+        connection = httplib.HTTPSConnection(urlparts[1], port, keyfile, \
+certfile)
+    else:
+        connection = httplib.HTTPConnection(urlparts[1])
+    # make the request
+    if type(postdata) == types.DictType:
+        postdata = urllib.urlencode(postdata)
+    rlog(10, 'url', 'fetching %s' % url)
+    connection.request('PUT', urlparts[2], postdata, headers)
+    # read the response and clean up
+    return connection.getresponse()
+
+def getpostdata(event):
+    ctype, pdict = cgi.parse_header(event.headers.getheader('content-type'))
+    body = cgi.FieldStorage(fp=event.rfile, headers=event.headers, \
+environ = {'REQUEST_METHOD':'POST'}, keep_blank_values = 1)
+    result = {}
+    for name in dict(body):
+        result[name] = body.getfirst(name)
+    return result
+
+def decode_html_entities(s):
+    """ smart decoding of html entities to utf-8 """
+    re_ent_match = re.compile(u'&([^;]+);')
+    re_entn_match = re.compile(u'&#([^x;]+);')
+    re_entnx_match = re.compile(u'&#x([^;]+);')
+    s = s.decode('utf-8', 'replace')
+    def to_entn(match):
+        """ convert to entities """
+        if htmlentitydefs.entitydefs.has_key(match.group(1)):
+            return htmlentitydefs.entitydefs[match.group(1)].decode('utf-8', \
+'replace')
+        return match.group(0)
+    def to_utf8(match):
+        """ convert to utf-8 """
+        return unichr(long(match.group(1)))
+    def to_utf8x(match):
+        """ convert to utf-8 """
+        return unichr(long(match.group(1), 16))
+    s = re_ent_match.sub(to_entn, s)
+    s = re_entn_match.sub(to_utf8, s)
+    s = re_entnx_match.sub(to_utf8x, s)
+    return s
+
+def get_encoding(data):
+    """ get encoding from web data """
+    # first we try if we have the .info attribute to determine the encoding from
+    if hasattr(data, 'info') and data.info.has_key('content-type') and \
+'charset' in data.info['content-type'].lower():
+        charset = data.info['content-type'].lower().split('charset', 1)[1].\
+strip()
+        if charset[0] == '=':
+            charset = charset[1:].strip()
+            if ';' in charset:
+                return charset.split(';')[0].strip()
+            return charset
+    # try to find the charset in the meta tags, 
+    # <meta http-equiv="content-type" content="text/html; charset=..." />
+    if '<meta' in data.lower():
+        metas = re.findall(u'<meta[^>]+>', data, re.I | re.M)
+        if metas:
+            for meta in metas:
+                test_http_equiv = \
+re.search('http-equiv\s*=\s*[\'"]([^\'"]+)[\'"]', meta, re.I)
+                if test_http_equiv and \
+test_http_equiv.group(1).lower() == 'content-type':
+                    test_content = \
+re.search('content\s*=\s*[\'"]([^\'"]+)[\'"]', meta, re.I)
+                    if test_content:
+                        test_charset = \
+re.search('charset\s*=\s*([^\s\'"]+)', meta, re.I)
+                        if test_charset:
+                            return test_charset.group(1)
+    # everything else failed, let's see if we can use chardet
+    if chardet:
+        test = chardet.detect(data)
+        if test.has_key('encoding'):
+            return test['encoding']
+    # nothing found, let's fall back to the default encoding
+    return sys.getdefaultencoding()
+
+class Stripper(sgmllib.SGMLParser):
+
+    """ html stripper """
+
+    def __init__(self):
+        sgmllib.SGMLParser.__init__(self)
+
+    def strip(self, some_html):
+        """ strip html """
+        self.theString = ""
+        self.feed(some_html)
+        self.close()
+        return self.theString
+
+    def handle_data(self, data):
+        """ data handler """
+        self.theString += fromenc(data)
+
+def striphtml(txt):
+    """ strip html from txt """
+    stripper = Stripper()
+    txt = stripper.strip(fromenc(txt))
+    return txt
+    
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/lockmanager.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/lockmanager.py
@@ -0,0 +1,56 @@
+# gozerbot/lockmanager.py
+#
+#
+
+""" manages locks """
+
+__copyright__ = 'this file is in the public domain'
+
+from log import rlog
+import thread, threading
+
+class Lockmanager(object):
+
+    """ place to hold locks """
+
+    def __init__(self):
+        self.locks = {}
+
+    def allocate(self, name):
+        """ allocate a new lock """
+        self.locks[name] = thread.allocate_lock()
+        rlog(0, 'lockmanager', 'allocated %s' % name)
+        
+    def get(self, name):
+        """ get lock """
+        if not self.locks.has_key(name):
+            self.allocate(name)
+        return self.locks[name]
+        
+    def delete(self, name):
+        """ delete lock """
+        if self.locks.has_key(name):
+            del self.locks[name]
+
+    def acquire(self, name):
+        """ acquire lock """
+        if not self.locks.has_key(name):
+            self.allocate(name)
+        rlog(0, 'lockmanager', 'acquire %s' % name)
+        self.locks[name].acquire()
+
+    def release(self, name):
+        """ release lock """
+        rlog(0, 'lockmanager', 'releasing %s' % name)
+        self.locks[name].release()
+
+
+class RLockManager(Lockmanager):
+
+    def allocate(self, name):
+        """ allocate a new lock """
+        self.locks[name] = threading.RLock()
+        rlog(0, 'lockmanager', 'allocated RLock %s' % name)
+
+lockmanager = Lockmanager()
+rlockmanager = RLockManager()
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/statdict.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/statdict.py
@@ -0,0 +1,45 @@
+# gozerbot/statdict.py
+#
+#
+
+""" stats dict """
+
+__copyright__ = 'this file is in the public domain'
+
+class Statdict(dict):
+
+    """ dictionary to hold stats """
+
+    def set(self, item, value):
+        """ set item to value """
+        self[item] = value
+
+    def upitem(self, item, value=1):
+        """ increase item """
+        if not self.has_key(item):
+            self[item] = value
+            return
+        self[item] += value
+
+    def top(self, start=1, limit=None):
+        """ return highest items """
+        result = []
+        for item, value in self.iteritems():
+            if value >= start:
+                result.append((item, value))
+        result.sort(lambda b, a: cmp(a[1], b[1]))
+        if limit:
+            result =  result[:limit]
+        return result
+
+    def down(self, end=100, limit=None):
+        """ return lowest items """
+        result = []
+        for item, value in self.iteritems():
+            if value <= end:
+                result.append((item, value))
+        result.sort(lambda a, b: cmp(a[1], b[1]))
+        if limit:
+            return result[:limit]
+        else:
+            return result
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/generic.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/generic.py
@@ -0,0 +1,513 @@
+# gozerbot/utils/generic.py
+#
+#
+
+""" generic functions """
+
+__copyright__ = 'this file is in the public domain'
+
+
+from gozerbot.persist.persist import Persist
+from exception import handle_exception
+from trace import calledfrom
+from stat import ST_UID, ST_MODE, S_IMODE
+from gozerbot.config import config
+from log import rlog
+from lazydict import LazyDict
+from simplejson import dumps
+import time, sys, re, getopt, types, os, random, socket, Queue 
+
+def loadeggs(eggdir, version=None):
+    rlog(10, 'booting', 'scanning %s' % eggdir)
+    for f in os.listdir(eggdir):
+        if f.endswith('.egg'):
+            rlog(10, 'booting', 'loading %s' % f)
+            try:
+                from pkg_resources import require
+                require("%s>0.0")
+            except ImportEror:
+                sys.path.insert(0, eggdir + os.sep + f)
+
+def jsonstring(s):
+    if type(s) == types.TupleType:
+        s = list(s)
+    return dumps(s)
+
+def stripident(userhost):
+    """ strip ident char from userhost """
+    try:
+        userhost.getNode()
+        return str(userhost)
+    except AttributeError:  
+        pass
+    if not userhost:
+        return None 
+    if userhost[0] in "~-+^":
+        userhost = userhost[1:]
+    elif userhost[1] == '=':   
+        userhost = userhost[2:]
+    return userhost
+
+def stripidents(ulist):
+    """ strip ident char from list of userhosts """
+    result = []
+    for userhost in ulist:
+        result.append(stripident(userhost))
+    return result
+
+def makedirs(datadir):
+    if not os.path.isdir(datadir):
+        os.mkdir(datadir)
+    if not os.path.isdir(datadir + '/states/'):    
+        os.mkdir(datadir + '/states/')    
+    if not os.path.isdir(datadir + '/db/'):
+        os.mkdir(datadir + '/db/')
+    if not os.path.isdir(datadir + '/configs/'):
+        os.mkdir(datadir + '/configs/')
+
+def cleanpyc():
+    removed = []
+    try:
+        files = os.listdir('gplugs')
+        for file in files:
+            if file.endswith('.pyc'):
+                os.unlink('gplugs' + os.sep + file)
+                removed.append(file)
+    except:
+        pass
+    try:
+        files = os.listdir('gplugs/olddb')
+        for file in files:
+            if file.endswith('.pyc'):
+                os.unlink('gplugs/olddb' + os.sep + file)
+                removed.append(file)
+    except:
+        pass
+    try:
+        files = os.listdir('gplugs/alchemy')
+        for file in files:
+            if file.endswith('.pyc'):
+                os.unlink('gplugs/alchemy' + os.sep + file)
+                removed.append(file)
+    except:
+        pass
+    return removed
+
+def cleanpycfile(filename):
+    try:
+        if filename.endswith('.pyc'):
+            os.unlink(filename)
+            rlog(10, 'generic', 'cleaned %s' % filename)
+    except:
+        pass
+
+def getversion():
+    version = config['version']
+    if config['nodb']:
+        version += ' JSON_USERS'
+    else:
+        driver = config.get("db_driver")
+        if driver: driver = driver.upper()
+        version += ' ' + config['dbtype'].upper() + ' ' + driver or ""
+    return version
+
+def makeoptions(ievent, options={}):
+    options = LazyDict(options)
+    try:
+        optargs = ""
+        optlist = []
+        if not options.has_key('--filter'):
+            options['--filter'] = ""
+        if not options.has_key('--to'):
+            options['--to'] = None
+        if not options.has_key('--chan'):
+            options['--chan'] = ievent.channel
+        if not options.has_key('--how'):
+            options['--how'] = "msg"
+        if not options.has_key('--speed'):
+            options['--speed'] = str(ievent.speed)
+        else:
+            options['--speed'] = str(options['--speed'])
+        for i, j in options.iteritems():
+            if '--' in i:
+                optlist.append("%s=" % i[2:])
+                if j:
+                    optlist.append(j)
+                continue
+            if '-' in i:
+                if j:
+                    optargs += ":%s" % i[1:]
+                else:
+                    optargs += i[1:]
+        args = ievent.txt.split()
+        try:
+            (opts, rest) = getopt.getopt(args[1:], optargs, optlist)
+        except AttributeError, ex:
+            print "option not allowed: %s" % str(ex), ievent.txt, options
+            return 0
+        except getopt.GetoptError, ex:
+            return 0
+        if opts:
+             for item in opts:
+                 ievent.optionset.append(item[0])
+        o = dict(options)
+        o.update(dict(opts))
+        try:
+            filter = o['--filter']
+            if filter and filter not in ievent.filter:
+                ievent.filter.append(filter)
+        except KeyError:
+            pass
+        try:
+            speed = o['--speed']
+            ievent.speed = int(speed)
+        except KeyError:
+            pass
+        try:
+            ievent.channel = o['--chan'] or ievent.channel
+        except KeyError:
+            pass
+        ievent.options.update(o)
+        if args:
+            ievent.txt = args[0] + ' ' + ' '.join(rest)
+        makeargrest(ievent)
+    except Exception, ex:
+        handle_exception()
+        return 
+    return ievent.options
+
+def makeargrest(ievent):
+    """ create ievent.args and ievent.rest .. this is needed because \
+         ircevents might be created outside the parse() function """
+    try:
+        ievent.args = ievent.txt.split()[1:]
+    except ValueError:
+        ievent.args = []   
+    try:
+        cmnd, ievent.rest = ievent.txt.split(' ', 1)
+    except ValueError:   
+        ievent.rest = ""   
+    ievent.command = ievent.txt.split(' ')[0]
+
+def setdefenc(encoding):
+    import sys
+    reload(sys)
+    sys.setdefaultencoding(encoding)
+
+def plugfile(datadir):
+    return datadir + os.sep + calledfrom(sys._getframe())
+
+def cchar(bot, ievent):
+    try:
+        cchar = bot.channels[ievent.channel]['cc']
+    except LookupError:
+        cchar = config['defaultcc'] or '!'
+    except TypeError:
+        cchar = config['defaultcc'] or '!'
+    return cchar
+
+def splittxt(what, l=375):
+    txtlist = []
+    start = 0
+    end = l
+    length = len(what)
+    for i in range(length/end+1):
+        endword = what.find(' ', end)
+        if endword == -1:
+            endword = length
+        res = what[start:endword]
+        if res:
+            txtlist.append(res)
+        start = endword
+        end = start + l
+    return txtlist
+    
+class istr(str): 
+    pass
+
+def die():
+    os.kill(os.getpid(), 9)
+
+def getlistensocket(listenip):
+    port = 5000
+    while 1:
+        time.sleep(0.01)
+        try:
+            port += 1
+            if ':' in listenip:
+                sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+            else:
+                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            sock.setblocking(1)
+            if port > 65000:
+                port = 5000
+            sock.bind((listenip, port))
+            sock.listen(1)
+            return (port, sock)
+        except Exception, ex:
+            pass
+
+def checkchan(bot, item):
+    chanre = re.search(' chan (\S+)', item)
+    if chanre:
+        chan = str(chanre.group(1))
+        item = re.sub(' chan ' + re.escape(chan), '', item)
+        return (chan.lower(), item)
+
+def getwho(bot, who):
+    """ get userhost from bots userhost cache """
+    try:
+        result = bot.userhosts.data[who]
+        if bot.cfg['stripident']:
+            rlog(10, 'getwho', 'removed ident from %s' % result)
+            result = stripident(result)
+        return result
+    except KeyError:
+        return None
+
+def waitforuser(bot, userhost, timeout=15):
+    queue = Queue.Queue()
+    waitnr = bot.privwait.register(userhost, queue, timeout)
+    result = queue.get()
+    bot.privwait.delete(waitnr)
+    return result
+
+def getrandomnick():
+    return "gbot" + str(random.randint(0, 100))
+
+def waitforqueue(queue, timeout=10, maxitems=None):
+    result = []
+    while 1:
+        try:
+            res = queue.get(1, timeout)
+        except Queue.Empty:
+            break
+        if not res:
+            break
+        result.append(res)
+        if maxitems and len(result) == maxitems:
+            break
+    return result
+
+def decodeperchar(txt, encoding='utf-8', what=""):
+
+    res = []
+    nogo = []
+
+    for i in txt:
+        try:
+            res.append(i.decode(encoding))
+        except UnicodeDecodeError:
+            if i not in nogo:
+                nogo.append(i)
+            continue
+
+    if nogo:
+        if what:
+            rlog(10, 'generic', "%s: can't decode %s characters to %s" % (what, nogo, encoding))
+        else:
+            rlog(10, 'generic', "can't decode %s characters to %s" % (nogo, encoding))
+
+    return u"".join(res)
+
+def toenc(what, encoding='utf-8'):
+    if not what:
+        return u""
+    try:
+        w = unicode(what)
+        return w.encode(encoding)
+    except UnicodeEncodeError:
+        rlog(10, 'generic', "can't encode %s to %s" % (what, encoding))
+        return u""
+
+def fromenc(txt, encoding='utf-8', what=""):
+    if not txt:
+        return u""
+    try:
+        if type(txt) == types.UnicodeType:
+            t = txt.encode(encoding)
+        t = unicode(txt)
+        return unicode(t.decode(encoding))
+    except UnicodeDecodeError:
+        return decodeperchar(txt, encoding, what)
+
+def toascii(what):
+    what = what.encode('ascii', 'replace')
+    return what
+
+def tolatin1(what):
+    what = what.encode('latin-1', 'replace')
+    return what
+
+def strippedtxt(what, allowed=[]):
+    txt = []
+    allowed = allowed + ['\001', '\002', '\003', '\t']
+    for i in what:
+        if ord(i) > 31 or (allowed and i in allowed):
+            txt.append(i)
+    return ''.join(txt)
+
+def uniqlist(l):
+    result = []
+    for i in l:
+        j = i.strip()
+        if j not in result:
+            result.append(j)
+    return result
+
+def fix_format(s):
+    counters = {
+        chr(2): 0, 
+        chr(3): 0
+        }
+    for letter in s:
+        if letter in counters:
+            counters[letter] += 1
+    for char in counters:
+        if counters[char] % 2:
+            s += char
+    return s
+
+def stripbold(s):
+    s = s.replace(chr(2), '')
+    s = s.replace(chr(3), '')
+    return s
+
+def jabberstrip(text, allowed=[]):
+    txt = []
+    allowed = allowed + ['\n', '\t']
+    for i in text:
+        if ord(i) > 31 or (allowed and i in allowed):
+            txt.append(i)
+    return ''.join(txt)
+
+def plugnames(dirname):
+    result = []
+    for i in os.listdir(dirname):
+        if os.path.isdir(dirname + os.sep + i):
+            if os.path.exists(dirname + os.sep + i + os.sep + '__init__.py'):
+                result.append(i)
+        elif i.endswith('.py'):
+            result.append(i[:-3])
+    try:
+        result.remove('__init__')
+    except:
+        pass
+    return result
+
+def filesize(path):
+    return os.stat(path)[6]
+
+def touch(fname):
+    fd = os.open(fname, os.O_WRONLY | os.O_CREAT)
+    os.close(fd)  
+
+def stringinlist(s, l):
+    for i in l:     
+        if s in i:  
+            return 1
+
+def stripped(userhost):
+    return userhost.split('/')[0]
+
+def checkpermissions(ddir, umode):
+    try:
+        uid = os.getuid()  
+        gid = os.getgid()
+    except AttributeError:
+        return
+    try:
+        stat = os.stat(ddir)
+    except OSError:
+        return
+    if stat[ST_UID] != uid:
+        try:
+            os.chown(ddir, uid, gid)
+        except:
+            pass
+    if S_IMODE(stat[ST_MODE]) != umode:
+        try:
+            os.chmod(ddir, umode)
+        except:
+            handle_exception()
+            pass
+
+def gethighest(ddir, ffile):
+    highest = 0
+    for i in os.listdir(ddir):
+        if os.path.isdir(ddir + os.sep + i) and ffile in i:
+            try:
+                seqnr = i.split('.')[2]
+            except IndexError:
+                continue
+            try:
+                if int(seqnr) > highest:
+                    highest = int(seqnr)
+            except ValueError:
+                pass
+    ffile += '.' + str(highest + 1)
+    return ffile
+
+def copyfile(src, target):
+    try:
+        pdir = os.sep.join(target.split(os.sep)[:-1])
+        if not pdir:
+            print "can't determine parent dir of %s" % src
+            return
+        if not os.path.isdir(pdir):
+            print "making %s dir" % pdir
+            os.mkdir(pdir)
+        print "copying %s to %s" % (src, target)
+        shutil.copy(src, target)
+        dosed(target, 's/gozerbot\.compat\./gozerplugs\./')
+    except IOError, ex:
+        return
+        #print "%s -> %s: %s" % (src, target, str(ex))
+    except Exception, ex:
+        handle_exception()
+
+def dosed(filename, sedstring):
+    try:
+        f = open(filename, 'r')
+    except IOError, ex:
+        if 'Is a dir' in str(ex):
+            return
+        else:
+            raise
+    tmp = filename + '.tmp'
+    fout = open(tmp, 'w')
+    seds = sedstring.split('/')
+    fr = seds[1].replace('\\', '')
+    to = seds[2].replace('\\', '')
+    try:
+        for line in f:
+            l = line.replace(fr,to)
+            fout.write(l)
+    finally:
+        fout.flush()
+        fout.close()
+    try:
+        os.rename(tmp, filename)
+    except WindowsError:
+        # no atomic operation supported on windows! error is thrown when destination exists
+        os.remove(filename)
+        os.rename(tmp, filename)
+
+def convertpickle(src, target):
+    import gozerbot.compat.persist
+    p = gozerbot.compat.persist.Persist(src)    
+    if p and p.data:
+        pers = Persist(target)
+        if not pers.data:
+            pers.data = {}
+        pers.data.update(p.data)
+        try:
+            pers.save()
+        except TypeError:
+            pers2 = Persist(target)
+            if not pers2.data:
+                pers2.data = {}
+            for item, value in p.data.iteritems():
+                pers2.data[jsonstring(item)] = value
+            pers2.save()
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/exception.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/exception.py
@@ -0,0 +1,89 @@
+# gozerbot/utils/exception.py
+#
+#
+
+""" generic functions """
+
+__copyright__ = 'this file is in the public domain'
+
+# ==============
+# IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.utils.log import rlog
+from gozerbot.utils.locking import lockdec
+
+# basic imports
+import sys, traceback, logging, thread, os
+
+# END IMPORT
+# ==========
+
+# ============
+# LOCK SECTION
+
+exceptionlock = thread.allocate_lock()
+exceptionlocked = lockdec(exceptionlock)
+
+borkonexception = False
+
+# END LOCK
+# ========
+
+@exceptionlocked
+def exceptionmsg():
+    exctype, excvalue, tb = sys.exc_info()
+    trace = traceback.extract_tb(tb)
+    result = ""
+    for i in trace:
+        fname = i[0]
+        linenr = i[1]
+        func = i[2]
+        result += "%s:%s %s | " % (fname, linenr, func)
+    del trace
+    res = "%s%s: %s" % (result, exctype, excvalue)
+    if res not in exceptionlist:
+        exceptionlist.append(res)
+    if '_props' in res:
+        print 
+    return res
+
+def handle_exception(event=None, log=True, short=False, txt=""):
+    global borkonexception
+    errormsg = exceptionmsg()
+
+    if event:
+       if '_props' in errormsg:
+           print "YOOOOOOOOOOOO"
+           print event
+           os._exit(1)
+
+    if log:
+        rlog(1000, 'EXCEPTION', errormsg)
+
+    if event:
+
+        if borkonexception:
+            rlog(1000, 'EXCEPTION', 'command: ' + event.txt)
+            rlog(1000, 'EXCEPTION', 'options: ' + str(event.options))
+
+        exceptionevents.append((event, errormsg))
+
+        if event.bot:
+            event.bot.error = errormsg
+
+        event.reply(errormsg)
+
+    if borkonexception:
+        rlog(1000, 'EXCEPTION', "BORK ON EXCEPTION")
+        sys.stdout.flush()
+        os._exit(1)
+
+# ============
+# INIT SECTION
+
+exceptionlist = []
+exceptionevents = []
+
+# END INIT
+# ========
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/rsslist.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/rsslist.py
@@ -0,0 +1,40 @@
+# gozerbot/rsslist.py
+#
+#
+
+""" create a list of rss data """
+
+__copyright__ = 'this file is in the public domain'
+
+from exception import handle_exception
+import xml.dom.minidom
+
+def gettext(nodelist):
+    """ get text data from nodelist """
+    result = ""
+    for node in nodelist:
+        if node.nodeType == node.TEXT_NODE or node.nodeType == \
+node.CDATA_SECTION_NODE:
+            stripped = node.data.strip()
+            if stripped:
+                result += stripped
+    return result
+
+def makersslist(xlist, nodes , d={}):
+    """ recurse until txt is found """
+    for i in nodes:
+        if i.nodeType == i.ELEMENT_NODE:
+            dd = d[i.nodeName] = {}
+            makersslist(xlist, i.childNodes, dd)
+            if dd:
+                xlist.append(dd)
+        txt = gettext(i.childNodes)
+        if txt:
+            d[i.nodeName] = txt
+        
+def rsslist(txt):
+    """ create list of dictionaries with rss data """
+    dom = xml.dom.minidom.parseString(txt)
+    result = []
+    makersslist(result, dom.childNodes)
+    return result
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/timeutils.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/timeutils.py
@@ -0,0 +1,230 @@
+# gozerbot/utils/timeutils.py
+#
+#
+
+""" time related helper functions """
+
+__copyright__ = 'this file is in the public domain'
+
+from exception import handle_exception
+import time, re, calendar
+
+leapfactor = float(6*60*60)/float(365*24*60*60)
+
+def elapsedstring(nsec, ywd = None):
+    nsec = int(float(nsec))
+    year = 365*24*60*60
+    week = 7*24*60*60
+    day = 24*60*60
+    hour = 60*60
+    minute = 60
+    nsec -= nsec * leapfactor
+    years = int(nsec/year)
+    nsec -= years*year
+    weeks = int(nsec/week)
+    nsec -= weeks*week
+    days = int(nsec/day)
+    nsec -= days*day
+    hours = int(nsec/hour)
+    nsec -= hours*hour
+    minutes = int(nsec/minute)
+    sec = int(nsec - minutes*minute)   
+    result = ''
+    if (years > 1):
+        result = str(years) + " years "
+    if (years == 1):
+        result = "1 year "
+    if (weeks > 1):
+        result += str(weeks) + " weeks "
+    if (weeks == 1):
+        result += "1 week "
+    if (days > 1):
+        if ywd:
+            result += 'and '+ str(days) + " days"
+        else:
+            result += str(days) + " days "
+    if (days == 1):
+        if ywd:
+            result += 'and 1 day'
+        else:
+            result += "1 day "
+    if ywd:
+        return result
+    if (hours > 1):
+        result += str(hours) + " hours "
+    if (hours == 1):
+        result += "1 hour "
+    if (minutes > 1):
+        result += str(minutes) + " minutes "
+    if (minutes == 1):
+        result += "1 minute "
+    if sec == 0:
+        if result:
+            return result
+        else:
+            return 0
+    if (sec == 1):
+        if result:
+            result += "and 1 second "
+        else:
+            result = "1 second"
+    else:
+        if result:
+            result += "and " + str(sec) + " seconds"
+        else: 
+            result = str(sec) + " seconds"
+    return result.strip()
+
+def hourmin(ttime):
+    result = ""
+    timeres = time.localtime(ttime)
+    if timeres[3] < 10:
+        result += "0" + str(timeres[3]) + ":"
+    else:
+        result += str(timeres[3]) + ":"
+    if timeres[4] < 10:
+        result += "0" + str(timeres[4])
+    else:
+        result += str(timeres[4])
+    return result
+	
+timere = re.compile('(\S+)\s+(\S+)\s+(\d+)\s+(\d+):(\d+):(\d+)\s+(\d+)')
+
+bdmonths = ['Bo', 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', \
+'Sep', 'Oct', 'Nov', 'Dec']
+
+def striptime(what):
+    """ strip time indicators from string """
+    what = str(what)
+    what = re.sub('\d+-\d+-\d+', '', what)
+    what = re.sub('\d+-\d+', '', what)
+    what = re.sub('\d+:\d+', '', what)
+    what = re.sub('\s+', ' ', what)
+    return what.strip()
+
+def now():
+    if time.daylight:
+        ttime = time.ctime(time.time() + int(time.timezone) + 3600)
+    else:
+        ttime = time.ctime(time.time() + int(time.timezone))
+    return ttime
+
+def today():
+    if time.daylight:
+        ttime = time.ctime(time.time() + int(time.timezone) + 3600)
+    else:
+        ttime = time.ctime(time.time() + int(time.timezone))
+    matched = re.search(timere, ttime)
+    if matched:
+        temp = "%s %s %s" % (matched.group(3), matched.group(2), \
+matched.group(7))
+        timestring = time.strptime(temp, "%d %b %Y")
+        result = time.mktime(timestring)
+        return result
+
+def strtotime(what):
+    daymonthyear = 0
+    hoursmin = 0
+    try:
+        dmyre = re.search('(\d+)-(\d+)-(\d+)', str(what))
+        if dmyre:
+            (day, month, year) = dmyre.groups()
+            day = int(day)
+            month = int(month)
+            year = int(year)
+            if day <= calendar.monthrange(year, month)[1]:
+                date = "%s %s %s" % (day, bdmonths[month], year)
+                daymonthyear = time.mktime(time.strptime(date, "%d %b %Y"))
+            else:
+                return None
+        else:
+            dmre = re.search('(\d+)-(\d+)', str(what))
+            if dmre:
+                year = time.localtime()[0]
+                (day, month) = dmre.groups()
+                day = int(day)
+                month = int(month)
+                if day <= calendar.monthrange(year, month)[1]: 
+                    date = "%s %s %s" % (day, bdmonths[month], year)
+                    daymonthyear = time.mktime(time.strptime(date, "%d %b %Y"))
+                else:
+                    return None
+        hmsre = re.search('(\d+):(\d+):(\d+)', str(what))
+        if hmsre:
+            (h, m, s) = hmsre.groups()
+            h = int(h)
+            m = int(m)
+            s = int(s)
+            if h > 24 or h < 0 or m > 60 or m < 0 or s > 60 or s < 0:
+                return None
+            hours = 60 * 60 * (int(hmsre.group(1)))
+            hoursmin = hours  + int(hmsre.group(2)) * 60
+            hms = hoursmin + int(hmsre.group(3))
+        else:
+            hmre = re.search('(\d+):(\d+)', str(what))
+            if hmre:
+                (h, m) = hmre.groups()
+                h = int(h)
+                m = int(m)
+                if h > 24 or h < 0 or m > 60 or m < 0:
+                    return None
+                hours = 60 * 60 * (int(hmre.group(1)))
+                hms = hours  + int(hmre.group(2)) * 60
+            else:
+                hms = 0
+        if not daymonthyear and not hms:
+            return None
+        if daymonthyear == 0:
+            heute = today()
+        else:
+            heute = daymonthyear
+        return heute + hms
+    except OverflowError:
+        return None
+    except ValueError:
+        return None
+    except Exception, ex:
+        handle_exception()
+        return None
+
+def uurminsec(ttime):
+    result = ""
+    timeres = time.localtime(ttime)
+    if timeres[3] < 10:
+        result += "0" + str(timeres[3]) + ":"
+    else:
+        result += str(timeres[3]) + ":"
+    if timeres[4] < 10:
+        result += "0" + str(timeres[4]) + ":"
+    else:
+        result += str(timeres[4]) + ":"
+    if timeres[5] < 10:
+        result += "0" + str(timeres[5])
+    else:
+        result += str(timeres[5])
+    return result
+
+
+def getdaymonth(ttime):
+    timestr = time.ctime(ttime)
+    result = re.search(timere, timestr)
+    if result:
+        return (result.group(3), result.group(2))
+    else:
+        return (None, None)
+
+def getdaymonthyear(ttime):
+    timestr = time.ctime(ttime)
+    result = re.search(timere, timestr)
+    if result:
+        return (result.group(3), result.group(2), result.group[7])
+    else:
+        return (None, None, None)
+
+def dmy(ttime):
+    timestr = time.ctime(ttime)
+    result = re.search(timere, timestr)
+    if result:
+        return "%s %s %s" % (result.group(3), result.group(2), result.group(7))
+    else:
+        return None
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/dol.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/dol.py
@@ -0,0 +1,63 @@
+# gozerbot/dol.py
+#
+#
+
+""" dict of lists """
+
+__copyright__ = 'this file is in the public domain'
+
+class Dol(dict):
+
+    """ dol is dict of lists """
+
+    def insert(self, nr, item, issue):
+        """ add issue to item entry """
+        if self.has_key(item):
+            self[item].insert(nr, issue)
+        else:
+            self[item] = [issue]
+        return 1
+
+    def add(self, item, issue):
+        """ add issue to item entry """
+        if self.has_key(item):
+            self[item].append(issue)
+        else:
+            self[item] = [issue]
+        return 1
+
+    def adduniq(self, item, issue):
+        """ only add issue to item if it is not already there """
+        if self.has_key(item):
+            if issue in self[item]:
+                return 0
+        self.add(item, issue)
+        return 1
+            
+    def delete(self, item, number):
+        """ del self[item][number] """
+        number = int(number)
+        if self.has_key(item):
+            try:
+                del self[item][number]
+                return 1
+            except IndexError:
+                return None
+
+    def remove(self, item, issue):
+        """ remove issue from item """
+        try:
+            self[item].remove(issue)
+            return 1
+        except ValueError:
+            pass
+
+    def has(self, item, issue):
+        """ check if item has issue """
+        try:
+            if issue in self[item]:
+                return 1
+            else:
+                return None
+        except KeyError:
+            pass
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/xmpp.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/xmpp.py
@@ -0,0 +1,36 @@
+# gozerbot/utils/xmpp.py
+#
+#
+
+from xml.etree import cElementTree as ET
+import types
+
+def make_presence(xml):
+    pres = {'subject': '', 'to': '', 'message': '', 'name': '', 'resource': '', 'jid': ''}
+    if type(xml) == types.DictType:
+        pres.update(xml)
+        return pres
+    et = ET.XMLID(xml)
+    pres.update(et[0].items())
+    xml = ET.XML(xml)
+    try:
+        pres['name'] = pres['from'].split('@')[0]
+        pres['resource'] = pres['from'].split('/')[1]
+        pres['jid'] = pres['from'].split('/')[0]
+    except KeyError:
+        pass
+    return pres
+
+def make_message(xml):
+    msg = {'subject': '', 'to': '', 'txt': '', 'message': '', 'from': '', 'jid': '', 'name': '', 'resource': ''}
+    if type(xml) == types.DictType:
+        msg.update(xml)
+        return msg
+    et = ET.XMLID(xml)
+    msg.update(et[0].items())
+    xml = ET.XML(xml)
+    msg['message'] = unicode(xml.findtext('body'))
+    msg['name'] = msg['from'].split('@')[0]
+    msg['resource'] = msg['from'].split('/')[1]
+    msg['jid'] = msg['from'].split('/')[0]
+    return msg
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/limlist.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/limlist.py
@@ -0,0 +1,29 @@
+# gozerbot/limlist.py
+#
+#
+
+""" limited list """
+
+__copyright__ = 'this file is in the public domain'
+
+class Limlist(list):
+
+    """ list with limited number of items """
+
+    def __init__(self, limit):
+        self.limit = limit
+        list.__init__(self)
+
+    def insert(self, index, item):
+        """ insert item at index .. pop oldest item if limit is reached """
+        if index > len(self):
+            return -1
+        if len(self) >= self.limit:
+            self.pop(len(self)-1)
+        list.insert(self, index, item)
+
+    def append(self, item):
+        """ add item to list .. pop oldest item if limit is reached """
+        if len(self) >= self.limit:
+            self.pop(0)
+        list.append(self, item)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/popen.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/popen.py
@@ -0,0 +1,83 @@
+# gozerbot/utils/popen.py
+#
+#
+
+""" popen helper functions """
+
+__copyright__ = 'this file is in the public domain'
+
+go = False
+
+try:
+    from subprocess import Popen, PIPE
+    from locking import lockdec
+    import thread, StringIO, logging, types
+    go = True
+except:
+    go = False
+
+if go:
+    popenlock = thread.allocate_lock()
+    popenlocked = lockdec(popenlock)
+
+    class PopenWhitelistError(Exception):
+
+        def __init__(self, item):
+            Exception.__init__(self)
+            self.item = item
+        
+        def __str__(self):
+            return self.item
+
+    class PopenListError(Exception):
+
+        def __init__(self, item):
+            Exception.__init__(self)
+            self.item = item
+        
+        def __str__(self):
+            return str(self.item)
+
+    class GozerStringIO(StringIO.StringIO):
+
+        def readlines(self):
+            return self.read().split('\n')
+
+    class Gozerpopen4(Popen):
+
+        def __init__(self, args):
+            Popen.__init__(self, args, shell=False, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
+            self.fromchild = self.stdout
+            self.tochild   = self.stdin
+            self.errors    = self.stderr
+
+        def close(self):
+            self.wait()
+            try:
+                self.stdin.close()
+            except:
+                pass
+            try:
+                self.stdout.close()
+            except:
+                pass
+            try:
+                self.errors.close()
+            except:
+                pass
+            return self.returncode
+
+    def gozerpopen(args, userargs=[]):
+
+        if type(args) != types.ListType:
+            raise PopenListError(args)
+
+        if type(userargs) != types.ListType:
+            raise PopenListError(args)
+
+        for i in userargs:
+            if i.startswith('-'):
+                raise PopenWhitelistError(i)
+
+        proces = Gozerpopen4(args + userargs)
+        return proces
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/log.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/log.py
@@ -0,0 +1,104 @@
+# gozerbot/utils/log.py
+#
+#
+
+""" gozerbots logging module. logging is implemented with the use of a 
+    loglevel and a loglist of plugins to log for. 
+"""
+
+# basic imports
+
+from trace import whichmodule
+import logging, logging.handlers, sys, traceback, os, thread
+
+# basic logger
+logging.basicConfig(level=logging.INFO, format="[%(asctime)s] (%(name)s) %(message)s")
+
+basiclogger = logging.getLogger('')
+
+# check if we are in GAE
+
+# make sure dirs are there
+if not os.path.isdir('logs'):
+    os.mkdir('logs')
+if not os.path.isdir('logs' + os.sep + 'bot'):
+    os.mkdir('logs' + os.sep + 'bot')
+
+# add logging to file
+filehandler = logging.handlers.TimedRotatingFileHandler(
+              'logs' + os.sep + 'bot' + os.sep + 'gozerbot.log', 'midnight')
+formatter = logging.Formatter("[%(asctime)s] (%(name)s) %(message)s")
+filehandler.setFormatter(formatter)
+basiclogger.addHandler(filehandler)
+
+# the vars
+loglevel = 10
+logcallbacks = []
+loglist = []
+logfile = None
+enabled = True
+debuglog = False
+
+# lock
+
+loglock = thread.allocate_lock()
+
+def exceptionmsg():
+    """ create a exception traceback as 1 liner. """
+    exctype, excvalue, tb = sys.exc_info()
+    trace = traceback.extract_tb(tb)
+    result = ""   
+    for i in trace:
+        fname = i[0]
+        linenr = i[1]
+        func = i[2]
+        result += "%s:%s %s | " % (fname, linenr, func)
+    del trace
+    return "%s%s: %s" % (result, exctype, excvalue)
+
+def rlog(level, descr, txt):
+    """ log an item showing description and txt. call logcallbacks if 
+        available
+    """
+    if not enabled:
+        return
+    try:
+        #loglock.acquire()
+        logger = logging.getLogger(descr)
+
+        go = False
+
+        if loglist:
+
+            for item in loglist:
+
+                if item in descr:
+                    go = True
+
+        if level >= loglevel or loglist and go:
+            if debuglog:
+                logger.info("(%s) %s - <%s>" % (descr, txt, whichmodule(2)))
+            else:
+                logger.info(txt)
+                         
+            for cb in logcallbacks:
+
+                try:
+                    cb(level, descr, txt)
+                except:
+                    print exceptionmsg()
+
+    except (IOError, OSError):
+        pass
+        
+def disable_logging():
+    global enabled
+    enabled = False
+
+def enable_logging(level=10, list=[]):
+    """ enable logging setting loglevel and/ort loglist """
+    global loglevel, loglist, enabled
+    logging.basicConfig(level=logging.INFO, format="[%(asctime)s] %(name)s %(message)s")
+    loglevel = level
+    loglist = list
+    enabled = True
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/lazydict.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/lazydict.py
@@ -0,0 +1,36 @@
+# gozerbot/utils/lazydict.py
+#
+# thnx to maze
+
+""" a lazydict allows dotted access to a dict .. dict.key """
+
+class LazyDict(dict):
+
+    """ Lazy dict allows dotted access to a dict """
+
+
+    def __getattr__(self, attr, default={}):
+
+        """ get attribute .. if not available init to default. """
+
+        if not self.has_key(attr):
+            self[attr] = default
+
+        return self[attr]
+
+    def __setattr__(self, attr, value):
+
+        """ set attribute. """
+
+        self[attr] = value
+
+    def __str__(self):
+
+        """ return a string representation of the dict """
+
+        res = ""
+        cp = dict(self)
+        for item, value in cp.iteritems():
+            res += "%r=%r " % (item, value)
+
+        return res
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/nextid.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/nextid.py
@@ -0,0 +1,63 @@
+# gozerbot/nextid.py
+#
+#
+
+""" provide increasing counters """
+
+__copyright__ = 'this file is in the public domain'
+
+import os
+
+class Nextid(object):
+
+    """ counters by name """
+
+    def __init__(self, fname):
+        self.data = {}
+
+    def get(self, item):
+        """ get counter for item """
+        item = item.lower()
+        try:
+            result = self.data[item]
+        except KeyError:
+            return None 
+        return result
+
+    def set(self, item, number):
+        """ set counter of item to number """
+        item = item.lower()
+        try:
+            self.data[item] = int(number)
+        except ValueError:
+            return 0
+        self.save()
+        return 1
+
+    def next(self, item):
+        """ get increment of item counter """
+        item = item.lower()
+        try:
+            self.data[item] += 1
+        except KeyError:
+            self.data[item] = 1
+        self.save()
+        return self.data[item]
+
+    def nextlist(self, item, nr):
+        """ get increment of item counter """
+        item = item.lower()
+        try:
+            start = self.data[item] + 1
+        except KeyError:
+            start = 1
+        stop = start + nr
+        l = range(start, stop)
+        self.data[item] = stop - 1
+        self.save()
+        return l
+
+    def save(self):
+        pass
+
+nextid = Nextid('notused')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/locking.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/locking.py
@@ -0,0 +1,88 @@
+# gozerbot/utils/locking.py
+#
+#
+
+""" generic functions """
+
+__copyright__ = 'this file is in the public domain'
+
+from log import rlog, loglevel
+from trace import whichmodule
+from lockmanager import lockmanager, rlockmanager
+
+import logging, sys
+locks = []
+
+def lockdec(lock):
+
+    """ locking decorator. """
+
+    def locked(func):
+
+        """ locking function for %s """ % str(func)
+
+        def lockedfunc(*args, **kwargs):
+            """ the locked function. """
+
+            if loglevel <= 1:
+                where = whichmodule(1)
+                rlog(1, 'locking', 'locking on %s (%s)' % (where, str(func)))
+            lock.acquire()
+            locks.append(str(func))
+            res = None
+
+            try:
+                res = func(*args, **kwargs)
+            finally:
+                lock.release()
+                locks.remove(str(func))
+
+            return res
+
+        return lockedfunc
+
+    return locked
+
+def funclocked(func):
+
+    """ locking function for %s """ % str(func)
+
+    def lockedfunc(*args, **kwargs):
+
+        """ the locked function. """
+
+        if loglevel <= 1:
+            where = whichmodule(1)
+            rlog(1, 'locking', 'locking on %s' % where)
+        rlockmanager.acquire(func)
+        locks.append(str(func))
+        res = None
+
+        try:
+            res = func(*args, **kwargs)
+        finally:
+            rlockmanager.release(func)
+            locks.remove(str(func))
+
+        return res
+
+
+    return lockedfunc
+
+class Locked(object):
+
+    """ class used to lock an entire object. """
+
+    def __getattribute__(self, attr):
+        if loglevel <= 1:
+            where = whichmodule(1)
+            rlog(1, 'locking', 'locking on %s' % where)
+        rlockmanager.acquire(object)
+        res = None
+
+        try:
+            res = super(Locked, self).__getattribute__(attr)
+        finally:
+            rlockmanager.release(object)
+
+        return res
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/name.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/name.py
@@ -0,0 +1,24 @@
+# gozerbot/utils/name.py
+#
+#
+
+""" name related helper functions. """
+
+## basic imports
+
+import string
+import os
+
+## defines
+
+allowednamechars = string.ascii_letters + string.digits + '!.@-'
+
+## functions
+
+def stripname(txt):
+    res = ""
+    for c in txt:
+        if c in allowednamechars:
+            res += c
+    res.replace(os.sep, '-')
+    return res
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/reboot.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/reboot.py
@@ -0,0 +1,26 @@
+# gozerbot/utils/reboot.py
+#
+#
+
+from gozerbot.fleet import fleet
+from gozerbot.config import config
+from simplejson import dump
+import os, sys, pickle, tempfile
+
+def reboot():
+    fleet.exit()
+    os.execl(sys.argv[0], *sys.argv)
+
+def reboot_stateful(bot, ievent, fleet, partyline):
+    """ reboot the bot, but keep the connections """
+    config.reload()
+    session = {'bots': {}, 'name': bot.name, 'channel': ievent.channel, \
+'partyline': []}
+    for i in fleet.bots:
+        session['bots'].update(i._resumedata())
+    session['partyline'] = partyline._resumedata()
+    sessionfile = tempfile.mkstemp('-session', 'gozerbot-')[1]
+    dump(session, open(sessionfile, 'w'))
+    fleet.save()
+    fleet.exit(jabber=True)
+    os.execl(sys.argv[0], sys.argv[0], '-r', sessionfile)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/fileutils.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/fileutils.py
@@ -0,0 +1,52 @@
+# gozerbot/utils/fileutils.py
+#
+# Description: Various file utilities
+# Author: Wijnand 'tehmaze' Modderman
+# Author URL: http://tehmaze.com
+# License: BSD
+
+from generic import istr
+import tarfile, os, types, cStringIO
+
+def tarextract(package, fileobj=None, prefix=None, base=None):
+    '''
+    Extracts a tarball from ``package``, or, if ``fileobj`` is either a string or a seekable
+    IO stream, it will extract the data from there. We only extract files from the tarball
+    that are member of the ``base`` directory if a ``base`` is specified.
+    '''
+    extracted = []
+    # if we have a fileobj, make sure it's a seekable stream, and not a string
+    if fileobj:
+        if type(fileobj) == types.StringType:
+            fileobj = cStringIO.StringIO(fileobj)
+        tarf = tarfile.open(mode='r|', fileobj=fileobj)
+    else:
+        tarf = tarfile.open(package, 'r')
+    # iterate tarball and extract candidates
+    for tarinfo in tarf:
+        if tarinfo.name.startswith('/'):
+            tarinfo.name = tarinfo.name[1:] # strip leading /
+        if not base or ((tarinfo.name.rstrip('/') == base and tarinfo.isdir()) or tarinfo.name.startswith(base+os.sep)):
+            if prefix:
+                tarinfo.name = '/'.join([prefix, tarinfo.name])
+            tarf.extract(tarinfo)
+            extracted.append(tarinfo.name)
+    tarf.close()
+    # clean up
+    if fileobj:
+        try:
+            fileobj.close()
+        except:
+            pass
+        del fileobj
+    return extracted
+
+def bunzip2(fileobj):
+    import bz2
+    return bz2.decompress(fileobj)
+
+def gunzip(fileobj):
+    import gzip
+    if type(fileobj) == types.StringType or isinstance(fileobj, istr):
+        fileobj = cStringIO.StringIO(str(fileobj))
+    return gzip.GzipFile(mode='rb', fileobj=fileobj).read()
--- gozerbot-0.99.1.orig/build/lib/gozerbot/utils/trace.py
+++ gozerbot-0.99.1/build/lib/gozerbot/utils/trace.py
@@ -0,0 +1,56 @@
+# gozerbot/utils/trace.py
+#
+#
+
+""" trace related functions """
+
+__copyright__ = 'this file is in the public domain'
+
+import sys, os
+
+def calledfrom(frame):
+    try:
+        plugname = frame.f_back.f_code.co_filename
+        name = plugname.split(os.sep)[-1][:-3]
+        if name == '__init__':
+            name = plugname.split(os.sep)[-2]
+        if name == 'generic':
+            plugname = frame.f_back.f_back.f_code.co_filename
+            name = plugname.split(os.sep)[-1][:-3]
+    except AttributeError:
+        name = None
+    del frame
+    return name
+
+def callstack(frame):
+    result = []
+    loopframe = frame
+    while 1:
+        try:
+            plugname = loopframe.f_back.f_code.co_filename
+            result.append("%s:%s" % (plugname.split(os.sep)[-1][:-3], \
+loopframe.f_back.f_lineno))
+            loopframe = loopframe.f_back
+        except:
+            break
+    del frame
+    return result
+
+def whichmodule(depth=1):
+    try:
+        frame = sys._getframe(depth)
+        plugfile = frame.f_back.f_code.co_filename[:-3].split('/')
+        lineno = frame.f_back.f_lineno
+        mod = []
+        for i in plugfile[::-1]:
+            mod.append(i)
+            if i == 'gozerbot' or i == 'gplugs':
+                break
+            if i == 'generic':
+                plugname = frame.f_back.f_back.f_code.co_filename
+                name = plugname.split(os.sep)[-1][:-3]
+        modstr = '.'.join(mod[::-1]) + ':' + str(lineno)
+    except AttributeError:
+        modstr = None
+    del frame
+    return modstr
--- gozerbot-0.99.1.orig/build/lib/gozerbot/irc/bot.py
+++ gozerbot-0.99.1/build/lib/gozerbot/irc/bot.py
@@ -0,0 +1,721 @@
+# gozerbot/irc/bot.py
+# 
+#
+#
+
+""" a bot object handles the dispatching of commands and check for callbacks
+    that need to be fired.  """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.utils.log import rlog
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.generic import getlistensocket, checkchan, waitforqueue, uniqlist, strippedtxt, makeargrest
+from gozerbot.commands import cmnds
+from gozerbot.callbacks import callbacks
+from gozerbot.plugins import plugins
+from gozerbot.users import users
+from gozerbot.datadir import datadir
+from gozerbot.partyline import partyline
+from monitor import outmonitor
+from gozerbot.channels import Channels
+from gozerbot.wait import Privwait
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.utils.dol import Dol
+from gozerbot.fleet import fleet
+from gozerbot.periodical import periodical
+from gozerbot.persist.persiststate import PersistState
+from gozerbot.runner import runners_start
+from irc import Irc
+from ircevent import Ircevent
+
+# basic imports
+import re, socket, struct, Queue, time, os, types
+from errno import EAGAIN
+
+# RE to determine if a DCC chat request is received
+dccchatre = re.compile('\001DCC CHAT CHAT (\S+) (\d+)\001', re.I)
+
+class Bot(Irc):
+
+    """ class that dispatches commands and checks for callbacks to fire. """ 
+
+    def __init__(self, name, cfg={}):
+        Irc.__init__(self, name, cfg)
+        # object used to wait for PRIVMSG
+        self.privwait = Privwait()
+        # channels where we are op
+        if not self.state.has_key('opchan'):
+            self.state['opchan'] = []
+        self.userchannels = Dol()
+        self.monitor = outmonitor
+        self.monitor.start()
+
+    def __str__(self):
+        return "name: %s nick: %s server: %s ipv6: %s ssl: %s port:%s" % (self.name, \
+self.nick, self.server, self.ipv6, self.ssl, self.port)
+
+    def _resume(self, data, reto):
+
+        """ resume the bot. """
+
+        if not Irc._resume(self, data, reto):
+            return 0
+        for i in self.state['joinedchannels']:
+            periodical.addjob(15, 1, self.who, self, i)
+        return 1
+
+    def _dccresume(self, sock, nick, userhost, channel=None):
+
+        """ resume dcc loop. """
+
+        if not nick or not userhost:
+            return
+        start_new_thread(self._dccloop, (sock, nick, userhost, channel))
+
+    def _dcclisten(self, nick, userhost, channel):
+
+        """ accept dcc chat requests. """
+
+        try:
+            # get listen socket on host were running on
+            listenip = socket.gethostbyname(socket.gethostname())
+            (port, listensock) = getlistensocket(listenip)
+            # convert ascii ip to netwerk 32 bit 
+            ipip2 = socket.inet_aton(listenip)
+            ipip = struct.unpack('>L', ipip2)[0]
+            # send dcc chat request
+            chatmsg = 'DCC CHAT CHAT %s %s' % (ipip, port)
+            self.ctcp(nick, chatmsg)
+            # go listen to response
+            sock = listensock.accept()[0]
+        except Exception, ex:
+            rlog(10 , self.name, 'dcc error: %s' % str(ex))
+            return
+
+        # connected
+        self._dodcc(sock, nick, userhost, channel)
+
+    def _dodcc(self, sock, nick, userhost, channel=None):
+
+        """ send welcome message and loop for dcc commands. """
+
+        if not nick or not userhost:
+            return
+
+        try:
+            # send welcome message .. show list of commands for USER perms
+            cmndslist = cmnds.list('USER')
+            cmndslist.sort()
+            sock.send('Welcome to the GOZERBOT partyline ' + nick + " ;]\n")
+            partylist = partyline.list_nicks()
+            if partylist:
+                sock.send("people on the partyline: %s\n" % ' .. '.join(partylist))
+            sock.send("control character is ! .. bot broadcast is @\n")
+        except Exception, ex:
+            rlog(10 , self.name, 'dcc error: %s' % str(ex))
+            return
+        start_new_thread(self._dccloop, (sock, nick, userhost, channel))
+
+    def _dccloop(self, sock, nick, userhost, channel=None):
+
+        """ loop for dcc commands. """
+
+        sockfile = sock.makefile('r')
+        res = ""
+        # add joined user to the partyline
+        partyline.add_party(self, sock, nick, userhost, channel)
+
+        while 1:
+            time.sleep(0.001)
+            try:
+                # read from socket
+                res = sockfile.readline()
+                # if res == "" than the otherside had disconnected
+                if self.stopped or not res:
+                    rlog(1, self.name, 'closing dcc with ' + nick)
+                    partyline.del_party(nick)
+                    return
+            except socket.timeout:
+                # skip on timeout 
+                continue
+            except socket.error, ex:
+                # handle socket errors .. skip on errno EAGAIN temp unavail
+                try:
+                    (errno, errstr) = ex
+                except:
+                    errno = 0
+                    errstr = str(ex)
+                if errno == EAGAIN:
+                    continue
+                else:
+                    raise
+            except Exception, ex:
+                # other exception occured .. close connection
+                handle_exception()
+                rlog(10, self.name, 'closing dcc with ' + nick)
+                partyline.del_party(nick)
+                return
+            try:
+                # see if user provided channel
+                res = strippedtxt(res.strip())
+                chan = checkchan(self, res)
+                if chan != None:
+                    (channel, res) = chan
+                else:
+                    channel = nick
+                # create ircevent
+                ievent = Ircevent()
+                ievent.nick = nick
+                ievent.userhost = userhost
+                ievent.channel = channel
+                ievent.origtxt = res
+                ievent.txt = res
+                ievent.cmnd = 'DCC'
+                ievent.bot = self
+                ievent.sock = sock
+                ievent.speed = 1
+                ievent.isdcc = True
+                ievent.msg = True
+                # check if its a command if so dispatch
+                if ievent.txt[0] == "!":
+                    ievent.txt = ievent.txt[1:]
+                    plugins.trydispatch(self, ievent)
+                    continue
+                elif ievent.txt[0] == "@":
+                    # command is broadcast so send response to the paryline
+                    # members
+                    partyline.say_broadcast_notself(ievent.nick, "[%s] %s" % (ievent.nick, ievent.txt))
+                    # make queue and run trydispatch to see if command has 
+                    # fired
+                    q = Queue.Queue()
+                    ievent.queues = [q]
+                    ievent.txt = ievent.txt[1:]
+                    plugins.trydispatch(self, ievent)
+                    # wait for result .. default timeout is 10 sec
+                    result = waitforqueue(q, 5)
+                    if result:
+                        # broadcast result
+                        for i in result:
+                            partyline.say_broadcast("[bot] %s" % i)
+                    continue
+                else:
+                    # not a command so send txt to partyline
+                    partyline.say_broadcast_notself(ievent.nick, \
+"[%s] %s" % (ievent.nick, ievent.txt))
+                # check PRIVMSG wait
+                self.privwait.check(ievent)
+            except socket.error, ex:
+                try:
+                    (errno, errstr) = ex
+                except:
+                    errno = 0
+                    errstr = str(ex)
+                if errno == EAGAIN:
+                    continue
+            except Exception, ex:
+                handle_exception()
+
+        sockfile.close()
+        rlog(1, self.name, 'closing dcc with ' + nick)
+
+    def _dccconnect(self, nick, userhost, addr, port):
+
+        """ connect to dcc request from nick. """
+
+        try:
+            port = int(port)
+            if re.search(':', addr):
+                rlog(1, self.name, 'creating ipv6 socket for dcc chat with %s'\
+% nick)
+                sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+                sock.connect((addr, port))
+            else:
+                rlog(1, self.name, 'creating ipv4 socket for dcc chat with %s'\
+ % nick)
+                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                sock.connect((addr, port))
+        except Exception, ex:
+            rlog(10 , self.name, 'dcc error: %s' % str(ex))
+            return
+
+        # were connected .. start dcc loop
+        self._dodcc(sock, nick, userhost)
+
+    def reconnect(self):
+
+        """ reconnect and if succesfull join channels. """
+
+        if Irc.reconnect(self):
+            self.joinchannels()
+
+    def joinchannels(self, wait=0):
+
+        """ join channels. """
+        wait = wait or self.cfg['sleepbeforejoin'] or 5
+        rlog(10, self.name, "waiting %s seconds before joining channels" % wait)
+        time.sleep(wait)
+        for i in self.state['joinedchannels']:
+            try:
+                key = self.channels.getkey(i)
+                rlog(10, self.name, 'join %s' % i.split()[0])
+                start_new_thread(self.join, (i, key))
+                time.sleep(1)
+            except Exception, ex:
+                rlog(10, self.name, 'failed to join %s: %s' % (i, str(ex)))
+
+    def broadcast(self, txt):
+
+        """ broadcast txt to all joined channels. """
+
+        for i in self.state['joinedchannels']:
+            self.say(i, txt)
+
+    def send(self, txt):
+
+        """ call Irc send and check for monitor callbacks. """
+
+        Irc.send(self, str(txt))
+        self.monitor.put(self, str(txt))
+
+    def save(self):
+
+        """ saves channels and state. """
+
+        self.channels.save()
+        self.userhosts.save()
+        Irc.save(self)
+
+    def stop(self):
+
+        """ stop the bot. """
+
+        self.stopped = 1
+        # shut down handlers
+        rlog(10, self.name, 'stopped')
+
+    def exit(self):
+
+        """ save data, quit the bot and do shutdown. """
+
+        if self.connectok.isSet():
+            try:
+                self._raw('QUIT :%s' % self.cfg['quitmsg'])
+            except IOError:
+                pass
+        self.stop()
+        partyline.stop(self)
+        Irc.exit(self)
+        self.save()
+        rlog(10, self.name, 'exit')
+        return 1
+
+    def getchannelmode(self, channel):
+
+        """ send MODE request for channel. """
+
+        if not channel:
+            return
+        self.putonqueue(9, 'MODE %s' % channel)
+
+    def join(self, channel, password=None):
+
+        """ join a channel .. use optional password. """
+
+        result = Irc.join(self, channel, password)
+        if result != 1:
+            return result
+        if not self.channels.has_key(channel):
+            # init channel data
+            self.channels.setdefault(channel, {})
+        chan = self.channels[channel]
+        # if password is provided set it
+        got = False
+        if password:
+            chan['key'] = password
+            got = True
+        # check for control char .. if its not there init to !
+        if not chan.has_key('cc'):
+            chan['cc'] = self.cfg['defaultcc'] or '!'
+            got = True
+        if not chan.has_key('perms'):
+            chan['perms'] = []
+            got = True
+        if not chan.has_key('mode'):
+            chan['mode'] = ""
+            got = True
+        if got:
+            self.channels.save()
+        self.getchannelmode(channel)
+        return 1
+
+    def say(self, printto, what, who=None, how='msg', fromm=None, speed=5, groupchat=False):
+
+        """ output what to printto. """
+
+        # check if printto is a queue if so put output to the queue
+        if type(printto) == type(Queue.Queue): 
+            printto.put_nowait('[%s] %s' % (self.name, what))
+            return
+        # check if bot is in notice mode
+        notice = False
+        try:
+            notice = self.channels[printto]['notice']
+        except (KeyError, TypeError):
+            pass
+        if notice:
+            how = 'notice'
+        Irc.say(self, printto, what, who, how, fromm, speed, groupchat)
+
+    def handle_privmsg(self, ievent):
+
+        """ check if PRIVMSG is command, if so dispatch. """
+
+        if ievent.nick in self.nicks401:
+            rlog(10, self.name, "%s is available again" % ievent.nick)
+            self.nicks401.remove(ievent.nick)
+
+        if not ievent.txt:
+            return
+
+        # check if it is a dcc chat request
+        chat = re.search(dccchatre, ievent.txt)
+        if chat:
+            # check if the user is known
+            if users.allowed(ievent.userhost, 'USER'):
+                # start connection
+                start_new_thread(self._dccconnect, (ievent.nick, ievent.userhost, chat.group(1), chat.group(2))) 
+                return
+
+        # see if base class method would handle it
+        if '\001' in ievent.txt:
+            Irc.handle_privmsg(self, ievent)
+            return
+
+        # set bot and socket in ircevent
+        ievent.bot = self
+        ievent.sock = self.sock
+        chan = ievent.channel
+
+        # check for /msg
+        if chan == self.nick:
+            ievent.msg = 1
+            ievent.speed =  7
+            ievent.printto = ievent.nick
+            ccs = ['!', '@', self.cfg['defaultcc']]
+            # check for PRIVMSG waiting callback
+            self.privwait.check(ievent)
+            if ievent.isresponse:
+                return
+            if not self.cfg['noccinmsg']:
+                plugins.trydispatch(self, ievent)
+            elif ievent.txt[0] in ccs: 
+                ievent.txt = ievent.txt[1:]
+                plugins.trydispatch(self, ievent)
+            return
+
+        ievent.printto = chan
+
+        # see if we can get channel control character
+        try:
+            cchar = self.channels[chan]['cc']
+        except LookupError:
+            cchar = self.cfg['defaultcc'] or '!'
+        except TypeError:
+            cchar = self.cfg['defaultcc'] or '!'
+
+        # see if cchar matches, if so dispatch
+        ievent.speed = 5
+        if ievent.txt[0] in cchar:
+            ievent.cc = ievent.txt[0]
+            ievent.txt = ievent.txt[1:]
+            plugins.trydispatch(self, ievent)
+            return
+
+        # see if were adressed, if so dispatch
+        txtlist = ievent.txt.split(':', 1)
+        if txtlist[0]  == self.nick:
+            if len(txtlist) < 2:
+                return
+            ievent.txt = txtlist[1].strip()
+            plugins.trydispatch(self, ievent)
+            return
+
+        # habbie addressing mode
+        txtlist = ievent.txt.split(',', 1)
+        if txtlist[0] == self.nick:
+            if len(txtlist) < 2:
+                return
+            ievent.txt = txtlist[1].strip()
+            plugins.trydispatch(self, ievent)
+            return
+
+        # check for PRIVMSG waiting callback
+        self.privwait.check(ievent)
+
+    def handle_join(self, ievent):
+
+        """ handle joins. """
+
+        if ievent.nick in self.nicks401:
+             rlog(10, self.name, "%s is available again" % ievent.nick)
+             self.nicks401.remove(ievent.nick)
+        chan = ievent.channel
+        nick = ievent.nick
+
+        # see if its the bot who is joining
+        if nick == self.nick:
+            # check if we already have a channels object, if not init it
+            if not self.channels.has_key(chan):
+                self.channels[chan] = {}
+                self.channels[chan]['cc'] = self.cfg['defaultcc'] or '!'
+            if not chan in self.state['joinedchannels']:
+                self.state['joinedchannels'].append(chan)
+                self.state.save()
+            if chan in self.state['opchan']:
+                self.state['opchan'].remove(chan)
+                self.state.save()
+            self.timejoined[chan] = time.time()
+            time.sleep(0.5)
+            periodical.addjob(10, 1, self.who, self, chan)
+            return
+
+        # sync joined user with userhosts cache
+        self.userhosts.data[nick] = ievent.userhost
+        self.userchannels.adduniq(nick, chan)
+
+    def handle_kick(self, ievent):
+
+        """ handle kick event. """
+
+        try:
+            who = ievent.arguments[1]
+        except IndexError:
+            return
+
+        chan = ievent.channel
+
+        # see if its the bot who got kicked .. if so remove from
+        # joinedchannels
+        if who == self.nick:
+            if chan in self.state['joinedchannels']:
+                self.state['joinedchannels'].remove(chan)
+                self.state.save()
+
+    def handle_nick(self, ievent):
+
+        """ update userhost cache on nick change. """
+
+        nick = ievent.txt
+        self.userhosts.data[nick] = ievent.userhost
+
+        if ievent.nick == self.nick:
+            self.cfg['nick'] = nick
+            self.cfg.save()
+
+        try:
+            self.userchannels[nick] = self.userchannels[ievent.nick]
+        except:
+           raise
+
+    def handle_part(self, ievent):
+
+        """ handle parts. """
+
+        chan = ievent.channel
+
+        # see if its the bot who is parting
+        if ievent.nick == self.nick:
+            rlog(1, self.name, 'parted channel %s' % chan)
+            # remove from joinedchannels
+            if chan in self.state['joinedchannels']:
+                self.state['joinedchannels'].remove(chan)
+                self.state.save()
+
+    def handle_ievent(self, ievent):
+
+        """ check for callbacks, call Irc method. """
+
+        try:
+            # call parent method
+            Irc.handle_ievent(self, ievent)
+            # check for callbacks
+            if ievent.cmnd == 'JOIN' or ievent.msg:
+                if ievent.nick in self.nicks401:
+                    self.nicks401.remove(ievent.nick)
+            i = Ircevent()
+            i.copyin(ievent)
+            i.bot = self
+            i.sock = self.sock
+            callbacks.check(self, i)
+        except:
+            handle_exception()
+ 
+    def handle_quit(self, ievent):
+
+        """ check if quit is because of a split. """
+
+        if '*.' in ievent.txt or self.server in ievent.txt:
+            self.splitted.append(ievent.nick)
+        
+    def handle_mode(self, ievent):
+
+        """ check if mode is about channel if so request channel mode. """
+
+        rlog(5, self.name, "mode change %s" % str(ievent.arguments))
+
+        try:
+            dummy = ievent.arguments[2]
+        except IndexError:
+            chan = ievent.channel
+            # channel mode change has 2 arguments
+            self.getchannelmode(chan)
+            self.channels.set(chan, 'mode', ievent.arguments[1])    
+
+    def handle_311(self, ievent):
+
+        """ handle 311 response .. sync with userhosts cache. """
+
+        target, nick, user, host, dummy = ievent.arguments
+        nick = nick
+        userhost = "%s@%s" % (user, host)
+        rlog(1, self.name, 'adding %s to userhosts: %s' % (nick, userhost))
+        # userhosts cache is accessed by lower case nick
+        self.userhosts.data[nick] = userhost
+
+    def handle_352(self, ievent):
+
+        """ handle 352 response .. sync with userhosts cache. """
+
+        args = ievent.arguments
+        channel = args[1]  
+        nick = args[5]
+        user = args[2]
+        host = args[3]
+        userhost = "%s@%s" % (user, host)
+        rlog(1, self.name, 'adding %s to userhosts: %s' % (nick, userhost))
+        self.userhosts.data[nick] = userhost
+        self.userchannels.adduniq(nick, channel)
+
+    def handle_353(self, ievent):
+
+        """ handle 353 .. check if we are op. """
+
+        userlist = ievent.txt.split()
+        chan = ievent.channel
+        for i in userlist:
+            if i[0] == '@' and i[1:] == self.nick:
+                if chan not in self.state['opchan']:
+                    self.state['opchan'].append(chan)
+
+    def handle_324(self, ievent):
+
+        """ handle mode request responses. """
+
+        self.channels.set(ievent.channel, 'mode', ievent.arguments[2])
+
+    def handle_invite(self, ievent):
+
+        """ join channel if invited by OPER. """
+
+        if users.allowed(ievent.userhost, ['OPER', ]):
+            self.join(ievent.txt)
+
+    def settopic(self, channel, txt):
+
+        """ set topic of channel to txt. """
+
+        if not channel or not txt:
+            return
+        self.putonqueue(7, 'TOPIC %s :%s' % (channel, txt))
+
+    def gettopic(self, channel):
+
+        """ get topic data. """
+
+        if not channel:
+            return
+
+        queue332 = Queue.Queue()
+        queue333 = Queue.Queue()
+        self.wait.register('332', channel, queue332)
+        self.wait.register('333', channel, queue333)
+        self.putonqueue(7, 'TOPIC %s' % channel)
+
+        try:
+            res = queue332.get(1, 5)
+        except Queue.Empty:
+            return None
+
+        what = res.txt
+
+        try:
+            res = queue333.get(1, 5)
+        except Queue.Empty:
+            return None
+
+        try:
+            splitted = res.postfix.split()
+            who = splitted[2]
+            when = float(splitted[3])
+        except (IndexError, ValueError):
+            return None
+
+        return (what, who, when)
+
+    def test(self, txt, timeout=0, kw={}):
+
+        """ run txt with test ievent. """
+
+        txt = txt.strip()
+        ievent = Ircevent()
+        ievent.bot = self
+        ievent.cmnd = 'PRIVMSG'
+        ievent.nick = 'test'
+        ievent.userhost = 'test@test'
+        ievent.origtxt =  txt
+        ievent.txt = ievent.origtxt
+        ievent.channel = '#test'
+        ievent.allowqueue = True
+        ievent.closequeue = True
+
+        if kw:
+            for i, j in kw.iteritems():
+                setattr(ievent, i, j)
+
+        if timeout:
+            result = plugins.cmnd(self, ievent, timeout)        
+        else:
+            result = plugins.cmnd(self, ievent, 10)        
+
+        rlog(1000, self.name, str(result))
+        return result
+
+    def testasync(self, txt, timeout=0, kw={}):
+
+        """ run txt with test ievent. don't close queues on exit."""
+
+        txt = txt.strip()
+        ievent = Ircevent()
+        ievent.bot = self
+        ievent.cmnd = 'PRIVMSG'
+        ievent.nick = 'test'
+        ievent.userhost = 'test@test'
+        ievent.origtxt =  txt
+        ievent.txt = ievent.origtxt
+        ievent.channel = '#test'
+        ievent.allowqueue = False
+        ievent.closequeue = False
+
+        if kw:
+            for i, j in kw.iteritems():
+                setattr(ievent, i, j)
+
+        if timeout:
+            result = plugins.cmnd(self, ievent, timeout)        
+        else:
+            result = plugins.cmnd(self, ievent, 10)        
+
+        rlog(100, self.name, str(result))
+        return result
--- gozerbot-0.99.1.orig/build/lib/gozerbot/irc/monitor.py
+++ gozerbot-0.99.1/build/lib/gozerbot/irc/monitor.py
@@ -0,0 +1,41 @@
+# gozerbot/monitor.py
+#
+#
+
+""" monitors .. call callback on bot output. """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.monitor import Monitor
+
+# gozerbot imports
+from ircevent import Ircevent
+
+class Outmonitor(Monitor):
+
+    """ monitor for bot output (bot.send). """
+
+    def handle(self, bot, txt):
+
+        """ fire outmonitor callbacks. """
+
+        ievent = Ircevent().parse(bot, txt)
+
+        if not ievent:
+            rlog(10, 'monitor', "can't make ircevent: %s" % txt)
+            return
+
+        ievent.nick = bot.nick
+
+        try:
+            ievent.userhost = bot.userhosts.data[bot.nick]
+        except KeyError:
+            ievent.userhost = "bot@bot"
+
+        Monitor.handle(self, bot, ievent)
+
+# bot.send() monitor
+outmonitor = Outmonitor('outmonitor') 
+
+# bot.say() monitor
+saymonitor = Monitor('saymonitor')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/irc/irc.py
+++ gozerbot-0.99.1/build/lib/gozerbot/irc/irc.py
@@ -0,0 +1,1144 @@
+# gozerbot/irc.py
+#
+#
+
+""" an Irc object handles the connection to the irc server .. receiving,
+    sending, connect and reconnect code.
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.utils.log import rlog
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.generic import getrandomnick, toenc, fromenc, strippedtxt
+from gozerbot.utils.generic import fix_format, splittxt, waitforqueue, uniqlist
+from gozerbot.utils.locking import lockdec
+from gozerbot.wait import Wait
+from gozerbot.config import config
+from monitor import saymonitor
+from gozerbot.less import Less
+from gozerbot.ignore import shouldignore
+from gozerbot.persist.pdod import Pdod
+from gozerbot.datadir import datadir
+#from gozerbot.fleet import fleet
+from gozerbot.botbase import BotBase
+from gozerbot.threads.thr import start_new_thread, threaded
+from gozerbot.periodical import periodical
+from gozerbot.morphs import inputmorphs, outputmorphs
+from ircevent import Ircevent
+
+# basic imports
+import time, thread, socket, threading, os, Queue, random
+from errno import EAGAIN, EBADF, EPIPE
+
+# locks
+outlock = thread.allocate_lock()
+outlocked = lockdec(outlock)
+
+# exceptions
+
+class AlreadyConnected(Exception):
+
+    """ already connected exception """
+
+    pass
+
+class AlreadyConnecting(Exception):
+
+    """ bot is already connecting exception """
+
+    pass
+
+class Irc(BotBase):
+
+    """ the irc class, provides interface to irc related stuff. """
+
+    def __init__(self, name, cfg={}):
+        BotBase.__init__(self, name, cfg)
+        self.type = 'irc'
+        self.wait = Wait()
+        self.outputlock = thread.allocate_lock()
+        self.fsock = None
+        self.oldsock = None
+        self.sock = None
+        if not self.cfg.has_key('nolimiter'):
+            self.nolimiter = 0
+        else:
+            self.nolimiter = self.cfg['nolimiter']
+        self.reconnectcount = 0
+        self.pongcheck = 0
+        self.nickchanged = 0
+        self.noauto433 = 0
+        if not self.state.has_key('alternick'):
+            self.state['alternick'] = self.cfg['alternick']
+        if not self.state.has_key('no-op'):
+            self.state['no-op'] = []
+        self.nrevents = 0
+        self.gcevents = 0
+        self.outqueues = [Queue.Queue() for i in range(10)]
+        self.tickqueue = Queue.Queue()
+        self.nicks401 = []
+        self.stopreadloop = False
+        self.stopoutloop = False
+        self.port = self.cfg['port'] or 6667
+        rlog(10, self.name, "port is %s" % self.port)
+        self.connectlock = thread.allocate_lock()
+        self.encoding = 'utf-8'
+
+    def __del__(self):
+        self.exit()
+
+    def _raw(self, txt):
+ 
+        """ send raw text to the server. """
+
+        if not txt:
+            return
+
+        rlog(2, self.name + '.sending', txt)
+
+        try:
+            self.lastoutput = time.time()
+            itxt = toenc(outputmorphs.do(txt), self.encoding)
+            if self.cfg.has_key('ssl') and self.cfg['ssl']:
+                self.sock.write(itxt + '\n')
+            else:
+                self.sock.send(itxt[:500] + '\n')
+        except Exception, ex:
+            # check for broken pipe error .. if so ignore 
+            # used for nonblocking sockets
+            try:
+                (errno, errstr) = ex
+                if errno != EPIPE and errno != EBADF:
+                    raise
+                else:
+                    time.sleep(0.5)
+            except:
+                rlog(10, self.name, "ERROR: can't send %s" % str(ex))
+                self.reconnect()
+
+    def _connect(self):
+
+        """ connect to server/port using nick. """
+
+        if self.connecting:
+            rlog(10, self.name, 'already connecting')
+            raise AlreadyConnecting()
+
+        if self.connected:
+            rlog(10, self.name, 'already connected')
+            raise AlreadyConnected()
+
+        self.stopped = 0
+        self.connecting = True
+        self.connectok.clear()
+        self.connectlock.acquire()
+
+        # create socket
+        if self.ipv6:
+            rlog(10, self.name, 'creating ipv6 socket')
+            self.oldsock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+            self.ipv6 = 1
+        else:
+            rlog(10, self.name, 'creating ipv4 socket')
+            self.oldsock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+
+        assert(self.oldsock)
+
+        # optional bind
+        server = self.server
+        elite = self.cfg['bindhost'] or config['bindhost']
+        if elite:
+            try:
+                self.oldsock.bind((elite, 0))
+            except socket.gaierror:
+                rlog(10, self.name, "can't bind to %s" % elite)
+               # resolve the IRC server and pick a random server
+                if not server:
+                    # valid IPv6 ip?
+                    try: socket.inet_pton(socket.AF_INET6, self.server)
+                    except socket.error: pass
+                    else: server = self.server
+                if not server:  
+                    # valid IPv4 ip?
+                    try: socket.inet_pton(socket.AF_INET, self.server)
+                    except socket.error: pass
+                    else: server = self.server
+                if not server:
+                    # valid hostname?
+                    ips = []
+                    try:
+                        for item in socket.getaddrinfo(self.server, None):
+                            if item[0] in [socket.AF_INET, socket.AF_INET6] and item[1] == socket.SOCK_STREAM:
+                                ip = item[4][0]
+                                if ip not in ips: ips.append(ip)
+                    except socket.error: pass
+                    else: server = random.choice(ips)
+
+        # do the connect .. set timeout to 30 sec upon connecting
+        rlog(10, self.name, 'connecting to %s (%s)' % (server, self.server))
+        self.oldsock.settimeout(15)
+        self.oldsock.connect((server, int(self.port)))
+
+        # we are connected
+        rlog(10, self.name, 'connection ok')
+        time.sleep(1)
+        self.connected = True
+
+        # make file socket
+        self.fsock = self.oldsock.makefile("r")
+
+        # set blocking
+        self.oldsock.setblocking(self.blocking)
+        self.fsock._sock.setblocking(self.blocking)
+
+        # set socket time out
+        if self.blocking:
+            socktimeout = self.cfg['socktimeout']
+            if not socktimeout:
+                socktimeout = 301.0
+            else:
+                socktimeout = float(socktimeout)
+            self.oldsock.settimeout(socktimeout)
+            self.fsock._sock.settimeout(socktimeout)
+        # enable ssl if set
+        if self.cfg.has_key('ssl') and self.cfg['ssl']:
+            rlog(10, self.name, 'ssl enabled')
+            try:
+                import ssl
+                rlog(10, self.name, 'using ssl.wrap_socket()')
+                self.sock = ssl.wrap_socket(self.oldsock)
+            except Exception, ex:
+                rlog(10, self.name, 'using socket.ssl()')
+                self.sock = socket.ssl(self.oldsock)
+        else: self.sock = self.oldsock
+
+        # try to release the outputlock
+        try:
+            self.outputlock.release()
+        except thread.error:
+            pass
+
+        # start input and output loops
+        start_new_thread(self._readloop, ())
+        start_new_thread(self._outloop, ())
+
+        # logon and start monitor
+        self._logon()
+        self.nickchanged = 0
+        self.reconnectcount = 0
+        saymonitor.start()
+        return 1
+
+    def _readloop(self):
+
+        """ loop on the socketfile. """
+
+        self.stopreadloop = 0
+        self.stopped = 0
+        doreconnect = 0
+        timeout = 1
+        rlog(5, self.name, 'starting readloop')
+        prevtxt = ""
+
+        while not self.stopped and not self.stopreadloop:
+
+            try:
+                time.sleep(0.01)
+                if self.cfg.has_key('ssl') and self.cfg['ssl']:
+                    intxt = inputmorphs.do(self.sock.read()).split('\n')
+                else:
+                    intxt = inputmorphs.do(self.fsock.readline()).split('\n')
+                # if intxt == "" the other side has disconnected
+                if self.stopreadloop or self.stopped:
+                    doreconnect = 0
+                    break
+                if not intxt or not intxt[0]:
+                    doreconnect = 1
+                    break
+                if prevtxt:
+                    intxt[0] = prevtxt + intxt[0]
+                    prevtxt = ""
+                if intxt[-1] != '':
+                    prevtxt = intxt[-1]
+                    intxt = intxt[:-1]
+                for r in intxt:
+                    r = r.rstrip()
+                    rr = fromenc(r, self.encoding)
+                    if not rr:
+                        continue
+                    res = strippedtxt(rr)
+                    res = rr
+                    rlog(2, self.name, res)
+                    # parse txt read into an ircevent
+                    try:
+                        ievent = Ircevent().parse(self, res)
+                    except Exception, ex:
+                        handle_exception()
+                        continue
+                    # call handle_ievent 
+                    if ievent:
+                        self.handle_ievent(ievent)
+                    timeout = 1
+
+            except UnicodeError:
+                handle_exception()
+                continue
+
+            except socket.timeout:
+                # timeout occured .. first time send ping .. reconnect if
+                # second timeout follows
+                if self.stopped:
+                    break
+                timeout += 1
+                if timeout > 2:
+                    doreconnect = 1
+                    rlog(10, self.name, 'no pong received')
+                    break
+                rlog(1, self.name, "socket timeout")
+                pingsend = self.ping()
+                if not pingsend:
+                    doreconnect = 1
+                    break
+                continue
+
+            except socket.sslerror, ex:
+                # timeout occured .. first time send ping .. reconnect if
+                # second timeout follows
+                if self.stopped or self.stopreadloop:
+                    break
+                if not 'timed out' in str(ex):
+                    handle_exception()
+                    doreconnect = 1
+                    break
+                timeout += 1
+                if timeout > 2:
+                    doreconnect = 1
+                    rlog(10, self.name, 'no pong received')
+                    break
+                rlog(1, self.name, "socket timeout")
+                pingsend = self.ping()
+                if not pingsend:
+                    doreconnect = 1
+                    break
+                continue
+
+            except IOError, ex:
+                if self.blocking and 'temporarily' in str(ex):
+                    time.sleep(0.5)
+                    continue
+                handle_exception()
+                doreconnect = 1
+                break
+
+            except Exception, ex:
+                if self.stopped or self.stopreadloop:
+                    break
+                err = ex
+                try:
+                    (errno, msg) = ex
+                except:
+                    errno = -1
+                    msg = err
+                # check for temp. unavailable error .. raised when using
+                # nonblocking socket ..
+                if errno == EAGAIN:
+                    time.sleep(0.5)
+                    continue
+                rlog(10, self.name, "error in readloop: %s" % msg)
+                doreconnect = 1
+                break
+
+        rlog(5, self.name, 'readloop stopped')
+        self.connectok.clear()
+        self.connected = False
+
+        # see if we need to reconnect
+        if doreconnect:
+            time.sleep(2)
+            self.reconnect()
+
+    def _getqueue(self):
+
+        """ get one of the outqueues. """
+
+        go = self.tickqueue.get()
+        for index in range(len(self.outqueues)):
+            if not self.outqueues[index].empty():
+                return self.outqueues[index]
+
+    def putonqueue(self, nr, *args):
+
+        """ put output onto one of the output queues. """
+
+        self.outqueues[nr].put_nowait(*args)
+        self.tickqueue.put_nowait('go')
+
+    def _outloop(self):
+
+        """ output loop. """
+
+        rlog(5, self.name, 'starting output loop')
+        self.stopoutloop = 0
+
+        while not self.stopped and not self.stopoutloop:
+            queue = self._getqueue()
+            if queue:
+                rlog(5, self.name, "outputsizes: %s" % self.outputsizes())
+                try:
+                    res = queue.get_nowait()
+                except Queue.Empty:
+                    continue
+                if not res:
+                    continue
+                try:
+                    (printto, what, who, how, fromm, speed) = res
+                except ValueError:
+                    self.send(res)
+                    continue
+                if not self.stopped and not self.stopoutloop and printto \
+not in self.nicks401:
+                    self.out(printto, what, who, how, fromm, speed)
+            else:
+                time.sleep(0.1)
+
+        rlog(5, self.name, 'stopping output loop')
+
+    def _logon(self):
+
+        """ log on to the network. """
+
+        # if password is provided send it
+        if self.password:
+            rlog(10, self.name ,'sending password')
+            self._raw("PASS %s" % self.password)
+
+        # register with irc server
+        rlog(10, self.name, 'registering with %s using nick %s' % \
+(self.server, self.nick))
+        rlog(10, self.name, 'this may take a while')
+
+        # check for username and realname
+        username = self.nick or self.cfg['username']
+        realname = self.cfg['realname'] or username
+
+        # first send nick
+        time.sleep(1)
+        self._raw("NICK %s" % self.nick)
+        time.sleep(1)
+
+        # send USER
+        self._raw("USER %s localhost localhost :%s" % (username, \
+realname))
+
+        # wait on login
+        self.connectok.wait()
+
+    def _onconnect(self):
+
+        """ overload this to run after connect. """
+
+        pass
+
+    def _resume(self, data, reto=None):
+
+        """ resume to server/port using nick. """
+
+        try:
+            if data['ssl']:
+                self.connectwithjoin()
+                return 1
+        except KeyError:
+            pass
+
+        try:
+            fd = int(data['fd'])
+        except (TypeError, ValueError):
+            fd = None
+
+        self.connecting = False # we're already connected
+        self.nick = data['nick']
+        self.orignick = self.nick
+        self.server = str(data['server'])
+        self.port = int(data['port'])
+        self.password = data['password']
+        self.ipv6 = data['ipv6']
+        self.ssl = data['ssl']
+
+        # create socket
+        if self.ipv6:
+            if fd:
+                rlog(1, self.name, 'resuming ipv6 socket')
+                self.sock = socket.fromfd(fd , socket.AF_INET6, socket.SOCK_STREAM)
+            else:
+                rlog(10, self.name, 'creating ipv6 socket')
+                self.sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+            self.ipv6 = 1
+        else:
+            if fd:
+                rlog(1, self.name, 'resuming ipv4 socket')
+                self.sock = socket.fromfd(fd, socket.AF_INET, socket.SOCK_STREAM)
+            else:
+                rlog(10, self.name, 'creating ipv4 socket')
+                self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+
+        # do the connect .. set timeout to 30 sec upon connecting
+        rlog(10, self.name, 'resuming to ' + self.server)
+        self.sock.settimeout(30)
+
+        # we are connected
+        rlog(10, self.name, 'connection ok')
+        self.stopped = 0
+        # make file socket
+        self.fsock = self.sock.makefile("r")
+        # set blocking
+        self.sock.setblocking(self.blocking)
+
+        # set socket time out
+        if self.blocking:
+            socktimeout = self.cfg['socktimeout']
+            if not socktimeout:
+                socktimeout = 301.0
+            else:
+                socktimeout = float(socktimeout)
+            self.sock.settimeout(socktimeout)
+
+        # start readloop
+        rlog(0, self.name, 'resuming readloop')
+        start_new_thread(self._readloop, ())
+        start_new_thread(self._outloop, ())
+
+        # init 
+        self.reconnectcount = 0
+        self.nickchanged = 0
+        self.connecting = False
+
+        # still there server?
+        self._raw('PING :RESUME %s' % str(time.time()))
+        self.connectok.set()
+        self.connected = True
+        self.reconnectcount = 0
+        if reto:
+            self.say(reto, 'rebooting done')
+        saymonitor.start()
+        return 1
+
+    def _resumedata(self):
+
+        """ return data used for resume. """
+        try:
+            fd = self.sock.fileno()
+        except AttributeError, ex:
+            fd = None
+            self.exit()
+        return {self.name: {
+            'nick': self.nick,
+            'server': self.server,
+            'port': self.port,
+            'password': self.password,
+            'ipv6': self.ipv6,
+            'ssl': self.ssl,
+            'fd': fd
+            }}
+
+
+    def outputsizes(self):
+
+        """ return sizes of output queues. """
+
+        result = []
+        for q in self.outqueues:
+            result.append(q.qsize())
+        return result
+
+    def broadcast(self, txt):
+
+        """ broadcast txt to all joined channels. """
+
+        for i in self.state['joinedchannels']:
+            self.say(i, txt, speed=-1)
+
+    def save(self):
+
+        """ save state data. """
+
+        self.state.save()
+
+    def connect(self, reconnect=True):
+
+        """ connect to server/port using nick .. connect can timeout so catch
+            exception .. reconnect if enabled.
+        """
+
+        res = 0
+
+        try:
+            res = self._connect()
+            if res:
+                self.connectok.wait()
+                self._onconnect()
+                self.connected = True
+                rlog(10, self.name, 'logged on !')
+            self.connecting = False
+        except AlreadyConnecting:
+            return 0 
+        except AlreadyConnected:
+            return 0
+        except Exception, ex:
+            self.connectlock.release()
+            if self.stopped:
+                return 0
+            rlog(10, self.name, 'connecting error: %s' % str(ex))
+            if reconnect:
+                self.reconnect()
+                return
+            raise
+
+        # add bot to the fleet
+        #if not fleet.byname(self.name):
+        #    fleet.addbot(self)
+        self.connectlock.release()
+        return res
+
+    def shutdown(self):
+
+        """ shutdown the bot. """
+
+        rlog(10, self.name, 'shutdown')
+        self.stopoutputloop = 1
+        self.stopped = 1
+        time.sleep(1)
+        self.tickqueue.put_nowait('go')
+        self.close()
+        self.connecting = False
+        self.connected = False
+        self.connectok.clear()
+
+    def close(self):
+
+        """ close the connection. """
+
+        try:
+            if self.cfg.has_key('ssl') and self.cfg['ssl']:
+                self.oldsock.shutdown(2)
+            else:
+                self.sock.shutdown(2)
+        except:
+            pass
+        try:
+            if self.cfg.has_key('ssl') and self.cfg['ssl']:
+                self.oldsock.close()
+            else:
+                self.sock.close()
+            self.fsock.close()
+        except:
+            pass
+
+    def exit(self):
+
+        """ exit the bot. """
+
+        self.stopreadloop = 1
+        self.stopped = 1
+        self.connected = 0
+        self.shutdown()
+
+    def reconnect(self):
+
+        """ reconnect to the irc server. """
+
+        try:
+            if self.stopped:
+                return 0
+            # determine how many seconds to sleep
+            if self.reconnectcount > 0:
+                reconsleep = self.reconnectcount*15
+                rlog(10, self.name, 'sleeping %s seconds for reconnect' % \
+reconsleep)
+                time.sleep(reconsleep)
+                if self.stopped:
+                    rlog(10, self.name, 'stopped.. not reconnecting')
+                    return 1
+                if self.connected:
+                    rlog(10, self.name, 'already connected .. not reconnecting')
+                    return 1
+            self.reconnectcount += 1
+            self.exit()
+            rlog(10, self.name, 'reconnecting')
+            result = self.connect()
+            return result
+        except Exception, ex:
+            handle_exception()
+
+    def handle_pong(self, ievent):
+
+        """ set pongcheck on received pong. """
+
+        rlog(1, self.name, 'received server pong')
+        self.pongcheck = 1
+
+    def sendraw(self, txt):
+
+        """ send raw text to the server. """
+
+        if self.stopped:
+            return
+        rlog(2, self.name + '.sending', txt)
+        self._raw(txt)
+
+    def fakein(self, txt):
+
+        """ do a fake ircevent. """
+
+        if not txt:
+            return
+        rlog(10, self.name + '.fakein', txt)
+        self.handle_ievent(Ircevent().parse(self, txt))
+
+    def say(self, printto, what, who=None, how='msg', fromm=None, speed=0, groupchat=False):
+
+        """ say what to printto. """
+
+        if not printto or not what or printto in self.nicks401:
+            return
+
+        # if who is set add "who: " to txt
+        if not 'socket' in repr(printto):
+            if who:
+                what = "%s: %s" % (who, what)
+            if speed > 9:
+                speed = 9
+            self.putonqueue(9-speed, (printto, what, who, how, fromm, speed))
+            return
+
+        # do the sending
+        try:
+            printto.send(what + '\n')
+            time.sleep(0.001)
+        except Exception, ex :
+            if "Broken pipe" in str(ex) or "Bad file descriptor" in str(ex):
+                return
+            handle_exception()
+
+    def out(self, printto, what, who=None, how='msg', fromm=None, speed=5):
+
+        """ output the first 375 chars .. put the rest into cache. """
+
+        # convert the data to the encoding
+        try:
+            what = toenc(what.rstrip())
+        except Exception, ex:
+            rlog(10, self.name, "can't output: %s" % str(ex))
+            return
+        if not what:
+            return
+
+        # split up in parts of 375 chars overflowing on word boundaries
+        txtlist = splittxt(what)
+        size = 0
+
+        # send first block
+        self.output(printto, txtlist[0], how, who, fromm)
+
+        # see if we need to store output in less cache
+        result = ""
+        if len(txtlist) > 2:
+            if not fromm:
+                self.less.add(printto, txtlist[1:])
+            else:
+                self.less.add(fromm, txtlist[1:])
+            size = len(txtlist) - 2
+            result = txtlist[1:2][0]
+            if size:
+                result += " (+%s)" % size
+        else:
+            if len(txtlist) == 2:
+                result = txtlist[1]
+
+        # send second block
+        if result:
+            self.output(printto, result, how, who, fromm)
+
+    def output(self, printto, what, how='msg' , who=None, fromm=None):
+
+        """ first output .. then call saymonitor. """
+
+        self.outputnolog(printto, what, how, who, fromm)
+        saymonitor.put(self.name, printto, what, who, how, fromm)
+        
+    def outputnolog(self, printto, what, how, who=None, fromm=None):
+
+        """ do output to irc server .. rate limit to 3 sec. """
+
+        if fromm and shouldignore(fromm):
+            return
+
+        try:
+            what = fix_format(what)
+            if what:
+                if how == 'msg':
+                    self.privmsg(printto, what)
+                elif how == 'notice':
+                    self.notice(printto, what)
+                elif how == 'ctcp':
+                    self.ctcp(printto, what)
+        except Exception, ex:
+            handle_exception()
+
+    def donick(self, nick, setorig=0, save=0, whois=0):
+
+        """ change nick .. optionally set original nick and/or save to config.  """
+
+        if not nick:
+            return
+
+        # disable auto 433 nick changing
+        self.noauto433 = 1
+
+        # set up wait for NICK command and issue NICK
+        queue = Queue.Queue()
+        nick = nick[:16]
+        self.wait.register('NICK', self.nick[:16], queue, 12)
+        self._raw('NICK %s\n' % nick)
+        result = waitforqueue(queue, 5)
+
+        # reenable 433 auto nick changing
+        self.noauto433 = 0
+        if not result:
+            return 0
+        self.nick = nick
+
+        # send whois
+        if whois:
+            self.whois(nick)
+
+        # set original
+        if setorig:
+            self.orignick = nick
+
+        # save nick to state and config file
+        if save:
+            self.state['nick'] = nick
+            self.state.save()
+            self.cfg.set('nick', nick)
+            self.cfg.save()
+        return 1
+
+    def join(self, channel, password=None):
+
+        """ join channel with optional password. """
+
+        if not channel:
+            return
+
+        # do join with password
+        if password:
+            self._raw('JOIN %s %s' % (channel, password))
+            try:
+                self.channels[channel]['key'] = password
+                self.channels.save()
+            except KeyError:
+                pass
+        else:
+            # do pure join
+            self._raw('JOIN %s' % channel)
+
+    def part(self, channel):
+
+        """ leave channel. """
+
+        if not channel:
+            return
+        self._raw('PART %s' % channel)
+
+        try:
+            self.state['joinedchannels'].remove(channel)
+            self.state.save()
+        except (KeyError, ValueError):
+            pass
+
+    def who(self, who):
+
+        """ send who query. """
+
+        if not who:
+            return
+        self.putonqueue(6, 'WHO %s' % who.strip())
+
+    def names(self, channel):
+
+        """ send names query. """
+
+        if not channel:
+            return
+        self.putonqueue(6, 'NAMES %s' % channel)
+
+    def whois(self, who):
+
+        """ send whois query. """
+
+        if not who:
+            return
+        self.putonqueue(6, 'WHOIS %s' % who)
+
+    def privmsg(self, printto, what):
+
+        """ send privmsg to irc server. """
+
+        if not printto or not what:
+            return
+        self.send('PRIVMSG %s :%s' % (printto, what))
+
+    def send(self, txt):
+
+        """ send text to irc server. """
+
+        if not txt:
+            return
+
+        if self.stopped:
+            return
+
+        try:
+            self.outputlock.acquire()
+            txt = toenc(strippedtxt(txt))
+            txt = txt.rstrip()
+            self._raw(txt)
+            now = time.time()
+            timetosleep = 5 - (now - self.lastoutput)
+            if timetosleep > 0 and not self.nolimiter:
+                rlog(0, self.name, 'flood protect')
+                time.sleep(timetosleep)
+            try:
+                self.outputlock.release()
+            except:
+                pass
+            self.lastoutput = time.time()
+        except Exception, ex:
+            try:
+                self.outputlock.release()
+            except:
+                pass
+            if not self.blocking and 'broken pipe' in str(ex).lower():
+                time.sleep(0.5)
+            else:
+                rlog(11, self.name, 'send error: %s' % str(ex))
+                self.reconnect()
+                return
+            
+    def voice(self, channel, who):
+
+        """ give voice. """
+
+        if not channel or not who:
+            return
+        self.putonqueue(9, 'MODE %s +v %s' % (channel, who))
+ 
+    def doop(self, channel, who):
+
+        """ give ops. """
+
+        if not channel or not who:
+            return
+        self._raw('MODE %s +o %s' % (channel, who))
+
+    def delop(self, channel, who):
+
+        """ de-op user. """
+
+        if not channel or not who:
+            return
+        self._raw('MODE %s -o %s' % (channel, who))
+
+    def quit(self, reason='http://gozerbot.org'):
+
+        """ send quit message. """
+
+        rlog(10, self.name, 'sending quit')
+        try:
+            self._raw('QUIT :%s' % reason)
+        except IOError:
+            pass
+
+    def notice(self, printto, what):
+
+        """ send notice. """
+
+        if not printto or not what:
+            return
+        self.send('NOTICE %s :%s' % (printto, what))
+ 
+    def ctcp(self, printto, what):
+
+        """ send ctcp privmsg. """
+
+        if not printto or not what:
+            return
+        self.send("PRIVMSG %s :\001%s\001" % (printto, what))
+
+    def ctcpreply(self, printto, what):
+
+        """ send ctcp notice. """
+
+        if not printto or not what:
+            return
+        self.putonqueue(2, "NOTICE %s :\001%s\001" % (printto, what))
+
+    def action(self, printto, what):
+
+        """ do action. """
+
+        if not printto or not what:
+            return
+        self.putonqueue(9, "PRIVMSG %s :\001ACTION %s\001" % (printto, what))
+
+    def handle_ievent(self, ievent):
+
+        """ handle ircevent .. dispatch to 'handle_command' method. """ 
+
+        try:
+            if ievent.cmnd == 'JOIN' or ievent.msg:
+                if ievent.nick in self.nicks401:
+                    self.nicks401.remove(ievent.nick)
+                    rlog(10, self.name, '%s joined .. unignoring' % ievent.nick)
+            # see if the irc object has a method to handle the ievent
+            method = getattr(self,'handle_' + ievent.cmnd.lower())
+            # try to call method
+            if method:
+                try:
+                    method(ievent)
+                except:
+                    handle_exception()
+        except AttributeError:
+            # no command method to handle event
+            pass
+        try:
+            # see if there are wait callbacks
+            self.wait.check(ievent)
+        except:
+            handle_exception()
+
+    def handle_432(self, ievent):
+
+        """ erroneous nick. """
+
+        self.handle_433(ievent)
+
+    def handle_433(self, ievent):
+
+        """ handle nick already taken. """
+
+        if self.noauto433:
+            return
+        nick = ievent.arguments[1]
+        # check for alternick
+        alternick = self.state['alternick']
+        if alternick and not self.nickchanged:
+            rlog(10, self.name, 'using alternick %s' % alternick)
+            self.donick(alternick)
+            self.nickchanged = 1
+            return
+        # use random nick
+        randomnick = getrandomnick()
+        self._raw("NICK %s" % randomnick)
+        self.nick = randomnick
+        rlog(100, self.name, 'ALERT: nick %s already in use/unavailable .. \
+using randomnick %s' % (nick, randomnick))
+        self.nickchanged = 1
+
+    def handle_ping(self, ievent):
+
+        """ send pong response. """
+
+        if not ievent.txt:
+            return
+        self._raw('PONG :%s' % ievent.txt)
+
+    def handle_001(self, ievent):
+
+        """ we are connected.  """
+
+        self.connectok.set()
+        self.connected = True
+        periodical.addjob(15, 1, self.whois, self, self.nick)
+
+    def handle_privmsg(self, ievent):
+
+        """ check if msg is ctcp or not .. return 1 on handling. """
+
+        if ievent.txt and ievent.txt[0] == '\001':
+            self.handle_ctcp(ievent)
+            return 1
+
+    def handle_notice(self, ievent):
+
+        """ handle notice event .. check for version request. """
+
+        if ievent.txt and ievent.txt.find('VERSION') != -1:
+            self.say(ievent.nick, self.cfg['version'], None, 'notice')
+            return 1
+
+    def handle_ctcp(self, ievent):
+
+        """ handle client to client request .. version and ping. """
+
+        if ievent.txt.find('VERSION') != -1:
+            self.ctcpreply(ievent.nick, 'VERSION %s' % self.cfg['version'])
+
+        if ievent.txt.find('PING') != -1:
+            try:
+                pingtime = ievent.txt.split()[1]
+                pingtime2 = ievent.txt.split()[2]
+                if pingtime:
+                    self.ctcpreply(ievent.nick, 'PING ' + pingtime + ' ' + \
+pingtime2)
+            except IndexError:
+                pass
+
+    def handle_error(self, ievent):
+
+        """ show error. """
+
+        if ievent.txt.startswith('Closing'):
+            rlog(10, self.name, ievent.txt)
+        else:
+            rlog(10, self.name + '.ERROR', "%s - %s" % (ievent.arguments, \
+ievent.txt))
+
+    def ping(self):
+
+        """ ping the irc server. """
+
+        rlog(1, self.name, 'sending ping')
+        try:
+            self.putonqueue(1, 'PING :%s' % self.server)
+            return 1
+        except Exception, ex:
+            rlog(10, self.name, "can't send ping: %s" % str(ex))
+            return 0
+
+    def handle_401(self, ievent):
+
+        """ handle 401 .. nick not available. """
+
+        try:
+            nick = ievent.arguments[1]
+            if nick not in self.nicks401:
+                rlog(10, self.name, '401 on %s .. ignoring' % nick)
+                self.nicks401.append(nick)
+        except:
+            pass
+
+    handle_403 = handle_401
+
+
+    def handle_700(self, ievent):
+
+        """ handle 700 .. encoding request of the server. """
+
+        try:
+            self.encoding = ievent.arguments[1]
+            rlog(10, self.name, '700 encoding now is %s' % self.encoding)
+        except:
+            pass
--- gozerbot-0.99.1.orig/build/lib/gozerbot/irc/ircevent.py
+++ gozerbot-0.99.1/build/lib/gozerbot/irc/ircevent.py
@@ -0,0 +1,484 @@
+# gozerbot/ircevent.py
+#
+#
+# http://www.irchelp.org/irchelp/rfc/rfc2812.txt
+
+""" an ircevent is extracted from the IRC string received from the server. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.utils.log import rlog
+from gozerbot.utils.generic import fix_format, toenc, fromenc, stripident
+from gozerbot.eventbase import EventBase, makeargrest
+from gozerbot.stats import stats
+from gozerbot.config import config
+
+# basic imports
+import time, re, types, copy
+
+cpy = copy.deepcopy
+
+try:
+    dotchars = config['dotchars']
+    if not dotchars:
+        dotchars = ' .. '
+except KeyError:
+    dotchars = ' .. '
+
+def makeargrest(ievent):
+
+    """ create ievent.args and ievent.rest .. this is needed because \
+         ircevents might be created outside the parse() function.
+    """ 
+
+    try:
+        ievent.args = ievent.txt.split()[1:]
+    except ValueError:
+        ievent.args = []
+
+    try:
+        cmnd, ievent.rest = ievent.txt.split(' ', 1)
+    except ValueError:
+        ievent.rest = ""   
+
+    ievent.command = ievent.txt.split(' ')[0]
+
+class Ircevent(EventBase):
+
+    """ represents an IRC event. """
+
+    def __copy__(self):
+        return Ircevent(self)
+
+    def __deepcopy__(self, bla):
+        return Ircevent(self)
+    
+    def toirc(self):
+        pass
+
+    def parse(self, bot, rawstr):
+
+        """ parse raw string into ircevent. """
+
+        self.bot = bot
+        stats.up('events', bot.name)
+        bot.nrevents += 1 
+        rawstr = rawstr.rstrip()
+        splitted = re.split('\s+', rawstr)
+
+        # check if there is a prefix (: in front)
+        if not rawstr[0] == ':':
+            # no prefix .. 1st word is command
+            splitted.insert(0, ":none!none@none")
+            rawstr = ":none!none@none " + rawstr
+
+        self.prefix = splitted[0][1:]
+
+        # get nick/userhost
+        nickuser = self.prefix.split('!')
+        if len(nickuser) == 2:
+            self.nick = nickuser[0]
+            stats.up('events', self.nick)
+            if self.bot.cfg['stripident'] or config['stripident']:
+                self.userhost = stripident(nickuser[1])
+            else:
+                self.userhost = nickuser[1]
+
+        # set command
+        self.cmnd = splitted[1]
+        self.cbtype = self.cmnd
+        stats.up('events', self.cmnd)
+
+        # split string based of postfix count .. nr of items ater the command
+        if pfc.has_key(self.cmnd):
+            self.arguments = splitted[2:pfc[self.cmnd]+2]
+            txtsplit = re.split('\s+', rawstr, pfc[self.cmnd]+2)
+            self.txt = txtsplit[-1]
+        else:
+            self.arguments = splitted[2:]
+
+        # 1st argument is target
+        if self.arguments:
+            self.target = self.arguments[0]
+        self.postfix = ' '.join(self.arguments)
+
+        # check if target is text
+        if self.target and self.target.startswith(':'):
+            self.txt = ' '.join(self.arguments)
+
+        # strip strarting ':' from txt
+        if self.txt:
+            if self.txt[0] == ":":
+                self.txt = self.txt[1:]
+        rlog(0, 'ircevent',"%s %s %s" % (self.cmnd, self.arguments, self.txt))
+
+        # set ircevent attributes
+        if self.cmnd == 'PING':
+            self.speed = 10
+        if self.cmnd == 'PRIVMSG':
+            self.channel = self.arguments[0]
+            if '\001' in self.txt:
+                self.isctcp = True
+        elif self.cmnd == 'JOIN' or self.cmnd == 'PART':
+            if self.arguments:
+                self.channel = self.arguments[0]
+            else:
+                self.channel = self.txt
+        elif self.cmnd == 'MODE':
+            self.channel = self.arguments[0]
+        elif self.cmnd == 'TOPIC':
+            self.channel = self.arguments[0]
+        elif self.cmnd == 'KICK':
+            self.channel = self.arguments[0]
+        elif self.cmnd == '353':
+            self.channel = self.arguments[2]
+        elif self.cmnd == '324':
+            self.channel = self.arguments[1]
+        if self.userhost:
+            # userhost before possible stripident
+            self.ruserhost = self.userhost
+            # jabber compat .. this is userhost on irc
+            self.stripped = self.userhost
+            # determine user
+            self.user = stripident(self.userhost).split('@')[0]
+
+        self.origtxt = self.txt
+        self.channel = self.channel.strip()
+        stats.up('events', self.channel)
+        self.origchannel = self.channel
+        rlog(-1, 'ircevent', self)
+
+        # show error
+        try:
+            nr = int(self.cmnd)
+            if nr > 399:
+                rlog(10, bot.name + '.error', '%s: %s %s' % (self.cmnd, \
+self.arguments, self.txt))
+        except ValueError:
+            pass
+
+        return self
+
+    def reply(self, txt, result=None, nick=None, dot=False, nritems=False, nr=False, fromm=None, private=False, how=''):
+
+        # don't replu is result is empty list
+        if result == []:
+            return
+
+        # stats
+        stats.up('events', 'replies')
+        if not how:
+            try:
+                how = self.options['--how']        
+            except KeyError:
+                how = 'msg'
+
+        # init
+        restxt = ""
+        splitted = []
+
+        # make reply if result is a dict
+        if type(result) == types.DictType:
+            for i, j in result.iteritems():
+                if type(j) == types.ListType:
+                    try:
+                        z = dotchars.join(j)
+                    except TypeError:
+                        z = unicode(j)
+                else:
+                    z = j
+                res = "%s: %s" % (i, z)
+                splitted.append(res)
+                if dot == True:
+                    restxt += "%s%s" % (res, dotchars)
+                else:
+                    restxt += "%s %s" % (dot or ' ', res)
+            if restxt:
+                if dot == True:
+                    restxt = restxt[:-6]
+                elif dot:
+                    restxt = restxt[:-len(dot)]
+
+        lt = False # set if result is list
+
+        # set vars if result is a list
+        if type(txt) == types.ListType and not result:
+            result = txt
+            origtxt = u""
+            lt = True
+        else:
+            origtxt = txt
+
+        if result:
+            lt = True
+
+        # if queues are set write output to them
+        if self.queues:
+            for i in self.queues:
+                if splitted:
+                    for item in splitted:
+                        i.put_nowait(item)
+                elif lt:
+                    for j in result:
+                        i.put_nowait(j)
+                elif restxt:
+                    i.put_nowait(restxt)
+                else:
+                    i.put_nowait(txt)
+            if self.onlyqueues:
+                return
+
+        # check if bot is set in event
+        if not self.bot:
+            rlog(10, 'event', 'no bot defined in event')
+            return
+
+        # make response
+        pretxt = origtxt
+        if lt and not restxt:
+            res = []
+
+            # check if there are list in list
+            for i in result:
+                if type(i) == types.ListType or type(i) == types.TupleType:
+                    try:
+                        res.append(dotchars.join(i))
+                    except TypeError:
+                        res.extend(i)
+                else:
+                    res.append(i)
+
+            # if nritems is set ..
+            result = res
+            if nritems:
+                if len(result) > 1:
+                    pretxt += "(%s items) .. " % len(result)
+            txtlist = result
+
+            # prepend item number for results
+            if not nr is False:
+                try:
+                    start = int(nr)
+                except ValueError:
+                    start = 0
+                txtlist2 = []
+                teller = start
+                for i in txtlist:
+                    txtlist2.append(u"%s) %s" % (teller, i))
+                    teller += 1
+                txtlist = txtlist2
+
+            # convert results to encoding
+            txtl = []
+            for item in txtlist:
+                txtl.append(toenc(item))
+            txtlist = txtl
+
+            # join result with dot 
+            if dot == True:
+                restxt = dotchars.join(txtlist)
+            elif dot:
+                restxt = dot.join(txtlist)
+            else:
+                restxt = ' '.join(txtlist)
+
+        # see if txt needs to be prepended
+        if pretxt:
+            try:
+                restxt = pretxt + restxt
+            except TypeError:
+                rlog(10, 'eventbase', "can't add %s and %s" % (str(pretxt), str(restxt)))
+
+        # if txt in result is filtered ignore the reuslt
+        if self.filtered(restxt):
+            return
+
+        # if event is DCC based write result directly to socket
+        if self.cmnd == 'DCC' and self.sock:
+            self.bot.say(self.sock, restxt, speed=self.speed, how=how)
+            return
+
+        # if nick is set write result to nick in question
+        if nick:
+            self.bot.say(nick, restxt, fromm=nick, speed=self.speed, how=how)
+            return
+
+        # if originatiog event is a private message or private flaf is set 
+        if self.msg or private:
+            self.bot.say(self.nick, restxt, fromm=self.nick, speed=self.speed, how=how)
+            return
+
+        # check if bot is in silent mode .. if so use /msg 
+        silent = False
+        channel = self.printto or self.channel
+        try:
+            silent = self.bot.channels[channel]['silent']
+        except (KeyError, TypeError):
+            pass
+        fromm = fromm or self.nick
+
+        # check if notice needs to be used
+        if silent:
+            notice = False
+            try:
+                notice = self.bot.channels[channel]['notice']
+            except (KeyError, TypeError):
+                pass
+            if notice:
+                self.bot.say(self.nick, restxt, how='notice', fromm=fromm, speed=self.speed)
+            else:
+                self.bot.say(self.nick, restxt, fromm=fromm, speed=self.speed, how=how)
+            return
+
+        # if printto is set used that as the target
+        if self.printto:
+            self.bot.say(self.printto, restxt, fromm=fromm, speed=self.speed, how=how)
+            return
+        else:
+            self.bot.say(self.channel, restxt, fromm=fromm, speed=self.speed, how=how)
+
+
+# postfix count aka how many arguments
+
+pfc = {}
+pfc['NICK'] = 0
+pfc['QUIT'] = 0
+pfc['SQUIT'] = 1
+pfc['JOIN'] = 0
+pfc['PART'] = 1
+pfc['TOPIC'] = 1
+pfc['KICK'] = 2
+pfc['PRIVMSG'] = 1
+pfc['NOTICE'] = 1
+pfc['SQUERY'] = 1
+pfc['PING'] = 0
+pfc['ERROR'] = 0
+pfc['AWAY'] = 0
+pfc['WALLOPS'] = 0
+pfc['INVITE'] = 1
+pfc['001'] = 1
+pfc['002'] = 1
+pfc['003'] = 1
+pfc['004'] = 4
+pfc['005'] = 15
+pfc['302'] = 1
+pfc['303'] = 1
+pfc['301'] = 2
+pfc['305'] = 1
+pfc['306'] = 1
+pfc['311'] = 5
+pfc['312'] = 3
+pfc['313'] = 2
+pfc['317'] = 3
+pfc['318'] = 2
+pfc['319'] = 2
+pfc['314'] = 5
+pfc['369'] = 2
+pfc['322'] = 3
+pfc['323'] = 1
+pfc['325'] = 3
+pfc['324'] = 4
+pfc['331'] = 2
+pfc['332'] = 2
+pfc['341'] = 3
+pfc['342'] = 2
+pfc['346'] = 3
+pfc['347'] = 2
+pfc['348'] = 3
+pfc['349'] = 2
+pfc['351'] = 3
+pfc['352'] = 7
+pfc['315'] = 2
+pfc['353'] = 3
+pfc['366'] = 2
+pfc['364'] = 3
+pfc['365'] = 2
+pfc['367'] = 2
+pfc['368'] = 2
+pfc['371'] = 1
+pfc['374'] = 1
+pfc['375'] = 1
+pfc['372'] = 1
+pfc['376'] = 1
+pfc['381'] = 1
+pfc['382'] = 2
+pfc['383'] = 5
+pfc['391'] = 2
+pfc['392'] = 1
+pfc['393'] = 1
+pfc['394'] = 1
+pfc['395'] = 1
+pfc['262'] = 3
+pfc['242'] = 1
+pfc['235'] = 3
+pfc['250'] = 1
+pfc['251'] = 1
+pfc['252'] = 2
+pfc['253'] = 2
+pfc['254'] = 2
+pfc['255'] = 1
+pfc['256'] = 2
+pfc['257'] = 1
+pfc['258'] = 1
+pfc['259'] = 1
+pfc['263'] = 2
+pfc['265'] = 1
+pfc['266'] = 1
+pfc['401'] = 2
+pfc['402'] = 2
+pfc['403'] = 2
+pfc['404'] = 2
+pfc['405'] = 2
+pfc['406'] = 2
+pfc['407'] = 2
+pfc['408'] = 2
+pfc['409'] = 1
+pfc['411'] = 1
+pfc['412'] = 1
+pfc['413'] = 2
+pfc['414'] = 2
+pfc['415'] = 2
+pfc['421'] = 2
+pfc['422'] = 1
+pfc['423'] = 2
+pfc['424'] = 1
+pfc['431'] = 1
+pfc['432'] = 2
+pfc['433'] = 2
+pfc['436'] = 2
+pfc['437'] = 2
+pfc['441'] = 3
+pfc['442'] = 2
+pfc['443'] = 3
+pfc['444'] = 2
+pfc['445'] = 1
+pfc['446'] = 1
+pfc['451'] = 1
+pfc['461'] = 2
+pfc['462'] = 1
+pfc['463'] = 1
+pfc['464'] = 1
+pfc['465'] = 1
+pfc['467'] = 2
+pfc['471'] = 2
+pfc['472'] = 2
+pfc['473'] = 2
+pfc['474'] = 2
+pfc['475'] = 2
+pfc['476'] = 2
+pfc['477'] = 2
+pfc['478'] = 3
+pfc['481'] = 1
+pfc['482'] = 2
+pfc['483'] = 1
+pfc['484'] = 1
+pfc['485'] = 1
+pfc['491'] = 1
+pfc['501'] = 1
+pfc['502'] = 1
+pfc['700'] = 2
+
+                
+# default event used to initialise events
+defaultevent = EventBase()
--- gozerbot-0.99.1.orig/build/lib/gozerbot/rest/server.py
+++ gozerbot-0.99.1/build/lib/gozerbot/rest/server.py
@@ -0,0 +1,265 @@
+# gozerbot/rest/server.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.utils.log import rlog
+from gozerbot.utils.exception import handle_exception, exceptionmsg
+from gozerbot.utils.trace import calledfrom
+from gozerbot.config import config
+from gozerbot.persist.persiststate import ObjectState
+from gozerbot.threads.thr import start_new_thread
+from SocketServer import BaseServer, ThreadingMixIn
+from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
+from urllib import unquote_plus
+from asyncore import dispatcher
+from cgi import escape
+import time, sys, select, types, socket
+
+class RestServerBase(HTTPServer):
+
+    """ REST web server """
+
+    allow_reuse_address = True
+    daemon_thread = True
+
+    def start(self):
+        self.name = calledfrom(sys._getframe(0))
+        self.stop = False
+        self.running = False
+        self.handlers = {}
+        self.webmods = {}
+        self.state = ObjectState()
+        self.state.define('whitelistenable', 0)
+        self.state.define('whitelist', [])
+        self.state.define('blacklist', [])
+        self.state.define('disable', [])
+        self.poll = select.poll()
+        self.poll.register(self)
+        start_new_thread(self.serve, ())
+
+    def shutdown(self):
+        try:
+            self.stop = True
+            #self.socket.shutdown(2)
+            #self.socket.close()
+            time.sleep(0.2)
+            self.server_close()
+        except Exception, ex:
+            handle_exception()
+
+    def serve(self):
+        rlog(10, self.name, 'starting server')
+        time.sleep(1)
+        while not self.stop:
+            self.running = True
+            try:
+                got = self.poll.poll(100)
+            except Exception, ex:
+                handle_exception()
+            if got and not self.stop:
+                try:
+                    self.handle_request()
+                except Exception, ex:
+                    handle_exception()
+            time.sleep(0.01)
+        self.running = False
+        rlog(10, self.name, 'stopping server')
+
+    def entrypoint(self, request):
+        ip = request.ip
+        if not self.whitelistenable() and ip in self.blacklist():
+            rlog(100, self.name, 'denied %s' % ip)
+            request.send_error(401)
+            return False
+        if  self.whitelistenable() and ip not in self.whitelist():
+            rlog(100, self.name, 'denied %s' % ip)
+            request.send_error(401)
+            return False
+        return True
+
+    def whitelistenable(self): 
+        return self.state['whitelistenable']
+
+    def whitelist(self): 
+        return self.state['whitelist']
+
+    def blacklist(self): 
+        return self.state['blacklist']
+
+    def addhandler(self, path, type, handler):
+        """ add a web handler """
+        splitted = []
+        for i in path.split('/'):
+            if i:
+                splitted.append(i)
+        splitted = tuple(splitted)
+        if not self.handlers.has_key(splitted):
+            self.handlers[splitted] = {}
+        self.handlers[splitted][type] = handler
+        rlog(0, self.name, '%s %s handler added' % (splitted, type))
+
+    def enable(self, what):
+        try:
+            self.state['disable'].remove(what)
+            rlog(10, self.name, 'enabled %s' % str(what))
+        except ValueError:
+            pass
+
+    def disable(self, what):
+        self.state['disable'].append(what)
+        rlog(10, self.name, 'enabled %s' % str(what))
+
+    def do(self, request):
+        """ do a request """
+        path = request.path.split('?')[0]
+        if path.endswith('/'):
+            path = path[:-1]
+        splitted = []
+        for i in path.split('/'):
+            if i:
+                splitted.append(i)
+        splitted = tuple(splitted)
+        for i in self.state['disable']:
+            if i in splitted:
+                rlog(10, self.name, 'denied disabled %s' % i)
+                request.send_error(404)
+                return
+        request.splitted = splitted
+        request.value = None
+        type = request.command
+        try:
+            func = self.handlers[splitted][type]
+        except (KeyError, ValueError):
+            try:
+                func = self.handlers[splitted[:-1]][type]
+                request.value = splitted[-1]
+            except (KeyError, ValueError):
+                request.send_error(404)
+                return
+        result = func(self, request)
+        rlog(10, self.name, 'result: %s' % str(result))
+        return result
+
+    def handle_error(self, request, addr):
+        """ log the error """
+        exctype, excvalue, tb = sys.exc_info()
+        if exctype == socket.timeout:
+            rlog(10, self.name, 'socket timeout on %s' % str(addr))
+            return
+        if exctype == socket.error:
+            rlog(10, self.name, 'socket error on %s: %s' % (str(addr), excvalue))
+            return
+        exceptstr = exceptionmsg()
+        rlog(10, self.name, 'error on %s: %s %s => %s' % (str(addr), exctype, excvalue, exceptstr))
+
+
+class RestServer(ThreadingMixIn, RestServerBase):
+
+    pass
+
+class RestServerAsync(RestServerBase, dispatcher):
+
+    pass
+
+class RestRequestHandler(BaseHTTPRequestHandler):
+
+    """ timeserver request handler class """
+
+    def setup(self):
+        BaseHTTPRequestHandler.setup(self)
+        self.ip = self.client_address[0]
+        self.name = self.ip
+        self.size = 0
+
+    def writeheader(self, type='text/plain'):
+        self.send_response(200)
+        self.send_header('Content-type', '%s; charset=%s ' % (type,sys.getdefaultencoding()))
+        self.send_header('Server', config['version'])
+        self.end_headers()
+
+    def sendresult(self):
+        try:
+            result = self.server.do(self)
+            if not result:
+                return
+            self.size = len(result)
+        except Exception, ex:
+            handle_exception()
+            self.send_error(501)
+            return
+        self.writeheader()
+        self.wfile.write(result)
+        self.wfile.close()
+
+    def handle_request(self):
+        if not self.server.entrypoint(self):
+            return
+        self.sendresult()
+
+    do_DELETE = do_PUT = do_GET = do_POST = handle_request
+
+    def log_request(self, code):
+        """ log the request """
+        try:
+            ua = self.headers['user-agent']
+        except:
+            ua = "-"
+        try:
+            rf = self.headers['referer']
+        except:
+            rf = "-"
+
+        if hasattr(self, 'path'):
+            rlog(10, self.name, '%s "%s %s %s" %s %s "%s" "%s"' % (self.address_string(), self.command, self.path, self.request_version, code, self.size, rf, ua))
+        else:
+            rlog(10, self.name, '%s "%s %s %s" %s %s "%s" "%s"' % (self.address_string(), self.command, "none", self.request_version, code, self.size, rf, ua))
+
+class SecureRestServer(RestServer):
+
+    def __init__(self, server_address, HandlerClass, keyfile, certfile):
+        from OpenSSL import SSL
+        BaseServer.__init__(self, server_address, HandlerClass)
+        ctx = SSL.Context(SSL.SSLv23_METHOD)
+        ctx.set_options(SSL.OP_NO_SSLv2)
+        rlog(10, self.name, "loading private key from %s" % keyfile)
+        ctx.use_privatekey_file (keyfile)
+        rlog(10, self.name, 'loading certificate from %s' % certfile)
+        ctx.use_certificate_file(certfile)
+        rlog(10, self.name, 'creating SSL socket on %s' % str(server_address))
+        self.socket = SSL.Connection(ctx, socket.socket(self.address_family,
+                                                        self.socket_type))
+        self.server_bind()  
+        self.server_activate()
+
+class SecureAuthRestServer(SecureRestServer):
+
+    def __init__(self, server_address, HandlerClass, chain, serverkey, servercert):
+        from OpenSSL import SSL
+        BaseServer.__init__(self, server_address, HandlerClass)
+        ctx = SSL.Context(SSL.SSLv23_METHOD)
+        rlog(10, self.name, "loading private key from %s" % serverkey)
+        ctx.use_privatekey_file (serverkey)
+        rlog(10, self.name, 'loading certificate from %s' % servercert)
+        ctx.use_certificate_file(servercert)
+        rlog(10, self.name, 'loading chain of certifications from %s' % chain)
+        ctx.set_verify_depth(2)
+        ctx.load_client_ca(chain)
+        #ctx.load_verify_locations(chain)
+        rlog(10, self.name, 'creating SSL socket on %s' % str(server_address))
+        callback = lambda conn,cert,errno,depth,retcode: retcode
+        ctx.set_verify(SSL.VERIFY_FAIL_IF_NO_PEER_CERT | SSL.VERIFY_PEER, callback)
+        ctx.set_session_id('gozerbot')
+        self.socket = SSL.Connection(ctx, socket.socket(self.address_family,
+                                                        self.socket_type))
+        self.server_bind()  
+        self.server_activate()
+
+class SecureRequestHandler(RestRequestHandler):
+
+    def setup(self):
+        self.connection = self.request._sock
+        self.request._sock.setblocking(1)
+        self.rfile = socket._fileobject(self.request, "rb", self.rbufsize)
+        self.wfile = socket._fileobject(self.request, "wb", self.rbufsize)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/rest/client.py
+++ gozerbot-0.99.1/build/lib/gozerbot/rest/client.py
@@ -0,0 +1,285 @@
+# gozerbot/rest/client.py
+#
+#
+
+""" Rest Client class """
+
+# gozerbot imports
+from gozerbot.utils.url import geturl3, geturl4, posturl, deleteurl, useragent
+from gozerbot.utils.generic import toenc
+from gozerbot.utils.log import rlog
+from gozerbot.utils.exception import handle_exception, exceptionmsg
+from gozerbot.utils.locking import lockdec
+from gozerbot.utils.lazydict import LazyDict
+
+# simple json import
+from simplejson import loads
+
+# basic imports
+from urllib2 import HTTPError, URLError
+from httplib import InvalidURL
+from urlparse import urlparse
+import socket, asynchat, urllib, sys, thread, re, asyncore, time
+from errno import EAGAIN, EBADF
+
+restlock = thread.allocate_lock()
+locked = lockdec(restlock)
+
+class RestResult(LazyDict):
+
+    def __init__(self, url="", name=""):
+        LazyDict.__init__(self)
+        self.url = url
+        self.name = name
+        self.data = None
+        self.error = None
+        self.status = None
+        self.reason = ""
+
+class RestClient(object):
+
+    def __init__(self, url, keyfile=None, certfile=None, port=None):
+        if not url.endswith('/'):
+            url += '/'
+        try:
+            u = urlparse(url)
+            splitted = u[1].split(':')
+            if len(splitted) == 2:
+                host, port = splitted
+            else:
+                host = splitted[0]
+                port = port or 9999
+            path = u[2]
+        except Exception, ex:
+            raise
+        self.host = host 
+        try:
+            self.ip = socket.gethostbyname(self.host)
+        except Exception, ex:
+            handle_exception()
+        self.path = path
+        self.port = port
+        self.url = url
+        self.keyfile = keyfile
+        self.certfile = certfile
+        self.callbacks = []
+
+    def addcb(self, callback): 
+        if not callback: 
+            return
+        self.callbacks.append(callback)
+        rlog(0, self.name, 'added callback %s' % str(callback))
+        return self
+
+    def delcb(self, callback):
+        try:
+            del self.callbacks[callback]
+            rlog(0, self.name, 'deleted callback %s' % str(callback))
+        except ValueError:
+            pass
+        
+    def do(self, func, url, *args, **kwargs):
+        result = RestResult(url)
+        try:
+            rlog(5, url, "calling %s" % str(func))
+            res = func(url, {}, kwargs, self.keyfile, self.certfile, self.port)
+            result.status = res.status
+            result.reason = res.reason
+            if result.status >= 400:
+                result.error = result.status
+            else:
+                result.error = None
+            if result.status == 200:
+                r = res.read()
+                result.data = loads(r)
+            else:
+                result.data = None
+            rlog(5, url, "result: %s" % str(result)) 
+        except Exception, ex:
+            result.error = str(ex)
+            result.data = None
+        for cb in self.callbacks:
+            try:
+                cb(self, result)
+                rlog(5, self.name, 'called callback %s' % str(cb))
+            except Exception, ex:
+                handle_exception()
+        return result
+
+    def post(self, *args, **kwargs):
+        return self.do(posturl, self.url, *args, **kwargs)
+
+    def add(self, *args, **kwargs):
+        return self.do(posturl, self.url, *args, **kwargs)
+
+    def delete(self, nr=None):
+         if nr:
+             return self.do(deleteurl, self.url + '/' + str(nr))
+         else:
+             return self.do(deleteurl, self.url)
+
+    def get(self, nr=None):
+        if not nr:
+            return self.do(geturl4, self.url)
+        else:
+            return self.do(geturl4, self.url + '/' + str(nr))
+
+class RestClientAsync(RestClient, asynchat.async_chat):
+
+    def __init__(self, url, name=""):
+        RestClient.__init__(self, url)
+        asynchat.async_chat.__init__(self)
+        self.set_terminator("\r\n\r\n")
+        self.reading_headers = True
+        self.error = None
+        self.buffer = ''
+        self.name = name or self.url
+        self.headers = {}
+        self.status = None
+
+    def handle_error(self):
+        exctype, excvalue, tb = sys.exc_info()
+        if exctype == socket.error:
+            try:
+                errno, errtxt = excvalue
+                if errno in [EAGAIN, EBADF]:
+                    rlog(10, self.name, "%s %s" % (errno, errtxt))
+                    return
+            except ValueError:
+                pass
+            self.error = str(excvalue)
+        else:
+            rlog(10, self.name, exceptionmsg())
+            self.error = exceptionmsg()
+        self.buffer = ''
+        result = RestResult(self.url, self.name)
+        result.error = self.error
+        result.data = None
+        for cb in self.callbacks:
+            try:
+                cb(self, result)
+                rlog(0, self.name, 'called callback %s' % str(cb))
+            except Exception, ex:
+                handle_exception()
+        self.close()
+
+    def handle_expt(self):
+        handle_exception()
+
+    def handle_connect(self):
+        rlog(10, self.name, 'connected %s' % str(self))
+         
+    def start(self):
+        assert(self.host)
+        assert(int(self.port))
+        try:
+            rlog(5, self.name, 'starting client')
+            self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
+            self.connect((self.ip, int(self.port)))
+        except socket.error, ex:
+            self.error = str(ex)
+            try:
+                self.connect((self.ip, int(self.port)))
+            except socket.error, ex:
+                self.error = str(ex)
+        except Exception, ex:
+            self.error = str(ex)
+        if self.error:
+            rlog(10, self.name, "can't start %s" % self.error)
+        else:
+            return True
+
+    @locked
+    def found_terminator(self):
+        rlog(10, self.name, 'found terminator')
+        if self.reading_headers:
+            self.reading_headers = False
+            try:
+                self.headers = self.buffer.split('\r\n')
+                self.status = int(self.headers[0].split()[1])
+            except (ValueError, IndexError):
+                rlog(10, self.name, "can't parse headers %s" % self.headers)
+                return
+            self.set_terminator(None)
+            self.buffer = ''
+            rlog(5, self.name, 'headers: %s' % self.headers)
+
+    def collect_incoming_data(self, data):
+        self.buffer = self.buffer + data
+
+    def handle_close(self):
+        self.reading_headers = False
+        self.handle_incoming()
+        rlog(10, self.name, 'closed')
+        self.close()
+      
+    def handle_incoming(self):
+        rlog(5, self.name, "incoming: " + self.buffer)
+        if not self.reading_headers:
+            result = RestResult(self.url, self.name)
+            if self.status >= 400:
+                rlog(10, self.name, 'error status: %s' % self.status)  
+                result.error = self.status
+                result.data = None
+            elif self.error:
+                result.error = self.error
+                result.data = None
+            elif self.buffer == "":
+                result.data = ""
+                result.error = None
+            else:
+                try:
+                    res = loads(self.buffer)
+                    if not res:
+                        self.buffer = ''
+                        return
+                    result.data = res
+                    result.error = None
+                except ValueError, ex:
+                    rlog(10, self.name, "can't decode %s" % self.buffer)
+                    result.error = str(ex)
+                except Exception, ex:
+                    rlog(10, self.name, exceptionmsg())
+                    result.error = exceptionmsg()                
+                    result.data = None
+            for cb in self.callbacks:
+                try:
+                    cb(self, result)
+                    rlog(0, self.name, 'called callback %s' % str(cb))
+                except Exception, ex:
+                    handle_exception()
+            self.buffer = ''
+
+    @locked
+    def dorequest(self, method, path, postdata={}, headers={}):
+        if postdata:
+            postdata = urllib.urlencode(postdata)
+        if headers:
+            if not headers.has_key('Content-Length'):
+                headers['Content-Length'] = len(postdata)
+            headerstxt = ""
+            for i,j in headers.iteritems():
+                headerstxt += "%s: %s\r\n" % (i.lower(), j)
+        else:
+            headerstxt = ""
+        if method == 'POST':
+            s = toenc("%s %s HTTP/1.0\r\n%s\r\n%s\r\n\r\n" % (method, path, headerstxt, postdata), 'ascii')
+        else:
+            s = toenc("%s %s HTTP/1.0\r\n\r\n" % (method, path), 'ascii')
+        if self.start():
+            rlog(10, self.url, 'sending %s' % s)
+            self.push(s)
+
+    def sendpost(self, postdata):
+        headers = {'Content-Type': 'application/x-www-form-urlencoded', \
+'Accept': 'text/plain; text/html', 'User-Agent': useragent()}
+        self.dorequest('POST', self.path, postdata, headers)
+
+    def sendget(self):
+        self.dorequest('GET', self.path)
+
+    def post(self, *args, **kwargs):
+        self.sendpost(kwargs)
+
+    def get(self):
+        self.sendget()
--- gozerbot-0.99.1.orig/build/lib/gozerbot/contrib/rijndael.py
+++ gozerbot-0.99.1/build/lib/gozerbot/contrib/rijndael.py
@@ -0,0 +1,376 @@
+"""
+A pure python (slow) implementation of rijndael with a decent interface
+
+To include -
+
+from rijndael import rijndael
+
+To do a key setup -
+
+r = rijndael(key, block_size = 16)
+
+key must be a string of length 16, 24, or 32
+blocksize must be 16, 24, or 32. Default is 16
+
+To use -
+
+ciphertext = r.encrypt(plaintext)
+plaintext = r.decrypt(ciphertext)
+
+If any strings are of the wrong length a ValueError is thrown
+"""
+
+# ported from the Java reference code by Bram Cohen, April 2001
+# this code is public domain, unless someone makes 
+# an intellectual property claim against the reference 
+# code, in which case it can be made public domain by 
+# deleting all the comments and renaming all the variables
+
+import copy
+import string
+
+shifts = [[[0, 0], [1, 3], [2, 2], [3, 1]],
+          [[0, 0], [1, 5], [2, 4], [3, 3]],
+          [[0, 0], [1, 7], [3, 5], [4, 4]]]
+
+# [keysize][block_size]
+num_rounds = {16: {16: 10, 24: 12, 32: 14}, 24: {16: 12, 24: 12, 32: 14}, 32: {16: 14, 24: 14, 32: 14}}
+
+A = [[1, 1, 1, 1, 1, 0, 0, 0],
+     [0, 1, 1, 1, 1, 1, 0, 0],
+     [0, 0, 1, 1, 1, 1, 1, 0],
+     [0, 0, 0, 1, 1, 1, 1, 1],
+     [1, 0, 0, 0, 1, 1, 1, 1],
+     [1, 1, 0, 0, 0, 1, 1, 1],
+     [1, 1, 1, 0, 0, 0, 1, 1],
+     [1, 1, 1, 1, 0, 0, 0, 1]]
+
+# produce log and alog tables, needed for multiplying in the
+# field GF(2^m) (generator = 3)
+alog = [1]
+for i in xrange(255):
+    j = (alog[-1] << 1) ^ alog[-1]
+    if j & 0x100 != 0:
+        j ^= 0x11B
+    alog.append(j)
+
+log = [0] * 256
+for i in xrange(1, 255):
+    log[alog[i]] = i
+
+# multiply two elements of GF(2^m)
+def mul(a, b):
+    if a == 0 or b == 0:
+        return 0
+    return alog[(log[a & 0xFF] + log[b & 0xFF]) % 255]
+
+# substitution box based on F^{-1}(x)
+box = [[0] * 8 for i in xrange(256)]
+box[1][7] = 1
+for i in xrange(2, 256):
+    j = alog[255 - log[i]]
+    for t in xrange(8):
+        box[i][t] = (j >> (7 - t)) & 0x01
+
+B = [0, 1, 1, 0, 0, 0, 1, 1]
+
+# affine transform:  box[i] <- B + A*box[i]
+cox = [[0] * 8 for i in xrange(256)]
+for i in xrange(256):
+    for t in xrange(8):
+        cox[i][t] = B[t]
+        for j in xrange(8):
+            cox[i][t] ^= A[t][j] * box[i][j]
+
+# S-boxes and inverse S-boxes
+S =  [0] * 256
+Si = [0] * 256
+for i in xrange(256):
+    S[i] = cox[i][0] << 7
+    for t in xrange(1, 8):
+        S[i] ^= cox[i][t] << (7-t)
+    Si[S[i] & 0xFF] = i
+
+# T-boxes
+G = [[2, 1, 1, 3],
+    [3, 2, 1, 1],
+    [1, 3, 2, 1],
+    [1, 1, 3, 2]]
+
+AA = [[0] * 8 for i in xrange(4)]
+
+for i in xrange(4):
+    for j in xrange(4):
+        AA[i][j] = G[i][j]
+        AA[i][i+4] = 1
+
+for i in xrange(4):
+    pivot = AA[i][i]
+    if pivot == 0:
+        t = i + 1
+        while AA[t][i] == 0 and t < 4:
+            t += 1
+            assert t != 4, 'G matrix must be invertible'
+            for j in xrange(8):
+                AA[i][j], AA[t][j] = AA[t][j], AA[i][j]
+            pivot = AA[i][i]
+    for j in xrange(8):
+        if AA[i][j] != 0:
+            AA[i][j] = alog[(255 + log[AA[i][j] & 0xFF] - log[pivot & 0xFF]) % 255]
+    for t in xrange(4):
+        if i != t:
+            for j in xrange(i+1, 8):
+                AA[t][j] ^= mul(AA[i][j], AA[t][i])
+            AA[t][i] = 0
+
+iG = [[0] * 4 for i in xrange(4)]
+
+for i in xrange(4):
+    for j in xrange(4):
+        iG[i][j] = AA[i][j + 4]
+
+def mul4(a, bs):
+    if a == 0:
+        return 0
+    r = 0
+    for b in bs:
+        r <<= 8
+        if b != 0:
+            r = r | mul(a, b)
+    return r
+
+T1 = []
+T2 = []
+T3 = []
+T4 = []
+T5 = []
+T6 = []
+T7 = []
+T8 = []
+U1 = []
+U2 = []
+U3 = []
+U4 = []
+
+for t in xrange(256):
+    s = S[t]
+    T1.append(mul4(s, G[0]))
+    T2.append(mul4(s, G[1]))
+    T3.append(mul4(s, G[2]))
+    T4.append(mul4(s, G[3]))
+
+    s = Si[t]
+    T5.append(mul4(s, iG[0]))
+    T6.append(mul4(s, iG[1]))
+    T7.append(mul4(s, iG[2]))
+    T8.append(mul4(s, iG[3]))
+
+    U1.append(mul4(t, iG[0]))
+    U2.append(mul4(t, iG[1]))
+    U3.append(mul4(t, iG[2]))
+    U4.append(mul4(t, iG[3]))
+
+# round constants
+rcon = [1]
+r = 1
+for t in xrange(1, 30):
+    r = mul(2, r)
+    rcon.append(r)
+
+del A
+del AA
+del pivot
+del B
+del G
+del box
+del log
+del alog
+del i
+del j
+del r
+del s
+del t
+del mul
+del mul4
+del cox
+del iG
+
+class rijndael:
+    def __init__(self, key, block_size = 16):
+        if block_size != 16 and block_size != 24 and block_size != 32:
+            raise ValueError('Invalid block size: ' + str(block_size))
+        if len(key) != 16 and len(key) != 24 and len(key) != 32:
+            raise ValueError('Invalid key size: ' + str(len(key)))
+        self.block_size = block_size
+
+        ROUNDS = num_rounds[len(key)][block_size]
+        BC = block_size / 4
+        # encryption round keys
+        Ke = [[0] * BC for i in xrange(ROUNDS + 1)]
+        # decryption round keys
+        Kd = [[0] * BC for i in xrange(ROUNDS + 1)]
+        ROUND_KEY_COUNT = (ROUNDS + 1) * BC
+        KC = len(key) / 4
+
+        # copy user material bytes into temporary ints
+        tk = []
+        for i in xrange(0, KC):
+            tk.append((ord(key[i * 4]) << 24) | (ord(key[i * 4 + 1]) << 16) |
+                (ord(key[i * 4 + 2]) << 8) | ord(key[i * 4 + 3]))
+
+        # copy values into round key arrays
+        t = 0
+        j = 0
+        while j < KC and t < ROUND_KEY_COUNT:
+            Ke[t / BC][t % BC] = tk[j]
+            Kd[ROUNDS - (t / BC)][t % BC] = tk[j]
+            j += 1
+            t += 1
+        tt = 0
+        rconpointer = 0
+        while t < ROUND_KEY_COUNT:
+            # extrapolate using phi (the round key evolution function)
+            tt = tk[KC - 1]
+            tk[0] ^= (S[(tt >> 16) & 0xFF] & 0xFF) << 24 ^  \
+                     (S[(tt >>  8) & 0xFF] & 0xFF) << 16 ^  \
+                     (S[ tt        & 0xFF] & 0xFF) <<  8 ^  \
+                     (S[(tt >> 24) & 0xFF] & 0xFF)       ^  \
+                     (rcon[rconpointer]    & 0xFF) << 24
+            rconpointer += 1
+            if KC != 8:
+                for i in xrange(1, KC):
+                    tk[i] ^= tk[i-1]
+            else:
+                for i in xrange(1, KC / 2):
+                    tk[i] ^= tk[i-1]
+                tt = tk[KC / 2 - 1]
+                tk[KC / 2] ^= (S[ tt        & 0xFF] & 0xFF)       ^ \
+                              (S[(tt >>  8) & 0xFF] & 0xFF) <<  8 ^ \
+                              (S[(tt >> 16) & 0xFF] & 0xFF) << 16 ^ \
+                              (S[(tt >> 24) & 0xFF] & 0xFF) << 24
+                for i in xrange(KC / 2 + 1, KC):
+                    tk[i] ^= tk[i-1]
+            # copy values into round key arrays
+            j = 0
+            while j < KC and t < ROUND_KEY_COUNT:
+                Ke[t / BC][t % BC] = tk[j]
+                Kd[ROUNDS - (t / BC)][t % BC] = tk[j]
+                j += 1
+                t += 1
+        # inverse MixColumn where needed
+        for r in xrange(1, ROUNDS):
+            for j in xrange(BC):
+                tt = Kd[r][j]
+                Kd[r][j] = U1[(tt >> 24) & 0xFF] ^ \
+                           U2[(tt >> 16) & 0xFF] ^ \
+                           U3[(tt >>  8) & 0xFF] ^ \
+                           U4[ tt        & 0xFF]
+        self.Ke = Ke
+        self.Kd = Kd
+
+    def encrypt(self, plaintext):
+        if len(plaintext) != self.block_size:
+            raise ValueError('wrong block length, expected ' + str(self.block_size) + ' got ' + str(len(plaintext)))
+        Ke = self.Ke
+
+        BC = self.block_size / 4
+        ROUNDS = len(Ke) - 1
+        if BC == 4:
+            SC = 0
+        elif BC == 6:
+            SC = 1
+        else:
+            SC = 2
+        s1 = shifts[SC][1][0]
+        s2 = shifts[SC][2][0]
+        s3 = shifts[SC][3][0]
+        a = [0] * BC
+        # temporary work array
+        t = []
+        # plaintext to ints + key
+        for i in xrange(BC):
+            t.append((ord(plaintext[i * 4    ]) << 24 |
+                      ord(plaintext[i * 4 + 1]) << 16 |
+                      ord(plaintext[i * 4 + 2]) <<  8 |
+                      ord(plaintext[i * 4 + 3])        ) ^ Ke[0][i])
+        # apply round transforms
+        for r in xrange(1, ROUNDS):
+            for i in xrange(BC):
+                a[i] = (T1[(t[ i           ] >> 24) & 0xFF] ^
+                        T2[(t[(i + s1) % BC] >> 16) & 0xFF] ^
+                        T3[(t[(i + s2) % BC] >>  8) & 0xFF] ^
+                        T4[ t[(i + s3) % BC]        & 0xFF]  ) ^ Ke[r][i]
+            t = copy.copy(a)
+        # last round is special
+        result = []
+        for i in xrange(BC):
+            tt = Ke[ROUNDS][i]
+            result.append((S[(t[ i           ] >> 24) & 0xFF] ^ (tt >> 24)) & 0xFF)
+            result.append((S[(t[(i + s1) % BC] >> 16) & 0xFF] ^ (tt >> 16)) & 0xFF)
+            result.append((S[(t[(i + s2) % BC] >>  8) & 0xFF] ^ (tt >>  8)) & 0xFF)
+            result.append((S[ t[(i + s3) % BC]        & 0xFF] ^  tt       ) & 0xFF)
+        return string.join(map(chr, result), '')
+
+    def decrypt(self, ciphertext):
+        if len(ciphertext) != self.block_size:
+            raise ValueError('wrong block length, expected ' + str(self.block_size) + ' got ' + str(len(ciphertext)))
+        Kd = self.Kd
+
+        BC = self.block_size / 4
+        ROUNDS = len(Kd) - 1
+        if BC == 4:
+            SC = 0
+        elif BC == 6:
+            SC = 1
+        else:
+            SC = 2
+        s1 = shifts[SC][1][1]
+        s2 = shifts[SC][2][1]
+        s3 = shifts[SC][3][1]
+        a = [0] * BC
+        # temporary work array
+        t = [0] * BC
+        # ciphertext to ints + key
+        for i in xrange(BC):
+            t[i] = (ord(ciphertext[i * 4    ]) << 24 |
+                    ord(ciphertext[i * 4 + 1]) << 16 |
+                    ord(ciphertext[i * 4 + 2]) <<  8 |
+                    ord(ciphertext[i * 4 + 3])        ) ^ Kd[0][i]
+        # apply round transforms
+        for r in xrange(1, ROUNDS):
+            for i in xrange(BC):
+                a[i] = (T5[(t[ i           ] >> 24) & 0xFF] ^
+                        T6[(t[(i + s1) % BC] >> 16) & 0xFF] ^
+                        T7[(t[(i + s2) % BC] >>  8) & 0xFF] ^
+                        T8[ t[(i + s3) % BC]        & 0xFF]  ) ^ Kd[r][i]
+            t = copy.copy(a)
+        # last round is special
+        result = []
+        for i in xrange(BC):
+            tt = Kd[ROUNDS][i]
+            result.append((Si[(t[ i           ] >> 24) & 0xFF] ^ (tt >> 24)) & 0xFF)
+            result.append((Si[(t[(i + s1) % BC] >> 16) & 0xFF] ^ (tt >> 16)) & 0xFF)
+            result.append((Si[(t[(i + s2) % BC] >>  8) & 0xFF] ^ (tt >>  8)) & 0xFF)
+            result.append((Si[ t[(i + s3) % BC]        & 0xFF] ^  tt       ) & 0xFF)
+        return string.join(map(chr, result), '')
+
+def encrypt(key, block):
+    return rijndael(key, len(block)).encrypt(block)
+
+def decrypt(key, block):
+    return rijndael(key, len(block)).decrypt(block)
+
+def test():
+    def t(kl, bl):
+        b = 'b' * bl
+        r = rijndael('a' * kl, bl)
+        assert r.decrypt(r.encrypt(b)) == b
+    t(16, 16)
+    t(16, 24)
+    t(16, 32)
+    t(24, 16)
+    t(24, 24)
+    t(24, 32)
+    t(32, 16)
+    t(32, 24)
+    t(32, 32)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/contrib/xmlstream.py
+++ gozerbot-0.99.1/build/lib/gozerbot/contrib/xmlstream.py
@@ -0,0 +1,271 @@
+##   xmlstream.py
+##
+##   Copyright (C) 2001 Matthew Allum
+##
+##   This program is free software; you can redistribute it and/or modify
+##   it under the terms of the GNU Lesser General Public License as published
+##   by the Free Software Foundation; either version 2, 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 Lesser General Public License for more details.
+
+
+"""\
+xmlstream.py provides simple functionality for implementing
+XML stream based network protocols. It is used as a  base
+for jabber.py.
+
+xmlstream.py manages the network connectivity and xml parsing
+of the stream. When a complete 'protocol element' ( meaning a
+complete child of the xmlstreams root ) is parsed the dipatch
+method is called with a 'Node' instance of this structure.
+The Node class is a very simple XML DOM like class for
+manipulating XML documents or 'protocol elements' in this
+case.
+
+"""
+
+# $Id: xmlstream.py,v 1.45 2004/02/03 16:33:37 snakeru Exp $
+
+import time, sys, re, socket
+from base64 import encodestring
+import xml.parsers.expat
+
+__version__ = VERSION = "0.5"
+
+ENCODING = 'utf-8'      # Though it is uncommon, this is the only right setting.
+ustr = str
+
+BLOCK_SIZE  = 1024     ## Number of bytes to get at at time via socket
+                       ## transactions
+
+def XMLescape(txt):
+    "Escape XML entities"
+    txt = txt.replace("&", "&amp;")
+    txt = txt.replace("<", "&lt;")
+    txt = txt.replace(">", "&gt;")
+    return txt
+
+def XMLunescape(txt):
+    "Unescape XML entities"
+    txt = txt.replace("&gt;", ">")
+    txt = txt.replace("&lt;", "<")
+    txt = txt.replace("&amp;", "&")
+    return txt
+
+class error(object):
+    def __init__(self, value):
+        self.value = str(value)
+    def __str__(self):
+        return self.value
+
+class Node(object):
+    """A simple XML DOM like class"""
+    def __init__(self, tag=None, parent=None, attrs={}, payload=[], node=None):
+        if node:
+            if type(node)<>type(self): node=NodeBuilder(node).getDom()
+            self.name,self.namespace,self.attrs,self.data,self.kids,self.parent = \
+                node.name,node.namespace,node.attrs,node.data,node.kids,node.parent
+        else:
+            self.name,self.namespace,self.attrs,self.data,self.kids,self.parent = 'tag','',{},[],[],None
+
+        if tag: self.namespace, self.name = (['']+tag.split())[-2:]
+
+        if parent: self.parent = parent
+
+#        if self.parent and not self.namespace: self.namespace=self.parent.namespace   # Doesn't checked if this neccessary
+
+        for attr in attrs.keys():
+            self.attrs[attr]=attrs[attr]
+
+        for i in payload:
+            if type(i)==type(self): self.insertNode(i)
+            else: self.insertXML(i)
+#            self.insertNode(Node(node=i))     # Alternative way. Needs perfomance testing.
+
+    def setParent(self, node):
+        "Set the nodes parent node."
+        self.parent = node
+
+    def getParent(self):
+        "return the nodes parent node."
+        return self.parent
+
+    def getName(self):
+        "Set the nodes tag name."
+        return self.name
+
+    def setName(self,val):
+        "Set the nodes tag name."
+        self.name = val
+
+    def putAttr(self, key, val):
+        "Add a name/value attribute to the node."
+        self.attrs[key] = val
+
+    def getAttr(self, key):
+        "Get a value for the nodes named attribute."
+        try: return self.attrs[key]
+        except: return None
+
+    def getAttributes(self):
+        "Get a value for the nodes named attribute."
+        return self.attrs
+
+    def putData(self, data):
+        "Set the nodes textual data"
+        self.data.append(data)
+
+    def insertData(self, data):
+        "Set the nodes textual data"
+        self.data.append(data)
+
+    def getData(self):
+        "Return the nodes textual data"
+        return ''.join(self.data)
+
+    def getDataAsParts(self):
+        "Return the node data as an array"
+        return self.data
+
+    def getNamespace(self):
+        "Returns the nodes namespace."
+        return self.namespace
+
+    def setNamespace(self, namespace):
+        "Set the nodes namespace."
+        self.namespace = namespace
+
+    def insertTag(self, name=None, attrs={}, payload=[], node=None):
+        """ Add a child tag of name 'name' to the node.
+
+            Returns the newly created node.
+        """
+        newnode = Node(tag=name, parent=self, attrs=attrs, payload=payload, node=node)
+        self.kids.append(newnode)
+        return newnode
+
+    def insertNode(self, node):
+        "Add a child node to the node"
+        self.kids.append(node)
+        return node
+
+    def insertXML(self, xml_str):
+        "Add raw xml as a child of the node"
+        newnode = NodeBuilder(xml_str).getDom()
+        self.kids.append(newnode)
+        return newnode
+
+    def __str__(self):
+        return self._xmlnode2str()
+
+    def _xmlnode2str(self, parent=None):
+        """Returns an xml ( string ) representation of the node
+         and it children"""
+        s = "<" + self.name
+        if self.namespace:
+            if parent and parent.namespace != self.namespace:
+                s = s + " xmlns = '%s' " % self.namespace
+        for key in self.attrs.keys():
+            val = ustr(self.attrs[key])
+            s = s + " %s='%s'" % ( key, XMLescape(val) )
+        s = s + ">"
+        cnt = 0
+        if self.kids != None:
+            for a in self.kids:
+                if (len(self.data)-1) >= cnt: s = s + XMLescape(self.data[cnt])
+                s = s + a._xmlnode2str(parent=self)
+                cnt=cnt+1
+        if (len(self.data)-1) >= cnt: s = s + XMLescape(self.data[cnt])
+        if not self.kids and s[-1:]=='>':
+            s=s[:-1]+' />'
+        else:
+            s = s + "</" + self.name + ">"
+        return s
+
+    def getTag(self, name, index=None):
+        """Returns a child node with tag name. Returns None
+        if not found."""
+        for node in self.kids:
+            if node.getName() == name:
+                if not index: return node
+                if index is not None: index-=1
+        return None
+
+    def getTags(self, name):
+        """Like getTag but returns a list with matching child nodes"""
+        nodes=[]
+        for node in self.kids:
+            if node.getName() == name:
+               nodes.append(node)
+        return nodes
+
+    def getChildren(self):
+        """Returns a nodes children"""
+        return self.kids
+
+    def removeTag(self,tag):
+        """Pops out specified child and returns it."""
+        if type(tag)==type(self):
+            try:
+                self.kids.remove(tag)
+                return tag
+            except: return None
+        for node in self.kids:
+            if node.getName()==tag:
+                self.kids.remove(node)
+                return node
+
+class NodeBuilder(object):
+    """builds a 'minidom' from data parsed to it. Primarily for insertXML
+       method of Node"""
+    def __init__(self,data=None):
+        self._parser = xml.parsers.expat.ParserCreate()
+        self._parser.StartElementHandler  = self.unknown_starttag
+        self._parser.EndElementHandler    = self.unknown_endtag
+        self._parser.CharacterDataHandler = self.handle_data
+        self.__depth = 0
+        self._dispatch_depth = 1
+        self.last_is_data = False
+        self._ptr = Node()
+        if data: self._parser.Parse(data,1)
+
+    def unknown_starttag(self, tag, attrs):
+        """XML Parser callback"""
+        self.__depth = self.__depth + 1
+        if self.__depth == self._dispatch_depth:
+            self._mini_dom = Node(tag=tag, attrs=attrs)
+            self._ptr = self._mini_dom
+        elif self.__depth > self._dispatch_depth:
+            self._ptr.kids.append(Node(tag=tag,parent=self._ptr,attrs=attrs))
+            self._ptr = self._ptr.kids[-1]
+        else:                           ## it the stream tag:
+            if attrs.has_key('id'):
+                self._incomingID = attrs['id']
+        self.last_is_data = False
+
+    def unknown_endtag(self, tag ):
+        """XML Parser callback"""
+        if self.__depth == self._dispatch_depth:
+            self.dispatch(self._mini_dom)
+        elif self.__depth > self._dispatch_depth:
+            self._ptr = self._ptr.parent
+        self.__depth = self.__depth - 1
+        self.last_is_data = False
+
+    def handle_data(self, data):
+        """XML Parser callback"""
+        if self.last_is_data:
+            self._ptr.data[-1] += data
+        else:
+            self._ptr.data.append(data)
+            self.last_is_data = True
+
+    def dispatch(self,dom):
+        pass
+
+    def getDom(self):
+        return self._mini_dom
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/code.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/code.py
@@ -0,0 +1,67 @@
+# plugs/code.py
+#
+#
+
+""" code related commands. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.redispatcher import rebefore, reafter
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.utils.exception import exceptionlist
+from gozerbot.plugins import plugins
+from gozerbot.aliases import aliasset
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('code', 'the code plugin provides code related commands')
+
+def handle_showexceptions(bot, ievent):
+
+    """ show exception list. """
+
+    try:
+        printto = ievent.args[0]
+    except IndexError:
+        printto = ievent.channel
+    cp = list(exceptionlist)
+    for exception in cp:
+        bot.say(printto, exception, groupchat=False)
+    if not exceptionlist:
+        ievent.reply('no exceptions yet !')
+
+cmnds.add('code-exceptions' , handle_showexceptions, 'OPER')
+examples.add('code-exceptions', 'show exception list', '1) code-exceptions 2) code-exceptions bthate@gmail.com')
+aliasset('exceptions', 'code-exceptions')
+tests.add('code-exceptions')
+
+def handle_funcnames(bot, ievent):
+
+    """ show function names of a plugin. """
+
+    try:
+        plugname = ievent.args[0]
+    except IndexError:
+        ievent.missing('<plugname>')
+        return
+
+    if not plugins.exist(plugname):
+        ievent.reply('no %s plugin exists' % plugname)
+        return
+
+    funcnames = []
+    funcnames = rebefore.getfuncnames(plugname)
+    funcnames += cmnds.getfuncnames(plugname)
+    funcnames += reafter.getfuncnames(plugname)
+
+    if funcnames:
+        ievent.reply(funcnames, dot=True)
+    else:
+        ievent.reply("can't find funcnames for %s plugin" % plugname)
+        
+cmnds.add('code-funcnames', handle_funcnames, 'OPER')
+examples.add('code-funcnames', 'show function names of a plugin', 'code-funcnames birthday')
+aliasset('funcnames', 'code-funcnames')
+tests.add('code-funcnames core', 'handle_version')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/tail.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/tail.py
@@ -0,0 +1,42 @@
+# plugs/tail.py
+#
+#
+
+""" tail bot results. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.utils.generic import waitforqueue
+from gozerbot.commands import cmnds
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+
+plughelp.add('tail', 'show last <nr> elements of pipeline')
+
+def handle_tail(bot, ievent):
+
+    """ used in a pipeline .. show last <nr> elements. """
+
+    if not ievent.inqueue:
+        ievent.reply("use tail in a pipeline")
+        return
+
+    try:
+        nr = int(ievent.args[0])
+    except (ValueError, IndexError):
+        ievent.reply('tail <nr>')
+        return
+
+    result = waitforqueue(ievent.inqueue, 30)
+
+    if not result:
+        ievent.reply('no data to tail')
+        return
+
+    ievent.reply(result[-nr:])
+    
+cmnds.add('tail', handle_tail, ['USER', 'CLOUD'], threaded=True)
+examples.add('tail', 'show last <nr> lines of pipeline output', 'list | tail 5')
+tests.add('list | tail 5')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/throttle.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/throttle.py
@@ -0,0 +1,142 @@
+# gozerbot/plugs/throttle.py
+#
+#
+
+from gozerbot.persist.persiststate import PlugState
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.users import users
+from gozerbot.generic import getwho, rlog
+from gozerbot.tests import tests
+
+import time
+
+plughelp.add('throttle', 'throttle user commands per minute')
+
+state = PlugState()
+state.define('lasttime', {})
+state.define('level', {})
+state.define('cpm', {}) # commands per minute
+
+cfg = PersistConfig()
+cfg.define('enable', 1)
+
+def throttlepre(bot, ievent):
+    if cfg.get('enable'):
+        return 1
+
+def throttlecb(bot, ievent):
+    try:
+        cpm = state['cpm']
+        uh = ievent.userhost
+        if ievent.usercmnd:
+            if cpm.has_key(uh):
+                cpm[uh] += 1
+            else:
+                cpm[uh] = 1
+        if uh in bot.throttle:
+            if time.time() - state['lasttime'][uh] > 60:
+                bot.throttle.remove(uh)
+                cpm[uh] = 0
+                ievent.reply('next command is unthrottled (%s)' % uh)
+                rlog(10, 'throttle', 'unignoring %s' % uh)
+        else:
+            if ievent.usercmnd and (cpm[uh] > state['level'][uh]):
+                perms = users.getperms(uh)
+                if perms and 'OPER' in perms:
+                    cpm[uh] = 0
+                    return
+                bot.throttle.append(uh)
+                ievent.reply('%s throttled' % uh)
+                rlog(10, 'throttle', 'ignoring %s' % uh)
+                state['lasttime'][uh] = time.time()
+    except (ValueError, KeyError):
+        pass
+
+def init():
+    callbacks.add('PRIVMSG', throttlecb, throttlepre)
+
+def handle_throttleget(bot, ievent):
+    if not ievent.rest:
+        ievent.missing("<nick>")
+        return
+    nick = ievent.rest
+    uh = getwho(bot, nick)
+    if not uh:
+        ievent.reply("can't find userhost of %s" % nick)
+        return
+    try:
+        ievent.reply("cpm of %s is %s" % (uh, state['level'][uh]))
+    except KeyError:
+        pass
+
+cmnds.add('throttle-get', handle_throttleget, 'OPER')
+examples.add('throttle-get', 'get commands per minute of <nick>', \
+'throttle-get dunker')
+tests.add('throttle-get exec')
+
+def handle_throttleset(bot, ievent):
+    try:
+        (nick, cpm) = ievent.args
+    except ValueError:
+        ievent.missing('<nick> <commands per minute>')
+        return
+    uh = getwho(bot, nick)
+    if not uh:
+        ievent.reply("can't find userhost of %s" % nick)
+        return
+    perms = users.getperms(uh)
+    if perms and 'OPER' in perms:
+        ievent.reply("can't throttle a OPER")
+        return
+    try:
+        cpm = float(cpm)
+        if cpm == 0:
+            ievent.reply("cpm can't be zero")
+            return
+        state['level'][uh] = cpm
+        state['cpm'][uh] = 0
+        state.save()
+    except ValueError:
+        ievent.reply('%s is not an integer' % cpm)
+        return
+    try:
+        bot.throttle.remove(uh)
+    except ValueError:
+        pass
+    ievent.reply('cpm set to %s for %s' % (cpm, uh))
+ 
+cmnds.add('throttle-set', handle_throttleset, 'OPER')
+examples.add('throttle-set', 'set allowed <cpm> commands per minute for \
+<nick>' , 'throttle-set dunker 10')
+tests.add('throttle-set mekker 10')
+
+def handle_throttleremove(bot, ievent):
+    if not ievent.rest:
+        ievent.missing('<nick>')
+        return
+    uh = getwho(bot, ievent.rest)
+    if not uh:
+        ievent.reply("can't find userhost of %s" % ievent.rest)
+        return
+    try:
+        bot.throttle.remove(uh)
+        state['cpm'][uh] = 0
+        state.save()
+        ievent.reply('throttle on %s removed' % uh)
+    except (KeyError, ValueError):
+        pass
+
+cmnds.add('throttle-remove', handle_throttleremove, 'OPER')
+examples.add('throttle-remove', 'remove throttle from <nick>', \
+'throttle-remove dunker')
+tests.add('throttle-remove exec')
+
+def handle_throttlelist(bot, ievent):
+    ievent.reply(bot.throttle)
+
+cmnds.add('throttle-list', handle_throttlelist, 'OPER')
+tests.add('throttle-list')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/chanperm.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/chanperm.py
@@ -0,0 +1,108 @@
+# plugs/chanperm.py
+#
+#
+
+""" 
+    allow all user in a channel to have permissions. permission that use 
+    userstate information can not be used, for that the users must be meeted to 
+    the bot.
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.utils.log import rlog
+from gozerbot.tests import tests
+from gozerbot.utils.locking import lockdec
+
+import thread
+
+plughelp.add('chanperm', 'manage channel permissions')
+
+chanpermlock = thread.allocate_lock()
+chanpermlocked = lockdec(chanpermlock)
+
+@chanpermlocked
+def handle_chanperm(bot, ievent):
+
+    """ show channel permissions. """
+
+    chan = ievent.channel.lower()
+
+    try:
+        p = bot.channels[chan]['perms']
+    except (KeyError, TypeError):
+        ievent.reply("channel %s has no permissions set" % chan)
+        return
+
+    if p:
+        ievent.reply('permissions of channel %s: ' % chan, p, dot=True)
+    else:
+        ievent.reply("channel %s has no permissions set" % chan)
+    
+cmnds.add('chanperm', handle_chanperm, 'OPER')
+examples.add('chanperm', 'show channel permissions', 'chanperm')
+tests.add('chanperm-add mekker --chan #dunkbots').add('chanperm chan #dunkbots', 'MEKKER').add('chanperm-del chan #dunkbots mekker')
+
+@chanpermlocked
+def handle_chanpermadd(bot, ievent):
+
+    """ add channel permission. """
+
+    try:
+        perm = ievent.args[0].upper()
+    except IndexError:
+        ievent.missing('<perm>')
+        return
+
+    if perm in ['OPER', 'USER']:
+        ievent.reply("can't set channel permission to %s" % perm)
+        return
+
+    chan = ievent.channel.lower()
+
+    try:
+        if perm in bot.channels[chan]['perms']:
+            ievent.reply('channel %s already has %s permission set' % \
+(chan, perm))
+            return
+    except (KeyError, TypeError):
+        try:
+            bot.channels[chan].setdefault('perms', [])
+        except AttributeError:
+            ievent.reply('channel %s is not in channel database' % chan)
+            return
+
+    bot.channels[chan]['perms'].append(perm.upper())
+    bot.channels.save()
+    ievent.reply('%s channel perm added' % perm)
+    
+cmnds.add('chanperm-add', handle_chanpermadd, 'OPER', allowqueue=False)
+examples.add('chanperm-add', 'add channel permission <perm>', 'chanperm-add ANONKARMA')
+tests.add('chanperm-add mekker chan #dunkbots', 'MEKKER').add('chanperm-del mekker chan #dunkbots')
+
+@chanpermlocked
+def handle_chanpermdel(bot, ievent):
+
+    """ delete channel permission. """
+
+    try:
+        perm = ievent.args[0]
+    except IndexError:
+        ievent.missing('<perm>')
+        return
+
+    chan = ievent.channel.lower()
+
+    try:
+        bot.channels[chan]['perms'].remove(perm.upper())
+        ievent.reply('%s channel perm deleted' % perm)
+    except (ValueError, KeyError, TypeError):
+        ievent.reply('there is no %s permission for channel %s' % (perm, chan))
+
+cmnds.add('chanperm-del', handle_chanpermdel, 'OPER')
+examples.add('chanperm-del', 'delete channel permission <perm>', 'chanperm-del ANONKARMA')
+tests.add('chanperm-add mekker chan #dunkbots').add('chanperm-del mekker chan #dunkbots', 'mekker')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/size.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/size.py
@@ -0,0 +1,47 @@
+# gozerbot/plugs/size.py
+#
+#
+
+""" show sizes of plugin data. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.users import users
+from gozerbot.redispatcher import rebefore, reafter
+from gozerbot.aliases import aliases
+from gozerbot.callbacks import callbacks
+from gozerbot.plugins import plugins
+from gozerbot.fleet import fleet
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('size', 'the size command shows the sizes of plugins that \
+provide a size() plugin command and the sizes of some basic structures')
+
+def handle_size(bot, ievent):
+
+    """ size .. show size of core datastructures  and plugins that provide a size() function. """
+
+    txtlist = []
+    txtlist.append("fleet: %s" % fleet.size())
+    txtlist.append("users: %s" % users.size())
+    txtlist.append("cmnds: %s" % cmnds.size())
+    txtlist.append("callbacks: %s" % callbacks.size())
+    txtlist.append("rebefore: %s" % rebefore.size())
+    txtlist.append("reafter: %s" % reafter.size())
+    txtlist.append("aliases: %s" % len(aliases.data))
+    txtlist.append("examples: %s" % examples.size()) 
+
+    plugsizes = plugins.plugsizes()
+
+    if plugsizes:
+        txtlist += plugsizes
+
+    ievent.reply(txtlist)
+
+cmnds.add('size', handle_size, ['USER', 'WEB'])
+examples.add('size', 'show sizes of various data structures', 'size')
+tests.add('size', 'users')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/mysqlkeepalive.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/mysqlkeepalive.py
@@ -0,0 +1,27 @@
+# gozerplugs/mysqlkeepalive
+#
+#
+
+from gozerbot.users import users
+from gozerbot.utils.log import rlog
+from gozerbot.threads.threadloop import ThreadSleeper
+from gozerbot.config import config
+
+import time
+
+class PingLoop(ThreadSleeper):
+
+
+    def handle(self):
+
+        if config['dbtype'] == 'mysql':
+            users.size()
+            rlog(10, 'mysqlkeepalive', 'pinged database')
+
+pingloop = PingLoop(timeout=1800)
+
+def init():
+    pingloop.start()
+
+def shutdown():
+    pingloop.stop()
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/user.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/user.py
@@ -0,0 +1,945 @@
+# dbplugs/user.py
+#
+#
+
+""" users related commands """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.utils.generic import getwho, stripident
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.log import rlog
+from gozerbot.utils.name import stripname
+from gozerbot.users import users
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.aliases import aliasdel, aliasset
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('user', 'manage users')
+
+def handle_whoami(bot, ievent):
+
+    """ user-whoami .. get your username. """
+
+    ievent.reply('%s' % users.getname(ievent.userhost))
+
+cmnds.add('user-whoami', handle_whoami, 'USER')
+examples.add('user-whoami', 'get your username', 'user-whoami')
+aliasset('whoami', 'user-whoami')
+tests.add('whoami')
+
+def handle_meet(bot, ievent):
+
+    """ user-meet <nick> .. introduce a new user to the bot. """
+
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+
+    if users.exist(nick):
+        ievent.reply('there is already a user with username %s' % nick)
+        return
+
+    userhost = getwho(bot, nick)
+
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % nick)
+        return
+
+    username = users.getname(userhost)
+
+    if username:
+        ievent.reply('we already have a user with userhost %s (%s)' % \
+(userhost, username))
+        return
+
+    result = 0
+    name = stripname(nick.lower())
+    result = users.add(name, [userhost, ], ['USER', ])
+
+    if result:
+        ievent.reply('%s (%s) added to user database' % (nick, name))
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('user-meet', handle_meet, ['OPER', 'MEET'])
+examples.add('user-meet', 'user-meet <nick> .. introduce <nick> to the \
+bot', 'user-meet dunker')
+aliasset('meet', 'user-meet')
+tests.add('meet test').add('delete test')
+
+def handle_adduser(bot, ievent):
+
+    """ user-add <name> <userhost> .. introduce a new user to the bot. """
+
+    try:
+        (name, userhost) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <userhost>')
+        return
+
+    username = users.getname(userhost)
+
+    if username:
+        ievent.reply('we already have a user with userhost %s (%s)' % \
+(userhost, username))
+        return
+
+    result = 0
+    name = stripname(name.lower()) 
+    result = users.add(name, [userhost, ], ['USER', ])
+
+    if result:
+        ievent.reply('%s added to user database' % name)
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('user-add', handle_adduser, 'OPER')
+examples.add('user-add', 'user-add <name> <userhost> .. add <name> with \
+<userhost> to the bot', 'user-add dunker bart@localhost')
+tests.add('user-add mtest1 mekker@test1', 'mtest1 added to user database').add('delete mtest1')
+
+def handle_merge(bot, ievent):
+
+    """ user-merge <name> <nick> .. merge the userhost into a already existing user. """
+
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <nick>')
+        return
+
+    name, nick = ievent.args
+    name = name.lower()
+
+    if users.gotperm(name, 'OPER') and not users.allowed(ievent.userhost, \
+'OPER'):
+        ievent.reply("only OPER perm can merge with OPER user")
+        return
+
+    if name == 'owner' and not bot.ownercheck(ievent, "can merge with owner \
+user"):
+         return 
+
+    if not users.exist(name):
+        ievent.reply("we have no user %s" % name)
+        return
+
+    userhost = getwho(bot, nick)
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % nick)
+        return
+
+    username = users.getname(userhost)
+    if username:
+        ievent.reply('we already have a user with userhost %s (%s)' % \
+(userhost, username))
+        return
+
+    result = users.merge(name, userhost)
+
+    if result:
+        ievent.reply('%s merged' % nick)
+    else:
+        ievent.reply('merge failed')
+
+cmnds.add('user-merge', handle_merge, ['OPER', 'MEET'])
+examples.add('user-merge', 'user-merge <name> <nick> .. merge record with \
+<name> with userhost from <nick>', 'merge bart dunker')
+aliasset('merge', 'user-merge')
+tests.add('user-add mtest2 mekker@test2').add('merge mtest2 bottest', 'bottest merged').add('delete mtest2')
+
+def handle_delete(bot, ievent):
+
+    """ user-del <name> .. remove user. """
+
+    if len(ievent.args) == 0:
+        ievent.missing('<name>')
+        return
+
+    name = ievent.args[0].lower()
+
+    if name == 'owner':
+        ievent.reply("can't delete owner")
+        return
+
+    result = 0
+    #name = stripname(name.lower())
+    name = name.lower()
+    result = users.delete(name)
+
+    if result:
+        ievent.reply('%s deleted' % name)
+    else:
+        ievent.reply('delete of %s failed' % name)
+
+cmnds.add('user-del', handle_delete, 'OPER')
+examples.add('user-del', 'user-del <name> .. delete user with <username>' , 'user-del dunker')
+aliasset('delete', 'user-del')
+tests.add('user-add mtest3 mekker@test3').add('delete mtest3', 'mtest3 deleted')
+
+def handle_userscan(bot, ievent):
+
+    """ user-scan <txt> .. scan for user. """
+
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<txt>')
+        return
+
+    name = name.lower()
+    names = users.names()
+
+    result = []
+    for i in names:
+        if i.find(name) != -1:
+            result.append(i)
+
+    if result:
+        ievent.reply("users matching %s: " % name, result, dot=True)
+    else:
+        ievent.reply('no users matched')
+        return
+
+cmnds.add('user-scan', handle_userscan, 'OPER')
+examples.add('user-scan', 'user-scan <txt> .. search database for matching usernames', 'user-scan dunk')
+aliasset('us', 'user-scan')
+tests.add('user-add mtest4 mekker@test4').add('user-scan mte', 'mtest4').add('delete mtest4')
+
+def handle_names(bot, ievent):
+
+    """ user-names .. show registered users. """
+
+    ievent.reply("usernames: ", users.names(), dot=True)
+
+cmnds.add('user-names', handle_names, 'OPER')
+examples.add('user-names', 'show names of registered users', 'user-names')
+aliasset('names', 'user-names')
+tests.add('user-add mtest5 mekker@test').add('user-names', 'mtest5').add('delete mtest5')
+
+def handle_name(bot, ievent):
+
+    """ user-name .. show name of user giving the command. """
+
+    ievent.reply('your name is %s' % users.getname(ievent.userhost))
+
+cmnds.add('user-name', handle_name, 'USER')
+examples.add('user-name', 'show name of user giving the commands', 'user-name')
+aliasset('name', 'user-name')
+tests.add('user-name', 'exec')
+
+def handle_getname(bot, ievent):
+
+    """ user-getname <nick> .. fetch name of nick. """
+
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing("<nick>")
+        return
+
+    userhost = getwho(bot, nick)
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % nick)
+        return
+
+    name = users.getname(userhost)
+    if not name:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+
+    ievent.reply(name)
+
+cmnds.add('user-getname', handle_getname, 'USER')
+examples.add('user-getname', 'user-getname <nick> .. get the name of <nick>', 'user-getname dunker')
+aliasset('gn', 'user-getname')
+aliasset('getname', 'user-getname')
+tests.add('user-getname test')
+
+def handle_addperm(bot, ievent):
+
+    """ user-addperm <name> <perm> .. add permission. """
+
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <perm>')
+        return
+
+    name, perm = ievent.args
+    perm = perm.upper()
+    name = name.lower()
+
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    result = 0
+
+    if users.gotperm(name, perm):
+        ievent.reply('%s already has permission %s' % (name, perm))
+        return         
+
+    result = users.addperm(name, perm)
+
+    if result:
+        ievent.reply('%s perm added' % perm)
+    else:
+        ievent.reply('perm add failed')
+
+cmnds.add('user-addperm', handle_addperm, 'OPER')
+examples.add('user-addperm', 'user-addperm <name> <perm> .. add permissions to user <name>', 'user-addperm dunker rss')
+aliasset('setperms', 'user-addperm')
+aliasset('addperms', 'user-addperm')
+tests.add('user-add mtest6 mekker@test6', 'mtest6').add('user-addperm mtest6 mekker', 'MEKKER perm added').add('delete mtest6')
+
+def handle_getperms(bot, ievent):
+
+    """ user-getperms <name> .. get permissions of name. """
+
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    perms = users.getuserperms(name)
+    if perms:
+        ievent.reply("permissions of %s: " % name, perms, dot=True)
+    else:
+        ievent.reply('%s has no permissions set' % name)
+
+cmnds.add('user-getperms', handle_getperms, 'OPER')
+examples.add('user-getperms', 'user-getperms <name> .. get permissions of <name>', 'user-getperms dunker')
+aliasset('getperms', 'user-getperms')
+tests.add('user-add mtest7 mekker@test7').add('user-addperm mtest7 mekker').add('user-getperms mtest7' , 'MEKKER').add('delete mtest7')
+
+def handle_perms(bot, ievent):
+
+    """ user-perms .. get permission of the user given the command. """
+
+    if ievent.rest:
+        ievent.reply("use getperms to get the permissions of somebody else")
+        return
+
+    name = users.getname(ievent.userhost)
+    if not name:
+         ievent.reply("can't find username for %s" % ievent.userhost)
+         return
+
+    perms = users.getuserperms(name)
+    if perms:
+        ievent.reply("you have permissions: ", perms, dot=True)
+
+cmnds.add('user-perms', handle_perms, 'USER')
+examples.add('user-perms', 'get permissions', 'user-perms')
+aliasset('perms', 'user-perms')
+tests.add('user-perms', 'USER')
+
+def handle_delperm(bot, ievent):
+
+    """ user-delperm <name> <perm> .. delete permission of name. """
+
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <perm>')
+        return
+
+    name, perm = ievent.args
+    perm = perm.upper()
+    name = name.lower()
+
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    result = users.deluserperm(name, perm)
+
+    if result:
+        ievent.reply('%s perm removed' % perm)
+    else:
+        ievent.reply("%s has no %s permission" % (name, perm))
+        return
+
+cmnds.add('user-delperm', handle_delperm, 'OPER')
+examples.add('user-delperms', 'delete from user <name> permission <perm>', 'user-delperms dunker rss')
+tests.add('user-add mtest8 mekker@test8').add('user-addperm mtest8mekker').add('user-delperm mtest8 mekker', 'MEKKER').add('delete mtest8')
+
+def handle_addstatus(bot, ievent):
+
+    """ user-addstatus <name> <status> .. add status of name. """
+
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <status>')
+        return
+
+    name, status = ievent.args
+    status = status.upper()
+    name = name.lower()
+
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    if users.gotstatus(name, status):
+        ievent.reply('%s already has status %s' % (name, status))
+        return
+
+    result = users.addstatus(name, status)
+
+    if result:
+        ievent.reply('%s status added' % status)
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('user-addstatus', handle_addstatus, 'OPER')
+examples.add('user-addstatus', 'user-addstatus <name> <status>', 'user-addstatus dunker #dunkbots')
+aliasset('setstatus', 'user-addstatus')
+aliasset('addstatus', 'user-addstatus')
+tests.add('user-add mtest9 mekker@test9').add('user-addstatus mtest9 mekker', 'MEKKER status added').add('delete mtest9')
+
+def handle_getstatus(bot, ievent):
+
+    """ user-getstatus <name> .. get status of name. """
+
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    status = users.getuserstatuses(name)
+    if status:
+        ievent.reply("status of %s: " % name, status, dot=True)
+    else:
+        ievent.reply('%s has no status set' % name)
+
+cmnds.add('user-getstatus', handle_getstatus, 'OPER')
+examples.add('user-getstatus', 'user-getstatus <name> .. get status of <name>', 'user-getstatus dunker')
+aliasset('getstatus', 'user-getstatus')
+tests.add('user-add mtest10 mekker@test10').add('user-addstatus mtest10 mekker', 'MEKKER status added').add('user-getstatus mtest10', 'MEKKER').add('delete mtest10')
+
+def handle_status(bot, ievent):
+
+    """ user-status .. get status of user given the command. """
+    status = users.getstatuses(ievent.userhost)
+    if status:
+        ievent.reply("you have status: ", status, dot=True)
+    else:
+        ievent.reply('you have no status set')
+
+cmnds.add('user-status', handle_status, 'USER')
+examples.add('user-status', 'get status', 'user-status')
+aliasset('status', 'user-status')
+tests.add('user-status')
+
+def handle_delstatus(bot, ievent):
+
+    """ user-delstatus <name> <status> .. delete status of name. """
+
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <status>')
+        return
+
+    name, status = ievent.args
+    status = status.upper()
+    name = name.lower()
+
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    result = users.deluserstatus(name, status)
+
+    if result:
+        ievent.reply('%s status deleted' % status)
+    else:
+        ievent.reply("%s has no %s status" % (name, status))
+        return
+
+cmnds.add('user-delstatus', handle_delstatus, 'OPER')
+examples.add('user-delstatus', 'user-delstatus <name> <status>', 'user-delstatus dunker #dunkbots')
+aliasset('delstatus', 'user-delstatus')
+tests.add('user-add mtest11 mekker@test11').add('user-addstatus mtest11 mekker').add('user-delstatus mtest11 mekker', 'MEKKER status deleted').add('delete mtest11')
+
+def handle_adduserhost(bot, ievent):
+
+    """ user-adduserhost <name> <userhost> .. add to userhosts of name. """ 
+
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <userhost>')
+        return
+
+    name, userhost = ievent.args
+    name = name.lower()
+    if name == 'owner' and not bot.ownercheck(ievent, 'can adduserhost to \
+owner'):
+        return
+
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    if users.gotuserhost(name, userhost):
+        ievent.reply('%s already has userhost %s' % (name, userhost))
+        return
+
+    result = users.adduserhost(name, userhost)
+
+    if result:
+        ievent.reply('userhost added')
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('user-adduserhost', handle_adduserhost, 'OPER')
+examples.add('user-adduserhost', 'user-adduserhost <name> <userhost>', 'user-adduserhost dunker bart@%.a2000.nl')
+aliasset('adduserhost', 'user-adduserhost')
+aliasset('adduserhosts', 'user-adduserhost')
+tests.add('user-add mtest12 mekker@test12').add('user-adduserhost mtest12 mekker2@test122', 'userhost added').add('delete mtest12')
+
+def handle_deluserhost(bot, ievent):
+
+    """ user-deluserhost <name> <userhost> .. remove from userhosts of name. """
+
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <userhost>')
+        return
+
+    name, userhost = ievent.args
+    name = name.lower()
+    if name == 'owner'  and not bot.ownercheck(ievent, 'can delete userhosts \
+from owner'):
+        return
+
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    result = users.deluserhost(name, userhost)
+
+    if result:
+        ievent.reply('userhost removed')
+    else:
+        ievent.reply("%s has no %s in userhost list" % (name, \
+userhost))
+        return  
+
+cmnds.add('user-deluserhost', handle_deluserhost, 'OPER')
+examples.add('user-deluserhost', 'user-deluserhost <name> <userhost> .. delete from usershosts of <name> userhost <userhost>','user-deluserhost dunker bart1@bla.a2000.nl')
+aliasset('deluserhost', 'user-deluserhost')
+aliasset('deluserhosts', 'user-deluserhost')
+tests.add('user-add mtest32 mekker@test32').add('user-adduserhost mtest12 mekker2@test32').add('user-deluserhost mtest12 mekker2@test32', 'userhost removed').add('delete mtest32')
+
+def handle_getuserhosts(bot, ievent):
+
+    """ user-getuserhosts <name> .. get userhosts of name. """
+
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+
+    who = who.lower()
+    userhosts = users.getuserhosts(who)
+    if userhosts:
+        ievent.reply("userhosts of %s: " % who, userhosts, dot=True)
+    else:
+        ievent.reply("can't find user %s" % who)
+
+cmnds.add('user-getuserhosts', handle_getuserhosts, 'OPER')
+examples.add('user-getuserhosts', 'user-getuserhosts <name> .. get userhosts of <name>', 'getuserhosts dunker')
+aliasset('getuserhosts', 'user-getuserhosts')
+tests.add('user-add mtest13 mekker@test13').add('user-adduserhost mtest13 mekker@test13').add('user-getuserhosts mtest13', 'mekker@test13').add('delete mtest13')
+
+def handle_userhosts(bot, ievent):
+
+    """ user-userhosts .. get userhosts of user giving the command. """
+
+    userhosts = users.gethosts(ievent.userhost)
+    if userhosts:
+        ievent.reply("you have userhosts: ", userhosts, dot=True)
+
+cmnds.add('user-userhosts', handle_userhosts, 'USER')
+examples.add('user-userhosts', 'get userhosts', 'user-userhosts')
+aliasset('userhosts', 'user-userhosts')
+tests.add('user-userhosts')
+
+def handle_getemail(bot, ievent):
+
+    """ user-getemail <name> .. get email of name. """
+
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    email = users.getuseremail(name)
+    if email:
+        ievent.reply(email)
+    else:
+        ievent.reply('no email set')
+
+cmnds.add('user-getemail', handle_getemail, 'USER')
+examples.add('user-getemail', 'user-getemail <name> .. get email from user <name>', 'user-getemail dunker')
+aliasset('getemail', 'user-getemail')
+tests.add('user-add mtest14 mekker@test14').add('user-setemail mtest14 mekker@test14').add('user-getemail mtest14', 'mekker@test14').add('delete mtest14')
+
+def handle_setemail(bot, ievent):
+
+    """ user-setemail <name> .. set email of name. """
+
+    try:
+        name, email = ievent.args
+    except ValueError:
+        ievent.missing('<name> <email>')
+        return
+
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    users.setemail(name, email)
+    ievent.reply('email set')
+
+cmnds.add('user-setemail', handle_setemail, 'OPER')
+examples.add('user-setemail', 'user-setemail <name> <email>.. set email of user <name>', 'user-setemail dunker bart@gozerbot.org')
+aliasset('setemail', 'user-setemail')
+tests.add('user-add mtest15 mekker@test15').add('user-setemail mtest15 mekker@test15', 'email set').add('delete mtest15')
+
+def handle_email(bot, ievent):
+
+    """ user-email .. show email of user giving the command. """
+
+    if len(ievent.args) != 0:
+        ievent.reply('use getemail to get the email address of an user .. \
+email shows your own mail address')
+        return
+
+    email = users.getemail(ievent.userhost)
+    if email:
+        ievent.reply(email)
+    else:
+        ievent.reply('no email set')
+
+cmnds.add('user-email', handle_email, 'USER')
+examples.add('user-email', 'get email', 'user-email')
+aliasset('email', 'user-email')
+tests.add('user-setemail mekker@mekker').add('user-email', 'mekker@mekker')
+
+def handle_delemail(bot, ievent):
+
+    """ user-delemail .. reset email of user giving the command. """
+
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find user for %s" % ievent.userhost)
+        return
+
+    result = users.delallemail(name)
+
+    if result:
+        ievent.reply('email removed')
+    else:
+        ievent.reply('delete failed')
+
+cmnds.add('user-delemail', handle_delemail, 'OPER')
+examples.add('user-delemail', 'reset email', 'user-delemail')
+aliasset('delemail', 'user-delemail')
+tests.add('user-setemail mekker@email').add('user-delemail', 'email removed')
+
+def handle_addpermit(bot, ievent):
+
+    """ user-addpermit <name> <permit> .. add permit to permit list of <name>. """
+
+    try:
+        who, what = ievent.args
+    except ValueError:
+        ievent.missing("<name> <permit>")
+        return
+
+    if not users.exist(who):
+        ievent.reply("can't find username of %s" % who)
+        return
+
+    name = users.getname(ievent.userhost)
+    if users.gotpermit(name, (who, what)):
+        ievent.reply('%s is already allowed to do %s' % (who, what))
+        return
+
+    result = users.addpermit(name, who, what)
+
+    if result:
+        ievent.reply('permit added')
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('user-addpermit', handle_addpermit, 'USER')
+examples.add('user-addpermit', 'user-addpermit <nick> <what> .. permit nick access to <what> .. use setperms to add permissions', 'user-addpermit dunker todo')
+aliasdel('allow')
+tests.add('user-add mtest16 mekker@test16').add('user-addpermit mtest16 todo', 'permit added').add('user-delpermit mtest16 todo').add('delete mtest16')
+
+def handle_permit(bot, ievent):
+
+    """ user-permit .. get permit list of user giving the command. """
+
+    if ievent.rest:
+        ievent.reply("use the user-addpermit command to allow somebody \
+something .. use getname <nick> to get the username of somebody .. this \
+command shows what permits you have")
+        return
+
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find user for %s" % ievent.userhost)
+        return
+
+    permits = users.getuserpermits(name)
+    if permits:
+        ievent.reply("you permit the following: ", permits, dot=True)
+    else:
+        ievent.reply("you don't have any permits")
+
+cmnds.add('user-permit', handle_permit, 'USER')
+examples.add('user-permit', 'show permit of user giving the command', 'user-permit')
+aliasset('permit', 'user-permit')
+tests.add('user-add mtest17 mekker@test17').add('user-addpermit mtest17 todo', 'permit added').add('user-delpermit mtest17 todo').add('delete mtest17')
+
+def handle_userdelpermit(bot, ievent):
+
+    """ user-delpermit <name> <permit> .. remove (name, permit) from permit list. """
+    try:
+        who, what = ievent.args
+    except ValueError:
+        ievent.missing("<name> <what>")
+        return
+
+    if not users.exist(who):
+        ievent.reply("can't find registered name of %s" % who)
+        return
+
+    name = users.getname(ievent.userhost)
+    if not users.gotpermit(name, (who, what)):
+        ievent.reply('%s is already not allowed to do %s' % (who, what))
+        return
+
+    result = users.deluserpermit(name, (who, what))
+
+    if result:
+        ievent.reply('%s denied' % what)
+    else:
+        ievent.reply('delete failed')
+
+cmnds.add('user-delpermit', handle_userdelpermit, 'USER')
+examples.add('user-delpermit', 'user-delpermit <name> <permit>', 'user-delpermit dunker todo')
+aliasdel('deny')
+tests.add('user-add mtest18 mekker@test17').add('user-addpermit mtest18 todo', 'permit added').add('user-delpermit mtest18 todo').add('delete mtest18')
+
+def handle_check(bot, ievent):
+
+    """ user-check <nick> .. get user data of <nick>. """
+
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+
+    userhost = getwho(bot, nick)
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % nick)
+        return
+
+    name = users.getname(userhost)
+    if not name:
+        ievent.reply("can't find user")
+        return
+
+    userhosts = users.getuserhosts(name)
+    perms = users.getuserperms(name)
+    email = users.getuseremail(name)
+    permits = users.getuserpermits(name)
+    status = users.getuserstatuses(name)
+    ievent.reply('userrecord of %s = userhosts: %s perms: %s email: %s permits: %s status: %s' % (name, str(userhosts), str(perms), str(email), str(permits), str(status)))
+
+cmnds.add('user-check', handle_check, 'OPER')
+examples.add('user-check', 'user-check <nick>', 'user-check dunker')
+aliasset('check', 'user-check')
+tests.add('user-add mtest19 mekker@test19').add('user-check mtest19', 'mekker@test19').add('delete mtest19')
+
+def handle_show(bot, ievent):
+
+    """ user-show <name> .. get data of <name>. """
+
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+
+    userhosts = str(users.getuserhosts(name))
+    perms = str(users.getuserperms(name))
+    email = str(users.getuseremail(name))
+    permits = str(users.getuserpermits(name))
+    status = str(users.getuserstatuses(name))
+    ievent.reply('userrecord of %s = userhosts: %s perms: %s email: %s permits: %s status: %s' % (name, userhosts, perms, email, permits, status))
+
+cmnds.add('user-show', handle_show, 'OPER')
+examples.add('user-show', 'user-show <name> .. show data of <name>', 'user-show dunker')
+tests.add('user-add mtest20 mekker@test20').add('user-show mtest20', 'mekker@test20').add("delete mtest20")
+
+def handle_match(bot, ievent):
+
+    """ user-match <userhost> .. get data of <userhost>. """
+
+    try:
+        userhost = ievent.args[0]
+    except IndexError:
+        ievent.missing('<userhost>')
+        return
+
+    name = users.getname(userhost)
+    if not name:
+        ievent.reply("can't find user with userhost %s" % userhost)
+        return
+
+    userhosts = str(users.gethosts(userhost))
+    perms = str(users.getperms(userhost))
+    email = str(users.getemail(userhost))
+    permits = str(users.getpermits(userhost))
+    status = str(users.getstatuses(userhost))
+    rlog(10, 'users', "matched called")
+    ievent.reply('userrecord of %s = userhosts: %s perms: %s email: %s permits: %s status: %s' % (name, userhosts, perms, email, permits, status))
+
+cmnds.add('user-match', handle_match, ['USER', 'OPER'])
+examples.add('user-match', 'user-match <userhost>', 'user-match test@test')
+aliasset('match', 'user-match')
+tests.add('user-add mtest21 mekker@test21').add('user-match mekker@test21', 'mekker@test21').add("delete mtest21")
+
+def handle_getuserstatus(bot, ievent):
+
+    """ user-allstatus <status> .. list users with status <status>. """
+
+    try:
+        status = ievent.args[0].upper()
+    except IndexError:
+        ievent.missing('<status>')
+        return
+
+    result = users.getstatususers(status)
+    if result:
+        ievent.reply("users with %s status: " % status, result, dot=True)
+    else:
+        ievent.reply("no users with %s status found" % status)
+    return
+
+cmnds.add('user-allstatus', handle_getuserstatus, 'OPER')
+examples.add('user-allstatus', 'user-allstatus <status> .. get all users with <status> status', 'user-allstatus #dunkbots')
+tests.add('user-allstatus')
+
+def handle_getuserperm(bot, ievent):
+
+    """ user-allperm <perm> .. list users with permission <perm>. """
+
+    try:
+        perm = ievent.args[0].upper()
+    except IndexError:
+        ievent.missing('<perm>')
+        return
+
+    result = users.getpermusers(perm)
+
+    if result:
+        ievent.reply('users with %s permission: ' % perm, result, dot=True)
+    else:
+        ievent.reply("no users with %s permission found" % perm)
+    return
+
+cmnds.add('user-allperm', handle_getuserperm, 'OPER')
+examples.add('user-allperm', 'user-allperm <perm> .. get users with <perm> permission', 'user-allperm rss')
+tests.add('user-allperm OPER', 'owner')
+
+def handle_usersearch(bot, ievent):
+
+    """ search for user matching given userhost. """
+
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        ievent.missing('<what>')
+        return
+
+    result = users.usersearch(what)
+    if result:
+        res = ["(%s) %s" % u for u in result]
+        ievent.reply('users matching %s: ' % what, res, dot=True)
+    else:
+        ievent.reply('no userhost matching %s found' % what)
+
+cmnds.add('user-search', handle_usersearch, 'OPER')
+examples.add('user-search', 'search users userhosts', 'user-search gozerbot')
+tests.add('user-search exe', 'exec')
+
+def handle_addpermall(bot, ievent):
+
+    """ user-addpermall <perm> .. add permission to all users. """
+
+    try:
+        perm = ievent.args[0].upper()
+    except IndexError:
+        ievent.missing('<perm>')
+        return
+
+    if perm == 'OPER':
+        ievent.reply("can't add OPER permissions to all")
+        return
+
+    users.addpermall(perm)
+    ievent.reply('%s perm added' % perm)
+
+#cmnds.add('user-addpermall', handle_addpermall, 'OPER')
+#examples.add('user-addpermall', 'user-addpermall <perm> .. add <permission> to all users', 'addpermsall USER')
+#tests.add('user-addpermall blabla', 'BLABLA perm added').add('user-delpermall blabla')
+
+def handle_delpermall(bot, ievent):
+
+    """ user-delpermall <perm> .. delete permission from all users. """
+
+    try:
+        perm = ievent.args[0].upper()
+    except IndexError:
+        ievent.missing('<perm>')
+        return
+
+    if perm == 'OPER':
+        ievent.reply("can't delete OPER permissions from all")
+        return
+
+    users.delpermall(perm)
+    ievent.reply('%s perm deleted' % perm)
+
+#cmnds.add('user-delpermall', handle_delpermall, 'OPER')
+#examples.add('user-delpermall', 'user-delpermall <perm> .. delete <permission> from all users', 'delpermsall BLA')
+#tests.add('user-addpermall blabla').add('user-delpermall blabla', 'BLABLA perm deleted')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/tell.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/tell.py
@@ -0,0 +1,43 @@
+# gozerbot/plugs/tell.py
+#
+#
+
+""" send the output of a command to <nick>. """
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plugins import plugins
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import copy
+
+plughelp.add('tell', 'the tell command sends the output of a command to another user')
+
+def handle_tell(bot, ievent):
+
+    """ send output of command to another user. """
+
+    try:
+        nick, cmnd = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<nick> <command>')
+        return
+
+    event = copy.deepcopy(ievent)
+    event.txt = cmnd
+    event.onlyqueues = True
+    result = plugins.cmnd(bot, event)
+
+    if not result:
+        ievent.reply("no result for %s" % cmnd)
+        return
+
+    ievent.reply("%s sends your this: " % ievent.nick, result, nick=nick, \
+dot=True)
+    ievent.reply("%s item(s) send" % len(result))
+
+cmnds.add('tell', handle_tell, 'USER', threaded=True)
+examples.add('tell', 'tell <nick> <command> .. send output of command to another user', 'tell dunker version')
+tests.add('tell dunker version', 'GOZERBOT')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/uniq.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/uniq.py
@@ -0,0 +1,45 @@
+# gozerbot/plugs/uniq.py
+#
+# used in a pipeline .. unique elements """
+# Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# BSD License
+
+"""  used in a pipeline .. unique elements """
+
+__author__ = "Wijnand 'tehmaze' Modderman - http://tehmaze.com"
+__license__ = 'BSD'
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.utils.generic import waitforqueue
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+# basic imports
+import sets
+
+plughelp.add('uniq', 'unique elements of a pipeline')
+
+def handle_uniq(bot, ievent):
+
+    """ uniq the result list """
+
+    if not ievent.inqueue:
+        ievent.reply('use uniq in a pipeline')
+        return
+
+    result = waitforqueue(ievent.inqueue, 30)
+
+    if not result:
+        ievent.reply('no data')
+        return
+
+    result = list(sets.Set(result))
+
+    if not result:
+        ievent.reply('no result')
+    else:
+        ievent.reply(result, dot=True)
+
+cmnds.add('uniq', handle_uniq, ['USER', 'WEB', 'CLOUD'])
+tests.add('list | uniq')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/to.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/to.py
@@ -0,0 +1,53 @@
+# gozerbot/plugs/to.py
+#
+#
+
+""" send output to another user .. used in a pipeline. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.utils.generic import getwho, waitforqueue
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('to', 'send the output to another user .. used in a pipeline')
+
+def handle_to(bot, ievent):
+
+    """ direct pipeline output to <nick>. """
+
+    if not ievent.inqueue:
+        ievent.reply('use to in a pipeline')
+        return
+
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.reply('to <nick>')
+        return
+
+    if nick == 'me':
+        nick = ievent.nick
+
+    if not getwho(bot, nick):
+        ievent.reply("don't know %s" % nick)
+        return
+
+    result = waitforqueue(ievent.inqueue, 5)
+
+    if result:
+        ievent.reply("%s sends you this:" % ievent.nick, nick=nick)
+        ievent.reply(result, nick=nick, dot=True)
+        if len(result) == 1:
+            ievent.reply('1 element sent')
+        else:
+            ievent.reply('%s elements sent' % len(result))
+    else:
+        ievent.reply('nothing to send')
+
+cmnds.add('to', handle_to, 'USER', threaded=True)
+examples.add('to', 'send pipeline output to another user', 'list | to dunker')
+tests.add('list | to dunker')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/core.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/core.py
@@ -0,0 +1,975 @@
+# plugs/core.py
+#
+#
+
+""" core bot commands. """
+
+
+__copyright__ = 'this file is in the public domain'
+__gendocskip__ = ['userhostcache', ]
+
+# gozerbot imports
+from gozerbot.utils.generic import getwho, die
+from gozerbot.utils.timeutils import elapsedstring
+from gozerbot.reboot import reboot_stateful, reboot
+from gozerbot.utils.generic import getversion, cleanpyc
+from gozerbot.utils.exception import handle_exception
+from gozerbot.exit import globalshutdown
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.callbacks import callbacks
+from gozerbot.redispatcher import rebefore, reafter
+from gozerbot.plugins import plugins
+from gozerbot.users import users
+from gozerbot.partyline import partyline
+from gozerbot.fleet import fleet
+from gozerbot.config import config
+from gozerbot.utils.statdict import Statdict
+from gozerbot.aliases import aliases, aliasreverse, aliasset
+from gozerbot.partyline import partyline
+from gozerbot.plughelp import plughelp
+from gozerbot.eventhandler import mainhandler
+from gozerbot.runner import cbrunners, cmndrunners
+from gozerbot.tests import tests
+import gozerbot.utils.log
+
+from simplejson import loads
+
+# basic imports
+from sets import Set
+import time, threading, sys, re, os, copy
+
+plughelp.add('core', 'core commands for the bot')
+
+try:
+    pluginlist = loads(open('pluginlist').read())
+except:
+    pluginlist = []
+
+def handle_rusage(bot, ievent):
+
+    """ show resource usage. """
+
+    try:
+        import resource
+        ievent.reply('resources: %s' % str(resource.getrusage(resource.RUSAGE_SELF)))
+    except ImportError:
+        ievent.reply('this commands only works on unix/linux')
+
+cmnds.add('rusage', handle_rusage, 'OPER')
+examples.add('rusage', 'show rusage of the bot', 'rusage')
+tests.add('rusage', 'ru_stime')
+
+def handle_options(bot, ievent):
+
+    """ show possible options of a command. """
+
+    if not ievent.rest:
+        ievent.missing('<command>')
+        return
+
+    options = plugins.getoptions(ievent.rest)
+
+    if options:
+        ievent.reply("the following options are available for command %s: " % \
+ievent.rest, options.keys())
+    else:
+        ievent.reply('no command options found for %s' % ievent.rest)
+
+cmnds.add('options', handle_options, ['USER', 'OPER'])
+examples.add('options', 'show what options are available for a command', 'options list')
+tests.add('options list', '--chan')
+
+def handle_whatperms(bot, ievent):
+
+    """ show possible permissions. """
+
+    ievent.reply("the following permission are available: ", plugins.whatperms())
+
+cmnds.add('whatperms', handle_whatperms, ['USER', 'OPER'])
+examples.add('whatperms', 'show what permissions are available', 'whatperms')
+tests.add('whatperms', 'USER')
+
+def handle_encoding(bot, ievent):
+
+    """ show default encoding. """
+
+    ievent.reply('default encoding is %s' % sys.getdefaultencoding())
+
+cmnds.add('encoding', handle_encoding, ['USER', 'OPER'])
+examples.add('encoding', 'show default encoding', 'encoding')
+tests.add('encoding')
+
+def handle_uptime(bot, ievent):
+
+    """ show uptime. """
+
+    ievent.reply("uptime is %s" % elapsedstring(time.time()-bot.starttime))
+
+cmnds.add('uptime', handle_uptime, ['USER', 'WEB', 'JCOLL'])
+examples.add('uptime', 'show uptime of the bot', 'uptime')
+aliasset('up', 'uptime')
+tests.add('uptime', 'uptime is')
+
+def handle_userhostcache(bot, ievent):
+
+    """ show bots userhost cache. """
+
+    ievent.reply(str(bot.userhosts.data))
+
+cmnds.add('userhostcache', handle_userhostcache, 'OPER')
+tests.add('userhostcache', 'exec')
+
+def handle_list(bot, ievent):
+
+    """ list [<plugin>] .. list loaded plugins or list commands provided by \
+        plugin.
+    """
+    global pluginlist
+
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        # no arguments given .. show plugins
+        ievent.reply('loaded plugins: ', plugins.list())
+        return
+
+    # show commands of <what> plugin
+    result = []
+
+    for i, j in cmnds.items():
+        if what == j.plugname:
+            txt = ""
+            alias = aliasreverse(i)
+            if alias:
+                txt += "%s (%s)" % (i, alias)
+            else:
+                txt = i
+            if txt:
+                result.append(txt)
+
+    if result:
+        result.sort()
+        ievent.reply('%s has the following commands: ' % what, result)
+    else:
+        ievent.reply('no commands found for plugin %s' % what)
+
+cmnds.add('list', handle_list, ['USER', 'WEB', 'CLOUD'], threaded=True)
+examples.add('list', 'list registered plugins or list commands in plugin', '1) list 2) list rss')
+tests.add('list', 'core')
+
+def handle_available(bot, ievent):
+
+    """ available .. show what plugins are available. """
+
+    l = Set(plugins.list())
+    ondisk = Set(plugins.available())
+    diff = list(ondisk - l)    
+    diff.sort()
+    ievent.reply('\002available plugins:\002 (reload to enable): ', diff)
+
+cmnds.add('available', handle_available, ['USER', 'WEB'])
+examples.add('available', 'show what plugins are available but not loaded (see the list command for loaded plugins)', 'available')
+aliasset('avail', ' available')
+aliasset('plugins', 'available')
+tests.add('avail')
+
+def doquit(bot, ievent):
+
+    """ quit the bot. """
+
+    globalshutdown()
+
+cmnds.add('quit', doquit, 'OPER')
+examples.add('quit', 'quit the bot', 'quit')
+aliasset('shutdown', 'quit')
+aliasset('exit', 'quit')
+aliasset('halt', 'quit')
+
+def handle_reboot(bot, ievent):
+
+    """ reboot .. reboot the bot. """
+
+    ievent.reply('rebooting')
+    global backupstop
+    stateful = True
+
+    if ievent.rest == 'cold':
+        stateful = False
+
+    time.sleep(2)
+
+    try: 
+        backupstop = 1
+        if not stateful:
+            fleet.exit()
+        else:
+            fleet.exit(jabber=True)
+        plugins.exit()
+    finally:
+        if stateful:
+            mainhandler.put(0, reboot_stateful, bot, ievent, fleet, partyline)
+        else:
+            mainhandler.put(0, reboot)
+
+cmnds.add('reboot', handle_reboot, 'OPER')
+examples.add('reboot', 'restart the bot', 'reboot')
+
+def handle_commands(bot, ievent):
+
+    """ commands <plugin> .. show commands of <plugin>. """
+
+    try:
+        plugin = ievent.args[0].lower()
+    except IndexError:
+        ievent.missing('<plugin> .. see the list command for available \
+plugins')
+        return
+
+    if not plugins.plugs.has_key(plugin):
+        ievent.reply('no %s plugin is loaded .. see the available command for \
+available plugins (reload to enable)' % plugin)
+        return
+
+    result = []
+
+    cp = dict(cmnds)
+    for i, j in cp.iteritems():
+        if plugin == j.plugname:
+            txt = ""
+            alias = aliasreverse(i)
+            if alias:
+                txt += "%s (%s)" % (i, alias)
+            else:
+                txt = i
+            if txt:
+                result.append(txt)
+
+    if result:
+        result.sort()
+        ievent.reply('%s has the following commands: ' % plugin, result, \
+dot=True)
+    else:
+        ievent.reply('no commands found for plugin %s' % plugin)
+
+cmnds.add('commands', handle_commands, ['USER', 'WEB', 'CLOUD'])
+examples.add('commands', 'show commands of <plugin>', '1) commands core')
+tests.add('commands core', 'uptime')
+
+def handle_perm(bot, ievent):
+
+    """ perm <command> .. get permission of command. """
+
+    try:
+        cmnd = ievent.args[0]
+    except IndexError:
+        ievent.missing("<cmnd>")
+        return
+
+    try:
+        cmnd = aliases.data[cmnd]
+    except KeyError:
+        pass
+
+    perms = cmnds.perms(cmnd)
+
+    if perms:
+        ievent.reply("%s command needs %s permission" % (cmnd, perms))
+        return
+
+    ievent.reply("can't find perm for %s" % cmnd)
+
+cmnds.add('perm', handle_perm, ['USER', 'WEB'])
+examples.add('perm', 'show permission of command', 'perm quit')
+tests.add('perm version', 'USER')
+
+def handle_cc(bot, ievent):
+
+    """ cc [<controlchar>] .. set/get control character of channel. """
+
+    try:
+        chan = ievent.args[1].lower()
+    except IndexError:
+        chan = ievent.channel.lower()
+
+    try:
+        what = ievent.args[0]
+
+        if not users.allowed(ievent.userhost, 'OPER'):
+            return
+
+        if len(what) > 1:
+            ievent.reply("only one character is allowed")
+            return
+
+        try:
+            bot.channels[chan]['cc'] = what
+        except (KeyError, TypeError):
+            ievent.reply("no channel %s in database" % chan)
+            return
+
+        bot.channels.save()
+        ievent.reply('control char set to %s' % what)
+    except IndexError:
+        # no argument given .. show cc of channel command is given in
+        try:
+            cchar = bot.channels[chan]['cc']
+            ievent.reply('control character(s) for channel %s are/is %s' % \
+(chan, cchar))
+        except (KeyError, TypeError):
+            ievent.reply("default cc is %s" % config['defaultcc'])
+
+cmnds.add('cc', handle_cc, 'USER', allowqueue=False)
+examples.add('cc', 'set control char of channel or show control char of channel','1) cc ! 2) cc')
+tests.add('cc --chan #dunkbots', '!')
+tests.add('cc --chan #dunkbots !', '!')
+
+def handle_ccadd(bot, ievent):
+
+    """ add a control char to the channels cc list. """
+
+    try:
+        chan = ievent.args[1].lower()
+    except IndexError:
+        chan = ievent.channel.lower()
+
+    try:
+        what = ievent.args[0]
+
+        if not users.allowed(ievent.userhost, 'OPER'):
+            return
+
+        if len(what) > 1:
+            ievent.reply("only one character is allowed")
+            return
+
+        try:
+            bot.channels[chan]['cc'] += what
+        except (KeyError, TypeError):
+            ievent.reply("no channel %s in database" % chan)
+            return
+
+        bot.channels.save()
+        ievent.reply('control char %s added' % what)
+    except IndexError:
+        ievent.missing('<cc> [<channel>]')
+
+cmnds.add('cc-add', handle_ccadd, 'OPER', allowqueue=False)
+examples.add('cc-add', 'cc-add <control char> .. add control character', 'cc-add #')
+tests.add('cc-add --chan #dunkbots @', '@').add('cc-del --chan #dunkbots @')
+
+def handle_ccdel(bot, ievent):
+
+    """ remove a control char from the channels cc list. """
+
+    try:
+        chan = ievent.args[1].lower()
+    except IndexError:
+        chan = ievent.channel.lower()
+
+    try:
+        what = ievent.args[0]
+
+        if not users.allowed(ievent.userhost, 'OPER'):
+            return
+
+        if len(what) > 1:
+            ievent.reply("only one character is allowed")
+            return
+
+        try:
+            bot.channels[chan]['cc'] = \
+bot.channels[chan]['cc'].replace(what, '')
+        except KeyError:
+            ievent.reply("no channel %s in database")
+            return
+        except TypeError:
+            ievent.reply("no channel %s in database" % chan)
+            return
+
+        bot.channels.save()
+        ievent.reply('control char %s deleted' % what)
+
+    except IndexError:
+        ievent.missing('<cc> [<channel>]')
+
+cmnds.add('cc-del', handle_ccdel, 'OPER')
+examples.add('cc-del', 'cc-del <control character> .. remove cc', 'cc-del #')
+tests.add('cc-add --chan #dunkbots @').add('cc-del --chan #dunkbots @', '@')
+
+def handle_intro(bot, ievent):
+
+    """ intro <nick> .. do whois on nick to sync userhosts cache. """
+
+    if not bot.type == 'irc':
+        ievent.reply("intro only works on irc bots")
+        return
+
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        ievent.reply("intro <nick>")
+        return
+
+    bot.whois(who)
+    ievent.reply('whois command send')
+
+cmnds.add('intro', handle_intro, 'OPER')
+examples.add('intro', 'do a whois of <nick> to sync userhost into the userhost cache', 'intro dunker')
+tests.add('intro dunker')
+
+def handle_loglevel(bot, ievent):
+
+    """ loglevel <level> .. get or set loglevel. the lower the more the bot logs. """
+
+    if len(ievent.args) == 0:
+        ievent.reply('loglevel is %s' % str(gozerbot.utils.log.loglevel))
+        return
+
+    try:
+        level = int(ievent.args[0])
+    except ValueError:
+        ievent.reply('i need a integer argument')
+        return
+
+    config.set('loglevel', level)
+    gozerbot.utils.log.loglevel = level
+    ievent.reply('loglevel is now %s' % config['loglevel'])
+
+cmnds.add('loglevel', handle_loglevel,'OPER')
+examples.add('loglevel', 'get/set current loglevel .. the lower the loglevel the more the bot logs', '1) loglevel 2) loglevel 10')
+tests.add('loglevel 10', 'is now 10').add('loglevel', '10')
+
+def handle_loglist(bot, ievent):
+
+    """ loglist <plugin> .. get or set loglist .. loglist is a list of plugins 
+        to log.
+    """
+
+    if config['loglist'] == None:
+        config['loglist'] = []
+
+    for plugin in ievent.args:
+        if plugin not in config['loglist']:
+            config['loglist'].append(plugin)
+        if plugin not in gozerbot.utils.log.loglist:
+            gozerbot.utils.log.loglist.append(plugin)
+        config.save()
+
+    ievent.reply('loglist is now %s' % config['loglist'])
+
+cmnds.add('loglist', handle_loglist,'OPER')
+examples.add('loglist', 'get loglist or add plugin to loglist', '1) loglist 2) loglist rss')
+tests.add('loglist rss', 'rss').add('loglist', 'rss')
+
+def handle_loglistdel(bot, ievent):
+
+    """ loglist-del <plugin> .. delete plugin from loglist. """
+
+    if config['loglist'] == None:
+        config['loglist'] = []
+
+    for plugin in ievent.args:
+
+        try:
+            config['loglist'].remove(plugin)
+        except ValueError:
+            pass
+
+        try:
+            gozerbot.utils.log.loglist.remove(plugin)
+        except ValueError:
+            pass
+
+        config.save()
+
+    ievent.reply('loglist is now %s' % config['loglist'])
+ 
+cmnds.add('loglist-del', handle_loglistdel,'OPER')
+examples.add('loglist-del', 'remove plugin from loglist', 'loglist-del rss')
+tests.add('loglist rss', 'rss').add('loglist-del')
+
+def handle_partylist(bot, ievent):
+
+    """ partylist .. show users on partylist. """
+
+    partynicks = partyline.list_nicks()
+
+    if partynicks:
+        ievent.reply("people on partyline: ", partynicks)
+    else:
+        ievent.reply('no party yet!')
+
+cmnds.add('partylist', handle_partylist, ['USER', 'WEB'])
+examples.add('partylist', 'show connected partylist users', 'partylist')
+tests.add('partylist')
+
+def handle_partysilent(bot, ievent):
+
+    """ party-silent .. disable partyline noise. """
+
+    partyline.silent(ievent.nick)
+    ievent.reply('partyline put to silent mode')
+
+cmnds.add('party-silent', handle_partysilent, ['USER', ])
+examples.add('party-silent', 'disable partyline noise', 'party-silent')
+tests.add('party-silent')
+
+def handle_partyloud(bot, ievent):
+
+    """ party-loud .. enable partyline noise. """
+
+    partyline.loud(ievent.nick)
+    ievent.reply('partyline put to loud mode')
+
+cmnds.add('party-loud', handle_partyloud, ['USER', ])
+examples.add('party-loud', 'enable partyline noise', 'party-loud')
+tests.add('party-loud')
+
+def handle_threads(bot, ievent):
+
+    """ show running threads. """
+
+    stats = Statdict()
+    threadlist = threading.enumerate()
+
+    for thread in threadlist:
+        stats.upitem(thread.getName())
+
+    result = []
+
+    for item in stats.top():
+        result.append("%s = %s" % (item[0], item[1]))
+
+    result.sort()
+    ievent.reply("threads running: ", result)
+
+cmnds.add('threads', handle_threads, ['USER', 'OPER'])
+examples.add('threads', 'show running threads', 'thread')
+tests.add('threads', 'Bot')
+
+def handle_running(bot, ievent):
+
+    """ running .. show running jobs on the runner. """
+
+    stats = [Statdict() for i in range(10)]
+    teller = 0
+
+    for runner in cbrunners.running():
+        stats[teller].upitem(runner)
+        teller += 1
+
+    teller = 0
+
+    for runner in cmndrunners.running():
+        stats[teller].upitem(runner)
+        teller += 1
+
+    result = []
+
+    for i in range(teller):
+        for item in stats[i].top():
+            result.append("%s.%s = %s" % (item[0], 10-i, item[1]))
+
+    result.sort()
+    ievent.reply("runners: ", result)
+
+cmnds.add('running', handle_running, ['USER', 'OPER'])
+examples.add('running', 'show running jobs', 'running')
+tests.add('running')
+
+def handle_nowrunning(bot, ievent):
+    result = []
+
+    for runner in cbrunners.runners:
+        result.append(runner.nowrunning)
+
+    ievent.reply('nowrunning callbacks: %s' % str(result))
+    result = []
+
+    for runner in cmndrunners.runners:
+        result.append(runner.nowrunning)
+
+    ievent.reply('nowrunning commands: %s' % str(result))
+
+cmnds.add('nowrunning', handle_nowrunning, 'OPER')
+tests.add('nowrunning')
+
+def handle_callbacks(bot, ievent):
+
+    """ list all callbacks. """
+
+    ievent.reply(callbacks.list())
+
+cmnds.add('callbacks', handle_callbacks, 'OPER')
+tests.add('callbacks')
+
+def handle_save(bot, ievent):
+
+    """ save bot data to disk. """
+
+    ievent.reply('saving')
+    plugins.save()
+    fleet.save()
+    config.save()
+    ievent.reply('done')
+
+cmnds.add('save', handle_save, 'OPER')
+examples.add('save', 'save bot data', 'save')
+tests.add('save', 'done')
+
+def handle_version(bot, ievent):
+
+    """ show bot's version. """
+
+    ievent.reply(getversion())
+
+cmnds.add('version', handle_version, ['USER', 'WEB', 'JCOLL', 'CLOUD'])
+examples.add('version', 'show version of the bot', 'version')
+aliasset('v', 'version')
+tests.add('version', 'GOZERBOT')
+
+def handle_whereis(bot, ievent):
+
+    """ whereis <cmnd> .. locate a command. """
+
+    try:
+        cmnd = ievent.args[0]
+    except IndexError:
+        ievent.missing('<cmnd>')
+        return
+
+    plugs = plugins.whereis(cmnd)
+
+    if plugs:
+        ievent.reply("%s command is in: " %  cmnd, plugs)
+    else:
+        ievent.reply("can't find " + cmnd)
+
+cmnds.add('whereis', handle_whereis, ['USER', 'WEB'])
+examples.add('whereis', 'whereis <cmnd> .. show in which plugins <what> is', 'whereis test')
+tests.add('whereis version', 'core')
+
+def handle_help(bot, ievent):
+
+    """ help [<cmnd>|<plugin>] .. show help on plugin/command or show basic help msg. """
+
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        ievent.reply('run help on one of the following plugins: ', pluginlist)
+        return
+
+    plugins.needreloadcheck(bot, ievent, what)
+    phelp = plughelp.get(what)
+    cmndresult = []
+
+    if phelp:
+        ievent.reply('plugin description: %s' % phelp)
+
+        perms = list(users.getperms(ievent.userhost))
+
+        for i, j in cmnds.iteritems():
+            if what == j.plugname:
+                for perm in j.perms:
+                    if perm in perms:
+                        if i not in cmndresult:
+                            cmndresult.append(i)
+
+        if cmndresult:
+            cmndresult.sort()
+            resultstr = ""
+            for i in cmndresult:
+                alias = aliasreverse(i)
+                if alias:
+                    resultstr += "%s (%s) .. " % (i, alias)
+                else:
+                    resultstr += "%s .. " % i
+            ievent.reply('commands: %s'\
+ % resultstr[:-4])
+        else:
+            ievent.reply('no commands available for permission %s' % \
+str(perms))
+
+        result = []
+
+        for i in rebefore.relist:
+            if what == i.plugname:
+                if users.allowed(ievent.userhost, i.perms):
+                    result.append(i.regex)
+
+        for i in reafter.relist:
+            if what == i.plugname:
+                if users.allowed(ievent.userhost, i.perms):
+                    result.append(i.regex)
+
+        if result:
+            resultstr = ""
+            for i in result:
+                resultstr += '"%s" .. ' % i
+            ievent.reply('regular expressions: %s' % resultstr[:-4])
+        else:
+            pass
+
+        result = []
+
+        for i, j in callbacks.cbs.items():
+            for z in j:
+                if what == z.plugname:
+                    result.append(i)
+
+        if result:
+            resultstr = ""
+            for i in result:
+                resultstr += "%s .. " % i
+            ievent.reply('callbacks: %s' % resultstr[:-4])
+        else:
+            pass
+
+        if not cmndresult:
+            return
+
+    if what in aliases.data:
+        ievent.reply('%s is an alias for %s' % (what, aliases.data[what]))
+        what = aliases.data[what]
+
+    try:
+        example = examples[what]
+    except KeyError:
+        return
+
+    ievent.reply('%s .. alias: %s .. examples: %s' % (example.descr, aliasreverse(what), example.example))
+
+cmnds.add('help', handle_help, ['USER', 'WEB'])
+examples.add('help', 'get help on <cmnd> or <plugin>', '1) help test 2) help misc')
+tests.add('help core', 'version')
+
+def handle_apro(bot, ievent):
+
+    """ apro <cmnd> .. apropos for command. """
+
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        ievent.missing('<what>')
+        return
+
+    result = []
+    perms = users.getperms(ievent.userhost)
+
+    for i in cmnds.apropos(re.escape(what), perms=perms):
+        alias = aliasreverse(i)
+        if alias:
+            result.append('%s (%s)' % (i, alias))
+        else:
+            result.append(i)
+
+    res = []
+
+    for alias in aliases.data:
+        if what in alias and not what in result:
+            res.append(alias)
+
+    result.extend(res)
+
+    if result:
+        ievent.reply("commands matching %s: " % what, result , nr=1)
+    else: 
+        ievent.reply('no matching commands found for %s' % what)
+
+cmnds.add('apro', handle_apro, ['USER', 'WEB'])
+aliases.data['apropos'] = 'apro'
+examples.add('apro', 'apro <what> .. search for commands that contain <what>', 'apro com')
+tests.add('apro ver', 'version')
+
+def handle_u(bot, ievent):
+
+    """ u <nick> .. show userhost entry in cache. """
+
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+
+    result = getwho(bot, nick)
+
+    if result:
+        ievent.reply(result)
+    else:
+        ievent.reply("can't get userhost for %s" % nick)
+
+cmnds.add('u', handle_u, ['USER', ])
+examples.add('u', 'u <nick> .. get userhost cache entry for <nick>', 'u dunker')
+tests.add('u dunker')
+
+def handle_less(bot, ievent):
+
+    """ get entry from the output cache. """
+
+    try:
+        if len(ievent.args) == 3:
+            (who, index1, index2) = ievent.args
+        elif len(ievent.args) == 2:
+            if bot.jabber: 
+                who = ievent.userhost
+            else:
+                who = ievent.nick
+            (index1, index2) = ievent.args
+        else:
+            if bot.jabber:
+                who = ievent.userhost
+            else:
+                who = ievent.nick
+            index1 = 0
+            index2 = ievent.args[0]
+        index1 = int(index1)
+        index2 = int(index2)
+    except IndexError:
+        ievent.missing('[<who>] [<index1>] <index2>')
+        return
+    except ValueError:
+        ievent.reply('i need integers as arguments')
+        return
+
+    txt = bot.less.get(who, index1, index2)
+
+    if not txt:
+        ievent.reply('no data available for %s %s %s' % \
+(who, index1, index2))
+        return
+
+    if bot.jabber:
+        bot.say(ievent.userhost, txt)
+    else:
+        ievent.reply(txt)
+
+cmnds.add('less', handle_less, ['USER', 'CLOUD'])
+examples.add('less', "less [<who>] [<index1>] <index2> .. get txt from bots output cache", '1) less 0 2) less 0 2 3) less bart 1 0')
+tests.add('less 0 0')
+
+def handle_lesssize(bot, ievent):
+
+    """ show size of output cache. """
+
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        who = ievent.nick
+
+    ievent.reply(bot.less.size(who))
+
+cmnds.add('less-size', handle_lesssize, ['USER', ])
+examples.add('less-size', "show sizes of data in bot's ouput cache", 'less-size')
+tests.add('less-size')
+
+def handle_more(bot, ievent):
+
+    """ pop message from the output cache. """
+
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        if bot.jabber:
+            who = ievent.userhost
+        else:
+            who = ievent.nick
+
+    what, size = bot.less.more(who, 0)
+
+    if not what:
+        ievent.reply('no more data available for %s' % who)
+        return
+
+    if bot.jabber:
+        if size:
+            bot.say(ievent.userhost, "%s (+%s)" % (what, size))
+        else:
+            ievent.reply(what)
+        return      
+
+    if size:
+
+        # check if bot is in notice mode
+        notice = False
+
+        try:
+            notice = bot.channels[ievent.printto]['notice']
+        except (KeyError, TypeError):
+            pass
+
+        # check if bot is in silent mode
+        silent = False
+
+        try:
+            silent = bot.channels[ievent.printto]['silent']
+        except (KeyError, TypeError):
+            pass
+
+        if notice:
+            how = 'notice'
+        else:
+            how = 'msg'
+
+        if silent:
+            printto = ievent.nick
+        else:
+            printto = ievent.printto
+
+        bot.output(printto,"%s \002(+%s)\002" % (what, size), how)
+    else:
+        ievent.reply(what)
+     
+cmnds.add('more', handle_more, ['USER', 'CLOUD'], threaded=True)
+examples.add('more', 'return txt from output cache', '1) more 2) more test')
+tests.add('more')
+
+def handle_whatcommands(bot, ievent):
+
+    """ show all commands with permission. """
+
+    if not ievent.rest:
+        ievent.missing('<perm>')
+        return
+
+    result = cmnds.list(ievent.rest)
+    result.sort()
+
+    if not result:
+        ievent.reply('no commands known for permission %s' % ievent.rest)
+    else:
+        ievent.reply('commands known for permission %s: ' % ievent.rest, result)
+
+cmnds.add('whatcommands', handle_whatcommands, 'USER')
+examples.add('whatcommands', 'show commands with permission <perm>', 'whatcommands USER')
+tests.add('whatcommands USER', 'version')
+
+def handle_cleanpyc(bot, ievent):
+
+    """ clean pyc files. """
+
+    removed = cleanpyc()
+    ievent.reply('removed: ', removed, dot=True)
+
+cmnds.add('cleanpyc', handle_cleanpyc, 'OPER')
+tests.add('cleanpyc')
+
+def handle_versions(bot, ievent):
+
+    """ show versions of all loaded modules (if available). """
+
+    versions = {}
+    for mod in copy.copy(sys.modules):
+        try:
+            versions[mod] = sys.modules[mod].__version__
+        except AttributeError, ex:
+            pass
+        try:
+            versions['python'] = sys.version
+        except AttributeError, ex:
+            pass
+    ievent.reply("versions ==> ", versions)
+    
+
+cmnds.add('versions', handle_versions, 'OPER')
+examples.add('versions', 'show versions of all loaded modules', 'versions')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/irc.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/irc.py
@@ -0,0 +1,495 @@
+# plugs/irc.py
+#
+#
+
+""" irc related commands. """
+
+__copyright__ = 'this file is in the public domain'
+__gendocfirst__ = ['reconnect', 'join']
+__gendoclast__ = ['part', ]
+
+# gozerbot imports
+from gozerbot.callbacks import callbacks
+from gozerbot.fleet import fleet
+from gozerbot.partyline import partyline
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+import gozerbot.threads.thr as thr
+
+# basic imports
+import Queue, sets
+
+plughelp.add('irc', 'irc related commands')
+
+ignorenicks = []
+
+def handle_broadcast(bot, ievent):
+
+    """ broadcast txt to all joined channels. """
+
+    if not ievent.rest:
+         ievent.missing('<txt>')
+         return
+
+    ievent.reply('broadcasting')
+    fleet.broadcast(ievent.rest)
+    partyline.say_broadcast(ievent.rest)
+    ievent.reply('done')
+
+cmnds.add('broadcast', handle_broadcast, 'OPER')
+examples.add('broadcast', 'send a message to all channels and dcc users', 'broadcast good morning')
+tests.add('broadcast testing testing')
+
+def handle_alternick(bot, ievent):
+
+    """ set alternative nick used if nick is already taken. """
+
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.reply('alternick is %s' % bot.state['alternick'])
+        return
+
+    ievent.reply('changing alternick to %s' % nick)
+    bot.state['alternick'] = nick
+    bot.state.save()
+    ievent.reply('done')
+
+cmnds.add('alternick', handle_alternick, 'OPER')
+examples.add('alternick', 'get/set alertnick' , '1) alternick 2) alternick gozerbot2')
+tests.add('alternick testbot', 'testbot')
+
+def dojoin(bot, ievent):
+
+    """ join <channel> [password]. """
+
+    try:
+        channel = ievent.args[0]
+    except IndexError:
+        ievent.missing("<channel> [password]")
+        return
+
+    try:
+        password = ievent.args[1]
+    except IndexError:
+        password = None
+
+    ievent.reply('joining %s' % channel)
+    bot.join(channel, password=password)
+    ievent.done()
+
+cmnds.add('join', dojoin, ['OPER', 'JOIN'])
+examples.add('join', 'join <channel> [password]', '1) join #test 2) join #test mekker')
+tests.add('join #dunkbots')
+
+def delchan(bot, ievent):
+
+    """ delchan <channel>  .. remove channel from bot.channels. """
+
+    try:
+        chan = ievent.args[0].lower()
+    except IndexError:
+        ievent.missing("<channel>")
+        return
+
+    try:
+        bot.state['joinedchannels'].remove(chan)
+        bot.state.save()
+    except ValueError:
+        pass
+
+    try:
+        del bot.channels.data[chan]
+        bot.channels.save()
+    except KeyError:
+        ievent.reply("no channel %s in database" % chan)
+
+    ievent.done()
+
+cmnds.add('delchan', delchan, 'OPER')
+examples.add('delchan', 'delchan <channel> .. remove channel from bot.channels', 'delchan #mekker')
+
+def dopart(bot, ievent):
+
+    """ part [<channel>]. """
+
+    if not ievent.rest:
+        chan = ievent.channel
+    else:
+        chan = ievent.rest
+
+    ievent.reply('leaving %s chan' % chan)
+    bot.part(chan)
+    ievent.done()
+
+cmnds.add('part', dopart, 'OPER')
+examples.add('part', 'part [<channel>]', '1) part 2) part #test')
+tests.add('part #mekker')
+
+def handle_channels(bot, ievent):
+
+    """ channels .. show joined channels. """
+
+    chans = bot.state['joinedchannels']
+
+    if chans:
+        ievent.reply("joined channels: ", chans, dot=True)
+    else:
+        ievent.reply('no channels joined')
+
+cmnds.add('channels', handle_channels, ['USER', 'WEB'])
+examples.add('channels', 'show what channels the bot is on', 'channels')
+tests.add('channels', '#dunkbots')
+
+def handle_chat(bot, ievent):
+
+    """ chat .. start a bot initiated dcc chat session. """
+
+    if not bot.type == 'irc':
+        ievent.reply("chat only works on irc bots")
+        return
+
+    i = ievent
+    thr.start_new_thread(bot._dcclisten, (i.nick, i.userhost, i.channel))
+    ievent.reply('dcc chat request sent')
+
+cmnds.add('chat', handle_chat, 'USER')
+examples.add('chat', 'start a dcc chat session', 'chat')
+tests.add('chat', 'sent')
+
+def handle_cycle(bot, ievent):
+
+    """ cycle .. recycle channel. """
+
+    ievent.reply('cycling %s' % ievent.channel)
+    bot.part(ievent.channel)
+    try:
+        key = bot.channels[ievent.channel.lower()]['key']
+    except (KeyError, TypeError):
+        key = None
+
+    bot.join(ievent.channel, password=key)
+    ievent.done()
+
+cmnds.add('cycle', handle_cycle, 'OPER')
+examples.add('cycle', 'part/join channel', 'cycle')
+tests.add('cycle')
+
+def handle_jump(bot, ievent):
+
+    """ jump <server> <port> .. change server. """
+
+    if bot.jabber:
+        ievent.reply('jump only works on irc bots')
+        return
+    if len(ievent.args) != 2:
+        ievent.missing('<server> <port>')
+        return
+    (server, port) = ievent.args
+    ievent.reply('changing to server %s' % server)
+    bot.shutdown()
+    bot.server = server
+    bot.port = port
+    bot.connect()
+    ievent.done()
+
+cmnds.add('jump', handle_jump, 'OPER')
+examples.add('jump', 'jump <server> <port> .. switch server', 'jump localhost 6667')
+
+def modecb(bot, ievent):
+
+    """ callback to detect change of channel key. """
+
+    if ievent.postfix.find('+k') != -1:
+        key = ievent.postfix.split('+k')[1]
+        bot.channels[ievent.channel.lower()]['key'] = key
+
+callbacks.add('MODE', modecb)
+
+def handle_nick(bot, ievent):
+
+    """ nick <nickname> .. change bot's nick. """
+
+    if bot.jabber:
+        ievent.reply('nick works only on irc bots')
+        return
+
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nickname>')
+        return
+
+    ievent.reply('changing nick to %s' % nick)
+    bot.donick(nick, setorig=1, save=1)
+    ievent.done()
+
+cmnds.add('nick', handle_nick, 'OPER', threaded=True)
+examples.add('nick', 'nick <nickname> .. set nick of the bot', 'nick mekker')
+tests.add('nick miep')
+
+def handle_sendraw(bot, ievent):
+
+    """ sendraw <txt> .. send raw text to the server. """
+
+    ievent.reply('sending raw txt')
+    bot.sendraw(ievent.rest)
+    ievent.done()
+
+cmnds.add('sendraw', handle_sendraw, 'SENDRAW')
+examples.add('sendraw', 'sendraw <txt> .. send raw string to the server', \
+'sendraw PRIVMSG #test :yo!')
+
+def handle_nicks(bot, ievent):
+
+    """ return nicks on channel. """
+
+    if bot.jabber:
+        ievent.reply('nicks only works on irc bots')
+        return
+
+    try:
+        chan = ievent.args[0]
+    except IndexError:
+        chan = ievent.channel
+
+    queue = Queue.Queue()
+    # set callback for name info response
+    wait353 = bot.wait.register('353', chan, queue)
+    # 366 is end of names response list
+    wait366 = bot.wait.register('366', chan, queue)
+    result = ""
+    ievent.reply('searching for nicks')
+    bot.names(chan)
+
+    while(1):
+        qres = queue.get()
+        if qres == None:
+            break
+        if qres.cmnd == '366':
+            break
+        else:
+            result += "%s " % qres.txt
+
+    bot.wait.delete(wait353)
+    bot.wait.delete(wait366)
+
+    if result:
+        res = result.split()
+
+        for nick in res:
+            for i in ignorenicks:
+                if i in nick:
+                    try:
+                        res.remove(nick)
+                    except ValueError:
+                        pass
+
+        res.sort()
+        ievent.reply("nicks on %s (%s): " % (chan, bot.server), res)
+    else:
+        ievent.reply("can't get nicks of channel %s" % chan)
+
+cmnds.add('nicks', handle_nicks, ['OPER', 'WEB'], threaded=True)
+examples.add('nicks', 'show nicks on channel the command was given in', 'nicks')
+tests.add('nicks', "can't")
+
+def handle_silent(bot, ievent):
+
+    """ set silent mode of channel. """
+
+    if ievent.rest:
+        channel = ievent.rest.split()[0].lower()
+    else:
+        if ievent.cmnd == 'DCC':
+            return
+        channel = ievent.channel
+
+    ievent.reply('putting %s to silent mode' % channel)
+
+    try:
+        bot.channels[channel]['silent'] = 1
+    except (KeyError, TypeError):
+        ievent.reply("no %s channel in database" % channel)
+        return 
+    ievent.done()
+
+cmnds.add('silent', handle_silent, 'OPER')
+examples.add('silent', 'set silent mode on channel the command was given in', 'silent')
+tests.add('silent').add('loud')
+
+def handle_loud(bot, ievent):
+
+    """ loud .. enable output to the channel. """
+
+    if ievent.rest:
+        channel = ievent.rest.split()[0].lower()
+    else:
+        if ievent.cmnd == 'DCC':
+            return
+        channel = ievent.channel
+
+    ievent.reply('putting %s into loud mode' % ievent.channel)
+
+    try:
+        bot.channels[channel]['silent'] = 0
+    except (KeyError, TypeError):
+        ievent.reply("no %s channel in database" % channel)
+        return 
+
+    ievent.done()
+
+cmnds.add('loud', handle_loud, 'OPER')
+examples.add('loud', 'disable silent mode of channel command was given in', 'loud')
+tests.add('loud')
+
+def handle_withnotice(bot, ievent):
+
+    """ withnotice .. make bot use notice in channel. """
+
+    if ievent.rest:
+        channel = ievent.rest.split()[0].lower()
+    else:
+        if ievent.cmnd == 'DCC':
+            return
+        channel = ievent.channel
+
+    ievent.reply('setting notice in %s' % channel)
+
+    try:
+        bot.channels[channel]['notice'] = 1
+    except (KeyError, TypeError):
+        ievent.reply("no %s channel in database" % channel)
+        return 
+
+    ievent.done()
+    
+cmnds.add('withnotice', handle_withnotice, 'OPER')
+examples.add('withnotice', 'make bot use notice on channel the command was given in', 'withnotice')
+tests.add('withnotice').add('withprivmsg')
+
+def handle_withprivmsg(bot, ievent):
+
+    """ withprivmsg .. make bot use privmsg in channel. """
+
+    if ievent.rest:
+        channel = ievent.rest.split()[0].lower()
+    else:
+        if ievent.cmnd == 'DCC':
+            return
+        channel = ievent.channel
+
+    ievent.reply('setting privmsg in %s' % ievent.channel)
+
+    try:
+        bot.channels[channel]['notice'] = 0
+    except (KeyError, TypeError):
+        ievent.reply("no %s channel in database" % channel)
+        return 
+
+    ievent.done()
+
+cmnds.add('withprivmsg', handle_withprivmsg, 'OPER')
+examples.add('withprivmsg', 'make bot use privmsg on channel command was given in', 'withprivmsg')
+tests.add('withprivmsg')
+
+def handle_reconnect(bot, ievent):
+
+    """ reconnect .. reconnect to server. """
+
+    ievent.reply('reconnecting')
+    bot.reconnect()
+    ievent.done()
+
+cmnds.add('reconnect', handle_reconnect, 'OPER', threaded=True)
+examples.add('reconnect', 'reconnect to server', 'reconnect')
+
+def handle_channelmode(bot, ievent):
+
+    """ show channel mode. """
+
+    if bot.type != 'irc':
+        ievent.reply('channelmode only works on irc bots')
+        return
+
+    try:
+        chan = ievent.args[0].lower()
+    except IndexError:
+        chan = ievent.channel.lower()
+
+    if not chan in bot.state['joinedchannels']:
+        ievent.reply("i'm not on channel %s" % chan)
+        return
+
+    ievent.reply('channel mode of %s is %s' % (chan, bot.channels.get(chan, 'mode')))
+
+cmnds.add('channelmode', handle_channelmode, 'OPER')
+examples.add('channelmode', 'show mode of channel', '1) channelmode 2) channelmode #test')
+tests.add('channelmode --chan #dunkbots')
+
+def handle_action(bot, ievent):
+
+    """ make the bot send an action string. """
+
+    try:
+        channel, txt = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<channel> <txt>')
+        return
+
+    bot.action(channel, txt)
+
+cmnds.add('action', handle_action, ['ACTION', 'OPER'], speed=1)
+examples.add('action', 'send an action message', 'action #test yoo dudes')
+tests.add('action #dunkbots mekker')
+
+def handle_say(bot, ievent):
+
+    """ make the bot say something. """
+
+    try:
+        channel, txt = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<channel> <txt>')
+        return
+
+    bot.say(channel, txt)
+
+cmnds.add('say', handle_say, ['SAY', 'OPER'], speed=1)
+examples.add('say', 'send txt to channel/user', 'say #test good morning')
+tests.add('say #dunkbots mekkerbot')
+
+def handle_server(bot, ievent):
+
+    """ show the server to which the bot is connected. """
+
+    ievent.reply(bot.server)
+
+cmnds.add('server', handle_server, 'OPER')
+examples.add('server', 'show server hostname of bot', 'server')
+tests.add('server')
+
+def handle_voice(bot, ievent):
+
+    """ give voice. """
+
+    if bot.type != 'irc':
+        ievent.reply('voice only works on irc bots')
+        return
+
+    if len(ievent.args)==0:
+        ievent.missing('<nickname>')
+        return
+
+    ievent.reply('setting voide on %s' % str(ievent.args))
+
+    for nick in sets.Set(ievent.args):
+        bot.voice(ievent.channel, nick)
+
+    ievent.done()
+
+cmnds.add('voice', handle_voice, 'OPER')
+examples.add('voice', 'give voice to user', 'voice test')
+tests.add('voice dunker')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/sort.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/sort.py
@@ -0,0 +1,111 @@
+# gozerbot/plugs/sort.py
+#
+# Sorting
+
+""" sort bot results. """
+
+__author__ = "Wijnand 'maze' Modderman <http://tehmaze.com>"
+__license__ = "BSD"
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.utils.generic import waitforqueue
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+
+# basic imports
+import optparse
+
+plughelp.add('sort', ' sort elements (of a pipeline)')
+
+class SortError(Exception): pass
+
+class SortOptionParser(optparse.OptionParser):
+
+    """ options parsers for the sort command. """
+
+    def __init__(self):
+        optparse.OptionParser.__init__(self)
+
+        self.add_option('-f', '--ignore-case',
+            help='fold lower case to upper case characters', default=False,
+            action='store_true', dest='ignorecase')
+
+        self.add_option('-n', '--numeric-sort', default=False,
+            help='compare according to string numerical value', 
+            action='store_true', dest='numeric')
+
+        self.add_option('-r', '--reverse', default=False,
+            help='reverse the result of comparisons', 
+            action='store_true', dest='reverse')
+
+        self.add_option('-u', '--unique', default=False,
+            help='output only the first of an equal run', 
+            action='store_true', dest='unique')
+
+    def format_help(self, formatter=None):
+        raise SortError('sort [-fnru] [--ignore-case] [--numeric-sort] [--reverse] [--unique]')
+
+    def error(self, msg):
+        return self.exit(msg=msg)
+
+    def exit(self, status=0, msg=None):
+        if msg:
+            raise SortError(msg)
+        else:
+            raise SortError
+
+def numeric_compare(x, y):
+    try: a = int(x)
+    except: return cmp(x, y)
+    try: b = int(y)
+    except: return cmp(x, y)
+    return a - b
+
+def handle_sort(bot, ievent):
+
+    """ sort the result list. """
+
+    parser = SortOptionParser()
+
+    if not ievent.inqueue:
+        if not ievent.args:
+            ievent.missing('<input>')
+            return
+        try:
+            options, result = parser.parse_args(ievent.args)
+        except SortError, e:
+            ievent.reply(str(e))
+            return
+    else:
+        result = waitforqueue(ievent.inqueue, 30)
+        try:
+            options, args = parser.parse_args(ievent.rest.split())
+        except SortError, e:
+            ievent.reply(str(e))
+            return
+
+    if not result:
+        ievent.reply('no data to sort')
+        return
+
+    if options.unique:
+        result = list(set(result))
+
+    if options.numeric:
+        result.sort(numeric_compare)
+    else:
+        result.sort()
+
+    if options.ignorecase:
+        result.sort(lambda a, b: cmp(a.upper(), b.upper()))
+
+    if options.reverse:
+        result.reverse()
+    
+    ievent.reply(result, dot=True)
+
+cmnds.add('sort', handle_sort, ['USER', 'WEB', 'CLOUD'], threaded=True)
+examples.add('sort', 'sort the output of a command', 'list | sort')
+tests.add('list | sort')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/ignore.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/ignore.py
@@ -0,0 +1,83 @@
+# plugs/ignore.py
+#
+#
+
+""" ignore users. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.utils.generic import getwho
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.ignore import addignore, delignore, ignore
+from gozerbot.tests import tests
+from gozerbot.users import users
+
+plughelp.add('ignore', 'ignore users for a certain time')
+
+def handle_ignore(bot, ievent):
+
+    """ ignore nick for number of seconds. """
+
+    try:
+        (nick, nrseconds) = ievent.args
+        nrseconds = int(nrseconds)
+    except ValueError:
+        ievent.missing('<nick> <seconds>')
+        return
+
+    userhost = getwho(bot, nick)
+
+    if not userhost:
+        ievent.reply("can't get userhost of %s" % nick)
+        return
+
+    allowed = users.allowed(userhost, 'OPER', log=False)
+
+    if allowed:
+        ievent.reply("can't ignore OPER")
+        return
+
+    addignore(userhost, nrseconds)
+    ievent.reply("ignoring %s for %s seconds" % (nick, nrseconds))
+    
+cmnds.add('ignore', handle_ignore, ['OPER', 'IGNORE'], speed=1)
+examples.add('ignore', 'ignore <nick> <seconds> .. ignore <nick> for <seconds>', 'ignore test 3600')
+tests.add('ignore bottest 3', 'bottest').add('ignore-del bottest')
+
+def handle_ignoredel(bot, ievent):
+
+    """ remove nick from ignore list. """
+
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+
+    userhost = getwho(bot, nick)
+
+    if not userhost:
+        ievent.reply("can't get userhost of %s" % nick)
+        return
+
+    if delignore(userhost):
+        ievent.reply("ignore for %s removed" % nick)
+    else:
+        ievent.reply("can't remove ignore of %s" % nick)
+        
+cmnds.add('ignore-del', handle_ignoredel, ['OPER', 'IGNORE'])
+examples.add('ignore-del', 'ignore-del <nick> .. unignore <nick>', 'ignore-del dunker')
+tests.add('ignore bottest 1').add('ignore-del bottest', 'removed')
+
+def handle_ignorelist(bot, ievent):
+
+    """ show ignore list. """
+
+    ievent.reply(str(ignore))
+    
+cmnds.add('ignore-list', handle_ignorelist, 'OPER')
+examples.add('ignore-list', 'show ignore list', 'ignore-list')
+tests.add('ignore bottest 20').add('ignore-list', 'bottest').add('ignore-del bottest')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/stats.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/stats.py
@@ -0,0 +1,26 @@
+# gozerbot/plugs/stats.py
+#
+#
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.stats import stats
+from gozerbot.tests import tests
+
+def handle_stats(bot, ievent):
+
+    """ show stats of the bot. """
+
+    if not ievent.rest:
+        ievent.missing('[%s]' % '|'.join(stats.all()))
+        return
+
+    item = ievent.rest
+    result = stats.get(item)
+
+    if result:
+        ievent.reply('stats of %s ==> ' % item, dict(result))
+
+cmnds.add('stats', handle_stats, 'OPER')
+examples.add('stats', 'show stats of the bot', '1) stats 2) stats callbacks')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/inform.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/inform.py
@@ -0,0 +1,41 @@
+# gozerbot/plugs/inform.py
+#
+#
+
+""" prepend nick: to the output of a command. """
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plugins import plugins
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import copy
+
+plughelp.add('inform', 'inform <nick> the output of a command')
+
+def handle_inform(bot, ievent):
+
+    """ prepend nick: to the output of command to another user """
+
+    try:
+        nick, cmnd = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<nick> <command>')
+        return
+
+    event = copy.deepcopy(ievent)
+    event.txt = cmnd
+    event.onlyqueues = True
+    result = plugins.cmnd(bot, event)
+
+    if not result:
+        ievent.reply("no result for %s" % cmnd)
+        return
+
+    ievent.reply("%s: " % nick, result, dot=True)
+
+cmnds.add('inform', handle_inform, 'USER', threaded=True)
+examples.add('inform', 'inform <nick> <command> .. inform <nick> the output of command', 'inform dunker version')
+tests.add('inform dunker version', 'dunker')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/jabber.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/jabber.py
@@ -0,0 +1,99 @@
+# plugs/jabber.py
+#
+#
+
+""" jabber related commands. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot import
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.xmpp.presence import Presence
+
+plughelp.add('jabber', 'jabber specific commands')
+
+def handle_jabberratelimit(bot, ievent):
+
+    """ set jabber output limiter. """
+
+    if not bot.jabber:
+        ievent.reply('this command only works on a jabber bot')
+        return 
+
+    try:
+        limit = int(ievent.args[0])
+    except IndexError:
+        ievent.reply('limiter is %s seconds' % bot.state['ratelimit'])
+        return
+    except ValueError:
+        ievent.missing('<seconds>')
+        return
+
+    bot.state['ratelimit'] = limit
+    ievent.reply('rate limiter set to %s' % limit)
+
+cmnds.add('jabber-ratelimit', handle_jabberratelimit, 'OPER')
+examples.add('jabber-ratelimit', 'limit jabber output', 'jabber-ratelimit 1')
+
+def handle_ircstr(bot, ievent):
+
+    """ show ircevent repr like string of jabbermessage. """
+
+    if not bot.jabber:
+        ievent.reply('this command only works on a jabber bot')
+        return 
+
+    ievent.reply(ievent.ircstr())
+
+cmnds.add('jabber-ircstr', handle_ircstr, 'OPER')
+examples.add('jabber-ircstr', 'show the given event as ircstr', 'jabber-ircstr')
+
+def handle_show(bot, ievent):
+
+    """ send status stanza to server """
+
+    if not bot.jabber:
+        ievent.reply('this command only works on a jabber bot')
+        return 
+
+    try:
+        bot.state['show'] = show = ievent.args[0]
+    except IndexError:
+        bot.state['show'] = show = ''
+    bot.state.save()
+    bot.sendpresence()
+
+cmnds.add('jabber-show', handle_show, 'OPER')
+examples.add('jabber-show', 'send status to the server', 'jabber-show away')
+
+def handle_imhere(bot, ievent):
+
+    """ send presence stanza to server """
+
+    if not bot.jabber:
+        ievent.reply('this command only works on a jabber bot')
+        return 
+
+    bot.send(Presence({'type': 'available'}))
+
+cmnds.add('jabber-imhere', handle_imhere, 'OPER')
+examples.add('jabber-imhere', 'send presence to the server', 'jabber-imhere')
+
+def handle_jabberstatus(bot, ievent):
+
+    """ set jabber status. """
+
+    if not bot.jabber:
+        ievent.reply('this command only works on a jabber bot')
+        return 
+
+    bot.state['status'] = ievent.rest
+    bot.state.save()
+    bot.sendpresence()
+
+cmnds.add('jabber-status', handle_jabberstatus, 'OPER')
+examples.add('jabber-status', 'set the status of the bot', 'jabber-status happy !!')
+
+  
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/test.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/test.py
@@ -0,0 +1,250 @@
+# gozerplugs/test.py
+#
+#
+
+from gozerbot.utils.exception import exceptionmsg, handle_exception
+from gozerbot.tests import tests
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.irc.ircevent import Ircevent
+from gozerbot.users import users
+from gozerbot.plughelp import plughelp
+from gozerbot.partyline import partyline
+from gozerbot.threads.thr import start_new_thread
+
+plughelp.add('test', 'plugin to do tests')
+
+import time, random
+
+donot = ['quit', 'reboot', 'shutdown', 'exit', 'delete', 'halt', 'upgrade', \
+'install', 'reconnect', 'wiki', 'weather', 'sc', 'jump', 'disable', 'dict', \
+'snarf', 'validate', 'popcon', 'twitter', 'tinyurl', 'whois', 'rblcheck', \
+'wowwiki', 'wikipedia', 'tr', 'translate', 'serie', 'sc', 'shoutcast', 'mash', \
+'gcalc', 'identi', 'mail', 'part', 'cycle', 'exception', 'fleet', 'rss', 'ln', 'markov-learn', 'pit', 'bugtracker', 'tu', 'banner', 'test', 'cloud', 'dispatch', 'lns']
+
+def dummy(a, b=None):
+    return ""
+
+import gozerbot.utils.url
+import gozerbot.generic
+
+oldgeturl = gozerbot.utils.url.geturl
+oldgeturl2 = gozerbot.utils.url.geturl2 
+
+def handle_testplugs(bot, msg):
+    if bot.cfg['type'] == 'irc' and not msg.isdcc:
+        msg.reply('use this command in a /dcc chat with the bot')
+        return
+    gozerbot.utils.url.geturl = dummy
+    gozerbot.utils.url.geturl2 = dummy
+    gozerbot.generic.geturl = dummy
+    gozerbot.generic.geturl2 = dummy
+    if msg.rest:
+        match = msg.rest
+    else:
+        match = ""
+    try:
+        users.add('test', ['test@test',], ['USER', 'OPER'])
+    except Exception, ex:
+        pass
+    bot.channels.setdefault('test', {})
+    try:
+        loop = int(msg.options['--loop'])
+    except (KeyError, ValueError):
+        loop = 1
+    teller = 0
+    for i in range(loop):
+        msg.reply('starting loop %s' % str(i))
+        examplez = examples.getexamples()
+        random.shuffle(examplez)
+        for example in examplez:
+            if match and match not in example:
+                continue
+            skip = False
+            for dont in donot:
+                if dont in example:
+                    skip = True
+            if skip:
+                continue
+            teller += 1
+            if bot.jabber:
+                from gozerbot.xmpp.message import Message
+                newmessage = Message(msg)
+                newmessage.txt = example
+                newmessage.onlyqueues = False
+                msg.reply('command: ' + example)  
+                try:
+                    bot.domsg(newmessage)
+                except Exception, ex:
+                    handle_exception()
+            else:
+                newmessage = Ircevent(msg)
+                newmessage.txt = '!' + example
+                newmessage.onlyqueues = False
+                msg.reply('command: ' + example)
+                try:
+                    bot.domsg(newmessage)
+                except Exception, ex:
+                    handle_exception()
+            try:
+                time.sleep(int(msg.options['--sleep']))
+            except (KeyError, ValueError):
+                pass
+    msg.reply('%s tests run' % teller)
+    gozerbot.utils.url.geturl = oldgeturl
+    gozerbot.utils.url.geturl2 = oldgeturl2
+    gozerbot.generic.geturl = oldgeturl
+    gozerbot.generic.geturl2 = oldgeturl2
+
+cmnds.add('test-plugs', handle_testplugs, ['OPER', ], options={'--sleep': '0', '--loop': '1'}, threaded=True)
+#tests.add('test-plugs')
+
+def handle_testsrun(bot, ievent):
+    if bot.cfg['type'] == 'irc' and not ievent.isdcc:
+        ievent.reply('use this command in a /dcc chat with the bot')
+        return
+    toolate = []
+    err = {}
+    try:
+        loop = ievent.options['--loop']
+        loop = int(loop)
+    except (KeyError, ValueError):
+        loop = 1
+    tests.dotests(bot, ievent)
+    ievent.reply('%s tests run .. %s errors' % (tests.teller, len(tests.err)))
+    if tests.err:
+        teller = 0
+        for test in tests.err:
+            ievent.reply('error #%s %s' % (teller, str(test)))
+            teller += 1
+    if tests.toolate:
+        ievent.reply('toolate: ', tests.toolate, dot=True)
+
+cmnds.add('test-run', handle_testsrun, 'OPER', threaded=True, options={'--loop': '1', '--threaded': 'False'})
+examples.add('test-run', 'run the tests', 'test-run --sleep 0')
+
+def handle_testrunthread(bot, ievent):
+    if bot.cfg['type'] == 'irc' and not ievent.isdcc:
+        ievent.reply('use this command in a /dcc chat with the bot')
+        return
+    toolate = []
+    err = {}
+    try:
+        plug = ievent.options['--plug']
+    except (KeyError, ValueError):
+        plug = None
+    tests.dotests(bot, ievent, threaded=True, plug=plug)
+    ievent.reply('%s tests run .. %s errors' % (tests.teller, len(tests.err)))
+    if tests.err:
+        teller = 0
+        for execstring, test in tests.err.iteritems():
+            ievent.reply('error #%s .. %s' % (teller, str(test)))
+            teller += 1
+    if tests.toolate:
+        ievent.reply('toolate: ', tests.toolate, dot=True)
+
+cmnds.add('test-runthread', handle_testrunthread, 'OPER', threaded=True, options={'--plug': None})
+
+def handle_forcedreconnect(bot, ievent):
+    if bot.jabber:
+        bot.disconnectHandler(Exception('test exception for reconnect'))
+    else:
+        bot.sock.close()
+
+cmnds.add('test-forcedreconnect', handle_forcedreconnect, 'OPER')
+
+def handle_forcedexception(bot, ievent):
+    raise Exception('test exception')
+
+cmnds.add('test-forcedexception', handle_forcedexception, 'OPER')
+#tests.add('test-forcedexception')
+
+def handle_testwrongxml(bot, ievent):
+    if not bot.jabber:
+        ievent.reply('only xmpp')
+        return
+    ievent.reply('sending bork xml')
+    bot._raw('<message asdfadf/>')
+
+cmnds.add('test-wrongxml', handle_testwrongxml, 'OPER')
+
+def handle_testhammer(bot, msg):
+    if bot.cfg['type'] == 'irc' and not msg.isdcc:
+        msg.reply('use this command in a /dcc chat with the bot')
+        return
+    gozerbot.utils.url.geturl = dummy
+    gozerbot.utils.url.geturl2 = dummy
+    gozerbot.generic.geturl = dummy
+    gozerbot.generic.geturl2 = dummy
+    if msg.rest:
+        match = msg.rest
+    else:
+        match = ""
+    try:
+        users.add('test', ['test@test',], ['USER', 'OPER'])
+    except Exception, ex:
+        pass
+    bot.channels.setdefault('test', {})
+    try:
+        loop = int(msg.options['--loop'])
+    except (KeyError, ValueError):
+        loop = 1
+    try:
+        hammer = int(msg.options['--hammer'])
+    except (KeyError, ValueError):
+        hammer = 10
+    teller = 0
+    for i in range(loop):
+        msg.reply('starting loop %s' % str(i))
+        examplez = examples.getexamples()
+        random.shuffle(examplez)
+        for example in examplez:
+            if match and match not in example:
+                continue
+            skip = False
+            for dont in donot:
+                if dont in example:
+                    skip = True
+            if skip:
+                continue
+            teller += 1
+            if bot.jabber:
+                from gozerbot.xmpp.message import Message
+                newmessage = Message(msg)
+                newmessage.txt = example
+                newmessage.onlyqueues = False
+                msg.reply('command: ' + example)  
+                for hammernr in range(hammer):
+                    try:
+                        bot.domsg(newmessage)
+                    except Exception, ex:
+                        handle_exception()
+            else:
+                newmessage = Ircevent(msg)
+                newmessage.txt = '!' + example
+                newmessage.onlyqueues = False
+                msg.reply('command: ' + example)
+                for hammernr in range(hammer):
+                    try:
+                        bot.domsg(newmessage)
+                    except Exception, ex:
+                        handle_exception()
+            try:
+                time.sleep(int(msg.options['--sleep']))
+            except (KeyError, ValueError):
+                pass
+    msg.reply('%s tests run' % teller)
+    gozerbot.utils.url.geturl = oldgeturl
+    gozerbot.utils.url.geturl2 = oldgeturl2
+    gozerbot.generic.geturl = oldgeturl
+    gozerbot.generic.geturl2 = oldgeturl2
+
+cmnds.add('test-hammer', handle_testhammer, 'OPER')
+cmnds.add('test-hammer', handle_testhammer, 'OPER', threaded=True)
+examples.add('test-hammer', 'run the hammer tests', 'test-hammer')
+#tests.add('test-hammer')
+
+def handle_tojson(bot, ievent):
+    ievent.reply(ievent.tojson())
+
+cmnds.add('test-json', handle_tojson, 'OPER')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/grep.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/grep.py
@@ -0,0 +1,103 @@
+# plugs/grep.py
+#
+#
+
+""" grep the output of bot comamnds. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.utils.generic import waitforqueue
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+import getopt, re
+
+plughelp.add('grep', ' grep elements of a pipeline')
+
+def handle_grep(bot, ievent):
+
+    """ grep the result list. """
+
+    if not ievent.inqueue:
+        ievent.reply('use grep in a pipeline')
+        return
+
+    if not ievent.rest:
+        ievent.reply('grep <txt>')
+        return
+
+    try:
+        (options, rest) = getopt.getopt(ievent.args, 'riv')
+    except getopt.GetoptError, ex:
+        ievent.reply(str(ex))
+        return
+
+    result = waitforqueue(ievent.inqueue, 30)
+
+    if not result:
+        ievent.reply('no data to grep on')
+        return
+
+    doregex = False
+    docasein = False
+    doinvert = False
+
+    for i, j in options:
+        if i == '-r':
+            doregex = True
+        if i == '-i':
+            docasein = True
+        if i == '-v':
+            doinvert = True
+
+    res = []
+
+    if doregex:
+
+        try:
+            if docasein:
+                reg = re.compile(' '.join(rest), re.I)
+            else:
+                reg = re.compile(' '.join(rest))
+        except Exception, ex:
+            ievent.reply("can't compile regex: %s" % str(ex))
+            return
+
+        if doinvert:
+            for i in result:
+                if not re.search(reg, i):
+                    res.append(i)
+        else:
+            for i in result:
+                if re.search(reg, i):
+                    res.append(i)
+    else:
+
+        if docasein:
+            what = ' '.join(rest).lower()
+        elif doinvert:
+            what = ' '.join(rest)
+        else:
+            what = ievent.rest
+
+        for i in result:
+            if docasein:
+                if what in str(i.lower()):
+                    res.append(i)
+            elif doinvert:
+                if what not in str(i):
+                    res.append(i)
+            else:
+                if what in str(i):
+                    res.append(i)
+
+    if not res:
+        ievent.reply('no result')
+    else:
+        ievent.reply(res, dot=True)
+
+cmnds.add('grep', handle_grep, ['USER', 'WEB', 'CLOUD'], threaded=True)
+examples.add('grep', 'grep the output of a command', 'list | grep core')
+tests.add('list | grep core', 'core')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/nickserv.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/nickserv.py
@@ -0,0 +1,272 @@
+# gozerbot/plugs/nickserv.py
+#
+# let gozerbot authenticate to NickServ
+
+
+""" authenticate to NickServ. """
+
+__author__ = "Wijnand 'tehmaze' Modderman - http://tehmaze.com"
+__license__ ='BSD'
+__gendoclast__ = ['ns-del', ]
+
+# gozerbot imports
+from gozerbot.utils.generic import convertpickle
+from gozerbot.examples import examples
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.fleet import fleet
+from gozerbot.persist.pdod import Pdod
+from gozerbot.plughelp import plughelp
+from gozerbot.utils.log import rlog
+from gozerbot.config import config
+from gozerbot.tests import tests
+
+# basic imports
+import os, time
+
+plughelp.add('nickserv', 'authenticate the bot through (nick)services')
+
+## UPGRADE PART
+
+def upgrade():
+
+    """ upgrade the nickserv data. """
+
+    try:
+        convertpickle(datadir + os.sep + 'nickserv', datadir + os.sep + 'plugs' + os.sep + \
+'nickserv' + os.sep + 'nickserv')
+    except Exception, ex:
+        rlog(10, 'nickserv', 'failed to upgrade .. %s' % str(ex))
+
+## END UPGRADE PART
+
+class NSAuth(Pdod):
+
+    """ nickserve auth. """
+
+    def __init__(self):
+        self.registered = False
+        Pdod.__init__(self, datadir + os.sep + 'plugs' + os.sep + \
+'nickserv' + os.sep + 'nickserv')
+
+    def add(self, bot, **kwargs):
+
+        """ add a nickserv entry. """
+
+        options = {
+            'nickserv': 'NickServ',
+            'identify': 'IDENTIFY',
+        }
+
+        options.update(kwargs)
+        assert options.has_key('password'), 'A password must be set'
+
+        for key in options.keys():
+            Pdod.set(self, bot.name, key, options[key])
+
+        self.save()
+
+    def remove(self, bot):
+
+        """ remove a nickserv entry. """
+
+        if self.has_key(bot.name):
+            del self[bot.name]
+            self.save()
+
+    def has(self, bot):
+
+        """ check if a bot is in the nickserv list. """
+
+        return self.has_key(bot.name)
+
+    def register(self, bot, passwd):
+
+        """ register a bot to nickserv. """
+
+        if self.has_key(bot.name) and self.has_key2(bot.name, 'nickserv'):
+            bot.sendraw('PRIVMSG %s :%s %s' % (self.get(bot.name, \
+'nickserv'),  'REGISTER', passwd))
+            rlog(10, 'nickserv', 'register sent on %s' % bot.server)
+
+    def identify(self, bot):
+
+        """ identify a bot to nickserv. """
+
+        #if self.has_key(bot.name) and self.has_key2(bot.name, 'nickservpass'):
+            #bot.say(self.get(bot.name, 'nickserv', ), '%s %s' % (self.get(bot.name, 'identify'), self.get(bot.name, 'password')), speed=9)
+        bot._raw("PRIVMSG %s :%s %s" % (self.get(bot.name, 'nickserv') or 'NickServ', self.get(bot.name, 'identify'), self.get(bot.name, 'password')))
+        rlog(10, 'nickserv', 'identify sent on %s' % bot.server)
+
+    def listbots(self):
+
+        """ list all bots know. """
+ 
+        all = []
+
+        for bot in self.data.keys():
+            all.append((bot, self.data[bot]['nickserv']))
+
+        return all
+
+    def sendstring(self, bot, txt):
+
+        """ send string to nickserver. """
+
+        nickservnick = self.get(bot.name, 'nickserv')
+        bot.say(nickservnick, txt)
+
+    def handle_001(self, bot, ievent):
+        self.identify(bot)
+        try:
+            for i in self.data[bot.name]['nickservtxt']:
+                self.sendstring(bot, i)
+                rlog(10, 'nickserv', 'sent %s' % i)
+        except:
+            pass
+
+# basic init stuff
+nsauth = NSAuth()
+
+if not nsauth.data:
+    upgrade()
+    nsauth = NSAuth()
+
+callbacks.add('001', nsauth.handle_001, threaded=True)
+
+def init():
+
+    """ init the nickserv data. """
+
+    passwd = config['nickservpass']
+    if passwd:
+        nsauth.add(bot, **{'password': passwd, 'nickservtxt': config['nickservtxt']})
+    return 1
+
+def handle_nsadd(bot, ievent):
+
+    """ add a bot to the nickserv. """
+
+    if bot.jabber:
+        return
+
+    if len(ievent.args) < 1:
+        ievent.missing('<password> [<nickserv nick>] [<identify command>]')
+        return
+
+    if nsauth.has(bot):
+        ievent.reply('replacing previous configuration')
+
+    options = {}
+
+    if len(ievent.args) >= 1:
+        options.update({'password': ievent.args[0]})
+
+    if len(ievent.args) >= 2:
+        options.update({'nickserv': ievent.args[1]})
+
+    if len(ievent.args) >= 3:
+        options.update({'identify': ' '.join(ievent.args[2:])})
+
+    nsauth.add(bot, **options)
+    ievent.reply('ok')
+
+cmnds.add('ns-add', handle_nsadd, 'OPER', threaded=True)
+examples.add('ns-add', 'ns-add <password> [<nickserv nick>] [<identify command>] .. add nickserv', 'ns-add mekker')
+tests.add('ns-add mekker', 'ok')
+
+def handle_nsdel(bot, ievent):
+
+    """ remove a bot from nickserv. """
+
+    if bot.jabber:
+        return
+
+    if len(ievent.args) != 1:
+        ievent.missing('<fleetbot name>')
+        return
+
+    botname = ievent.args[0]
+    fbot = fleet.byname(botname)
+
+    if not fbot:
+        ievent.reply('fleet bot %s not found' % botname)
+        return
+
+    if not nsauth.has(fbot):
+        ievent.reply('nickserv not configured on %s' % fbot.name)
+        return
+    nsauth.remove(fbot)
+    ievent.reply('ok')
+
+cmnds.add('ns-del', handle_nsdel, 'OPER', threaded=True)
+examples.add('ns-del', 'ns-del <fleetbot name>', 'ns-del test')
+tests.add('ns-del default', 'ok')
+
+def handle_nssend(bot, ievent):
+
+    """ send string to the nickserv. """
+
+    if bot.jabber:
+        return
+
+    if not ievent.rest:
+        ievent.missing('<txt>')
+        return
+
+    nsauth.sendstring(bot, ievent.rest)    
+    ievent.reply('send')
+
+cmnds.add('ns-send', handle_nssend, 'OPER', threaded=True)
+examples.add('ns-send', 'ns-send <txt> .. send txt to nickserv', 'ns-send identify bla')
+#tests.add('ns_send', 'send')
+
+def handle_nsauth(bot, ievent):
+
+    """ perform an auth request. """
+
+    if bot.jabber:
+        return
+
+    if len(ievent.args) != 1:
+        name = bot.name
+    else:
+        name = ievent.args[0]
+
+    fbot = fleet.byname(name)
+
+    if not fbot:
+        ievent.reply('fleet bot %s not found' % name)
+        return
+
+    if not nsauth.has(fbot):
+        ievent.reply('nickserv not configured on %s' % fbot.name)
+        return
+
+    nsauth.identify(fbot)
+    ievent.reply('ok')
+
+cmnds.add('ns-auth', handle_nsauth, 'OPER', threaded=True)
+examples.add('ns-auth','ns-auth [<botname>]', '1) ns-auth 2) ns-auth test')
+#tests.add('ns-add mekker').add('ns-auth default', 'ok')
+
+def handle_nslist(bot, ievent):
+
+    """ show a list of all bots know with nickserv. """
+
+    if bot.jabber:
+        return
+
+    all = dict(nsauth.listbots())
+    rpl = []
+
+    for bot in all.keys():
+        rpl.append('%s: authenticating through %s' % (bot, all[bot]))
+
+    rpl.sort()
+    ievent.reply(' .. '.join(rpl))
+
+cmnds.add('ns-list', handle_nslist, 'OPER')
+examples.add('ns-list', 'list all nickserv entries', 'ns-list')
+tests.add('ns-list')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/reverse.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/reverse.py
@@ -0,0 +1,33 @@
+# gozerbot/plugs/reverse.py
+#
+# 
+
+__copyright__ = 'this file is in the public domain'
+__author__ = 'Hans van Kranenburg <hans@knorrie.org>'
+
+# gozerbot imports
+from gozerbot.utils.generic import waitforqueue
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('reverse', 'reverse string or list')
+
+def handle_reverse(bot, ievent):
+
+    """ reverse string or pipelined list. """
+
+    if ievent.inqueue:
+        result = waitforqueue(ievent.inqueue, 5)
+    elif not ievent.rest:
+        ievent.missing('<text to reverse>')
+        return
+    else:
+        result = ievent.rest
+
+    ievent.reply(result[::-1])
+
+cmnds.add('reverse', handle_reverse, ['USER', 'CLOUD'], threaded=True)
+examples.add('reverse', 'reverse text or pipeline', '1) reverse gozerbot 2) list | reverse')
+tests.add('reverse gozerbot', 'tobrezog').add('list | reverse', 'misc')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/choice.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/choice.py
@@ -0,0 +1,43 @@
+# plugs/choice.py
+#
+#
+
+""" the choice command can be used with a string or in a pipeline """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.utils.generic import waitforqueue
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+# basic imports
+import random
+
+plughelp.add('choice', 'make a random choice')
+
+def handle_choice(bot, ievent):
+
+    """ make a random choice out of different words or list elements. """ 
+
+    result = []
+
+    if ievent.inqueue:
+        result = waitforqueue(ievent.inqueue, 5)
+    elif not ievent.args:
+        ievent.missing('<space seperated list>')
+        return
+    else:
+        result = ievent.args 
+
+    if result:
+        ievent.reply(random.choice(result))
+    else:
+        ievent.reply('nothing to choose from')
+
+cmnds.add('choice', handle_choice, ['USER', 'WEB', 'CLOUD'], threaded=True)
+examples.add('choice', 'make a random choice', '1) choice a b c 2) list | choice')
+tests.add('choice a ab ac', 'a')
+tests.add('list | choice')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/userstate.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/userstate.py
@@ -0,0 +1,139 @@
+# gozerbot/plugs/userstate.py
+#
+#
+
+""" userstate is stored in gozerdata/userstates. """
+
+__gendoclast__ = ['userstate-del', ]
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.persist.persiststate import UserState
+from gozerbot.users import users
+from gozerbot.aliases import aliasset
+from gozerbot.plughelp import plughelp
+
+plughelp.add('userstate', 'maintain state per user')
+
+def handle_userstate(bot, ievent):
+
+    """ let the user manage its own state. """
+
+    try:
+        (item, value) = ievent.args
+    except ValueError:
+        item = value = None
+
+    username = users.getname(ievent.userhost)
+    userstate = UserState(username)
+    if item and value:
+        userstate[item] = value
+        userstate.save()
+
+    result = []
+    for i, j in userstate.data.iteritems():
+        result.append("%s=%s" % (i, j))
+
+    if result:
+        ievent.reply("userstate of %s: " % username, result, dot=True)
+    else:
+        ievent.reply('no userstate of %s known' % username)
+
+cmnds.add('userstate', handle_userstate, 'USER')
+examples.add('userstate', 'get or set userstate', '1) userstate 2) userstate TZ -1')
+aliasset('set', 'userstate')
+
+def handle_userstateget(bot, ievent):
+
+    """ get state of a user. """
+
+    if not ievent.rest:
+        ievent.missing('<username>')
+        return
+
+    userstate = UserState(ievent.rest)
+    result = []
+    for i, j in userstate.data.iteritems():
+        result.append("%s=%s" % (i, j))
+
+    if result:
+        ievent.reply("userstate of %s: " % ievent.rest, result, dot=True)
+    else:
+        ievent.reply('no userstate of %s known' % ievent.rest)
+
+cmnds.add('userstate-get', handle_userstateget, 'OPER')
+examples.add('userstate-get', 'get the userstate of another user', 'userstate-get dunker')
+
+def handle_userstateset(bot, ievent):
+
+    """ set the userstate of a user. """
+
+    try:
+        (username, item, value) = ievent.args
+    except ValueError:
+        ievent.missing('<username> <item> <value>')
+        return
+
+    userstate = UserState(username)
+    userstate[item] = value
+    userstate.save()
+    ievent.reply('userstate %s set to %s' % (item, value))
+
+cmnds.add('userstate-set', handle_userstateset, 'OPER')
+examples.add('userstate-set', 'set userstate variable of another user', 'userstate-set dunker TZ -1')
+
+def handle_userstatedel(bot, ievent):
+
+    """ remove value from user state. """
+
+    username = None
+    try:
+        (username, item)  = ievent.args
+    except ValueError:
+        try:
+           item = ievent.args[0]
+        except IndexError:
+            ievent.missing('[username] <item>')
+            return
+
+    if not username:
+        username = users.getname(ievent.userhost)
+
+    userstate = UserState(username)
+    try:
+        del userstate.data[item]
+    except KeyError:
+        ievent.reply('no such item')
+        return
+
+    userstate.save()
+    ievent.reply('item %s deleted' % item)
+
+cmnds.add('userstate-del', handle_userstatedel, 'OPER')
+examples.add('userstate-del', 'delete userstate variable', '1) userstate-del TZ 2) userstate-del dunker TZ')
+
+def handle_unset(bot, ievent):
+
+    """ remove value from user state of the user giving the command. """
+
+    try:
+        item = ievent.args[0]
+    except IndexError:
+        ievent.missing('<item>')
+        return
+ 
+    username = users.getname(ievent.userhost)
+
+    userstate = UserState(username)
+    try:
+        del userstate.data[item]
+    except KeyError:
+        ievent.reply('no such item')
+        return
+
+    userstate.save()
+    ievent.reply('item %s deleted' % item)
+
+cmnds.add('unset', handle_unset, 'USER')
+examples.add('unset', 'delete userstate variable for user gving the command', '1) unset TZ')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/underauth.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/underauth.py
@@ -0,0 +1,41 @@
+# plugs/underauth.py
+#
+#
+
+"""Handle non-ident connection on undernet. """
+
+__copyright__ = 'this file is in the public domain'
+__author__ = 'aafshar@gmail.com'
+
+# gozerbot imports
+from gozerbot.callbacks import callbacks
+from gozerbot.plughelp import plughelp
+
+plughelp.add('underauth', 'provide callbacks that registers the bot with the \
+undernet network')
+
+def pre_underauth_cb(bot, ievent):
+    """
+    Only respond to the message like:
+
+    NOTICE AUTH :*** Your ident is disabled or broken, to continue
+    to connect you must type /QUOTE PASS 16188
+    """
+    args = ievent.arguments
+
+    try:
+        return (args[0] == u'AUTH' and
+                args[-3] == u'/QUOTE' and
+                args[-2] == u'PASS')
+    except Exception, ex:
+        return 0
+
+def underauth_cb(bot, ievent):
+    """
+    Send the raw command to the server
+    """
+    # last two elements of the arguments list are PASS <id>
+    bot._raw(' '.join(ievent.arguments[-2:]))
+
+
+callbacks.add('NOTICE', underauth_cb, pre_underauth_cb)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/__init__.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/__init__.py
@@ -0,0 +1,26 @@
+# gozerbot basic plugins
+#
+#
+
+""" register all .py files """
+
+__copyright__ = 'this file is in the public domain'
+
+import os
+
+(f, tail) = os.path.split(__file__)
+__all__ = []
+
+for i in os.listdir(f):
+    if i.endswith('.py'):
+        __all__.append(i[:-3])
+    elif os.path.isdir(f + os.sep + i):
+        __all__.append(i)
+
+try:
+    __all__.remove('__init__')
+except ValueError:
+    pass
+
+__plugs__ = __all__
+
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/at.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/at.py
@@ -0,0 +1,96 @@
+# plugs/at.py
+#
+#
+
+""" run a bot command at a certain time. """
+
+__author__ = "Wijnand 'tehmaze' Modderman - http://tehmaze.com"
+__license__ = "BSD"
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.periodical import at, periodical, JobError
+from gozerbot.plugins import plugins
+from gozerbot.irc.ircevent import Ircevent
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+# basic imports
+import copy, types, time
+
+plughelp.add('at', 'schedule a command at a specific time')
+
+class AtJob:
+
+    """ Job to run at certain time. """
+
+    def __init__(self, when, bot, nevent):
+        self.when = when
+        self.bot  = bot
+        self.nevent = nevent
+
+        @at(when)
+        def at_job():
+            plugins.trydispatch(self.bot, self.nevent)
+        at_job.cmnd = self.nevent.txt
+        at_job.ievent = self.nevent
+        at_job()
+
+def handle_at(bot, ievent):
+
+    """ start a job at a certain time. """
+
+    if len(ievent.args) < 2:
+        ievent.missing('<time> <command>')
+        return
+
+    nevent = Ircevent()
+    nevent.copyin(ievent)
+    nevent.txt = ' '.join(ievent.args[1:])
+    nevent.origtxt = u'!' + nevent.txt
+
+    if plugins.woulddispatch(bot, nevent):
+        try:
+            when = int(ievent.args[0])
+        except ValueError, e:
+            when = ievent.args[0] 
+        try:
+            AtJob(when, bot, nevent)
+        except JobError:
+            ievent.reply('wrong date/time')
+            return
+        ievent.reply('job scheduled')
+    else:
+        ievent.reply('could not dispatch')
+
+cmnds.add('at', handle_at, 'USER')
+examples.add('at', 'start a job at given time', 'at 23:00 say moooo')
+tests.add('at 23:55 say #dunkbots mekker', 'job scheduled')
+
+def handle_atlist(bot, ievent):
+
+    """ show scheduled at events. """
+
+    reply = []
+
+    for job in periodical.jobs:
+        if job.func.func_name != 'at_job':
+            continue
+        next = job.next
+        if type(next) in [types.FloatType, types.IntType]:
+            next = float(next)
+        try:
+            cmnd = job.func.cmnd
+        except AttributeError:
+            cmnd = '<unknown>'
+        reply.append('%d: at %s, "%s"' % (job.id(), time.ctime(next), cmnd)) 
+
+    if reply:
+        ievent.reply(reply, dot=True)
+    else:
+        ievent.reply('no jobs')
+
+cmnds.add('at-list', handle_atlist, 'OPER')
+examples.add('at-list', 'show list of at jobs', 'at-list')
+tests.add('at 23:59 version').add('at-list', 'version')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/alias.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/alias.py
@@ -0,0 +1,148 @@
+# plugs/alias.py
+#
+#
+
+""" this alias plugin allows aliases for commands to be added. aliases are in
+ the form of <alias> -> <command> .. aliases to aliases are not allowed
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.aliases import aliasget, aliasdel, aliasset, aliases
+from gozerbot.tests import tests, expect
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.datadir import datadir
+from gozerbot.utils.generic import convertpickle
+
+# basuc imports
+import os
+
+plughelp.add('alias', 'support for aliases')
+
+## UPGRADE PART
+
+def upgrade():
+
+    """ upgrade the aliases pickle file to to aliases.new json file. """
+
+    convertpickle(datadir + os.sep + 'aliases', datadir + os.sep + \
+'aliases.new')
+
+## END UPGRADE PART
+
+def handle_aliassearch(bot, ievent):
+
+    """ alias-search <what> .. search aliases. """
+
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        ievent.missing('<what>')
+        return
+
+    result = []
+    res = []
+
+    for i, j in aliases.data.iteritems():
+        if what in i or what in j:
+            result.append((i, j))
+
+    if not result:
+        ievent.reply('no %s found' % what)
+    else:
+        for i in result:
+            res.append("%s => %s" % i)
+        ievent.reply("aliases matching %s: " % what, res, dot=True)
+
+cmnds.add('alias-search', handle_aliassearch, 'USER')
+examples.add('alias-search', 'search aliases',' alias-search web')
+tests.add('alias-set mekker miep').add('alias-search mekker', 'miep').add('alias-del mekker')
+
+def handle_aliasset(bot, ievent):
+
+    """ alias-set <from> <to> .. set alias. """
+
+    global aliases
+
+    try:
+        (aliasfrom, aliasto) = (ievent.args[0], ' '.join(ievent.args[1:]))
+    except IndexError:
+        ievent.missing('<from> <to>')
+        return
+
+    if not aliasto:
+        ievent.missing('<from> <to>')
+        return
+
+    if aliases.data.has_key(aliasto):
+        ievent.reply("can't alias an alias")
+        return
+
+    if cmnds.has_key(aliasfrom):
+        ievent.reply('command with same name already exists.')
+        return
+
+    # add alias and save
+    aliasset(aliasfrom, aliasto)
+    aliases.save()
+    ievent.reply('alias added')
+
+cmnds.add('alias-set', handle_aliasset, 'OPER', allowqueue=False)
+examples.add('alias-set', 'alias-set <alias> <command> .. define alias', \
+'alias-set ll list')
+aliasset('alias', 'alias-set')
+tests.add('alias-set mekker2 list', 'alias added').add('mekker2', 'grep').add('alias-del mekker2')
+
+def handle_delalias(bot, ievent):
+
+    """ alias-del <word> .. delete alias. """
+
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        ievent.missing('<what>')
+        return
+
+    # del alias and save
+    if not aliasdel(what):
+        ievent.reply('there is no %s alias' % what)
+        return
+
+    aliases.save()
+    ievent.reply('alias deleted')
+
+cmnds.add('alias-del', handle_delalias, 'OPER')
+examples.add('alias-del', 'alias-del <what> .. delete alias', 'alias-del ll')
+tests.add('alias-set mekker3 miep').add('alias-del mekker3', 'alias deleted')
+
+def handle_getalias(bot, ievent):
+
+    """ alias-get <word> .. show alias. """
+
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        ievent.missing('<what>')
+        return
+    # del alias and save
+
+    alias = aliasget(what)
+
+    if not alias:
+        ievent.reply('there is no %s alias' % what)
+        return
+
+    ievent.reply(alias)
+
+cmnds.add('alias-get', handle_getalias, 'USER')
+examples.add('alias-get', 'alias-get <what> .. get alias', 'alias-get v')
+tests.add('alias-set mekker4 miep').add('alias-get mekker4', 'miep').add('alias-del mekker4')
+
+def init():
+
+     """ initialise the alias plugin. """
+
+     aliases.init()
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/count.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/count.py
@@ -0,0 +1,32 @@
+# plugs/count.py
+#
+#
+
+""" count number of items in result queue. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.utils.generic import waitforqueue
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('count', 'the count command counts the number of results in a \
+pipeline')
+
+def handle_count(bot, ievent):
+
+    """ show nr of elements in result list. """
+
+    if not ievent.inqueue:
+        ievent.reply("use count in a pipeline")
+        return
+
+    result = waitforqueue(ievent.inqueue, 5)
+    ievent.reply(str(len(result)))
+
+cmnds.add('count', handle_count, ['USER', 'WEB', 'CLOUD'], threaded=True)
+examples.add('count', 'count nr of items', 'todo | count')
+tests.add('list | count')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/admin.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/admin.py
@@ -0,0 +1,49 @@
+# gozerbot/plugs/admin.py
+#
+#
+
+""" admin related funtions. """
+
+from gozerbot.commands import cmnds
+from gozerbot.persist.persist import Persist
+from gozerbot.aliases import aliasreverse
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+
+import os
+
+plughelp.add("admin", "admin related functions.")
+
+def handle_cmndtablesave(bot, ievent):
+    from gozerbot.datadir import datadir
+    cmndtable = Persist(datadir + os.sep + 'run' + os.sep + 'cmndtable')
+    if not cmndtable.data:
+        cmndtable.data = {}
+
+    for cmndname, c in cmnds.iteritems():
+        cmndtable.data[cmndname] = c.plugname
+        a = aliasreverse(cmndname)
+        if a:
+            cmndtable.data[a] = c.plugname
+
+    cmndtable.save()
+    ievent.done()
+
+cmnds.add('admin-cmndtable', handle_cmndtablesave, 'OPER')
+examples.add("admin-cmndtable", "save the command table", "admin-cmndtable")
+
+def handle_pluginlist(bot, ievent):
+    plugins = []
+    from gozerbot.datadir import datadir
+    pluginlist = Persist(datadir + os.sep + 'run' + os.sep + 'pluginlist')
+    if not pluginlist.data:
+        pluginlist.data = []
+    for cmndname, c in cmnds.iteritems():
+        if c.plugname not in plugins:
+            plugins.append(c.plugname)
+    pluginlist.data = plugins
+    pluginlist.save()
+    ievent.done()
+
+cmnds.add('admin-pluginlist', handle_pluginlist, 'OPER')
+examples.add("admin-pluginlust", "save the plugin list", "admin-pluginlist")
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/reload.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/reload.py
@@ -0,0 +1,106 @@
+# gozerbot/plugs/reload.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.config import config
+from gozerbot.plugins import plugins
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliases
+from gozerbot.gozerimport import gozer_import
+from gozerbot.tests import tests
+
+# basic imports
+import os, sets
+
+plughelp.add('reload', 'reload a plugin')
+
+def handle_reload(bot, ievent):
+
+    """ reload a plugin. """
+
+    try:
+        plugs = ievent.args
+    except IndexError:
+        ievent.missing('<list plugins>')
+        return
+
+    reloaded = []
+    errors = []
+
+    for plug in plugs:
+        plug = plug.lower()
+
+        if plug == 'config':
+            config.reload()
+            ievent.reply('config reloaded')
+            continue
+
+        p = gozer_import('gozerbot.plugs.__init__')
+
+        if plug in p.__plugs__:
+            reloaded.extend(plugins.reload('gozerbot.plugs', plug, True))
+            continue
+
+        try:
+            reloaded.extend(plugins.reload('myplugs', plug))
+        except ImportError, ex:
+            try:
+                reloaded.extend(plugins.reload('gplugs', plug))
+            except ImportError, ex:
+                errors.append(str(ex))
+                if config.get('db_driver') == "olddb":
+                    try:
+                        reloaded.extend(plugins.reload('gplugs.olddb', plug))
+                    except ImportError, ex:
+                        errors.append(str(ex))
+                else:
+                    try:
+                        reloaded.extend(plugins.reload('gplugs.alchemy', plug))
+                    except ImportError, ex:
+                        errors.append(str(ex))
+
+    ievent.reply('reloaded: ', reloaded, dot=True)
+
+    try:
+       cantreload = list(sets.Set(plugs) - sets.Set(reloaded))
+       if cantreload:
+           ievent.reply("can't reload: " , cantreload, dot=True)
+           if errors:
+               ievent.reply('errors: ', errors)
+    except AttributeError:  # in case of !reload reload
+       pass 
+    
+cmnds.add('reload', handle_reload, 'OPER', threaded=True)
+examples.add('reload', 'reload <plugin>', 'reload core')
+aliases.data['load'] = 'reload'
+tests.add('reload country', 'country').add('unload country')
+
+def handle_unload(bot, ievent):
+
+    """ unload a plugin. """
+
+    try:
+        what = ievent.args[0].lower()
+    except IndexError:
+        ievent.missing('<plugin>')
+        return
+
+    if not plugins.exist(what):
+        ievent.reply('there is no %s module' % what)
+        return
+
+    got = plugins.unload(what)
+
+    for what in got:
+        plugins.disable(what)
+
+    ievent.reply("unloaded and disabled: ", got, dot=True)
+
+cmnds.add('unload', handle_unload, 'OPER')
+examples.add('unload', 'unload <plugin>', 'unload relay')
+tests.add('reload country').add('unload country', 'country')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/all.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/all.py
@@ -0,0 +1,70 @@
+# gozerplugs/plugs/all.py
+#
+#
+
+""" allow commands for all users. """
+
+__gendoclast__ = ['all-del', ]
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.aliases import aliasget
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('all', 'allow commands to be executed by all users')
+
+def handle_alladd(bot, ievent):
+
+    """ add a command to the allow all list. """
+
+    if not ievent.rest:
+        ievent.missing('<command>')
+        return
+
+    target = aliasget(ievent.rest) or ievent.rest
+
+    if not 'OPER' in cmnds.perms(target):
+        if target in bot.state['allowed']:
+            ievent.reply('%s is already allowed' % target)
+            return
+        bot.state['allowed'].append(target)
+        bot.state.save()
+        ievent.reply('%s command is now allowed for all clients' % target)
+    else:
+        ievent.reply('sorry')
+
+cmnds.add('all-add', handle_alladd, 'OPER')
+examples.add('all-add', 'add command to be allowed by all users', 'all-add version')
+tests.add('all-add version', 'version').add('all-del version')
+
+def handle_alldel(bot, ievent):
+
+    """ remove a command from the all allowed list. """
+
+    if not ievent.rest:
+        ievent.missing('<command>')
+        return
+
+    target = aliasget(ievent.rest) or ievent.rest
+
+    if target in bot.state['allowed']:
+        bot.state['allowed'].remove(target)
+        ievent.reply('%s command is removed from allowed list' % target)
+    else:
+        ievent.reply('%s command is not in allowed list' % target)
+
+cmnds.add('all-del', handle_alldel, 'OPER')
+examples.add('all-del', 'remove command from the allowed list', 'all-del version')
+tests.add('all-add version').add('all-del version', 'version')
+
+def handle_alllist(bot, ievent):
+
+    """ show the all allowed list. """
+
+    ievent.reply('commands allowed: ', bot.state['allowed'], dot=True)
+
+cmnds.add('all-list', handle_alllist, 'USER')
+examples.add('all-list', 'list commands allowed by all users', 'all-list')
+tests.add('all-add version').add('all-list', 'version').add('all-del version')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/nickcapture.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/nickcapture.py
@@ -0,0 +1,32 @@
+# gozerplugs/plugs/nickcapture.py
+#
+#
+
+""" nick recapture callback. """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.callbacks import callbacks
+from gozerbot.plughelp import plughelp
+
+plughelp.add('nickcapture', 'nickcapture takes a nick back if a user quits')
+
+def ncaptest(bot, ievent):
+
+    """ test if user is splitted. """
+
+    if '*.' in ievent.txt or bot.server in ievent.txt:
+        return 0
+
+    if bot.orignick.lower() == ievent.nick.lower():
+        return 1
+
+    return 0
+
+def ncap(bot, ievent):
+
+    """ recapture the nick. """
+
+    bot.donick(bot.orignick)
+
+callbacks.add('QUIT', ncap, ncaptest, threaded=True)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/job.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/job.py
@@ -0,0 +1,130 @@
+# gozerbot/plugs/job.py
+#
+# (c) Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# BSD License
+
+""" job management. """
+
+__author__ = "Wijnand 'tehmaze' Modderman - http://tehmaze.com"
+__license__ = "BSD"
+
+# gozerbot imports
+from gozerbot.aliases import aliases
+from gozerbot.commands import cmnds
+from gozerbot.periodical import periodical, at
+from gozerbot.plugins import plugins
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.utils.generic import uniqlist
+from gozerbot.tests import tests
+from gozerbot.utils.statdict import Statdict
+
+# basic imports
+import copy, datetime, time, types
+
+plughelp.add('job', 'job management')
+
+def size():
+
+    """ show nr of running jobs. """
+
+    return len(periodical.jobs)
+
+def handle_job(bot, ievent):
+
+    """ show data of <jobid>. """
+
+    if not ievent.args or not ievent.args[0].isdigit():
+        ievent.reply('<job id>')
+        return
+
+    for job in periodical.jobs:
+        if job.id() == int(ievent.args[0]):
+            next = job.next
+            if type(next) in [types.FloatType, types.IntType]:
+                next = datetime.datetime(*time.localtime(next)[:7])
+            ievent.reply('%s, fires at %s' % (job.__repr__(), str(next)))
+            return
+
+    ievent.reply('job not found')
+
+cmnds.add('job', handle_job, 'USER')
+examples.add('job', 'show job data of <jobid> ', 'job 1')
+tests.add('job 1')
+
+def handle_joblist(bot, ievent):
+
+    """ show job list. """
+
+    try:
+        group = ievent.args[0]
+    except IndexError:
+        group = None
+    result = []
+
+    for job in periodical.jobs:
+        if group and not job.group == group:
+            continue
+        if job.description:
+            result.append('%d (%s)' % (job.id(), job.description))
+        else:
+            result.append('%d (%s)' % (job.id(), str(job.func.func_name)))
+
+    if result:
+        ievent.reply('jobs scheduled: ', result, dot=True)
+    else:
+        ievent.reply('no jobs')
+
+cmnds.add('job-list', handle_joblist, 'OPER')
+examples.add('job-list', 'show all waiting jobs or all jobs belonging to [group]', '1) job-list 2) job-list rss')
+aliases.data['jobs'] = 'job-list'
+tests.add('job-list', 'runner')
+
+def handle_jobgroups(bot, ievent):
+
+    """ show job groups. """
+
+    result = [job.group for job in periodical.jobs]
+
+    if result:
+        ievent.reply('job groups: ', uniqlist(result), dot=True)
+    else:
+        ievent.reply('no jobs')
+
+cmnds.add('job-groups', handle_jobgroups, 'OPER')
+examples.add('job-groups', 'show all job groups', 'job-groups')
+tests.add('job-groups')
+
+def handle_jobkill(bot, ievent):
+
+    """ kill a job. """
+
+    if not ievent.args or not ievent.args[0].isdigit():
+        ievent.missing('<job id> [<job id> ...]')
+        return
+
+    try:
+        ids = [int(jid) for jid in ievent.args]
+    except ValueError:
+        ievent.missing('<job id> [<job id> ...]')
+        return
+
+    for jid in ids:
+        periodical.killjob(int(ievent.args[0]))
+
+    ievent.reply('killed %d jobs' % len(ids))
+
+cmnds.add('job-kill', handle_jobkill, 'OPER')
+examples.add('job-kill', 'kill job with <jobid>', 'job-kill 100000')
+
+def handle_jobrunning(bot, ievent):
+
+    """ show running job threads. """
+
+    result = Statdict()
+    for job in periodical.running:
+        result.upitem(job.description)
+    ievent.reply("running jobs: ", result)
+
+cmnds.add("job-running", handle_jobrunning, 'OPER')
+examples.add("job-running", "show running job threads", "job-running")
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/plug.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/plug.py
@@ -0,0 +1,123 @@
+# gozerbot/plugs/plug.py
+#
+#
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plugins import plugins
+from gozerbot.utils.exception import exceptionmsg, handle_exception
+from gozerbot.gozerimport import gozer_import 
+from gozerbot.tests import tests
+from gozerbot.config import config
+
+import os
+
+def handle_plugenable(bot, ievent):
+
+    """ enable and reload a plugin. """
+
+    doall = False
+    plugs = []
+    oldplugs = []
+    alchemyplugs = []
+
+    if '-a' in ievent.optionset:
+        doall = True
+
+    if not ievent.rest and not doall:
+        ievent.missing('<plugname>')
+        return
+
+    if doall:
+        if config.get('db_driver') == "olddb":
+            try:
+                oldplugs = gozer_import('gplugs.olddb').__plugs__
+            except ImportError:
+                pass
+        else:
+            try:
+                alchemyplugs = gozer_import('gplugs.alchemy').__plugs__
+            except ImportError:
+                pass
+
+        try:
+            plugs.extend(gozer_import('gplugs').__plugs__)
+        except ImportError:
+            pass
+
+        if hasattr(os, 'isdir') and os.isdir('myplugs'):
+            for plugname in os.listdir('myplugs'):
+                if plugname.endswith('.py'):
+                    plugs.append(plugname)
+ 
+    else:
+        plugs = ievent.rest.split()
+
+    ievent.reply("trying to reload: ", plugs, dot=True)
+    errors = []
+    reloaded = []
+    failed = []
+
+    if config.get('db_driver') == "olddb":
+        for plug in oldplugs:
+            try:
+                reloaded.extend(plugins.reload('gplugs.olddb', plug))
+            except ImportError, ex: pass
+    else:
+        for plug in alchemyplugs:
+            try:
+                reloaded.extend(plugins.reload('gplugs.alchemy', plug))
+            except ImportError, ex: pass
+
+    if True:
+        for plug in plugs: 
+            try:
+                reloaded.extend(plugins.reload('gplugs', plug))
+            except ImportError, ex:
+                try:
+                    reloaded.extend(plugins.reload('myplugs', plug))
+                except ImportError, ex: pass
+                except Exception, ex:
+                    failed.append(plug)
+                    errors.append(str(ex))
+            except Exception, ex:
+                handle_exception()
+                errors.append(exceptionmsg())
+                failed.append(plug)
+
+    ievent.reply('enabled plugins: ', reloaded, dot=True)
+  
+    if failed:
+        ievent.reply('failed to reload: ', failed, dot=True)
+
+    if errors:
+        ievent.reply('errors: ', errors, dot=True)
+
+    config.save()
+  
+cmnds.add('plug-enable', handle_plugenable, 'OPER', options={'-a': ''}, threaded=True)
+examples.add('plug-enable', 'enable a plugin', 'plug-enable karma')
+tests.add('plug-enable country', 'country')
+
+def handle_plugdisable(bot, ievent):
+
+    """ disable and unload a plugin. """
+
+    if not ievent.rest:
+        ievent.missing('<plugname>')
+        return
+
+    plugs = ievent.rest.split()
+    disabled = []
+
+    for plug in plugs:
+        plugins.unload(plug)
+        plugins.disable(plug)
+        disabled.append(plug)
+
+    ievent.reply('disabled plugins: ', disabled)
+
+cmnds.add('plug-disable', handle_plugdisable, 'OPER')
+examples.add('plug-disable', 'disable a plugin', 'plug-disable karma')
+tests.add('plug-disable country', 'country')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/rest.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/rest.py
@@ -0,0 +1,80 @@
+# gozerbot/plugs/rest.py
+#
+#
+
+__author__ = "Wijnand 'tehmaze' Modderman - http://tehmaze.com"
+__license__ = 'BSD'
+
+# gozerbot imports
+from gozerbot.commands import cmnds
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+
+# basic imports
+import time
+
+plughelp.add('rest', 'show rest of the output in /msg')
+
+def handle_rest(bot, ievent):
+
+    """ show rest of the output in /msg. """
+
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        if bot.jabber:
+            who = ievent.userhost
+        else:
+            who = ievent.nick
+
+    what, size = bot.less.more(who, 0)
+
+    if not what:
+        ievent.reply('no more data available for %s' % who)
+        return
+
+    if not bot.jabber and int(size)+1 > 10:
+        ievent.reply("showing %d of %d lines in private" % \
+(10, int(size)+1))
+    else:
+        ievent.reply("showing %d lines in private" % (int(size)+1))
+
+    count = 0
+
+    while what:
+
+        count += 1
+
+        if bot.jabber:
+            if size:
+                bot.say(ievent.userhost, "%s (+%s)" % (what, size))
+            else:
+                bot.say(ievent.userhost, what)
+        else:
+            if size:
+                bot.output(ievent.nick, "%s (+%s)" % (what, size))
+            else:
+                bot.output(ievent.nick, what)
+
+        # output limiter
+        if count >= 10:
+            what = None
+        else:
+            what, size = bot.less.more(who, 0)
+            if what:
+                time.sleep(3)
+
+    # let the user know if we have remaining data
+    if size:
+        s = ''
+        if size > 1:
+            s = 's'
+        if bot.jabber:
+            bot.say(ievent.userhost, "%s more line%s" % (size, s)) 
+        else:
+            bot.output(ievent.nick, "%s more line%s" % (size, s))
+
+cmnds.add('rest', handle_rest, 'USER')
+examples.add('rest', 'show the rest of output cache data', 'rest')
+tests.add('avail | rest')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/misc.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/misc.py
@@ -0,0 +1,169 @@
+# plugs/misc.py
+#
+#
+
+""" misc commands. """
+
+__copyright__ = 'this file is in the public domain'
+__gendocfirst__ = ['timezone', 'time']
+
+# gozerbot imports
+from gozerbot.utils.generic import waitforuser
+from gozerbot.tests import tests
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.aliases import aliases
+from gozerbot.plughelp import plughelp
+from gozerbot.persist.persiststate import UserState
+from gozerbot.users import users
+
+# basic imports
+import time, os, threading, thread
+
+plughelp.add('misc', 'miscellaneous commands')
+
+def handle_test(bot, ievent):
+
+    """ test .. give test response which is a string of the ircevent. """
+
+    ievent.reply("%s .. it works!" % ievent.userhost)
+
+cmnds.add('test', handle_test, ['USER', 'WEB', 'JCOLL', 'CLOUD', ], options={'--t': 'bla'})
+examples.add('test', 'give test response',' test')
+tests.add('test')
+
+def handle_source(bot, ievent):
+
+    """ source .. show where to fetch the bot source. """ 
+
+    ievent.reply('see http://gozerbot.googlecode.com')
+
+cmnds.add('source', handle_source, ['USER', 'WEB', 'CLOUD'])
+examples.add('source', 'show source url', 'source')
+aliases.data['about'] = 'source'
+tests.add('source', 'gozerbot')
+
+def handle_response(bot, ievent):
+
+    """ check if we can get a reply of user. """
+
+    ievent.reply("say something so i can see if i can get a \
+response from you")
+    reply = waitforuser(bot, ievent.userhost)
+
+    if not reply:
+        ievent.reply("can't get a response")
+    else:
+        ievent.reply("you said %s" % reply.txt)
+
+cmnds.add('response', handle_response, ['USER', ], threaded=True)
+examples.add('response', 'response test .. see if we can receive a response', 'response')
+
+def handle_time(bot, ievent):
+
+    """ show current time """
+
+    authuser = users.getname(ievent.userhost)
+
+    if authuser:
+
+        if ievent.rest:
+            if users.exist(ievent.rest.lower()):
+                username = ievent.rest.lower()
+            else:
+                ievent.reply("We don't have a user %s" % ievent.rest)
+                return
+        else:
+            username = authuser
+
+        userstate = UserState(username)
+
+        try:
+            tz = userstate['TZ']
+        except KeyError:
+            if username.lower() == authuser.lower():
+                tz = handle_ask_timezone(bot, ievent)
+                if tz and set_timezone(bot, ievent, userstate, tz):
+                    tz = userstate['TZ']
+                else:
+                    tz = 0
+            else:
+                ievent.reply("%s doesn't have a timezone set" % username)
+                return
+        ievent.reply(get_time(tz, username, authuser))
+
+    else:
+        ievent.reply(get_time('UTC', '', ''))
+
+cmnds.add('time', handle_time, ['USER', 'CLOUD'], threaded=True)
+examples.add('time', 'show current time (of a user)', 'time test')
+aliases.data['t'] = 'time'
+aliases.data['date'] = 'time'
+#tests.add('time')
+
+def handle_timezone(bot, ievent):
+
+    """ timezone .. set current timezone. """
+
+    username = users.getname(ievent.userhost)
+
+    if username:
+        userstate = UserState(username)
+        if ievent.rest:
+            try:
+                timezone = int(ievent.rest)
+                
+                set_timezone(bot, ievent, userstate, timezone)
+            except ValueError:
+                ievent.reply('TZ needs to be an integer')
+                return
+        else:
+            timezone = handle_ask_timezone(bot, ievent)
+            if timezone:
+                set_timezone(bot, ievent, userstate, timezone)
+            else:
+                ievent.reply("can't determine timezone")
+
+cmnds.add('timezone', handle_timezone, ['USER'], threaded=True)
+examples.add('timezone', 'set current timezone', 'timezone +1')
+#tests.add('timezone')
+
+def handle_ask_timezone(bot, ievent):
+
+    """ ask for a users timezone. """
+
+    ievent.reply('what is your timezone ? for example -1 or +4')
+    response = waitforuser(bot, ievent.userhost)
+
+    if response:
+        return response.txt
+    else:
+        ievent.reply("can't determine timezone .. not setting it")
+        return
+
+def set_timezone(bot, ievent, userstate, timezone):
+
+    """ set a users timezone. """
+
+    # check for timezone validity and return False, if necessary
+    try:
+        tz = int(timezone)
+    except ValueError:
+        ievent.reply('timezone needs to be an integer')
+        return False
+
+    userstate['TZ'] = tz
+    userstate.save()
+    ievent.reply("timezone set to %s" % tz)
+    return True
+
+def get_time(zone, username, authuser):
+
+    """ get the time of a user. """
+
+    try:
+        zone = int(zone)
+    except ValueError:
+        zone = 0
+
+    return time.ctime(time.time() + int(time.timezone) + zone*3600)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/not.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/not.py
@@ -0,0 +1,74 @@
+# gozerbot/plugs/not.py
+#
+#
+
+""" negative grep. """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.tests import tests
+from gozerbot.examples import examples
+from gozerbot.commands import cmnds
+from gozerbot.utils.generic import waitforqueue
+from gozerbot.plughelp import plughelp
+
+# basic imports
+import getopt, re
+
+plughelp.add('not', 'the not command is a negative grep used in pipelines')
+
+def handle_not(bot, ievent):
+
+    """ negative grep. """
+
+    if not ievent.inqueue:
+        ievent.reply('use not in a pipeline')
+        return
+
+    if not ievent.rest:
+        ievent.reply('not <txt>')
+        return
+
+    try:
+        (options, rest) = getopt.getopt(ievent.args, 'r')
+    except getopt.GetoptError, ex:
+        ievent.reply(str(ex))
+        return
+
+    result = waitforqueue(ievent.inqueue, 10)
+
+    if not result:
+        ievent.reply('no data to grep on')
+        return
+
+    doregex = False
+
+    for i, j in options:
+        if i == '-r':
+            doregex = True
+
+    res = []
+
+    if doregex:
+        try:
+            reg = re.compile(' '.join(rest))
+        except Exception, ex:
+            ievent.reply("can't compile regex: %s" % str(ex))
+            return
+        for i in result:
+            if not re.search(reg, i):
+                res.append(i)
+    else:
+        for i in result:
+            if ievent.rest not in str(i):
+                res.append(i)
+
+    if not res:
+        ievent.reply('no result')
+    else:
+        ievent.reply(res, dot=True)
+
+cmnds.add('not', handle_not, ['USER', 'WEB', 'CLOUD'], threaded=True)
+examples.add('not', 'reverse grep used in pipelines', 'list | not todo')
+tests.add('list | not core')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/plugs/fleet.py
+++ gozerbot-0.99.1/build/lib/gozerbot/plugs/fleet.py
@@ -0,0 +1,339 @@
+# plugs/fleet.py
+#
+#
+
+""" the fleet makes it possible to run multiple bots in one gozerbot.
+    this can both be irc and jabber bots
+"""
+
+__copyright__ = 'this file is in the public domain'
+__gendoclast__ = ['fleet-disconnect', 'fleet-del']
+
+# gozerbot imports
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.fleet import fleet, FleetBotAlreadyExists
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliasset
+from gozerbot.config import config, Config, fleetbotconfigtxt
+from gozerbot.datadir import datadir
+from gozerbot.tests import tests
+
+# basic imports
+import os
+
+plughelp.add('fleet', 'manage list of bots')
+
+def handle_fleetavail(bot, ievent):
+
+    """ show available fleet bots. """
+
+    ievent.reply('available bots: ', fleet.avail()) 
+
+cmnds.add('fleet-avail', handle_fleetavail, 'OPER')
+examples.add('fleet-avail', 'show available fleet bots', 'fleet-avail')
+
+def handle_fleetconnect(bot, ievent):
+
+    """ fleet-connect <botname> .. connect a fleet bot to it's server. """
+
+    try:
+        botname = ievent.args[0]
+    except IndexError:
+        ievent.missing('<botname>')
+        return
+
+    try:
+        if fleet.connect(botname):
+            ievent.reply('%s connected' % botname)
+        else:
+            ievent.reply("can't connect %s .. trying enable" % botname)
+            fleet_enable(bot, ievent)
+    except Exception, ex:
+        ievent.reply(str(ex))
+
+cmnds.add('fleet-connect', handle_fleetconnect, 'OPER', threaded=True)
+examples.add('fleet-connect', 'connect bot with <name> to irc server', 'fleet-connect test')
+tests.add('fleet-add local test localhost').add('fleet-connect local').add('fleet-del local')
+
+def handle_fleetdisconnect(bot, ievent):
+
+    """ fleet-disconnect <botname> .. disconnect a fleet bot from server. """
+
+    try:
+        botname = ievent.args[0]
+    except IndexError:
+        ievent.missing('<botname>')
+        return
+
+    ievent.reply('exiting %s' % botname)
+
+    try:
+        if fleet.exit(botname):
+            ievent.reply("%s bot stopped" % botname)
+        else:
+            ievent.reply("can't stop %s bot" % botname)
+    except Exception, ex:
+        ievent.reply(str(ex))
+
+cmnds.add('fleet-disconnect', handle_fleetdisconnect, 'OPER', threaded=True)
+examples.add('fleet-disconnect', 'fleet-disconnect <name> .. disconnect bot with <name> from irc server', 'fleet-disconnect test')
+tests.add('fleet-add local test localhost').add('fleet-disconnect local').add('fleet-del local')
+
+def handle_fleetlist(bot, ievent):
+
+    """ fleet-list .. list bot names in fleet. """
+
+    ievent.reply("fleet: ", fleet.list(), dot=True)
+
+cmnds.add('fleet-list', handle_fleetlist, ['USER', 'WEB'])
+examples.add('fleet-list', 'show current fleet list', 'fleet-list')
+tests.add('fleet-add local test localhost').add('fleet-list local').add('fleet-del local')
+
+def handle_fleetaddirc(bot, ievent):
+
+    """ fleed-addirc <name> <nick> <server> [port] [passwd] [ipv6] .. add irc \
+        bot to fleet.
+    """
+
+    from gozerbot.irc.bot import Bot
+    length  = len(ievent.args)
+
+    if length == 7:
+        (name, nick, server, ipv6, ssl, port, password) = ievent.args
+    elif length == 6:
+        (name, nick, server, ipv6, ssl, port) = ievent.args
+        password = ""
+    elif length == 5:
+        (name, nick, server, ipv6, ssl) = ievent.args
+        password = ""
+        if ssl:
+           port = 6697
+        else:
+           port = 6667
+    elif length == 4:
+        (name, nick, server, ipv6) = ievent.args
+        password = ""
+        ssl = 0
+        port = 6667
+    elif length == 3:
+        (name, nick, server) = ievent.args
+        port = 6667
+        password = ""
+        ssl = 0
+        ipv6 = 0
+    else:
+        ievent.missing('<name> <nick> <server> [<ipv6>] [<ssl>] [<port>] \
+[<password>]')
+        return
+
+    if fleet.byname(name):
+        ievent.reply('we already have a bot with %s name in fleet' % \
+name)
+        return
+
+    if '--port' in ievent.optionset:
+        port = ievent.options['--port']
+
+    if '--owner' in ievent.optionset:
+        owner = ievent.options['--owner']
+    else:
+        owner = config['owner']
+
+    cfg = Config(datadir + os.sep + 'fleet' + os.sep + name, 'config', \
+fleetbotconfigtxt)
+    cfg['enable'] = 1
+    cfg['owner'] = owner
+    cfg['name'] = name
+    cfg['nick'] = nick
+    cfg['server'] = server
+    cfg['port'] = port
+    cfg['password'] = password
+    cfg['ipv6'] = ipv6
+    cfg['ssl'] = ssl
+    cfg.save()
+
+    try:
+        b = fleet.makebot(name, cfg)
+        ievent.reply('adding bot: %s' % str(b))
+        fleet.addbot(b)
+        ievent.reply('connecting to %s' % server)
+        fleet.connect(name)
+        ievent.reply('%s started' % name)
+    except FleetBotAlreadyExists, ex:
+        ievent.reply(str(ex))
+    except Exception, ex:
+        ievent.reply(str(ex))
+        fleet.delete(b)
+
+cmnds.add('fleet-addirc', handle_fleetaddirc, 'OPER', options={'--port': '6667'}, threaded=True)
+examples.add('fleet-addirc', 'fleet-addirc <name> <nick> <server> [ipv6] [port] [passwd] .. add new server to fleet', 'fleet-addirc test3 gozertest localhost')
+aliasset('fleet-add', 'fleet-addirc')
+tests.add('fleet-add local test localhost', 'already|started').add('fleet-del local')
+
+def handle_fleetaddjabber(bot, ievent):
+
+    """ fleed-addjabber <name> <host> <user> <password> [port] .. add jabber 
+        bot to fleet.
+    """
+
+    length  = len(ievent.args)
+
+    if length == 5:
+        (name, host, user, password, port) = ievent.args
+    elif length == 4:
+        (name, host, user, password) = ievent.args
+        port = 5222
+    else:
+        ievent.missing('<name> <host> <user> <password> [<port>]')
+        return
+
+    if fleet.byname(name):
+        ievent.reply('we already have a bot with %s name in fleet' % \
+name)
+        return
+
+    if '--port' in ievent.optionset:
+        port = ievent.options['--port']
+
+    if '--owner' in ievent.optionset:
+        owner = ievent.options['--owner']
+    else:
+        owner = config['owner']
+
+    cfg = Config(datadir + os.sep + 'fleet' + os.sep + name, 'config')
+    cfg['enable'] = 1
+    cfg['owner'] = owner
+    cfg['name'] = name
+    cfg['type'] = 'xmpp'
+    cfg['host'] = host
+    cfg['user'] = user
+    cfg['password'] = password
+    cfg['port'] = port
+    cfg.save()
+    b = fleet.makebot(name, cfg)
+
+    try:
+        ievent.reply('added %s bot' % name)
+        fleet.addbot(b)
+        ievent.reply('connecting to %s' % host)
+        start_new_thread(fleet.connect, (name, ))
+        ievent.reply('%s started' % name)
+    except Exception, ex:
+        ievent.reply(str(ex))
+        fleet.delete(b)
+
+cmnds.add('fleet-addjabber', handle_fleetaddjabber, 'OPER', options={'--port': '5222'}, threaded=True)
+examples.add('fleet-addjabber', 'fleet-addjabber <name> <host> <user> <passwd> [<port>] .. add new jabber server to fleet', 'fleet-addjabber test2 gozerbot.org testbot@gozerbot.org xwe23')
+
+def handle_fleetdel(bot, ievent):
+
+    """ fleet-del <botname> .. delete bot from fleet. """
+
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+
+    try:
+        if fleet.delete(name):
+            ievent.reply('%s deleted' % name)
+        else:
+            ievent.reply('%s delete failed' % name)
+    except Exception, ex:
+        ievent.reply(str(ex))
+
+cmnds.add('fleet-del', handle_fleetdel, 'OPER', threaded=True)
+examples.add('fleet-del', 'fleet-del <botname> .. delete bot from fleet list', 'fleet-del test')
+tests.add('fleet-add local test localhost').add('fleet-del local', 'deleted')
+
+def docmnd(bot, ievent):
+
+    """ do command on bot/all bots. """
+
+    try:
+        name = ievent.args[0]
+        cmnd = ' '.join(ievent.args[1:])
+    except IndexError:
+        ievent.missing('<name> <cmnd>')
+        return
+
+    if not cmnd:
+        ievent.missing('<name> <cmnd>')
+        return
+
+    if cmnd.find('cmnd') != -1:
+        ievent.reply("no looping please ;]")
+        return
+
+    try:
+        if name == 'all':
+            fleet.cmndall(ievent, cmnd)
+        else:
+            fleet.cmnd(ievent, name, cmnd)
+    except Exception, ex:
+        ievent.reply(str(ex))
+
+cmnds.add('cmnd', docmnd, ['USER', 'WEB'], threaded=True)
+examples.add('cmnd', "cmnd all|<botname> <cmnd> .. excecute command on bot with <name> or on all fleet bots", '1) cmnd main st 2) cmnd all st')
+tests.add('fleet-add local test localhost').add('cmnd --chan #dunkbots local nicks')
+
+def fleet_disable(bot, ievent):
+
+    """ disable a fleet bot. """
+
+    if not ievent.rest:
+        ievent.missing("list of fleet bots")
+        return
+
+    bots = ievent.rest.split()
+
+    for name in bots:
+        bot = fleet.byname(name)
+        if bot:
+            bot.cfg['enable'] = 0
+            bot.cfg.save()
+            ievent.reply('disabled %s' % name)
+            fleet.exit(name)
+        else:
+            ievent.reply("can't find %s bot in fleet" % name)
+
+cmnds.add('fleet-disable', fleet_disable, 'OPER')
+examples.add('fleet-disable', 'disable a fleet bot', 'fleet-disable local')
+tests.add('fleet-add local test localhost').add('fleet-disable local', 'disabled')
+
+def fleet_enable(bot, ievent):
+
+    """ enable a fleet bot. """
+
+    if not ievent.rest:
+        ievent.missing("list of fleet bots")
+        return
+
+    bots = ievent.rest.split()
+
+    for name in bots:
+        bot = fleet.byname(name)
+
+        if bot:
+            bot.cfg.load()
+            bot.cfg['enable'] = 1
+            bot.cfg.save()
+            ievent.reply('enabled %s' % name)
+            start_new_thread(fleet.connect, (name, ))
+        elif name in fleet.avail():
+            bots = fleet.start([name, ], enable=True)
+            for bot in bots:
+                bot.cfg.load()
+                bot.cfg['enable'] = 1
+                bot.cfg.save()
+                ievent.reply('enabled and started %s bot' % name)
+                #start_new_thread(fleet.connect, (name, ))
+        else:
+            ievent.reply('no %s bot in fleet' % name)
+
+cmnds.add('fleet-enable', fleet_enable, 'OPER', threaded=True)
+examples.add('fleet-enable', 'enable a fleet bot', 'fleet-enable local')
+tests.add('fleet-add local test localhost').add('fleet-disable local').add('fleet-enable local')
--- gozerbot-0.99.1.orig/build/lib/gozerbot/database/db.py
+++ gozerbot-0.99.1/build/lib/gozerbot/database/db.py
@@ -0,0 +1,421 @@
+# gozerbot/databse/db.py
+#
+#
+
+""" database interface """
+
+__copyright__ = 'this file is in the public domain'
+
+# gozerbot imports
+from gozerbot.config import config
+from gozerbot.utils.log import rlog
+from gozerbot.utils.locking import lockdec
+from gozerbot.utils.generic import tolatin1
+from gozerbot.utils.exception import handle_exception
+from gozerbot.datadir import datadir
+
+# basic imports
+import thread, os, time, types
+
+# locks
+dblock = thread.allocate_lock()
+dblocked = lockdec(dblock)
+
+class Db(object):
+
+    """ this class implements a database connection. it connects to the 
+        database on initialisation.
+    """
+
+    def __init__(self, doconnect=True, dbtype=None, ddir=None,config=config):
+        self.datadir = ddir or datadir
+        if hasattr(os, 'mkdir'):
+            if not os.path.isdir(self.datadir + os.sep + 'db/'):
+                os.mkdir(self.datadir + os.sep + 'db/')
+        self.config = config
+        self.dbname = self.config['dbname'] or ""
+        self.dbhost = self.config['dbhost'] or ""
+        self.dbuser = self.config['dbuser'] or ""
+        self.dbpasswd = self.config['dbpasswd'] or ""
+        self.connection = None
+        self.timeout = 15
+        self.oldstyle = ""
+        self.dbtype = dbtype or self.config['dbtype'] or 'sqlite'
+        if doconnect:
+            self.connect()
+
+    def connect(self, dbname=None, dbhost=None, dbuser=None, dbpasswd=None, \
+timeout=15, oldstyle=False):
+
+        """ connect to the database. """
+
+        self.dbname = dbname or self.config['dbname']
+        self.dbhost = dbhost or self.config['dbhost']
+        self.dbuser = dbuser or self.config['dbuser']
+        self.dbpasswd = dbpasswd or self.config['dbpasswd']
+        self.timeout = timeout
+        self.oldstyle = oldstyle or self.config['dboldstyle']
+
+        if self.dbtype == 'mysql':
+
+            import MySQLdb
+            self.connection = MySQLdb.connect(db=self.dbname, host=self.dbhost, user=self.dbuser, passwd=self.dbpasswd, connect_timeout=self.timeout, charset='utf8')
+
+        elif 'sqlite' in self.dbtype:
+
+            try:
+                import sqlite
+                self.connection = sqlite.connect(self.datadir + os.sep + self.dbname)
+            except ImportError:
+                import sqlite3
+                self.connection = sqlite3.connect(self.datadir + os.sep + self.dbname, check_same_thread=False)
+
+        elif self.dbtype == 'postgres':
+
+            import psycopg2
+            rlog(1000, 'db', 'NOTE THAT POSTGRES IS NOT FULLY SUPPORTED')
+            self.connection = psycopg2.connect(database=self.dbname, \
+host=self.dbhost, user=self.dbuser, password=self.dbpasswd)
+
+        else:
+            rlog(100, 'db', 'unknown database type %s' % self.dbtype)
+            return 0
+
+        rlog(10, 'db', "%s database ok" % self.dbname)
+        return 1
+
+    def reconnect(self):
+
+        """ reconnect to the database server. """
+
+        return self.connect()
+
+    @dblocked
+    def executescript(self, txt):
+        cursor = self.cursor()
+        cursor.executescript(txt)
+        self.commit()
+
+    @dblocked
+    def execute(self, execstr, args=None):
+
+        """ execute string on database. """
+
+        time.sleep(0.001)
+        result = None
+        execstr = execstr.strip()
+
+        if self.dbtype == 'sqlite':
+            execstr = execstr.replace('%s', '?')
+
+        # first to ping to see if connection is alive .. if not reconnect
+        if self.dbtype == 'mysql':
+            try:
+                self.ping()
+            except AttributeError:
+                self.reconnect()                
+            except Exception, ex:
+                rlog(10, 'db', "can't ping database: %s" % str(ex))
+                rlog(10, 'db', 'reconnecting')
+                try:
+                    self.reconnect()
+                except Exception, ex:
+                    rlog(10, 'db', 'failed reconnect: %s' % str(ex))
+                    return
+        # convert to latin1 if oldstyle is set
+        if args and self.oldstyle:
+            nargs = []
+            for i in args:
+                nargs.append(tolatin1(i))
+            args = nargs
+        rlog(-2, 'db', 'exec %s %s' % (execstr, args))
+
+        # get cursor
+        cursor = self.cursor()
+        nr = 0
+
+        # excecute string on cursor
+        try:
+            if args:
+                if type(args) == tuple or type(args) == list:
+                    nr = cursor.execute(execstr, args)
+                else:
+                    nr = cursor.execute(execstr, (args, ))
+            else:
+                nr = cursor.execute(execstr)
+        except:
+            if self.dbtype == 'postgres':
+                cursor.execute(""" ROLLBACK """)
+            if self.dbtype == 'sqlite':
+                cursor.close()
+            raise
+
+        # see if we need to commit the query
+        got = False
+        if execstr.startswith('INSERT'):
+            nr = cursor.lastrowid or nr
+            got = True
+        elif execstr.startswith('UPDATE'):
+            nr = cursor.rowcount
+            got = True
+        elif execstr.startswith('DELETE'):
+            nr = cursor.rowcount
+            got = True
+        if got:
+            self.commit()
+
+        # determine rownr
+        if self.dbtype == 'sqlite' and not got and type(nr) != types.IntType:
+            nr = cursor.rowcount or cursor.lastrowid
+            if nr == -1:
+                nr = 0
+
+        # fetch results
+        result = None
+        try:
+            result = cursor.fetchall()
+            if not result:
+                result = nr
+        except Exception, ex:
+            if 'no results to fetch' in str(ex):
+                pass
+            else:
+                handle_exception()
+            result = nr
+
+        cursor.close()
+        return result
+
+    def cursor(self):
+
+        """ return cursor to the database. """
+
+        return self.connection.cursor()
+
+    def commit(self):
+
+        """ do a commit on the datase. """
+
+        self.connection.commit()
+
+    def ping(self):
+
+        """ do a ping. """
+
+        return self.connection.ping()
+
+    def close(self):
+
+        """ close database. """
+
+        if 'sqlite' in self.dbtype:
+            self.commit()
+        self.connection.close()
+
+db = Db()
+
+def init_tables():
+    if True:
+        if db.dbtype in ["sqlite", "sqlite3"]:
+            import sqlite3
+            try:
+                rlog(10, 'db', 'trying to create tables')
+                db.executescript(sqlite3_newtxt)
+                rlog(10, 'db', 'tables created')
+            except sqlite3.OperationalError, ex:
+                if 'already exists' in str(ex): rlog(10, 'db', 'tables are already created')
+            except Exception, ex: handle_exception()
+            
+        else: rlog(10, 'db', "dbtype is %s .. NOT initialising tables. see the files dir for mysql or postgress schema's" % db.dbtype)
+
+sqlite3_oldtxt =  """
+
+CREATE TABLE userhosts (
+    userhost VARCHAR(255) NOT NULL,
+    name VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE perms (
+    name VARCHAR(255) NOT NULL,
+    perm VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE email (
+    name VARCHAR(255) NOT NULL,
+    email VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE permits (
+    name VARCHAR(255) NOT NULL,
+    permit VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE statuses (
+    name VARCHAR(255)  NOT NULL,
+    status VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE passwords (
+    name VARCHAR(255) NOT NULL,
+    passwd VARCHAR(255) NOT NULL,
+    PRIMARY KEY (name)
+);
+
+CREATE TABLE infoitems (
+    indx INTEGER PRIMARY KEY,
+    item VARCHAR(255) NOT NULL,
+    description TEXT NOT NULL,
+    userhost VARCHAR(255) NOT NULL,
+    time INT(20) NOT NULL
+);
+
+CREATE TABLE karma (
+    item VARCHAR(255) NOT NULL,
+    value INT(20) NOT NULL,
+    PRIMARY KEY (item)
+);
+
+CREATE TABLE whykarma (
+    item VARCHAR(255) NOT NULL,
+    updown VARCHAR(10) NOT NULL,
+    why TEXT NOT NULL
+);
+
+CREATE TABLE whokarma (
+    item VARCHAR(255) NOT NULL,
+    nick VARCHAR(255) NOT NULL,
+    updown VARCHAR(10) NOT NULL
+);
+
+CREATE TABLE quotes (
+  indx INTEGER PRIMARY KEY,
+  quote text NOT NULL,
+  userhost VARCHAR(255) NOT NULL,
+  createtime INT(20) NOT NULL,
+  nick VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE todo (
+  indx INTEGER PRIMARY KEY,
+  name VARCHAR(255) NOT NULL,
+  time INT(20) DEFAULT NULL,
+  duration INT(20) DEFAULT NULL,
+  warnsec INT(20) DEFAULT NULL,
+  descr TEXT NOT NULL,
+  priority INT(20) DEFAULT NULL
+);
+
+CREATE TABLE birthday (
+    name VARCHAR(255) NOT NULL,
+    birthday varchar(255) NOT NULL,
+    PRIMARY KEY (name)
+);
+
+CREATE TABLE list (
+    indx INTEGER PRIMARY KEY,
+    username VARCHAR(255) NOT NULL,
+    listname VARCHAR(255) NOT NULL,
+    item TEXT NOT NULL
+);
+"""
+
+sqlite3_newtxt = """
+
+PRAGMA foreign_keys=OFF;
+BEGIN TRANSACTION;
+CREATE TABLE user (
+	name VARCHAR(255) NOT NULL, 
+	PRIMARY KEY (name)
+);
+CREATE TABLE perms (
+	name VARCHAR(255) NOT NULL, 
+	perm VARCHAR(255) NOT NULL, 
+	FOREIGN KEY(name) REFERENCES user (name)
+);
+INSERT INTO "perms" VALUES('owner','USER');
+INSERT INTO "perms" VALUES('owner','OPER');
+CREATE TABLE userhosts (
+	userhost VARCHAR(255) NOT NULL, 
+	name VARCHAR(255) NOT NULL, 
+	PRIMARY KEY (userhost), 
+	FOREIGN KEY(name) REFERENCES user (name)
+);
+CREATE TABLE permits (
+	name VARCHAR(255) NOT NULL, 
+	permit VARCHAR(255) NOT NULL, 
+	FOREIGN KEY(name) REFERENCES user (name)
+);
+CREATE TABLE passwords (
+	name VARCHAR(255) NOT NULL, 
+	passwd VARCHAR(255) NOT NULL, 
+	PRIMARY KEY (name), 
+	FOREIGN KEY(name) REFERENCES user (name)
+);
+CREATE TABLE statuses (
+	name VARCHAR(255) NOT NULL, 
+	status VARCHAR(255) NOT NULL, 
+	FOREIGN KEY(name) REFERENCES user (name)
+);
+CREATE TABLE email (
+	name VARCHAR(255) NOT NULL, 
+	email VARCHAR(255) NOT NULL, 
+	"order" INTEGER NOT NULL, 
+	FOREIGN KEY(name) REFERENCES user (name)
+);
+CREATE TABLE whokarma (
+	item VARCHAR(255) NOT NULL, 
+	nick VARCHAR(255) NOT NULL, 
+	updown VARCHAR(10) NOT NULL
+);
+CREATE TABLE karma (
+	item VARCHAR(255) NOT NULL, 
+	value INTEGER NOT NULL, 
+	PRIMARY KEY (item)
+);
+CREATE TABLE whykarma (
+	item VARCHAR(255) NOT NULL, 
+	updown VARCHAR(10) NOT NULL, 
+	why TEXT NOT NULL
+);
+CREATE TABLE quotes (
+	indx INTEGER NOT NULL, 
+	quote TEXT NOT NULL, 
+	userhost VARCHAR(255) NOT NULL, 
+	createtime DATETIME NOT NULL, 
+	nick VARCHAR(255) NOT NULL, 
+	PRIMARY KEY (indx), 
+	FOREIGN KEY(userhost) REFERENCES userhosts (userhost)
+);
+CREATE TABLE todo (
+	indx INTEGER NOT NULL, 
+	name VARCHAR(255) NOT NULL, 
+	time DATETIME, 
+	duration INTEGER, 
+	warnsec INTEGER, 
+	descr TEXT NOT NULL, 
+	priority INTEGER, 
+	PRIMARY KEY (indx)
+);
+CREATE TABLE birthday (
+	name VARCHAR(255) NOT NULL, 
+	birthday VARCHAR(255) NOT NULL, 
+	PRIMARY KEY (name)
+);
+CREATE TABLE infoitems (
+	indx INTEGER NOT NULL, 
+	item VARCHAR(255) NOT NULL, 
+	description TEXT NOT NULL, 
+	userhost VARCHAR(255) NOT NULL, 
+	time DATETIME NOT NULL, 
+	PRIMARY KEY (indx), 
+	FOREIGN KEY(userhost) REFERENCES userhosts (userhost)
+);
+CREATE TABLE list (
+	indx INTEGER NOT NULL, 
+	username VARCHAR(255) NOT NULL, 
+	listname VARCHAR(255) NOT NULL, 
+	item TEXT NOT NULL, 
+	PRIMARY KEY (indx)
+);
+COMMIT;
+"""
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gozerbot/database/samodels.py
+++ gozerbot-0.99.1/build/lib/gozerbot/database/samodels.py
@@ -0,0 +1,264 @@
+# gozerbot/databse/alchemy.py
+#
+#
+
+""" alchemy interface. """
+
+__copyright__ = 'this file is in the public domain'
+
+## gozerbot imports
+
+from gozerbot.utils.log import rlog
+
+## sqlalchemy imports
+
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.ext.orderinglist import ordering_list
+from sqlalchemy import Text, Integer, Sequence, ForeignKey, DateTime, Column, String, Table
+from sqlalchemy.orm import relation
+
+## basic imports
+
+import sqlalchemy
+import os
+import time
+import logging
+from datetime import datetime
+
+created = []
+
+def create_all(plugname='all', base=None):
+    rlog(10, 'alchemy', 'running create_all (%s)' % plugname)
+    if plugname not in created:
+        created.append(plugname)
+        if not base:
+            base = Base
+        try: base.metadata.create_all()
+        except Exception, ex: rlog(10, 'alchemy', 'problem creating %s tables: %s' % (str(base), str(ex)))
+    else:
+        rlog(10, 'alchemy', '%s tables already created' % plugname)
+
+# defines 
+
+Base = declarative_base()
+
+## USER MODEL
+
+user = Table('user', Base.metadata,
+    Column('name', String(255), primary_key=True)
+)
+
+email = Table('email', Base.metadata,
+    Column('name', String(255), ForeignKey(user.c.name), nullable=False),
+    Column('email', String(255), nullable=False),
+    Column('order', Integer, nullable=False)
+)
+
+class User(Base):
+    __table__ = user
+    _userhosts = relation("UserHost", backref="user", cascade="all, delete-orphan")
+    _perms = relation("Perms", backref="user", cascade="all, delete-orphan")
+    _permits = relation("Permits", backref="user",cascade="all, delete-orphan" )
+    _statuses = relation("Statuses", backref="user", cascade="all, delete-orphan")
+    _pasword = relation("Passwords", backref="user", cascade="all, delete-orphan")
+    _email = relation("Email", backref="user", collection_class=ordering_list('order'),
+                        cascade="all, delete-orphan", order_by=[email.c.order])
+    email = association_proxy('_email', 'email')
+    userhosts = association_proxy('_userhosts', 'userhost')
+    perms = association_proxy('_perms', 'perm')
+    permits = association_proxy('_permits', 'permit')
+    statuses = association_proxy('_statuses', 'status')
+    password = association_proxy('_password', 'passwd')
+
+class Email(Base):
+    __table__ = email
+    __mapper_args__ = {'primary_key':[email.c.name,email.c.email]}
+
+    def __init__(self, email):
+        self.email = email
+
+class UserHost(Base):
+    __tablename__ = 'userhosts'
+    userhost = Column('userhost', String(255), primary_key=True)
+    name = Column('name', String(255), ForeignKey('user.name'), nullable=False)
+
+    def __init__(self, userhost):
+        self.userhost = userhost
+
+class Perms(Base):
+    __tablename__ = 'perms'
+    name = Column('name', String(255), ForeignKey('user.name'), nullable=False)
+    perm = Column('perm', String(255), nullable=False)
+    __mapper_args__ = {'primary_key':[name,perm]}
+
+    def __init__(self, perm):
+        self.perm = perm
+
+class Permits(Base):
+    __tablename__ = 'permits'
+    name = Column('name', String(255), ForeignKey('user.name'), nullable=False)
+    permit = Column('permit', String(255), nullable=False)
+    __mapper_args__ = {'primary_key':[name,permit]}
+
+    def __init__(self, permit):
+        self.permit = permit
+
+class Statuses(Base):    
+    __tablename__ = 'statuses'
+    name = Column('name', String(255), ForeignKey('user.name'), nullable=False)
+    status = Column('status', String(255), nullable=False)
+    __mapper_args__ = {'primary_key':[name,status]}
+
+    def __init__(self, status):
+        self.status = status
+
+class Passwords(Base):    
+    __tablename__ = 'passwords'
+    name = Column('name', String(255), ForeignKey('user.name'), primary_key=True)
+    passwd = Column('passwd', String(255), nullable=False)
+
+    def __init__(self, passwd):
+        self.passwd = passwd
+
+## Birthday Model
+
+class Birthday(Base):
+    __tablename__ = 'birthday'
+    __table_args__ = {'useexisting': True}
+    name = Column('name', String(255), primary_key=True)
+    birthday = Column('birthday', String(255), nullable=False)
+
+    def __init__(self, name, birthday):
+        self.name = name
+        self.birthday = birthday
+
+
+## Quote Model
+
+class Quotes(Base):
+    __tablename__ = 'quotes'
+    __table_args__ = {'useexisting': True }
+    indx = Column('indx', Integer, Sequence('quotes_indx_seq', optional=True), primary_key=True)
+    quote = Column('quote', Text, nullable=False)
+    userhost = Column('userhost', String(255), ForeignKey('userhosts.userhost'), nullable=False)
+    createtime = Column('createtime', DateTime, nullable=False)
+    nick = Column('nick', String(255), nullable=False)
+
+    def __init__(self, quote, userhost, createtime, nick):
+        self.quote = quote
+        self.userhost = userhost
+        self.createtime = createtime
+        self.nick = nick
+
+## Infoitems Model
+
+class InfoItems(Base):
+    __tablename__ = 'infoitems'
+    __table_args__ = {'useexisting': True}
+    indx = Column('indx', Integer, Sequence('infoitems_indx_seq', optional=True), primary_key=True)
+    item = Column('item', String(255), nullable=False)
+    description = Column('description', Text, nullable=False)
+    userhost = Column('userhost', String(255), ForeignKey('userhosts.userhost'), nullable=False)
+    time = Column('time', DateTime, nullable=False)
+
+    def __init__(self, item, description, userhost, ttime=None):
+        self.time = ttime and ttime or datetime.now()
+        self.item = item.lower()
+        self.description = description
+        self.userhost = userhost
+
+
+## Karma Model
+
+class Karma(Base):
+    __tablename__ = 'karma'
+    __table_args__ = {'useexisting': True}
+    item = Column('item', String(255), primary_key=True)
+    value = Column('value', Integer, nullable=False)
+
+    def __init__(self, item, value):  
+        self.item = item
+        self.value = value
+
+class WhyKarma(Base):
+    __tablename__ = 'whykarma'
+    __table_args__ = {'useexisting': True}
+    item = Column('item', String(255), nullable=False)
+    updown = Column('updown', String(10), nullable=False)
+    why = Column('why', Text, nullable=False)
+    __mapper_args__ = {'primary_key':[item,updown,why]}
+
+    def __init__(self, item, updown, why):
+        self.item = item
+        self.updown = updown
+        self.why = why
+
+class WhoKarma(Base):
+    __tablename__ = 'whokarma'
+    __table_args__ = {'useexisting': True}
+    item = Column('item', String(255), nullable=False)
+    nick = Column('nick', String(255), nullable=False)
+    updown = Column('updown', String(10), nullable=False)
+    __mapper_args__ = {'primary_key': [item, nick, updown]}
+
+    def __init__(self, item, nick, updown):
+        self.item = item
+        self.nick = nick
+        self.updown = updown
+
+
+## Todo Model
+
+if True:
+
+    class Todo(Base):
+        __tablename__ = 'todo'
+        __table_args__ = {'useexisting': True}
+        indx = Column('indx', Integer, Sequence('todo_indx_seq', optional=True), primary_key=True)
+        name = Column('name', String(255), nullable=False)
+        time = Column('time', DateTime)
+        duration = Column('duration', Integer)
+        warnsec = Column('warnsec', Integer)
+        descr = Column('descr', Text, nullable=False)
+        priority = Column('priority', Integer)
+
+        def __init__(self, name, time, duration, warnsec, descr, priority):
+            self.name = name
+            self.time = time
+            self.duration = duration
+            self.warnsec = warnsec
+            self.descr = descr
+            self.priority = priority
+
+## Lists Model
+
+class Lists(Base):
+    __tablename__ = 'list'
+    __table_args__ = {'useexisting': True}
+    indx = Column('indx', Integer, Sequence('list_indx_seq', optional=True), primary_key=True)
+    username = Column('username', String(255), nullable=False)
+    listname = Column('listname', String(255), nullable=False)
+    item = Column('item', Text, nullable=False)
+
+    def __init__(self, username, listname, item):
+        self.username = username
+        self.listname = listname
+        self.item = item
+
+## IRCLogs Model
+
+class ChatLog(Base):
+    __tablename__ = 'chatlog'
+    __table_args__ = {'useexisting': True}
+    id = Column('id', Integer, primary_key=True)
+    time = Column('time', DateTime, nullable=False, default=datetime.now)
+    network = Column('network', String(256), nullable=False, default='') 
+    target = Column('target', String(256), nullable=False, default='')   
+    nick = Column('nick', String(256), nullable=False, default='')
+    type = Column('type', String(256), nullable=False, default='')
+    message = Column('message', Text, nullable=False, default='') 
+
+    def __init__(self, **kwargs):
+        for k, v in kwargs.items():
+            setattr(self, k, v)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/database/alchemy.py
+++ gozerbot-0.99.1/build/lib/gozerbot/database/alchemy.py
@@ -0,0 +1,341 @@
+# gozerbot/databse/alchemy.py
+#
+#
+
+""" alchemy interface. """
+
+__copyright__ = 'this file is in the public domain'
+
+## IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.stats import stats
+from gozerbot.datadir import datadir
+from gozerbot.config import config
+from gozerbot.utils.locking import lockdec
+from gozerbot.utils.log import rlog
+from gozerbot.utils.exception import handle_exception
+
+# sqlalchemy imports
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.ext.orderinglist import ordering_list
+from sqlalchemy import Text, Integer, Sequence, ForeignKey, DateTime
+from sqlalchemy import create_engine, Column, String, Table
+from sqlalchemy.orm import  scoped_session, sessionmaker, relation, eagerload
+from sqlalchemy.orm import create_session as cs
+
+# basic imports
+import sqlalchemy, thread, os, time, logging
+
+## END IMPORT
+
+# debug settings
+if config['debug']:
+    logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
+
+# locks
+alchemylock = thread.allocate_lock()
+alchemylocked = lockdec(alchemylock)
+sessionlock = thread.allocate_lock()
+sessionlocked = lockdec(sessionlock)
+querylock = thread.allocate_lock()
+querylocked = lockdec(querylock)
+createlock = thread.allocate_lock()
+createlocked = lockdec(createlock)
+
+created = []
+
+
+
+def geturi(ddir=None, mainconfig=None):
+
+    """  determine database URI from config file """
+
+    d = ddir or datadir
+
+    # set config file
+    if mainconfig:
+        config = mainconfig 
+    else:
+        from gozerbot.config import config
+
+    # if dburi not provided in config file construct it
+    if not config['dburi']:
+
+        if not 'sqlite' in config['dbtype'] and not 'mysql' in config['dbtype']:
+            dburi = "%s://%s:%s@%s/%s" % (config['dbtype'], config['dbuser'], \
+config['dbpasswd'], config['dbhost'], config['dbname'])
+        elif 'mysql' in config['dbtype']:
+            dburi = "%s://%s:%s@%s/%s?charset=utf8&use_unicode=0" % (config['dbtype'], config['dbuser'], \
+config['dbpasswd'], config['dbhost'], config['dbname'])
+        else:
+            if not os.path.isdir(d + os.sep + 'db'):
+                os.mkdir(d + os.sep + 'db')
+            dburi = "sqlite:///%s/%s" % (ddir or datadir, config['dbname'])
+
+    else:
+        # dburi found in config
+        dburi = config['dburi']
+
+        # determine dbtype
+        try:
+            dbtype = dburi.split(':')[0]
+        except:
+            rlog(10, 'alchemy', "can't extract db data from dburi")
+            dbtype = 'unknown'
+
+        # save dbtype
+        if config['dbtype'] != dbtype:
+            config['dbtype'] = dbtype
+            config.save()
+
+    return dburi
+
+def dbstart(ddir=None, mainconfig=None, base=None):
+
+    """ start the database connection setting Session and engine. """
+
+    dburi = geturi(ddir, mainconfig)
+
+    # only show dburi if it doesn't contain a password
+    if '///' in dburi:
+        rlog(10, 'alchemy', 'starting database %s' % dburi)
+    else:
+        rlog(10, 'alchemy', 'starting database')
+
+    try:
+        engine = create_engine(dburi, strategy='threadlocal', pool_recycle=60, pool_size=50, max_overflow=0)
+    except:
+        engine = create_engine(dburi, strategy='threadlocal', pool_recycle=3600)
+    #try:
+    #    engine = create_engine(dburi, pool_recycle=60, pool_size=50, max_overflow=0)
+    #except:
+    #    engine = create_engine(dburi, pool_recycle=3600)
+
+    # setup metadata and session
+    if not base:
+        base = Base
+    base.metadata.bind = engine
+    create_all()
+    rlog(10, 'alchemy', 'done')
+    Session = scoped_session(sessionmaker(bind=engine, autocommit=True))
+    stats.up('alchemy', 'engines')
+
+    return (Session, engine)
+
+# vars
+Base = declarative_base()
+#Session, engine = dbstart(datadir)
+Session = engine = None
+
+def startmaindb(ddir=None, mainconfig=None):
+
+    """ start the main database. """
+
+    global Session
+    global engine
+
+    Session, engine = dbstart(ddir, mainconfig)
+    #pass
+
+def dblocked(func, *args, **kwargs):
+
+    @alchemylocked
+    def dofunc(*args, **kwargs):
+        try:
+            Session.begin(subtransactions=True)
+            res = func(*args, **kwargs)
+            Session.commit()
+            try: idnr = res.indx
+            except AttributeError: idnr = None
+            Session.close()
+            return idnr or res
+        except Exception, ex:
+            Session.rollback() ; Session.close()
+            raise
+    return dofunc
+
+def create_all(plugname='all', base=None):
+    rlog(10, 'alchemy', 'running create_all (%s)' % plugname)
+    if plugname not in created:
+        created.append(plugname)
+        if not base:
+            base = Base
+        try: base.metadata.create_all()
+        except Exception, ex: rlog(10, 'alchemy', 'problem creating %s tables: %s' % (str(base), str(ex)))
+    else:
+        rlog(10, 'alchemy', '%s tables already created' % plugname)
+
+### MODEL
+
+user = Table('user', Base.metadata,
+    Column('name', String(255), primary_key=True)
+)
+
+email = Table('email', Base.metadata,
+    Column('name', String(255), ForeignKey(user.c.name), nullable=False),
+    Column('email', String(255), nullable=False),
+    Column('order', Integer, nullable=False)
+)
+
+class User(Base):
+    __table__ = user
+    _userhosts = relation("UserHost", backref="user", cascade="all, delete-orphan")
+    _perms = relation("Perms", backref="user", cascade="all, delete-orphan")
+    _permits = relation("Permits", backref="user",cascade="all, delete-orphan" )
+    _statuses = relation("Statuses", backref="user", cascade="all, delete-orphan")
+    _pasword = relation("Passwords", backref="user", cascade="all, delete-orphan")
+    _email = relation("Email", backref="user", collection_class=ordering_list('order'),
+                        cascade="all, delete-orphan", order_by=[email.c.order])
+    email = association_proxy('_email', 'email')
+    userhosts = association_proxy('_userhosts', 'userhost')
+    perms = association_proxy('_perms', 'perm')
+    permits = association_proxy('_permits', 'permit')
+    statuses = association_proxy('_statuses', 'status')
+    password = association_proxy('_password', 'passwd')
+
+class Email(Base):
+    __table__ = email
+    __mapper_args__ = {'primary_key':[email.c.name,email.c.email]}
+
+    def __init__(self, email):
+        self.email = email
+
+class UserHost(Base):
+    __tablename__ = 'userhosts'
+    userhost = Column('userhost', String(255), primary_key=True)
+    name = Column('name', String(255), ForeignKey('user.name'), nullable=False)
+
+    def __init__(self, userhost):
+        self.userhost = userhost
+
+class Perms(Base):
+    __tablename__ = 'perms'
+    name = Column('name', String(255), ForeignKey('user.name'), nullable=False)
+    perm = Column('perm', String(255), nullable=False)
+    __mapper_args__ = {'primary_key':[name,perm]}
+
+    def __init__(self, perm):
+        self.perm = perm
+
+class Permits(Base):
+    __tablename__ = 'permits'
+    name = Column('name', String(255), ForeignKey('user.name'), nullable=False)
+    permit = Column('permit', String(255), nullable=False)
+    __mapper_args__ = {'primary_key':[name,permit]}
+
+    def __init__(self, permit):
+        self.permit = permit
+
+class Statuses(Base):    
+    __tablename__ = 'statuses'
+    name = Column('name', String(255), ForeignKey('user.name'), nullable=False)
+    status = Column('status', String(255), nullable=False)
+    __mapper_args__ = {'primary_key':[name,status]}
+
+    def __init__(self, status):
+        self.status = status
+
+class Passwords(Base):    
+    __tablename__ = 'passwords'
+    name = Column('name', String(255), ForeignKey('user.name'), primary_key=True)
+    passwd = Column('passwd', String(255), nullable=False)
+
+    def __init__(self, passwd):
+        self.passwd = passwd
+
+### END MODEL
+
+def query(q):
+    """ do a query on the database. """
+    stats.up('alchemy', 'query')
+    res = Session.query(q)
+    return res
+
+def douser(userhost):
+    user = query(UserHost).filter_by(userhost=userhost).first()
+    if user:
+        res = query(User).filter_by(name=user.name.lower()).first()
+        if res: 
+            return res
+
+
+def getuser(userhost):
+
+    """ get a user based on userhost. """
+
+    stats.up('alchemy', 'getuser')
+    try:
+        return douser(userhost)
+    except sqlalchemy.exc.OperationalError, ex:
+        if 'server has gone away' in str(ex):
+            rlog(10, 'alchemy', 'mysql server has gone away')
+            startmaindb()
+            return douser(userhost)
+        else:
+            raise
+    except Exception, ex:
+        rlog(10, 'alchemy', 'error getting %s user: %s' % (str(userhost), str(ex)))
+
+def doname(name):
+        res = Session.query(User).filter_by(name=name.lower()).first()
+        return res
+
+def byname(name):
+    """ get a users based on name. """
+    try:
+        return doname(name)
+    except Exception, ex:
+        if 'server has gone away' in str(ex):
+            rlog(10, 'alchemy', 'error: %s' % str(ex))
+            startmaindb()
+            return doname(name)
+        else:
+            raise
+
+@dblocked
+def dbupgrade(mainconfig=None):
+
+    """ upgrade the database. """
+
+    #time.sleep(10)
+    print 'upgrading users'
+    users = Session.query(UserHost).all()
+    upgraded = []
+
+    # populate the User table
+    Session.begin()
+    for user in users:
+        name = user.name
+        if name in upgraded:
+            continue
+        try:
+            if not byname(name):
+                newuser = User(name=name)
+                session.add(newuser)
+            upgraded.append(name)
+        except sqlalchemy.exc.IntegrityError, ex:
+            pass
+        except:
+            handle_exception()
+
+    Session.commit()
+    Session.close()
+    print "upgraded: %s" % ' .. '.join(upgraded) 
+    print 'upgrading email table'
+    from gozerbot.database.db import Db
+
+    # upgrade email table
+    try:
+        db = Db(config=mainconfig)
+        if db.dbtype == 'mysql':
+            db.execute("ALTER TABLE email ADD COLUMN email.order INT")
+        else:
+            db.execute("ALTER TABLE email ADD COLUMN 'order' INT")
+    except Exception, ex:
+        if 'already exists' in str(ex) or 'duplicate column name' in \
+str(ex).lower():
+            pass
+        else:
+            handle_exception()
--- gozerbot-0.99.1.orig/build/lib/gozerbot/database/__init__.py
+++ gozerbot-0.99.1/build/lib/gozerbot/database/__init__.py
@@ -0,0 +1,2 @@
+from gozerbot.eggs import loadegg
+loadegg('sqlalchemy', log=False)
--- gozerbot-0.99.1.orig/build/lib/gozerbot/database/gae.py
+++ gozerbot-0.99.1/build/lib/gozerbot/database/gae.py
@@ -0,0 +1,73 @@
+# gozerbot/database/googledb.py
+#
+#
+
+""" alchemy interface. rewritten to use BigTable"""
+
+__copyright__ = 'this file is in the public domain'
+
+## IMPORT SECTION
+
+# gozerbot imports
+from gozerbot.stats import stats
+from gozerbot.datadir import datadir
+from gozerbot.config import config
+from gozerbot.utils.locking import lockdec, funclocked, Locked
+from gozerbot.utils.log import rlog
+from gozerbot.utils.exception import handle_exception
+
+# google imports
+from google.appengine.ext import db
+
+# basic imports
+import os, time, logging
+
+## END IMPORT
+
+### MODEL
+
+class GozerUser(db.Expando):
+
+    name = db.StringProperty(required=True)
+    email = db.StringProperty()
+    userhosts = db.StringListProperty(required=True)
+    perms = db.StringListProperty()
+    permits = db.StringListProperty()
+    statuses = db.StringListProperty()
+    password = db.StringProperty()
+
+class GozerUserhost(db.Expando):
+
+    name = db.StringProperty(required=True)
+    userhost = db.StringProperty(required=True)
+
+### END MODEL
+
+def query(q):
+
+    """ do a query on the database. """
+
+    res = None
+    stats.up('alchemy', 'query')
+    res = db.GqlQuery(q).all().fetch(1000)
+    return res
+
+def getuser(userhost):
+
+    """ get a user based on userhost. """
+    
+    uh = GozerUserhost.all().filter('userhost =', userhost).get()
+    if not uh:
+        rlog(10, 'db', 'no userhost found for %s' % userhost)
+        return
+    user = db.GqlQuery("SELECT * FROM GozerUser WHERE name = :1", uh.name).get()
+    if user:
+        return user
+    else:
+        rlog(10, 'db', 'no user found for %s' % uh.name)
+
+def byname(name):
+
+    """ get a users based on name. """
+    user = db.GqlQuery("SELECT * FROM GozerUser WHERE name = :1", name).get()
+    return user
--- gozerbot-0.99.1.orig/build/lib/gplugs/markov.py
+++ gozerbot-0.99.1/build/lib/gplugs/markov.py
@@ -0,0 +1,543 @@
+# plugs/markov.py
+#
+#
+
+"""
+
+Markov Talk for Gozerbot
+
+The Chain:
+    (predictate) -> [list of possible words]
+
+TODO:
+    - Propabilities
+    - Start searching for full sentence, not just the first ORDER_K words 
+      of a sentence
+"""
+
+__copyright__ = 'this file is in the public domain'
+__author__ =  'Bas van Oostveen'
+__coauthor__ = 'Bart Thate <bart@gozerbot.org>'
+__gendocfirst__ = ['markov-enable', ]
+__gendoclast__ = ['markov-disable', ]
+__depend__ = ['log', ]
+
+from gozerbot.datadir import datadir
+from gozerbot.generic import rlog, geturl, striphtml, jsonstring
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.callbacks import callbacks, jcallbacks
+from gozerbot.plughelp import plughelp
+from gozerbot.plugins import plugins
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.utils.statdict import Statdict
+from gozerbot.utils.limlist import Limlist
+from gozerbot.tests import tests
+
+from os.path import join as _j
+import time, re, random, types
+
+from gozerbot.persist.persistconfig import PersistConfig
+
+plughelp.add('markov', 'Gozerbot speaking madness')
+
+cfg = PersistConfig()
+cfg.define('enable', [])
+cfg.define('command', 1)
+cfg.define('onjoin', [])
+
+def enabled(botname, channel):
+    if jsonstring([botname, channel]) in cfg['enable']:
+        return True
+
+# Markers (is Marker the correct name for this?)
+class Marker: pass
+class BeginMarker(Marker): pass
+class EndMarker(Marker): pass
+class NickMarker(Marker): pass
+
+# Tokens
+TOKEN = Marker()
+TOKEN_BEGIN = BeginMarker()
+TOKEN_END = EndMarker()
+TOKEN_NICK = NickMarker()
+
+# Order-k, use predictate [-k:] = [word,word,]
+# if ORDER_K==1: { ('eggs'):['with','spam',], 'with': ['bacon','green',] }
+# if ORDER_K==2: { ('eat','eggs'):['with',TOKEN,), ('eggs','with'): ['bacon',] }
+# ...
+# Logical setting is often 2 or 3
+ORDER_K = 2
+
+# Maximum generation cycles
+MAXGEN = 500
+
+markovlearn = PlugPersist('markovlearn', [])
+markovwords = {}
+markovwordi = []
+markovchains = {}
+
+cfg.define('loud', 1)
+
+def init():
+    """ init plugin """
+    # check if enabled
+    if not cfg.get('enable'):
+        return 1
+    # if so register callbacks
+    callbacks.add("PRIVMSG", cb_markovtalk, cb_markovtalk_test, threaded=True)
+    callbacks.add('JOIN', cb_markovjoin, threaded=True)
+    jcallbacks.add('Message', cb_markovtalk, cb_jmarkovtalk_test, \
+threaded=True)
+    # learn log or url on startup
+    start_new_thread(markovtrain, (markovlearn.data,))
+    return 1
+
+def size():
+    """ return size of markov chains """
+    return len(markovchains)
+
+def markovtrain(l):
+    """ train items in list """
+    time.sleep(1)
+    for i in l:
+        if i.startswith('http://'):
+            start_new_thread(markovlearnurl, (i,))
+        else:
+            start_new_thread(markovlearnlog, (i,))
+    return 1
+	
+def iscommand(bot, ievent):
+    """ check to see if ievent is a command """
+    if not ievent.txt:
+        return 0
+    try:
+        cc = bot.channels[ievent.channel]['cc']
+    except (TypeError, KeyError):
+        cc = None
+    txt = ""
+    if cc and ievent.txt[0] == cc:
+        txt = ievent.txt[1:]
+    if ievent.txt.startswith(bot.nick + ':') or \
+ievent.txt.startswith(bot.nick + ','):
+        txt = ievent.txt[len(bot.nick)+1:]
+    oldtxt = ievent.txt
+    ievent.txt = txt
+    result = plugins.woulddispatch(bot, ievent)
+    ievent.txt = oldtxt
+    return result
+
+def cb_markovjoin(bot, ievent):
+    """ callback to run on JOIN """
+    # check if its we who are joining
+    nick = ievent.nick.lower()
+    if nick in bot.splitted:
+        return
+    if nick == bot.nick.lower():
+        return
+    # check if (bot.name, ievent.channel) is in onjoin list if so respond
+    try:
+        onjoin = cfg.get('onjoin')
+    except KeyError:
+        onjoin = None
+    if type(onjoin) != types.ListType:
+        return
+    if jsonstring([bot.name, ievent.channel]) in onjoin:
+        txt = getreply(bot, ievent, ievent.nick + ':')
+        if txt:
+            ievent.reply('%s: %s' % (ievent.nick, txt))
+            
+def cb_markovtalk_test(bot, ievent):
+    """ callback precondition """
+    if not ievent.usercmnd:
+        return 1
+
+def cb_jmarkovtalk_test(bot, ievent):
+    """ callback precondition """
+    if not ievent.usercmnd:
+        return 1
+
+def cb_markovtalk(bot, ievent):
+    """ learn from everything that is being spoken to the bot """
+    # check for relay
+    if ievent.txt.count('[%s]' % bot.nick) > 0:
+        return
+    # strip
+    txt = strip_txt(bot, ievent.txt)
+    # markovtalk_learn
+    if enabled(bot.name, ievent.channel):
+        markovtalk_learn(txt)
+    # if command is set in config then we don't respond in callback
+    elif not cfg.get('loud'):
+        return 
+    itxt = ievent.txt.lower()
+    # check is bot.nick is in ievent.txt if so give response
+    botnick = bot.nick.lower()
+    #responsenicks = (botnick, botnick+":", botnick+",")
+    if botnick in itxt or cfg.get('loud') and ievent.msg: 
+        # reply when called 
+        result = getreply(bot, ievent, txt)
+	# dont reply if answer is going to be the same as question
+        if not result:
+            return
+        if result.lower() == txt.lower():
+            return
+        ievent.reply(result)
+
+# re to strip first word of logline
+txtre = re.compile('^\S+ ')
+
+def markovlearnlog(chan):
+    """ learn a log """
+    from gplugs.log import logs    
+    logmap = logs.getmmap(chan)
+    if not logmap:
+        rlog(10, 'markov', "can't get logfile of %s" % chan)
+        return
+    # process lines in mmaped file
+    lines = 0
+    rlog(10, 'markov', 'learning %s log' % chan)
+    while 1:
+        if lines % 10 == 0:
+            time.sleep(0.001)
+        line = logmap.readline()
+        if not line:
+            break
+        try:
+            items = line.strip().split(',', 4)
+            if items[3] == 'bot@bot':
+                continue
+            if items[4].startswith('CMND:'):
+                continue
+        except:
+            continue
+        try:
+            txt = re.sub(txtre, '', items[4])
+            markovtalk_learn(txt + '\n')
+        except IndexError:
+            continue
+        lines += 1
+    logmap.close()
+    rlog(10, 'markov', 'learning %s log done' % chan)
+    return lines
+
+def markovlearnurl(url):
+    """ learn an url """
+    lines = 0
+    rlog(10, 'markov', 'learning %s' % url)
+    try:
+        f = geturl(url)
+        for line in f.split('\n'):
+            line = striphtml(line)
+            if lines % 10 == 0:
+                time.sleep(0.01)
+            line = line.strip()
+            if not line:
+                continue
+            markovtalk_learn(line)
+            lines += 1
+    except Exception, e:
+        rlog(10, 'markov', str(e))
+    rlog(10, 'markov', 'learning %s done' % url)
+    return lines
+
+def strip_txt(bot, txt):
+    """ strip bot nick and addressing """
+    # TODO: strip other nicks, preferably replacing them with something like 
+    # TOKEN_NICK
+    txt = txt.replace("%s," % bot.nick, "")
+    txt = txt.replace("%s:" % bot.nick, "")
+    txt = txt.replace("%s" % bot.nick, "")
+    return txt.strip()
+
+def msg_to_array(msg):
+    """ convert string to lowercased items in list """
+    return [word.strip().lower() for word in msg.strip().split()]
+
+def mw(w):
+    if not w in markovwords:
+        wi = len(markovwordi)
+        markovwordi.append(w)
+        markovwords[w] = wi
+        return wi
+    return markovwords[w]
+
+def o2i(order):
+    return tuple(mw(w) for w in order)
+
+def i2o(iorder):
+    return tuple(markovwordi[i] for i in iorder)
+
+def markovtalk_learn(text_line):
+    """ this is the function were a text line gets learned """
+    text_line = msg_to_array(text_line)
+    length = len(text_line)
+    order = [TOKEN, ] * ORDER_K
+    for i in range(length-1):
+        order.insert(0, text_line[i])
+        order = order[:ORDER_K]
+        next_word = text_line[i+1]
+        key = markovchains.setdefault(o2i(order), [])
+        if not next_word in key:
+            key.append(mw(next_word))
+
+def getreply(bot, ievent, text_line):
+    """ get 20 replies and choose the largest one """
+    if not text_line:
+        return ""
+    text_line = msg_to_array(text_line)
+    wordsizes = {}
+    maxsize = 0
+    for i in text_line:
+        wordsizes[len(i)] = i
+        if len(i) > maxsize:
+            maxsize = len(i)
+    results = []
+    keywords = ['is', ]
+    max = maxsize
+    for i in range(7):
+        p = ['', ]
+        try:
+            p[0] = wordsizes[max]
+        except KeyError:
+            p[0] = random.choice(text_line)
+        if len(p) > 2:
+            p.append(random.choice(text_line))
+        #random.shuffle(p)
+        if len(p) < 2:
+            p.append('is')
+        line = getline(' '.join(p))
+        if line and line not in results:
+            results.append(line)
+        else:
+            max -= 1
+            if max < 1:
+                max = maxsize
+    if not results:
+        return ""
+    #highest = []
+    #high = 0
+    #for i in results:
+    #    if len(i) > high:
+    #        highest.insert(0, i)
+    #        high = len(i)
+    #for i in results:
+    #    if wordsizes[maxsize] in i:
+    #            return i
+    #res = random.choice(highest)
+    res = []
+    for result in results[:4]:
+        if len(result.split()) > 1:
+            res.append(result.capitalize())
+    return '. '.join(res)
+
+def getline(text_line):
+    """ get line from markovvhains """
+    text_line = msg_to_array(text_line)
+    order = Limlist(ORDER_K)
+    for i in range(ORDER_K):
+        order.append(TOKEN)
+    teller = 0
+    for i in text_line[:ORDER_K-1]:
+        order[teller] = i
+        teller += 1
+    output = ""
+    for i in range(MAXGEN):
+        try:
+            successorList = i2o(markovchains[o2i(order)])
+        except KeyError:
+            continue
+        #print successorList
+        keyword = successorList[0]
+        word = random.choice(successorList)
+        if not word:
+            break
+        if word not in output:
+            output = output + " "  + word
+        order.insert(0, word)
+        order = order[:ORDER_K]
+    return output.strip()
+    
+def handle_markovsize(bot, ievent):
+    """ markov-size .. returns size of markovchains """
+    ievent.reply("I know %s phrases" % str(len(markovchains.keys())))
+
+cmnds.add('markov-size', handle_markovsize, 'OPER')
+examples.add('markov-size', 'size of markovchains', 'markov-size')
+tests.add('markov-size')
+
+def handle_markovlearn(bot, ievent):
+    """ command to let the bot learn a log or an url .. learned data 
+        is not persisted """
+    try:
+        item = ievent.args[0]
+    except IndexError:
+        ievent.reply('<channel>|<url>')
+        return
+    if item.startswith('http://'):
+        nrlines = markovlearnurl(item)
+        ievent.reply('learned %s lines' % nrlines)
+        return
+    from gplugs.log import logs
+    if item in logs.loglist:
+        ievent.reply('learning log file %s' % item)
+        nrlines = markovlearnlog(item)
+        ievent.reply('learned %s lines' % nrlines)
+        return
+    else:
+        ievent.reply('logging is not enabled in %s' % item)
+
+cmnds.add('markov-learn', handle_markovlearn, 'OPER', threaded=True)
+examples.add('markov-learn', 'learn a logfile or learn an url', \
+'1) markov-learn #dunkbots 2) markov-learn http://gozerbot.org')
+tests.add('markov-learn http://gozerbot.org', 'learned')
+ 
+def handle_markovlearnadd(bot, ievent):
+    """ add log or url to be learned at startup or reload """
+    try:
+        item = ievent.args[0]
+    except IndexError:
+        ievent.missing('<channel>|<url>')
+        return
+    if item in markovlearn.data:
+        ievent.reply('%s is already in learnlist' % item)
+        return
+    markovlearn.data.append(item)
+    markovlearn.save()
+    handle_markovlearn(bot, ievent)
+    ievent.reply('done')
+
+cmnds.add('markov-learnadd', handle_markovlearnadd, 'OPER')
+examples.add('markov-learnadd', 'add channel or url to permanent learning .. \
+this will learn the item on startup', '1) markov-learnadd #dunkbots 2) \
+markov-learnadd http://gozerbot.org')
+tests.add('markov-learnadd http://gozerbot.org')
+
+def handle_markovlearnlist(bot, ievent):
+    """ show the learnlist """
+    ievent.reply(str(markovlearn.data))
+
+cmnds.add('markov-learnlist', handle_markovlearnlist, 'OPER')
+examples.add('markov-learnlist', 'show items in learnlist', \
+'markov-learnlist')
+tests.add('markov-learnlist', 'gozerbot.org')
+
+def handle_markovlearndel(bot, ievent):
+    """ remove item from learnlist """
+    try:
+        item = ievent.args[0]
+    except IndexError:
+        ievent.missing('<channel>|<url>')
+        return
+    if item not in markovlearn.data:
+        ievent.reply('%s is not in learnlist' % item)
+        return
+    markovlearn.data.remove(item)
+    markovlearn.save()
+    ievent.reply('done')
+
+cmnds.add('markov-learndel', handle_markovlearndel, 'OPER')
+examples.add('markov-learndel', 'remove item from learnlist', \
+'1) markov-learndel #dunkbots 2) markov-learndel http://gozerbot.org')
+tests.add('markov-learndel mekker')
+
+def handle_markov(bot, ievent):
+    """ this is the command to make the bot reply a markov response """
+    if not enabled(bot.name, ievent.channel):
+        ievent.reply('markov is not enabled in %s' % ievent.channel)
+        return
+    if not ievent.rest:
+        ievent.missing('<txt>')
+        return
+    result = getreply(bot, ievent, strip_txt(bot, ievent.rest))
+    if result:
+        ievent.reply(result)
+
+cmnds.add('markov', handle_markov, ['USER', 'WEB', 'CLOUD'])
+examples.add('markov', 'ask for markov response', 'markov nice weather')
+tests.add('markov gozerbot')
+
+def handle_markovonjoinadd(bot, ievent):
+    """ add channel to onjoin list """
+    try:
+        channel = ievent.args[0]
+    except IndexError:
+        channel = ievent.channel
+    if (bot.name, channel) in cfg.get('onjoin'):
+        ievent.reply('%s already in onjoin list' % channel)
+        return
+    cfg.get('onjoin').append((bot.name, channel))
+    cfg.save()
+    ievent.reply('%s added' % channel)
+
+cmnds.add('markov-onjoinadd', handle_markovonjoinadd, 'OPER')
+examples.add('markov-onjoinadd', 'add channel to onjoin config', \
+'1) markov-onjoinadd 2) markov-onjoinadd #dunkbots')
+tests.add('markov-onjoinadd #dunkbots')
+ 
+def handle_markovonjoinremove(bot, ievent):
+    """ remove channel from onjoin list """
+    try:
+        channel = ievent.args[0]
+    except IndexError:
+        channel = ievent.channel
+    try:
+        cfg.get('onjoin').remove((bot.name, channel))
+    except ValueError:
+        ievent.reply("%s not in onjoin list" % channel)
+        return
+    cfg.save()
+    ievent.reply('%s removed' % channel)
+
+cmnds.add('markov-onjoinremove', handle_markovonjoinremove, 'OPER')
+examples.add('markov-onjoinremove', 'remove channel from onjoin config', \
+'1) markov-onjoinremove 2) markov-onjoinremove #dunkbots')
+tests.add('markov-onjoinremove #dunkbots')
+
+def handle_markovenable(bot, ievent):
+    """ enable markov in a channel .. learn the log of that channel """
+    try:
+        channel = ievent.args[0]
+    except IndexError:
+        channel = ievent.channel
+    if not enabled(bot.name, channel):
+        cfg.get('enable').append(jsonstring([bot.name, channel]))
+    else:
+        ievent.reply('%s is already enabled' % channel)
+        return
+    cfg.save()
+    markovlearn.data.append(channel)
+    markovlearn.save()
+    plugins.reload('gplugs', 'markov')
+    ievent.reply('%s enabled' % channel)
+
+cmnds.add('markov-enable', handle_markovenable, 'OPER')
+examples.add('markov-enable', 'enable markov learning in [<channel>]', '1) \
+markov-enable 2) markov-enable #dunkbots')
+tests.add('markov-enable #dunkbots')
+
+def handle_markovdisable(bot, ievent):
+    """ disable markov in a channel """
+    try:
+        channel = ievent.args[0]
+    except IndexError:
+        channel = ievent.channel
+    if enabled(bot.name, channel):
+        cfg.get('enable').remove(jsonstring([bot.name, channel]))
+    else:
+        ievent.reply('%s is not enabled' % channel)
+        return
+    cfg.save()
+    try:
+        markovlearn.data.remove(channel)
+        markovlearn.save()
+    except ValueError:
+        pass
+    plugins.reload('gplugs', 'markov')
+    ievent.reply('%s disabled' % channel)
+
+cmnds.add('markov-disable', handle_markovdisable, 'OPER')
+examples.add('markov-disable', 'disable markov learning in [<channel>]', '1) \
+markov-disable 2) markov-disable #dunkbots')
+tests.add('markov-disable #dunkbots')
--- gozerbot-0.99.1.orig/build/lib/gplugs/autovoice.py
+++ gozerbot-0.99.1/build/lib/gplugs/autovoice.py
@@ -0,0 +1,61 @@
+# plugins/autovoice.py
+#
+#
+
+""" do voice on join """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.callbacks import callbacks
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('autovoice', 'enable auto voicing of people join .. commands \
+work for the channels the commands are given in')
+
+def preautovoice(bot, ievent):
+    """ precondition on auto-op .. we must be op """
+    if ievent.channel in bot.state['opchan']:
+        return 1
+
+def cbautovoice(bot, ievent):
+    """ autovoice callback """
+    chandata = 0
+    try:
+        chandata = bot.channels[ievent.channel]['autovoice']
+    except KeyError:
+        return
+    if chandata:
+        bot.voice(ievent.channel, ievent.nick)
+
+callbacks.add('JOIN', cbautovoice, preautovoice)
+
+def handle_autovoiceon(bot, ievent):
+    """ autovoice-on .. enable autovoice for channel the command was given \
+        in """
+    try:
+        bot.channels[ievent.channel]['autovoice'] = 1
+    except TypeError:
+        ievent.reply('no %s in channel database' % ievent.channel)
+        return
+    ievent.reply('autovoice enabled on %s' % ievent.channel)
+
+cmnds.add('autovoice-on', handle_autovoiceon, 'OPER')
+examples.add('autovoice-on', 'enable autovoice on channel in which the \
+command is given', 'autovoice-on')
+
+def handle_autovoiceoff(bot, ievent):
+    """ autovoice-off .. disable autovoice for the channel the command was \
+        given in """
+    try:
+        bot.channels[ievent.channel]['autovoice'] = 0
+        ievent.reply('autovoice disabled on %s' % ievent.channel)
+    except TypeError:
+        ievent.reply('no %s channel in database' % ievent.channel)
+
+cmnds.add('autovoice-off', handle_autovoiceoff, 'OPER')
+examples.add('autovoice-off', 'disable autovoice on channel in which \
+the command is given', 'autovoice-off')
+tests.add('autovoice-on --chan #dunkbots', 'enabled').fakein(':dunker!mekker@127.0.0.1 JOIN #dunkbots').add('autovoice-off --chan #dunkbots', 'disabled')
--- gozerbot-0.99.1.orig/build/lib/gplugs/chatlog.py
+++ gozerbot-0.99.1/build/lib/gplugs/chatlog.py
@@ -0,0 +1,402 @@
+# gozerplugs/chatlog.py
+#
+
+""" log irc channels to [hour:min] <nick> txt format 
+The db backend expects the following table structure
+$dbtable(time, network, target, nick, type, message)
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.callbacks import callbacks, jcallbacks
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.generic import hourmin, rlog, lockdec
+from gozerbot.irc.monitor import outmonitor
+from gozerbot.xmpp.monitor import xmppmonitor
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.irc.ircevent import Ircevent
+from gozerbot.fleet import fleet
+from gozerbot.tests import tests
+
+import time, os, thread
+from os import path
+from datetime import datetime
+
+plughelp.add('chatlog', 'log irc channels')
+
+outlock = thread.allocate_lock()
+outlocked = lockdec(outlock)
+
+cfg = PersistConfig()
+cfg.define('channels', [])
+# format for logs. simple or supy are currently supported.
+cfg.define('format', 'simple')
+# basepath: the root of all logs.  None is $gozerbot-root/logs
+cfg.define('basepath', '')
+# msgs that should be logged start with this
+cfg.define('nologprefix', '[nolog]')
+# and are replaced with
+cfg.define('nologmsg', '-= THIS MESSAGE NOT LOGGED =-')
+# where do we write the logs too?
+cfg.define('backend', 'file')
+# db settings for db backend
+cfg.define('dbtype', '')
+cfg.define('dbname', '')
+cfg.define('dbhost', '')
+cfg.define('dbuser', '')
+cfg.define('dbpasswd', '')
+cfg.define('dburi', '')
+logfiles = {}
+backends = {}
+stopped = False
+db = None
+
+ # Formats are defined here. simple also provides default values if values
+ # are not supplied by the format, as well as format 'simple'. 
+ # Parameters that should be supplied:
+ #   * timestamp_format: format of timestamp in log files
+ #     * all strftime vars supported.
+ #   * filename: file name for log
+ #     * var channel : full channel ie. #dunkbot
+ #     * var channel_name : channel without '#' ie. dunkbot
+ #   * event_filename: 
+ #        if event_filename exists, then it will be used for
+ #        logging events (seperate from chat)
+ #     * var channel : full channel ie. #dunkbot
+ #     * var channel_name : channel without '#' ie. dunkbot
+ #   * separator: the separator between the timestamp and message
+formats = {
+    'simple': {
+        'timestamp_format': '%Y-%m-%d %H:%M:%S',
+        'basepath': None,
+        'filename': 'logs/%%(network)s/simple/%%(target)s.%Y%m%d.slog',
+        'event_prefix': '',
+        'event_filename': 'logs/%%(network)s/simple/%%(channel_name)s.%Y%m%d.slog',
+        'separator': ' | ',
+    },
+    'supy': {
+        'timestamp_format': '%Y-%m-%dT%H:%M:%S',
+        'filename': 'logs/%%(network)s/supy/%%(target)s/%%(target)s.%Y-%m-%d.log',
+        'event_prefix': '*** ',
+        'event_filename': None,
+        'separator': '  ',
+    }
+}
+
+# Get a format opt in the currently cfg'd format
+def format_opt(name):
+    simple_format = formats['simple']
+    format = formats.get(cfg.get('format'), 'simple')
+    opt = format.get(name, simple_format.get(name, None))
+    return opt
+
+def init():
+    global stopped
+    stopped = False
+    callbacks.add('ALL', chatlogcb, prechatlogcb)
+    jcallbacks.add('ALL', jabberchatlogcb, jabberprechatlogcb)
+    outmonitor.add('chatlog', chatlogcb, prechatlogcb)
+    xmppmonitor.add('chatlog-jabber', jabberchatlogcb, jabberprechatlogcb)
+    return 1
+
+def shutdown():
+    global stopped
+    stopped = True
+    for file in logfiles.values():
+        file.close()
+    return 1
+
+def timestr(dt):
+    return dt.strftime(format_opt('timestamp_format'))
+
+def write(m): 
+    """m is a dict with the following properties:
+      datetime
+      type : (comment, nick, topic etc..)
+      target : (#channel, bot etc..)
+      txt : actual message
+      network
+    """
+    backend_name = cfg.get('backend', 'file')
+    backend = backends.get(backend_name, file_write)
+    if m['txt'].startswith(cfg.get('nologprefix')):
+        m['txt'] = cfg.get('nologmsg')
+    backend(m)
+
+def file_write(m):
+    if stopped:
+        return
+    args = {
+        'target': m.get('target'), 
+        'network': m.get('network'), 
+    }
+    if args['target'].startswith('#'):
+        args['channel_name'] = args['target'][1:]
+    else: args['channel_name'] = args['target']
+    f = time.strftime(format_opt('filename')) % args
+    # if this is an event, and there is an event_filename, use that
+    # instead of filename
+    if m['type'] != 'comment':
+        event_filename = format_opt('event_filename')
+        if event_filename:
+            f = time.strftime(event_filename) % args
+        m['txt'] = '%s%s'%(m['event_prefix'], m['txt'])
+    else:
+        m['txt'] = '<%s> %s'%(m['nick'], m['txt'])
+
+    # if there is a basepath specified, append it,
+    # else it should go to a dir relative to the 
+    # gozerbot dir.
+    basepath = cfg.get('basepath')
+    if basepath:
+        f = path.join(basepath, f)
+
+    # create dir if it doesn't exist
+    dir = path.dirname(f)
+    if not path.exists(dir):
+        os.makedirs(dir)
+
+    timestamp = timestr(m['datetime'])
+
+    line = '%(timestamp)s%(separator)s%(txt)s\n'%({
+        'timestamp': timestamp, 
+        'separator': format_opt('separator'),
+        'txt': m['txt'],
+    })
+
+    try:
+        if logfiles.has_key(f):
+            logfiles[f].write(line)
+            logfiles[f].flush()
+        else:
+            rlog(5, 'chatlog', 'opening %s for logging'%(f))
+            logfiles[f] = open(f, 'a')
+            logfiles[f].write(line)
+            logfiles[f].flush()
+    except Exception, ex:
+        rlog(10, 'chatlog', str(ex))
+
+backends['file'] = file_write
+
+if cfg['backend'] == 'db' and not cfg['olddb']:
+    from gozerbot.database.samodels import ChatLog
+    from gozerbot.database.alchemy import Session, engine
+
+    def db_write(m):
+        try:
+            global Session
+            db = Session
+            db.begin()
+            row = {
+                'time' : m.get('datetime'),
+                'network' : m.get('network'),
+                'target' : m.get('target'),
+                'nick' : m.get('nick'),
+                'type' : m.get('type'),
+                'message' : m.get('txt')
+            }
+            db.add(ChatLog(**row))
+            db.commit()
+            db.close()
+        except Exception, e:
+            rlog(10, 'chatlog', 'failed to log to db: %s'%(str(e)))
+    
+    backends['db'] = db_write
+
+def log(bot, ievent):
+    m = {
+        'datetime': datetime.now(),
+        'separator': format_opt('separator'),
+        'event_prefix': format_opt('event_prefix'),
+        'network': bot.networkname,
+        'nick': ievent.nick,
+        'target': ievent.channel,
+    }
+
+    if ievent.cmnd == 'PRIVMSG':
+        if ievent.txt.startswith('\001ACTION'):
+            m.update({
+                'type': 'action',
+                'txt': '* %s %s'%(m['nick'], ievent.txt[7:-1].strip()),
+            })
+        else:
+            m.update({
+                'type': 'comment',
+                'txt': '%s'%(ievent.origtxt),
+            })
+    elif ievent.cmnd == 'NOTICE':
+        m.update({
+            'type': 'notice',
+            'target': ievent.arguments[0],
+            'txt': "-%s- %s"%(ievent.nick, ievent.txt)
+        })
+    elif ievent.cmnd == 'TOPIC':
+        m.update({
+            'type': 'topic',
+            'txt': '%s changes topic to "%s"'%(ievent.nick, ievent.txt),
+        })
+    elif ievent.cmnd == 'MODE':
+        margs = ' '.join(ievent.arguments[1:])
+        m.update({
+            'type': 'mode',
+            'txt': '%s sets mode: %s'%(ievent.nick, margs),
+        })
+    elif ievent.cmnd == 'JOIN':
+        m.update({
+            'type': 'join',
+            'txt': '%s (%s) has joined'%(ievent.nick, ievent.userhost),
+        })
+    elif ievent.cmnd == 'KICK':
+        m.update({
+            'type': 'kick',
+            'txt': '%s was kicked by %s (%s)'%(
+                ievent.arguments[1], 
+                ievent.nick, 
+                ievent.txt
+            ),
+        })
+    elif ievent.cmnd == 'PART':
+        m.update({
+            'type': 'part',
+            'txt': '%s (%s) has left'%(ievent.nick, ievent.userhost),
+        })
+    elif ievent.cmnd in ('QUIT', 'NICK'):
+        cmd = ievent.cmnd
+        nick = cmd == 'NICK' and ievent.txt or ievent.nick
+        if not bot.userchannels.has_key(nick.lower()):
+            return
+        for c in bot.userchannels[nick.lower()]:
+            if [bot.name, c] in cfg.get('channels'):
+                if c in bot.state['joinedchannels']:
+                    if cmd == 'NICK':
+                        m['txt'] = '%s (%s) is now known as %s'%(
+                            ievent.nick, ievent.userhost, ievent.txt
+                        )
+                    else:
+                        m['txt'] = '%s (%s) has quit: %s'%(
+                            ievent.nick, ievent.userhost, ievent.txt
+                        )
+                    m.update({
+                        'type': ievent.cmnd.lower(),
+                        'target': c,
+                    })
+                    write(m)
+        return
+    if m.get('txt'):
+        write(m)
+
+def jabberlog(bot, ievent):
+    if ievent.botoutput:
+        chan = ievent.to
+    else:
+        chan = ievent.channel
+    m = {
+        'datetime': datetime.now(),
+        'separator': format_opt('separator'),
+        'event_prefix': format_opt('event_prefix'),
+        'network': bot.networkname,
+        'nick': ievent.nick,
+        'target': chan,
+    }
+    if ievent.cmnd == 'Message':
+            m.update({
+                'type': 'comment',
+                'txt': ievent.txt.strip(),
+            })
+    elif ievent.cmnd == 'Presence':
+            if ievent.type == 'unavailable':
+                m.update({
+                    'type': 'part',
+                    'txt': "%s left"%ievent.nick
+                })
+            else:
+                m.update({
+                    'type': 'join',
+                    'txt': "%s joined"%ievent.nick
+                })
+    if m['txt']:
+        write(m)
+
+def prechatlogcb(bot, ievent):
+    """Check if event should be logged.  QUIT and NICK are not channel
+    specific, so we will check each channel in log()."""
+    if not ievent.msg and [bot.name, ievent.channel] in \
+            cfg.get('channels'):
+        return 1
+    if ievent.cmnd in ('QUIT', 'NICK'):
+        return 1
+    if ievent.cmnd == 'NOTICE':
+        if [bot.name, ievent.arguments[0]] in cfg.get('channels'):
+            return 1
+
+def chatlogcb(bot, ievent):
+    log(bot, ievent)
+
+def jabberprechatlogcb(bot, ievent):
+    if not ievent.groupchat:
+        return 0
+    if [bot.name, ievent.channel] in cfg.get('channels'):
+        return 1
+
+def jabberchatlogcb(bot, ievent):
+    jabberlog(bot, ievent)
+
+def handle_chatlogon(bot, ievent):
+    chan = ievent.channel
+    if [bot.name, chan] not in cfg.get('channels'):
+        cfg['channels'].append([bot.name, chan])
+        cfg.save()
+        ievent.reply('chatlog enabled on (%s,%s)' % (bot.name, chan))
+    else:
+        ievent.reply('chatlog already enabled on (%s,%s)' % (bot.name, chan))
+
+cmnds.add('chatlog-on', handle_chatlogon, 'OPER')
+examples.add('chatlog-on', 'enable chatlog on <channel> or the channel \
+the commands is given in', '1) chatlog-on 2) chatlog-on #dunkbots')
+tests.add('chatlog-on', 'enabled')
+
+def handle_chatlogoff(bot, ievent):
+    try:
+        cfg['channels'].remove([bot.name, ievent.channel])
+        cfg.save()
+    except ValueError:
+        ievent.reply('chatlog is not enabled in (%s,%s)' % (bot.name, \
+ievent.channel))
+        return
+    ievent.reply('chatlog disabled on (%s,%s)' % (bot.name, ievent.channel))
+
+cmnds.add('chatlog-off', handle_chatlogoff, 'OPER')
+examples.add('chatlog-off', 'disable chatlog on <channel> or the channel \
+the commands is given in', '1) chatlog-off 2) chatlog-off #dunkbots')
+tests.add('chatlog-off', 'disabled|not enabled')
+
+plughelp.add('chatlog', """
+chatlog can log chats to mutliple backends.  Currently, only the file and db 
+backends are supported.  
+
+If you are using the file backend, there are two 
+related configuration points; format and basepath.  Format dictates how the
+logs are output.  There are currently two supported formats; simple and supy.
+supy emulates the output logs of the excellent supybot ircbot.  Simple, as 
+the name applies is some what simpler, although it logs comments and all
+other lines types into seperate files.  Please create a ticket if you would
+like another format supported.   
+
+If you are using the db backend, then you must specify the database 
+parameters.  This follows the same convention as gozerbot itself.  The db-
+prefixed parameters are the ones you are after.  The chatlog plugin does
+not create an table for chatlogs, this is up to the owner.  The owner will
+need to create a table named chatlog with (time, network, target, nick, 
+type, message) fields.  If there is an id field, it should be auto 
+incrementing.  It is suggested to put and index on (network, target). 
+target is usually a channel name.  
+
+nologprefix is used to allow private messages that won't be logged by the bot.
+The will be replaced by nologmsg.  
+
+If you are looking for a great way to display your logs on the web, consider 
+the irclogs trac plugin.  
+</shameless-plug>
+""")
--- gozerbot-0.99.1.orig/build/lib/gplugs/mpd.py
+++ gozerbot-0.99.1/build/lib/gplugs/mpd.py
@@ -0,0 +1,346 @@
+# interact with (your) Music Player Daemon
+# (c) Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# BSD License
+#
+# CHANGELOG
+#
+#  2008-10-30
+#   * fixed "Now playing" when having a password on MPD
+#  2007-11-16
+#   * added watcher support
+#   * added formatting options ('song-status')
+#   * added more precision to duration calculation
+#  2007-11-10
+#   * initial version
+#
+# REFERENCES
+#
+#  The MPD wiki is a great resource for MPD information, especially:
+#   * http://mpd.wikia.com/wiki/MusicPlayerDaemonCommands
+#
+
+__version__ = '2007111601'
+
+import os, socket, time
+
+from gozerbot.utils.generic import convertpickle
+from gozerbot.aliases import aliases
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.examples import examples
+from gozerbot.fleet import fleet
+from gozerbot.generic import rlog
+from gozerbot.persist.pdod import Pdod
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.plughelp import plughelp
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.tests import tests
+
+plughelp.add('mpd', 'music player daemon control')
+
+## UPGRADE PART
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'mpd', \
+datadir + os.sep + 'plugs' + os.sep + 'mpd' + os.sep + 'mpd')
+
+
+cfg = PersistConfig()
+cfg.define('server-host', '127.0.0.1')
+cfg.define('server-port', 6600)
+cfg.define('server-pass', '')
+cfg.define('socket-timeout', 15)
+cfg.define('watcher-interval', 10)
+cfg.define('watcher-enabled', 0)
+cfg.define('file-status', 'now playing: %(file)s (duration: %(time)s)')
+cfg.define('whatsnext-song-status', 'next playing: %(artist)s - %(title)s on "%(album)s" (duration: %(time)s)')
+cfg.define('whatsnext-file-status', 'next playing: %(file)s (duration: %(time)s)')
+cfg.define('song-status', 'now playing: %(artist)s - %(title)s on "%(album)s" (duration: %(time)s)')
+
+class MPDError(Exception): pass
+
+class MPDDict(dict):
+    def __getitem__(self, item):
+        if not dict.has_key(self, item):
+            return '?'
+        else:
+            return dict.__getitem__(self, item)
+
+class MPDWatcher(Pdod):
+    def __init__(self):
+        Pdod.__init__(self, os.path.join(datadir + os.sep + 'plugs' + os.sep + 'mpd', 'mpd'))
+        self.running = False
+        self.lastsong = -1
+
+    def add(self, bot, ievent):
+        if not self.has_key2(bot.name, ievent.channel):
+            self.set(bot.name, ievent.channel, True)
+            self.save()
+
+    def remove(self, bot, ievent):
+        if self.has_key2(bot.name, ievent.channel):
+            del self.data[bot.name][ievent.channel]
+            self.save()
+
+    def start(self):
+        self.running = True
+        start_new_thread(self.watch, ())
+
+    def stop(self):
+        self.running = False
+
+    def watch(self):
+        if not cfg.get('watcher-enabled'):
+            raise MPDError('watcher not enabled, use "!%s-cfg watcher-enabled 1" to enable' % os.path.basename(__file__)[:-3])
+        while self.running:
+            if self.data:
+                try:
+                    status = MPDDict(mpd('currentsong'))
+                    songid = int(status['id'])
+                    if songid != self.lastsong:
+                        self.lastsong = songid
+                        self.announce(status)
+                except MPDError:
+                    pass
+                except KeyError:
+                    pass
+            time.sleep(cfg.get('watcher-interval'))
+
+    def announce(self, status):
+        if not self.running or not cfg.get('watcher-enabled'):
+            return
+        rlog(5, 'mpd', 'announcing song information')
+        status['time'] = mpd_duration(status['time'])
+        if status['artist'] == "?" or status['title'] == "?" or status['album'] == "?" :
+            song = cfg.get('file-status') % status
+        else:
+            song = cfg.get('song-status') % status
+        for name in self.data.keys():
+            bot = fleet.byname(name)
+            if bot:
+                for channel in self.data[name].keys():
+                    bot.say(channel, song)
+
+watcher = MPDWatcher()
+if not watcher.data:
+    watcher = MPDWatcher()
+
+def init():
+    if cfg.get('watcher-enabled'):
+        watcher.start()
+    return 1
+
+def shutdown():
+    if watcher.running:
+        watcher.stop()
+    return 1
+
+def mpd(command):
+    try:
+        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        s.settimeout(cfg.get('socket-timeout'))
+        s.connect((cfg.get('server-host'), cfg.get('server-port')))
+    except socket.error, e:
+        raise MPDError, 'Failed to connect to server: %s' % str(e)
+    m = s.makefile('r')
+    l = m.readline()
+    if not l.startswith('OK MPD '):
+	s.close()
+	raise MPDError, 'Protocol error'
+    if cfg.get('server-pass') and cfg.get('server-pass') != 'off':
+        s.send('password %s\n' % cfg.get('server-pass'))
+        l = m.readline()
+        if not l.startswith('OK'):
+            s.close()
+            raise MPDError, 'Protocol error'
+    s.send('%s\n' % command)
+    s.send('close\n')
+    d = []
+    while True:
+        l = m.readline().strip()
+        if not l or l == 'OK':
+            break
+        if ': ' in l:
+            l = l.split(': ', 1)
+            l[0] = l[0].lower()
+            d.append(tuple(l))
+    s.close()
+    return d
+
+def mpd_duration(timespec):
+    try:
+        timespec = int(timespec)
+    except ValueError:
+        return 'unknown'
+    timestr  = ''
+    m = 60
+    h = m * 60
+    d = h * 24
+    w = d * 7
+    if timespec > w:
+        w, timespec = divmod(timespec, w)
+        timestr = timestr + '%02dw' % w
+    if timespec > d:
+        d, timespec = divmod(timespec, d)
+        timestr = timestr + '%02dd' % d
+    if timespec > h:
+        h, timespec = divmod(timespec, h)
+        timestr = timestr + '%02dh' % h
+    if timespec > m:
+        m, timespec = divmod(timespec, m)
+        timestr = timestr + '%02dm' % m
+    return timestr + '%02ds' % timespec
+
+def handle_mpd_np(bot, ievent):
+    try:
+        status = MPDDict(mpd('currentsong'))
+        status['time'] = mpd_duration(status['time'])
+        if status['artist'] == "?" or status['title'] == "?" or status['album'] == "?" :
+              ievent.reply(cfg.get('file-status') % status)
+        else:
+              ievent.reply(cfg.get('song-status') % status)
+    except MPDError, e:
+        ievent.reply(str(e))
+
+def handle_mpd_whatsnext(bot, ievent):
+    try:
+        status = MPDDict(mpd('status'))
+        nextsongid = status['nextsongid']
+        status = MPDDict(mpd('%s %s' % ("playlistid", nextsongid)))
+        status['time'] = mpd_duration(status['time'])
+        if status['artist'] == "?" or status['title'] == "?" or status['album'] == "?" :
+            ievent.reply(cfg.get('whatsnext-file-status') % status)
+        else:   
+            ievent.reply(cfg.get('whatsnext-song-status') % status)
+    except MPDError, e:
+        ievent.reply(str(e))
+
+def handle_mpd_simple_seek(bot, ievent, command):
+    try:
+        mpd(command)
+        handle_mpd_np(bot, ievent)
+    except MPDError, e:
+        ievent.reply(str(e))
+        
+handle_mpd_next = lambda b,i: handle_mpd_simple_seek(b,i,'next') 
+handle_mpd_prev = lambda b,i: handle_mpd_simple_seek(b,i,'prev') 
+handle_mpd_play = lambda b,i: handle_mpd_simple_seek(b,i,'play') 
+handle_mpd_stop = lambda b,i: handle_mpd_simple_seek(b,i,'stop') 
+handle_mpd_pause = lambda b,i: handle_mpd_simple_seek(b,i,'stop') 
+
+def handle_mpd_find(bot, ievent):
+    type = 'file'
+    args = ievent.args
+    if args and args[0].lower() in ['title', 'album', 'artist']:
+        type = args[0].lower()
+        args = args[1:]
+    if not args:
+        ievent.missing('[<type>] <what>')
+        return
+    try:
+        find = mpd('search %s "%s"' % (type, ' '.join(args)))
+        show = []
+        for item, value in find:
+            if item == 'file':
+                show.append(value)
+        if show:
+            ievent.reply(show, dot=True, nritems=True)
+        else:
+            ievent.reply('no result')
+    except MPDError, e:
+        ievent.reply(str(e))
+
+def handle_mpd_queue(bot, ievent):
+    if not ievent.args:
+        ievent.missing('<file>')
+        return
+    try:
+        addid = MPDDict(mpd('addid "%s"' % ievent.rest))
+        if not addid.has_key('id'):
+            ievent.reply('failed to load song "%s"' % ievent.rest)
+        else:
+            ievent.reply('added song with id "%s", use "mpd-jump %s" to start playback' % (addid['id'], addid['id']))
+    except MPDError, e:
+        ievent.reply(str(e))
+
+def handle_mpd_jump(bot, ievent):
+    pos = 0
+    try:    pos = int(ievent.args[0])
+    except: pass
+    if not pos:
+        ievent.missing('<playlist id>')
+        return
+    try:
+        mpd('playid %d' % pos)
+        handle_mpd_np(bot, ievent)
+    except MPDError, e:
+        ievent.reply(str(e))
+
+def handle_mpd_stats(bot, ievent):
+    try:
+        status = MPDDict(mpd('stats'))
+        status['total playtime'] = mpd_duration(status['playtime'])
+        status['total database playtime'] = mpd_duration(status['db_playtime'])
+        status['uptime'] = mpd_duration(status['uptime'])
+        del status['playtime']
+        del status['db_playtime']
+        del status['db_update']
+        result = []
+        for item in sorted(status.keys()):
+            result.append('%s: %s' % (item, status[item]))
+        ievent.reply(result, dot=True)
+    except MPDError, e:
+        ievent.reply(str(e))
+
+def handle_mpd_watch_start(bot, ievent):
+    if not cfg.get('watcher-enabled'):
+        ievent.reply('watcher not enabled, use "!%s-cfg watcher-enabled 1" to enable and reload the plugin' % os.path.basename(__file__)[:-3])
+        return
+    watcher.add(bot, ievent)
+    ievent.reply('ok')
+
+def handle_mpd_watch_stop(bot, ievent):
+    if not cfg.get('watcher-enabled'):
+        ievent.reply('watcher not enabled, use "!%s-cfg watcher-enabled 1" to enable and reload the plugin' % os.path.basename(__file__)[:-3])
+        return
+    watcher.remove(bot, ievent)
+    ievent.reply('ok')
+
+def handle_mpd_watch_list(bot, ievent):
+    if not cfg.get('watcher-enabled'):
+        ievent.reply('watcher not enabled, use "!%s-cfg watcher-enabled 1" to enable and reload the plugin' % os.path.basename(__file__)[:-3])
+        return
+    result = []
+    for name in sorted(watcher.data.keys()):
+        if watcher.data[name]:
+            result.append('on %s:' % name)
+        for channel in sorted(watcher.data[name].keys()):
+            result.append(channel)
+    if result:
+        ievent.reply(' '.join(result))
+    else:
+        ievent.reply('no watchers running')
+
+aliases.data['np'] = 'mpd-np'
+aliases.data['mpd-search'] = 'mpd-find'
+aliases.data['mpd-playid'] = 'mpd-jump'
+aliases.data['mpd-watch'] = 'mpd-watch-start'
+aliases.data['mpd-stfu'] = 'mpd-watch-stop'
+cmnds.add('mpd-np',    handle_mpd_np,    'USER')
+cmnds.add('mpd-next',  handle_mpd_next,  'MPD')
+cmnds.add('mpd-prev',  handle_mpd_prev,  'MPD')
+cmnds.add('mpd-play',  handle_mpd_play,  'MPD')
+cmnds.add('mpd-stop',  handle_mpd_stop,  'MPD')
+cmnds.add('mpd-pause', handle_mpd_pause, 'MPD')
+cmnds.add('mpd-whatsnext',  handle_mpd_whatsnext,  'MPD')
+cmnds.add('mpd-find',  handle_mpd_find,  'MPD')
+examples.add('mpd-find', 'search for a song', 'mpd-find title love')
+cmnds.add('mpd-queue', handle_mpd_queue, 'MPD')
+examples.add('mpd-queue', 'add a song to the playlist', 'mpd-queue mp3/jungle/roni size/roni size-brown paper bag.mp3')
+cmnds.add('mpd-jump',  handle_mpd_jump,  'MPD')
+examples.add('mpd-jump', 'jump to the specified playlist id', 'mpd-jump 666')
+cmnds.add('mpd-stats', handle_mpd_stats, 'USER')
+examples.add('mpd-stats', 'show statistics', 'mpd-stats')
+cmnds.add('mpd-watch-start', handle_mpd_watch_start, 'MPD')
+cmnds.add('mpd-watch-stop',  handle_mpd_watch_stop, 'MPD')
+cmnds.add('mpd-watch-list',  handle_mpd_watch_list, 'MPD')
--- gozerbot-0.99.1.orig/build/lib/gplugs/urlinfo.py
+++ gozerbot-0.99.1/build/lib/gplugs/urlinfo.py
@@ -0,0 +1,177 @@
+# urlinfo.py
+# -*- coding: utf-8 -*-
+
+"""
+Catches URLs on channel and gives information about them like title, image size, etc.
+Uses http://whatisthisfile.appspot.com/ via XMLRPC
+
+Example:
+19:20 <@raspi> http://www.youtube.com/watch?v=9RZ-hYPAMFQ
+19:20 <@bot> Title: "YouTube - Black Knight Holy Grail"
+19:28 <@raspi> test http://www.raspi.fi foobar http://raspi.fi/wp-includes/images/rss.png
+19:28 <@bot> 1. Title: "raspi.fi" Redirect: http://raspi.fi/  2. Image: 14x14
+"""
+
+__author__ = u"Pekka 'raspi' Järvinen - http://raspi.fi/"
+__license__ = 'BSD'
+
+from gozerbot.generic import handle_exception, rlog
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.plughelp import plughelp
+from gozerbot.persist.persist import Persist
+from gozerbot.examples import examples
+from gozerbot.datadir import datadir
+
+import re
+import urlparse
+import xmlrpclib
+import socket
+import os
+
+plughelp.add('urlinfo', 'Gets information about URLs spoken on channel')
+
+cfg = Persist(datadir + os.sep + 'plugs' + os.sep + 'urlinfo' + os.sep + 'urlinfo', {})
+
+
+# Remove non-urls word by word
+def sanitize(text):
+  text = text.strip()
+
+  # Remove extra space
+  text = re.sub('\s\s+', ' ', text)
+
+  tmp = ''
+  for i in text.split(' '):
+    if len(i) >= 5:
+      if i.find('www.') != -1 or i.find('http') != -1:
+        # String has to contain www. or http somewhere
+        tmp += i + ' '
+
+  tmp = tmp.strip();
+  
+  tmp2 = ''
+  for i in tmp.split(' '):
+    if (i[0] == '(' and i[-1] == ')') or (i[0] == '[' and i[-1] == ']') or (i[0] == '<' and i[-1] == '>') or (i[0] == '{' and i[-1] == '}'):
+      # First and last character is one of ()[]{}<>
+      tmp2 += i[1:-1:1] + ' '
+    else:
+      tmp2 += i + ' '
+
+  tmp2 = tmp2.strip();
+  tmp = ''
+  for i in tmp2.split(' '):
+    if i.find('www.') == 0:
+      # Add http:// to beginning of string
+      tmp += 'http://' + i + ' '
+    else:
+      tmp += i + ' '
+
+  tmp = tmp.strip();
+  out = tmp;
+
+  return out;
+
+# Get valid URLs
+def getUrls(text):
+  regex = r"http[s]?://[-A-Za-z0-9+&@#/%?=~_()|!:,.;]*[-A-Za-z0-9+&@#/%=~_()|]"
+  p = re.compile(regex)
+  urls = []
+  
+  for i in text.split(' '):
+    for x in p.findall(i):
+      url = urlparse.urlparse(x)
+      if url.geturl() not in urls:
+        urls.append(url.geturl())
+      
+  return urls
+
+# Get URL information
+def getUrlInfo(text):
+  out = ''
+  text = sanitize(text)
+  urls = getUrls(text)
+
+  if len(urls):
+    idx = 1
+    for i in urls:
+      o = ''
+      try:
+        socket.setdefaulttimeout(30)
+
+        server = xmlrpclib.ServerProxy("http://whatisthisfile.appspot.com/xmlrpc")
+        rlog(10, 'urlinfo', "XMLRPC query: %s" % i)
+        urlinfo = server.app.query(i)
+
+        if urlinfo.has_key('html'):
+          if urlinfo['html'].has_key('title'):
+            o += 'Title: "%s" ' % urlinfo['html']['title'].strip()
+        elif urlinfo.has_key('image'):
+          o += 'Image: %dx%d ' % (urlinfo['image']['width'], urlinfo['image']['height'])
+
+        if urlinfo.has_key('real_url'):
+          if urlinfo['real_url'] != i:
+            o += 'Redirect: %s ' % (urlinfo['real_url'])
+
+        if len(o):
+          if len(urls) > 1:
+            out += ' ' + str(idx) + '. '
+            idx += 1
+
+          out += o
+
+      except Exception:
+        pass
+  return out.strip()
+
+# Catch channel chat for possible URLs
+def catchHasUrls(bot, ievent):
+  if cfg.data.has_key(bot.name) and cfg.data[bot.name].has_key(ievent.printto) and cfg.data[bot.name][ievent.printto]:
+    if len(ievent.txt) >= 5:
+      if (ievent.txt.find('www.') != -1) or (ievent.txt.find('http') != -1):
+        return 1
+  return 0  
+
+# Catch channel chat
+def catchUrls(bot, ievent):
+  ievent.reply(getUrlInfo(ievent.txt))
+
+callbacks.add('PRIVMSG', catchUrls, catchHasUrls, threaded=True)
+
+# Enable on channel
+def handle_urlinfo_enable(bot, ievent):
+  if not cfg.data.has_key(bot.name):
+    cfg.data[bot.name] = {}
+  cfg.data[bot.name][ievent.printto] = True
+  cfg.save()
+  ievent.reply('urlinfo enabled')
+
+cmnds.add('urlinfo-enable', handle_urlinfo_enable, 'OPER')
+examples.add('urlinfo-enable', 'enable urlinfo in the channel', 'urlinfo-enable')
+
+# Disable on channel
+def handle_urlinfo_disable(bot, ievent):
+   if cfg.data.has_key(bot.name):
+     cfg.data[bot.name][ievent.printto] = False
+     cfg.save()
+   ievent.reply('urlinfo disabled')
+
+cmnds.add('urlinfo-disable', handle_urlinfo_disable, 'OPER')
+examples.add('urlinfo-disable', 'disable urlinfo in the channel', 'urlinfo-disable')
+
+def handle_urlinfo_list(bot, ievent):
+  chans = []
+  names = cfg.data.keys()
+  names.sort()
+  
+  for name in names:
+    targets = cfg.data[name].keys()
+    targets.sort()
+    chans.append('%s: %s' % (name, ' '.join(targets)))
+  if not chans:
+    ievent.reply('none')
+  else:
+    ievent.reply('urlinfo enabled on channels: %s' % ', '.join(chans))
+
+cmnds.add('urlinfo-list', handle_urlinfo_list, 'OPER')
+examples.add('urlinfo-list', 'show in which channels urlinfo is enabled', 'urlinfo-list')
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gplugs/bugtracker.py
+++ gozerbot-0.99.1/build/lib/gplugs/bugtracker.py
@@ -0,0 +1,710 @@
+# -*- coding: utf-8 -*-
+# Support for bugtrackers
+# Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# BSD License
+#
+# ======
+#  TODO
+# ======
+#  * add authorization support to bugtrackers
+#  * add write support to bugtrackers (close/open bug)
+#
+# ======
+#  BUGS 
+# ======
+#  * I did test these bugtrackers on various installations, although not everything
+#    will work on all installations, for example on older versions or on bugtrackers
+#    that restyled the complete layout
+
+from gozerbot.aliases import aliases
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.examples import examples
+from gozerbot.generic import geturl, geturl2, striphtml, useragent
+from gozerbot.persist.pdod import Pdod
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.plughelp import plughelp
+from gozerbot.users import users
+from gozerbot.utils.generic import convertpickle
+import copy
+import os
+import re
+import urllib, urllib2
+import xml.dom.minidom
+
+plughelp.add('bugtracker', 'various bug tracker support, define a bugtracker for the channel with bugtracker-set')
+
+cfg = PersistConfig()
+cfg.define('sep', '..')
+
+class BugTrackerNotFound(Exception):
+    pass
+
+class BugTrackerNotImplemented(Exception):
+    pass
+
+class BugTrackerNotSupported(Exception):
+    pass
+
+class BugTracker:
+
+    bugurls = [] # regexp patterns that could match a bugtracker url
+    bugtags = re.compile('(?:bug|ticket)\s?#(\d+)', re.I)
+
+    def __init__(self, baseUrl, autoshow):
+        self.url = baseUrl.rstrip('/')
+        self.autoshow = autoshow
+
+    def close(self, bugId, userhost='', message='', action=''):
+        raise BugTrackerNotImplemented
+
+    def close_url(self, bugId):
+        raise BugTrackerNotImplemented
+
+    def comments(self, bugId):
+        raise BugTrackerNotImplemented
+
+    def comments_url(self, bugId):
+        raise BugTrackerNotImplemented
+
+    def list(self):
+        raise BugTrackerNotImplemented
+
+    def list_url(self):
+        raise BugTrackerNotImplemented
+
+    def open(self, message=''):
+        raise BugTrackerNotImplemented
+
+    def open_url(self):
+        raise BugTrackerNotImplemented
+
+    def show(self, bugId):
+        raise BugTrackerNotImplemented
+
+    def show_url(self, bugId):
+        raise BugTrackerNotImplemented
+        
+    def handle_close(self, bot, ievent):
+        if len(ievent.args) < 3:
+            ievent.missing('<bug id> <action> <message>')
+            return
+        try:
+            status = self.close(ievent.args[0], users.getname(ievent.userhost), 
+                ' '.join(ievent.args[2:]), ievent.args[1])
+            ievent.reply('ok')
+        except AssertionError, e:
+            ievent.reply('error: %s' % e)
+        except BugTrackerNotImplemented:
+            ievent.reply('error: not implemented in this bug tracker')
+        except BugTrackerNotSupported, e:
+            ievent.reply('error: not supported: %s' % e)
+        except BugTrackerNotFound, e:
+            ievent.reply('error: not found: %s' % e)
+
+    def handle_comments(self, bot, ievent):
+        if not ievent.args or not ievent.args[0].isdigit():
+            ievent.missing('<bug id>')
+            return
+        try:
+            comments = self.comments(ievent.args[0])
+            if comments:
+                ievent.reply('comments: ', comments, dot=' %s ' % cfg.get('sep'), nr=True, nritems=True)
+            else:
+                ievent.reply('no comments found')
+        except AssertionError, e:
+            ievent.reply('error: %s' % e)
+        except BugTrackerNotImplemented:
+            ievent.reply('error: not implemented in this bug tracker')
+        except BugTrackerNotSupported, e:
+            ievent.reply('error: not supported: %s' % e)
+        except BugTrackerNotFound, e:
+            ievent.reply('error: not found: %s' % e)
+
+    def handle_list(self, bot, ievent):
+        try:
+            bugs = self.list()
+            if bugs:
+                ievent.reply('open bugs: ', bugs, dot=' %s ' % cfg.get('sep'))
+            else:
+                ievent.reply('no open bugs found!')
+        except BugTrackerNotImplemented:
+            ievent.reply('error: not implemented in this bug tracker')
+        except BugTrackerNotSupported, e:
+            ievent.reply('error: not supported: %s' % e)
+        except BugTrackerNotFound, e:
+            ievent.reply('error: not found: %s' % e)
+
+    def handle_show(self, bot, ievent):
+        if len(ievent.args) != 1:
+            try:
+                open_url = self.open_url()
+                ievent.missing('<bug id> -- if you were looking to report a bug, please go to %s' % open_url)
+            except BugTrackerNotImplemented:
+                ievent.missing('<bug id>')
+            return
+        try:
+            status = self.show(ievent.args[0])
+            result = []
+            keys   = status.keys() ; keys.sort()
+            for key in keys:
+                if status[key]:
+                    result.append('%s=%s' % (key, status[key]))
+            result.append(self.show_url(ievent.args[0]))
+            ievent.reply(result, dot=' %s ' % cfg.get('sep'))
+        except AssertionError, e:
+            ievent.reply('error: %s' % e)
+        except BugTrackerNotImplemented:
+            ievent.reply('error: not implemented in this bug tracker')
+        except BugTrackerNotSupported, e:
+            ievent.reply('error: not supported: %s' % e)
+        except BugTrackerNotFound, e:
+            ievent.reply('error: not found: %s' % e)
+
+    def scan_privmsg(self, bot, ievent):
+        if not self.autoshow:
+            return
+        if not self.bugurls:
+            return
+        for bugurl in self.bugurls:
+            test = bugurl.findall(ievent.origtxt)
+            if test:
+                nevent = copy.copy(ievent)
+                nevent.args = [test[0]]
+                self.handle_show(bot, nevent)
+                del nevent
+                return
+        test = self.bugtags.findall(ievent.origtxt)
+        if test:
+            nevent = copy.copy(ievent)
+            nevent.args = [test[0]]
+            self.handle_show(bot, nevent)
+            del nevent
+            return
+
+class Bugzilla(BugTracker):
+    def __init__(self, url, autoshow):
+        BugTracker.__init__(self, url, autoshow)
+        self.bugurls = [
+            re.compile(r'%s/show_bug.*id=(\d+)' % self.url)
+            ]
+
+    def list(self):
+        csv = geturl2(self.list_url_summary())
+        num = 0
+        for line in csv.splitlines():
+            try:
+                num += int(line.split(',')[1])
+            except ValueError:
+                pass
+        bugs = []
+        if num > 100:
+            bugs.append('showing 100-%d' % num)
+        csv = geturl2(self.list_url())
+        for line in csv.splitlines()[1:]:
+            part = line.split(',')
+            bugs.append('%s (%s)' % (part[0], part[1].replace('"', '')))
+            if len(bugs) > 100:
+                break
+        return bugs        
+
+    def list_url(self):
+        return '%s/buglist.cgi?=&action=wrap&bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bugidtype=include&chfieldfrom=&chfieldto=Now&chfieldvalue=&email1=&email2=&emailtype1=substring&emailtype2=substring&field-1-0-0=bug_status&field0-0-0=noop&keywords=&keywords_type=allwords&long_desc=&long_desc_type=substring&query_format=advanced&remaction=&short_desc=&short_desc_type=allwordssubstr&status_whiteboard=&status_whiteboard_type=allwordssubstr&type-1-0-0=anyexact&type0-0-0=noop&value-1-0-0=NEW%%2CASSIGNED%%2CREOPENED&value0-0-0=&ctype=csv' % self.url
+
+    def list_url_summary(self):
+        return '%s/report.cgi?bug_file_loc=&bug_file_loc_type=allwordssubstr&bug_id=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bugidtype=include&chfieldfrom=&chfieldto=Now&chfieldvalue=&email1=&email2=&emailtype1=substring&emailtype2=substring&field0-0-0=noop&keywords=&keywords_type=allwords&long_desc=&long_desc_type=substring&short_desc=&short_desc_type=allwordssubstr&status_whiteboard=&status_whiteboard_type=allwordssubstr&type0-0-0=noop&value0-0-0=&x_axis_field=&y_axis_field=bug_status&z_axis_field=&width=600&height=350&action=wrap&ctype=csv&format=table' % self.url
+
+    def show(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        bugxml = geturl(self.show_url_xml(bugId))
+        bugdom = xml.dom.minidom.parseString(bugxml)
+        try:
+            bugset = bugdom.getElementsByTagName('bug')[0]
+        except:
+            raise BugTrackerNotFound('could not find bug tag')
+        bugget = {'creation_ts': 'created', 'product': 'product', 'component': 'component',
+            'version': 'version', 'bug_status': 'status', 'resolution': 'resolution',
+            'priority': 'priority', 'bug_severity': 'severity', 'reporter': 'reporter',
+            'short_desc': 'description', 'assigned_to': 'assigned to'}
+        data = {}
+        for tag in bugget.keys():
+            try:
+                value = bugset.getElementsByTagName(tag)[0].firstChild.nodeValue
+                data[bugget[tag]] = value
+            except:
+                pass
+        return data
+
+    def show_url(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        return '%s/show_bug.cgi?id=%s' % (self.url, bugId)
+
+    def show_url_xml(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        return '%s/show_bug.cgi?ctype=xml&id=%s' % (self.url, bugId)
+
+class Flyspray(BugTracker):
+    def __init__(self, url, autoshow):
+        BugTracker.__init__(self, url, autoshow)
+        self.bugurls = [
+            re.compile(r'%s/task/(\d+)' % self.url)
+            ]
+
+    def list(self):
+        bugrss = geturl(self.list_url())
+        bugdom = xml.dom.minidom.parseString(bugrss)
+        bugall = bugdom.getElementsByTagName('entry')
+        bugs = []
+        if bugall:
+            for entry in bugall:
+                try:
+                    bugid = entry.getElementsByTagName('id')[0].firstChild.nodeValue.split(':')[2]
+                    bugs.append(bugid)
+                except:
+                    pass
+        return bugs
+
+    def list_url(self):
+        return '%s/feed.php?feed_type=atom&project=' % self.url
+
+    def show(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        html = geturl2(self.show_url(bugId))
+        data = {}
+        stat = ''
+        for line in html.splitlines():
+            line = line.strip()
+            if not line:
+                continue
+            elif '<td headers="category">' in line:
+                stat = 'category'
+            elif '<td headers="status">' in line:
+                stat = 'status'
+            elif '<td headers="assignedto">' in line:
+                stat = 'assigned to'
+            elif '<td headers="os">' in line:
+                data['os'] = striphtml(line).strip()
+            elif '<td headers="severity">' in line:
+                data['severity'] = striphtml(line).strip()
+            elif '<td headers="priority">' in line:
+                data['priority'] = striphtml(line).strip()
+            elif '<td headers="reportedver">' in line:
+                data['version'] = striphtml(line).strip()
+            elif '<h2 class="summary' in line:
+                stat = 'summary'
+            elif '<a href="#comments">Comments (' in line:
+                data['comments'] = line.split('(', 1)[1].split(')')[0]
+            # stats
+            elif stat:
+                if stat in ['category', 'status', 'assigned to', 'summary']:
+                    data[stat] = striphtml(line).strip()
+                stat = ''
+        return data
+
+    def show_url(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        return '%s/task/%s' % (self.url, bugId)
+
+class GoogleCode(BugTracker):
+    def __init__(self, url, autoshow):
+        BugTracker.__init__(self, url, autoshow)
+        self.bugurls = [
+            re.compile(r'%s/issues.*id=(\d+)' % self.url)
+            ]
+
+    def close(self, *args):
+        raise BugTrackerNotSupported("google code needs authorization which I don't support")
+
+    def list(self):
+        html = geturl2(self.list_url())
+        bugs = []
+        for line in html.splitlines():
+            if '<a href="detail?id' in line and '&amp;' in line:
+                bug = line.split('id=')[1].split('&amp;')[0]
+                if not bug in bugs:
+                    bugs.append(bug)
+        return bugs
+
+    def list_url(self):
+        return '%s/issues/list' % self.url
+
+    def open(self, *args):
+        raise BugTrackerNotSupported("google code needs authorization which I don't support")
+
+    def show(self, bugId):
+        assert bugId.isdigit(), "bug id has to ba a number"
+        html = geturl2(self.show_url(bugId)).splitlines()
+        data = {}
+        stat = ''
+        for line in html:
+            line = line.strip()
+            if not line:
+                continue
+            if line.startswith('<span class=h3 >'):
+                data['summary'] = striphtml(line)
+            elif line.startswith('<tr><th align=left>Status:'):
+                stat = 'status'
+            elif line.startswith('class=label><b>Type-</b>'):
+                data['type'] = striphtml(line.split('</b>')[1])
+            elif line.startswith('class=label><b>Priority-</b>'):
+                data['priority'] = striphtml(line.split('</b>')[1])
+            elif line.startswith('<span class=author>') and not data.has_key('author'):
+                stat = 'author'
+            elif line.startswith('<tr><th align=left>Owner:'):
+                stat = 'owner'
+            elif line.startswith('<span class="date" title="'):
+                data['date'] = striphtml(line)
+            elif striphtml(line) == '':
+                pass
+            # stats
+            elif stat == 'author':
+                data['reporter'] = striphtml(line)
+                stat = ''
+            elif stat == 'owner':
+                data['owner'] = striphtml(line)
+                stat = ''
+            elif stat == 'status':
+                data['status'] = striphtml(line)
+                stat = ''
+        return data
+
+    def show_url(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        return '%s/issues/detail?id=%s' % (self.url.rstrip('/'), bugId)
+
+class Mantis(BugTracker):
+    def __init__(self, url, autoshow):
+        BugTracker.__init__(self, url, autoshow)
+
+    def show(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        html = geturl2(self.show_url(bugId))
+        if 'APPLICATION ERROR #1100' in html:
+            raise BugTrackerNotFound('issue not found')
+        data = {'notes': 0}
+        stat = ''
+        skip = 0
+        for line in html.splitlines():
+            line = line.strip().replace('\t', '')
+            if skip > 0:
+                skip -= 1
+                continue
+            elif not line:
+                continue
+            elif '<!-- Category -->' in line:
+                skip = 1
+                stat = 'category'
+            elif '<!-- Severity -->' in line:
+                skip = 1
+                stat = 'severity'
+            elif '<!-- Reproducibility -->' in line:
+                skip = 1
+                stat = 'reproducibility'
+            elif '<!-- Reporter -->' in line:
+                skip = 3
+                stat = 'reporter'
+            elif '<!-- Priority -->' in line:
+                skip = 1
+                stat = 'priority'
+            elif '<!-- Resolution -->' in line:
+                skip = 1
+                stat = 'resolution'
+            elif '<!-- Status -->' in line:
+                skip = 3
+                stat = 'status'
+            elif '<!-- Summary -->' in line:
+                skip = 4
+                stat = 'summary'
+            elif '<td class="bugnote-public">' in line:
+                data['notes'] += 1
+            # stats
+            elif stat:
+                if stat in ['category', 'severity', 'reproducibility', 'reporter',
+                    'priority', 'resolution', 'status', 'summary']:
+                    data[stat] = striphtml(line)
+                stat = ''
+        return data
+
+    def show_url(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        return '%s/view.php?id=%s' % (self.url.rstrip('/'), bugId)
+
+class Trac(BugTracker):
+    def __init__(self, url, autoshow):
+        BugTracker.__init__(self, url, autoshow)
+        self.bugurls = [
+            re.compile(r'%s/ticket/(\d+)' % self.url)
+            ]
+
+    def comments(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        bugrss = geturl(self.comments_url(bugId))
+        bugdom = xml.dom.minidom.parseString(bugrss)
+        bugall = bugdom.getElementsByTagName('item')
+        comments = []
+        if bugall:
+            for item in bugall:
+                title = item.getElementsByTagName('title')[0].firstChild.nodeValue
+                if 'comment added' in title:
+                    try:
+                        author = item.getElementsByTagName('dc:creator')[0].firstChild.nodeValue
+                    except IndexError:
+                        author = 'anonymous'
+                    comment = item.getElementsByTagName('description')[0].firstChild.nodeValue
+                    comment = striphtml(comment.replace('\n', ' ')).strip()
+                    while '  ' in comment:
+                        comment = comment.replace('  ', ' ')
+                    comments.append('%s: %s' % (author, comment))
+        return comments    
+
+    def comments_url(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        return '%s/ticket/%s?format=rss' % (self.url, bugId)
+
+    def list(self):
+        tsv = geturl2(self.list_url()).splitlines()
+        bugs = []
+	keys = map(lambda x: x.strip(), tsv[0].split())
+	for item in tsv[1:]:
+		data = {}
+		part = item.split('\t')
+		# dirty hack to allow unescaped multilines in trac
+		if part[0].isdigit() and part[1].isdigit() and len(part) == len(keys):
+			data = dict(zip(keys, part))
+			bugs.append('%s (%s)' % (data['summary'], data['ticket']))
+        return bugs
+
+    def list_url(self):
+        return '%s/report/1?format=tab&USER=anonymous' % self.url
+
+    def show(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        tsv = geturl2(self.show_url(bugId)+'?format=tab').splitlines()
+	keys = map(lambda x: x.strip(), tsv[0].split())
+	part = tsv[1].split('\t')
+	data = dict(zip(keys, part))
+        return data
+
+    def show_url(self, bugId):
+        assert bugId.isdigit(), "bug id has to be a number"
+        return '%s/ticket/%s' % (self.url, bugId)
+
+    def open(self, reporter, message, type='defect', priority='minor'):
+        postdata = {
+            'reporter':        reporter,
+            'summary':         message,
+            'type':            type,
+            'description':     message,
+            'priority':        priority,
+            'milestone':       '',
+            'component':       '',
+            'version':         '',
+            'keywords':        '',
+            'owner':           '',
+            'cc':              '',
+            # hidden stuff
+            'action':          'create',
+            'status':          'new',
+            }
+
+    def open_url(self):
+        return '%s/newticket' % self.url
+
+    def close(self, bugId, reporter, message, action='fixed'):
+        actions = ['fixed', 'invalid', 'wontfix', 'duplicate', 'worksforme']
+        # input check
+        assert bugId.isdigit(), "bug id has to be a number"
+        assert action in actions, "action has to be one of: %s" % ', '.join(actions)
+        showdata = self.show(bugId) 
+        postdata = {
+            'reporter':         reporter,
+            'comment':          message,
+            'action':           'resolve',
+            'type':             'defect',
+            'resolve_resolution': action,
+            'summary':          showdata['summary'],
+            'priority':         showdata['priority'],
+            'milestone':        showdata['milestone'],
+            'component':        showdata['component'],
+            'version':          showdata['version'],
+            'keywords':         showdata['keywords'],
+            'cc':               '',
+            }
+        postdata = urllib.urlencode(postdata)
+        req = urllib2.Request('%s/ticket/%s' % (self.url, bugId), data=postdata)
+        req.add_header('User-agent', useragent())
+        return urllib2.urlopen(req).read()
+
+class BugManager(Pdod):
+
+    types = {
+        'bugzilla': Bugzilla,
+        'flyspray': Flyspray,
+        'googlecode': GoogleCode,
+        'mantis': Mantis,
+        'trac': Trac
+        }
+    instances = {
+        }
+
+    def __init__(self):
+        Pdod.__init__(self, os.path.join(datadir + os.sep + 'plugs' + os.sep \
++ 'bugtracker', 'bugtracker'))
+        self.load()
+
+    def add(self, bot, ievent, type, url):
+        assert type in self.types.keys(), "unknown bugtracker type, supported: %s" % ', '.join(self.types.keys())
+        if hasattr(bot, 'name'):
+            botname = bot.name
+        else:
+            botname = bot
+        if hasattr(ievent, 'channel'):
+            channel = ievent.channel
+        else:
+            channel = ievent
+        if not self.data.has_key(botname):
+            self.data[botname] = {}
+        self.data[bot.name][channel] = [url, type, False]
+        self.save()
+        self.start(bot, ievent)
+
+    def check(self, bot, ievent):
+        if not self.instances.has_key(bot.name):
+            return False
+        if not self.instances[bot.name].has_key(ievent.channel):
+            return False
+        return True
+
+    def load(self):
+        for bot in self.data.keys():
+            for channel in self.data[bot].keys():
+                self.start(bot, channel)
+                
+    def start(self, bot, ievent):
+        if hasattr(bot, 'name'):
+            botname = bot.name
+        else:
+            botname = bot
+        if hasattr(ievent, 'channel'):
+            channel = ievent.channel
+        else:
+            channel = ievent
+        if not self.instances.has_key(botname):
+            self.instances[botname] = {}
+        data = self.data[botname][channel]
+        if not len(data) == 3:
+            data.append(False)
+            self.data[botname][channel] = data
+            self.save()
+        self.instances[botname][channel] = self.types[data[1]](data[0], data[2])
+
+    # "internals"
+    def handle_tracker_info(self, bot, ievent):
+        if not self.check(bot, ievent):
+            ievent.reply('no bugtracker active on %s' % ievent.channel)
+        else:
+            data = self.data[bot.name][ievent.channel]
+            ievent.reply('bugtracker type: %s .. url: %s .. autoshow: %s' % (data[1], data[0], str(data[2])))
+    
+    def handle_tracker_set(self, bot, ievent):
+        if len(ievent.args) != 2:
+            ievent.missing('<type> <url>')
+            return
+        try:
+            self.add(bot, ievent, ievent.args[0], ievent.args[1])
+            ievent.reply('ok')
+        except AssertionError, e:
+            ievent.reply('error: %s' % e) 
+
+    def handle_autoshow(self, bot, ievent):
+        if not self.check(bot, ievent):
+            ievent.reply('no bugtracker configured')
+            return
+        self.data[bot.name][ievent.channel][2] = not self.data[bot.name][ievent.channel][2]
+        try:
+            self.instances[bot.name][ievent.channel].autoshow = self.data[bot.name][ievent.channel][2]
+        except:
+            pass
+        self.save()
+        ievent.reply('autoshow is now %s' % str(self.data[bot.name][ievent.channel][2]))
+
+    # proxies
+    def handle_close(self, bot, ievent):
+        if not self.check(bot, ievent):
+            ievent.reply('no bugtracker configured')
+            return
+        try:
+            self.instances[bot.name][ievent.channel].handle_close(bot, ievent)
+        except Exception, e:
+            ievent.reply('failed to get bug information: %s' % str(e))
+
+    def handle_comments(self, bot, ievent):
+        if not self.check(bot, ievent):
+            ievent.reply('no bugtracker configured')
+            return
+        #try:
+	self.instances[bot.name][ievent.channel].handle_comments(bot, ievent)
+        #except Exception, e:
+        #    ievent.reply('failed to get bug information: %s' % str(e))
+    
+    def handle_list(self, bot, ievent):
+        if not self.check(bot, ievent):
+            ievent.reply('no bugtracker configured')
+            return
+        self.instances[bot.name][ievent.channel].handle_list(bot, ievent)
+        return
+        try:
+            self.instances[bot.name][ievent.channel].handle_list(bot, ievent)
+        except Exception, e:
+            ievent.reply('failed to get bug information: %s' % str(e))
+
+    def handle_open(self, bot, ievent):
+        if not self.check(bot, ievent):
+            ievent.reply('no bugtracker configured')
+            return
+        try:
+            self.instances[bot.name][ievent.channel].handle_open(bot, ievent)
+        except Exception, e:
+            ievent.reply('failed to get bug information: %s' % str(e))
+
+    def handle_show(self, bot, ievent):
+        if not self.data.has_key(bot.name):
+            ievent.reply('no bugtracker configured')
+            return False
+        try:
+            self.instances[bot.name][ievent.channel].handle_show(bot, ievent)
+        except Exception, e:
+            ievent.reply('failed to fetch bug information: %s' % str(e))
+
+    def cb_privmsg(self, bot, ievent):
+        if not self.instances.has_key(bot.name):
+            return 0
+        if not self.instances[bot.name].has_key(ievent.channel):
+            return 0
+        self.instances[bot.name][ievent.channel].scan_privmsg(bot, ievent)
+
+bugtrackers = BugManager()
+
+def init():
+    callbacks.add('PRIVMSG', bugtrackers.cb_privmsg)
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'bugtracker', \
+datadir + os.sep + 'plugs' + os.sep + 'bugtracker' + os.sep + 'bugtracker')
+
+cmnds.add('bug-autoshow', bugtrackers.handle_autoshow, ['OPER'])
+examples.add('bug-autoshow', 'toggle automatic retrieval of bug information', 'bug-autoshow')
+cmnds.add('bug-close', bugtrackers.handle_close, ['OPER', 'BUGS'])
+examples.add('bug-close', 'close a bug', 'bug-close 42 fixed Typo on line 23')
+cmnds.add('bug-comments', bugtrackers.handle_comments, ['USER'])
+examples.add('bug-comments', 'show all comments on a bug', 'bug-comments 42')
+cmnds.add('bug-list', bugtrackers.handle_list, ['USER', 'BUGS'])
+examples.add('bug-list', 'list all open bugs', 'bug-list')
+cmnds.add('bug-show', bugtrackers.handle_show, ['USER'])
+examples.add('bug-show', 'show a bug', 'bug-show 42')
+cmnds.add('bugtracker-info', bugtrackers.handle_tracker_info, ['BUGSOPER', 'OPER'])
+cmnds.add('bugtracker-set', bugtrackers.handle_tracker_set, ['BUGSOPER', 'OPER'])
+examples.add('bugtracker-set', 'set a bugtracker for the channel', 'bugtracker-set gozerbot http://dev.gozerbot.org')
+aliases.data['bug'] = 'bug-show'
+ 
--- gozerbot-0.99.1.orig/build/lib/gplugs/dope.py
+++ gozerbot-0.99.1/build/lib/gplugs/dope.py
@@ -0,0 +1,66 @@
+from gozerbot.tests import tests
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+import os, string, random
+
+plughelp.add('dope', 'for all the junkies out there')
+
+joint = '''
+purple haze
+white widow
+silver haze
+mango haze
+krystal
+mossad
+mexican haze
+northern lights
+master kush
+california orange bud
+b-52
+binnenkweek mix
+skunk
+jamaican
+jack herrer
+tafrolt
+pakistaan
+primero
+red libanon
+hija
+super hija
+afghaan
+zwarte afghaan
+twizla
+malana cream
+caramello balls
+nepal
+maroc
+super maroc
+charras malana
+royal cream
+'''.strip().splitlines()
+
+joint_action = '''
+rolls a nice %s
+passes the %s
+gives a large %s joint
+puts some %s in the took
+fixes a djonko with %s
+rolls a blunt with %s
+stuffs a waterpipe with %s
+smokes %s and gets really high
+passes the %s to tashiro
+builds a tulp with %s
+bakes a %s cake
+pulls a %s tea
+'''.strip().splitlines()
+
+
+def handle_joint(bot, ievent):
+    """ get a joint  """
+    what = random.choice(joint_action) % random.choice(joint)
+    bot.action(ievent.channel, what)
+
+cmnds.add('joint', handle_joint, 'USER')
+examples.add('joint', 'get a joint', 'joint')
+tests.add('joint')
--- gozerbot-0.99.1.orig/build/lib/gplugs/whois.py
+++ gozerbot-0.99.1/build/lib/gplugs/whois.py
@@ -0,0 +1,56 @@
+# Simple threaded whois lookup tool
+# (c) 2008 Wijnand 'maze' Modderman - http://tehmaze.com/
+# BSD Licsense
+
+__author__   = "Wijnand 'maze' Modderman"
+__licsense__ = "BSD"
+
+import socket
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+import gozerbot.threads.thr as thr
+
+plughelp.add('whois', 'query a whois server')
+
+def do_whois(ievent, server, port, lookup):
+    try:
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sock.connect((server, port))
+        sock.send('%s\r\n' % lookup)
+        rock = sock.makefile('rb')
+        info = []
+        for line in rock.readlines():
+            line = line.strip()
+            if not line: continue
+            if not line.startswith('%'):
+                while '  ' in line: line = line.replace('  ', ' ')
+                info.append(line)
+        sock.close()
+        if info:
+            ievent.reply(info, dot=', ')
+        else:
+            ievent.reply('object not found')
+    except socket.error, e:
+        ievent.reply('socket error: %s' % (str(e),))
+    except Exception, e:
+        ievent.reply('error: %s' % (str(e),))
+
+def handle_whois(bot, ievent):
+    lookup, server, port = None, None, socket.getservbyname("whois")
+    try:
+        if ':' in ievent.args[0]:
+            server, port = ievent.args[0].split(':')
+            port = int(port)
+        else:
+            server = ievent.args[0]
+        lookup = ' '.join(ievent.args[1:])
+    except (IndexError, ValueError):
+        ievent.missing('<server[:port]> <object>')
+
+    #ievent.reply('doing lookup for "%s" on %s:%d' % (lookup, server, port))
+    do_whois(ievent, server, port, lookup)
+
+cmnds.add('whois', handle_whois, 'USER')
+examples.add('whois', 'do a whois lookup on the specified server', 'whois whois.arin.net AS112')
+
--- gozerbot-0.99.1.orig/build/lib/gplugs/yahoo.py
+++ gozerbot-0.99.1/build/lib/gplugs/yahoo.py
@@ -0,0 +1,646 @@
+# Yahoo! search
+# (c) Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# (c) Leif Hedstrom <leif@ogre.com>, creator of pYsearch (License: BSD)
+
+__author__ = 'Wijnand Modderman <gozerbot@tehmaze.com>'
+__copyright__ = 'BSD'
+
+import time
+import urllib
+import xml.dom.minidom
+from gozerbot.aliases import aliases
+from gozerbot.commands import cmnds
+from gozerbot.generic import geturl, waitforqueue
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.plughelp import plughelp
+
+plughelp.add('yahoo', 'query yahoo search engine')
+
+cfg = PersistConfig()
+cfg.define('appid', '')
+
+# Function: string_to_bool
+#   Convert a string argument to a boolean
+#
+# Parmeters:
+#   s - The input string
+#
+# Returns:
+#   bool
+def string_to_bool(s):
+    sb = {'false': False, 'true': True}
+    if sb.has_key(s.lower()):
+        return sb[s.lower()]
+    return bool(s)
+
+class YahooException(Exception):
+    pass
+
+class YahooError(Exception):
+    pass
+
+class YahooXMLError(Exception):
+    pass
+
+class YahooResultDict(dict):
+    def __getattr__(self, key):
+        try:
+            return self[key]
+        except KeyError:
+            raise AttributeError("Result object has no attribute '%s'" % key)
+
+# Class: YahooResultParser
+#   Parse the results found by a <YahooResultParser> 
+class YahooResultParser(object):
+    # Constructor: __init__
+    # Parameters:
+    #   service - ...
+    #   res_dict - ...
+    def __init__(self, service, res_dict=YahooResultDict):
+        self._service = service
+        self._total_results_available = 0
+        self._total_results_returned = 0
+        self._first_result_position = 0
+        self._results = []
+        self._res_dict = res_dict
+        self._res_fields = []
+        self._init_res_fields()
+
+    def __iter__(self):
+        return iter(self._results)
+
+    def _init_res_fields(self):
+        """Initialize the valid result fields."""
+        self._res_fields = [('Title', None, None),
+                            ('Summary', None, None),
+                            ('Url', None, None),
+                            ('ClickUrl', None, None)]
+
+    def _get_results(self):
+        """Get the results."""
+        return self._results
+    results = property(_get_results, None, None,
+                       "The list of all results")
+
+    def _get_service(self):
+        """Get the service for this DOM parser."""
+        return self._service
+    def _set_service(self, service):
+        """Set the service for this DOM parser."""
+        self._service = service
+    service = property(_get_service, _set_service, None,
+                       "The Search Web Service object for this results parser")
+
+    def parse_results(self, result_set):
+        """Parse the results."""
+        err = "Search Result class %s must implement a parse_result()" % (
+            self._service.svc_name)
+        raise ClassError(err)
+
+    def _get_total_results_available(self):
+        """Get the total number of results for the query."""
+        return self._total_results_available
+
+    def _get_total_results_returned(self):
+        """Get the number of results returned."""
+        return self._total_results_returned
+    total_results_returned = property(_get_total_results_returned, None, None,
+                                      "The number of results returned")
+    totalResultsReturned = property(_get_total_results_returned, None, None,
+                                    "The number of results returned")
+
+    def _get_first_result_position(self):
+        """Get the first result position."""
+        return self._first_result_position
+    first_result_position = property(_get_first_result_position, None, None,
+                                     "The first result position")
+    firstResultPosition = property(_get_first_result_position, None, None,
+                                   "The first result position") 
+
+class YahooDOMResultParser(YahooResultParser):
+    """DomResultParser - Base class for Yahoo Search DOM result parsers
+
+    This is a DOM specific parser that is used as a base class for all
+    Yahoo Search result parsers. It obviously must implement the main entry
+    entry point, parse_results().
+    """
+    def parse_results(self, dom_object):
+        """This is a simple DOM parser for all Yahoo Search services. It
+        expects to find a top-level node named ResultSet. This is the main
+        entry point for the DOM parser, and it requires a properly con-
+        structed DOM object (e.g. using minidom).
+        """
+        try:
+            result_set = dom_object.getElementsByTagName('ResultSet')[0]
+        except:
+            raise YahooXMLError("DOM object has no ResultSet")
+        self._parse_result_set(result_set)
+
+    def _get_text(self, nodelist, casting=None):
+        """Find all text nodes for the nodelist, and concatenate them
+        into one resulting strings. This is a helper method for the
+        DOM parser.
+        """
+        rcode = ""
+        for node in nodelist:
+            if node.nodeType == node.TEXT_NODE:
+                rcode = rcode + node.data
+        if casting is not None:
+            if rcode == "":
+                return rcode
+            else:
+                return casting(rcode)
+        else:
+            return rcode
+
+    def _tag_to_list(self, node, tag, casting=None):
+        """Turn a number of tag elements into a list of values."""
+        ret = []
+        if casting is not None:
+            for item in node.getElementsByTagName(tag):
+                ret.append(casting(self._get_text(item.childNodes)))
+        else:
+            for item in node.getElementsByTagName(tag):
+                ret.append(self._get_text(item.childNodes))
+
+    def _tags_to_dict(self, node, tags):
+        """Internal method to parse and extract a list of tags from a
+        particular node. We return a dict, which can potentially be empty.
+        The tags argument is a list of lists, where each sub-list is
+
+            (tag-name, default value/None, casting function/None)
+
+        The default "type" of a value is string, so there is no reason
+        to explicitly cast to a str.
+        """
+        res = self._res_dict()
+        for tag in tags:
+            elem = node.getElementsByTagName(tag[0])
+            if elem:
+                val = self._get_text(elem[0].childNodes, tag[2])
+            elif tag[1] is not None:
+                val = tag[1]
+            else:
+                raise parser.XMLError("Result is missing a %s node" % tag[0])
+            res[tag[0]] = val
+        return res
+
+    def _id_attribute_to_dict(self, node):
+        """Internal method to parse and extract a node value, which
+        has an "id" attribute as well. This will return a result dict
+        with two values:
+
+            { 'Name' :  <node-text>, 'Id' : <id attribute> }
+        """
+        res = self._res_dict()
+        res['Name'] = self._get_text(node.childNodes)
+        node_id = node.attributes.getNamedItem('id')
+        if node_id:
+            res['Id'] = str(node_id.nodeValue)
+        else:
+            raise parser.XMLError("%s node has no id attribute" % node.nodeName)
+        return res
+
+    def _parse_list_node(self, node, tag):
+        """Internal method to parse a result node, which contains one
+        or more data nodes. Each such node is converted to a dict (see
+        _id_attribute_to_dict), and we return a list of such dicts.
+        """
+        res = []
+        for elem in node.getElementsByTagName(tag):
+            res.append(self._id_attribute_to_dict(elem))
+        return res
+
+    def _parse_result_set(self, result_set):
+        """Internal method to parse a ResultSet node"""
+        attributes = result_set.attributes
+        if not attributes:
+            raise parser.XMLError("ResultSet has no attributes")
+
+        attr = attributes.getNamedItem('totalResultsAvailable')
+        if attr:
+            self._total_results_available = int(attr.nodeValue)
+        else:
+            raise parser.XMLError("ResultSet has no totalResultsAvailable attr")
+        attr = attributes.getNamedItem('totalResultsReturned')
+        if attr:
+            self._total_results_returned = int(attr.nodeValue)
+        else:
+            raise parser.XMLError("ResultSet has no totalResultsReturned attr")
+        attr = attributes.getNamedItem('firstResultPosition')
+        if attr:
+            self._first_result_position = int(attr.nodeValue)
+        else:
+            raise parser.XMLError("ResultSet has no firstRestultPosition attr")
+        for res in result_set.getElementsByTagName('Result'):
+            self._results.append(self._parse_result(res))
+
+    def _parse_result(self, result):
+        """Internal method to parse one Result node"""
+        return self._tags_to_dict(result, self._res_fields)
+
+#
+# The actual parsers
+#
+
+class YahooQueryImageSearch(YahooDOMResultParser):
+    """ImageSearch - DOM parser for Image Search
+
+    Each result is a dictionary populated with the extracted data from the
+    XML results. The following keys are always available:
+
+        Title            - The title of the image file.
+        Summary          - Summary text associated with the image file.
+        Url              - The URL for the image file or stream.
+        ClickUrl         - The URL for linking to the image file.
+        RefererUrl       - The URL of the web page hosting the content.
+        FileSize         - The size of the file, in bytes.
+        FileFormat       - One of bmp, gif, jpg or png.
+        Thumbnail        - The URL of the thumbnail file.
+
+    The following attributes are optional, and might not be set:
+
+        Height           - The height of the image in pixels.
+        Width            - The width of the image in pixels.
+        Publisher        - The creator of the image file.
+        Restrictions     - Provides any restrictions for this media
+                           object. Restrictions include noframe and
+                           noinline.
+        Copyright        - The copyright owner.
+
+    The Thumbnail is in turn another dictionary, which will have the
+    following keys:
+
+        Url             - URL of the thumbnail.
+        Copyright        - The copyright owner.
+
+    The Thumbnail is in turn another dictionary, which will have the
+    following keys:
+
+        Url             - URL of the thumbnail.
+        Height          - Height of the thumbnail, in pixels (optional).
+        Width           - Width of the thumbnail, in pixels (optional).
+
+
+    Example:
+        results = ws.parse_results(dom)
+        for res in results:
+            print "%s - %s bytes" % (res.Title, res.FileSize)
+    """
+    def _init_res_fields(self):
+        """Initialize the valid result fields."""
+        super(YahooQueryImageSearch, self)._init_res_fields()
+        self._res_fields.extend((('RefererUrl', None, None),
+                                 ('FileSize', None, int),
+                                 ('FileFormat', None, None),
+                                 ('Height', 0, int),
+                                 ('Width', 0, int),
+                                 ('Publisher', "", None),
+                                 ('Restrictions', "", None),
+                                 ('Copyright', "", None)))
+
+    def _parse_result(self, result):
+        """Internal method to parse one Result node"""
+        res = super(YahooQueryImageSearch, self)._parse_result(result)
+        node = result.getElementsByTagName('Thumbnail')
+        if node:
+            res['Thumbnail'] = self._tags_to_dict(node[0], (('Url', None, None),
+                                                            ('Height', 0, int),
+                                                            ('Width', 0, int)))
+        else:
+            raise parser.XMLError("ImageSearch DOM object has no Thumbnail")
+        return res
+
+class YahooQueryPageData(YahooDOMResultParser):
+    """PageData - DOM parser for PageData results
+
+        Title            - The title of the web page.
+        Url              - The URL for the web page.
+        ClickUrl         - The URL for linking to the page.
+
+    """
+    def _init_res_fields(self):
+        """Initialize the valid result fields."""
+        self._res_fields = [('Title', None, None),
+                            ('Url', None, None),
+                            ('ClickUrl', None, None)]
+
+class YahooQueryWebSearch(YahooDOMResultParser):
+    """WebSearch 
+
+    Each result is a dictionary populated with the extracted data from the
+    XML results. The following keys are always available:
+
+        Title            - The title of the web page.
+        Summary          - Summary text associated with the web page.
+        Url              - The URL for the web page.
+        ClickUrl         - The URL for linking to the page.
+
+    The following attributes are optional, and might not be set:
+
+        ModificationDate - The date the page was last modified, Unix time.
+        MimeType         - The MIME type of the page.
+        Cache            - The URL of the cached result, and its size.
+
+    If present, the Cache value is in turn another dictionary, which will
+    have the following keys:
+
+        Url             - URL to cached data.
+        Size            - Size of the cached entry, in bytes.
+    """
+    def _init_res_fields(self):
+        """Initialize the valid result fields."""
+        super(YahooQueryWebSearch, self)._init_res_fields()
+        self._res_fields.extend((('ModificationDate', "", None),
+                                 ('MimeType', "", None)))
+
+    def _parse_result(self, result):
+        """Internal method to parse one Result node"""
+        res = super(YahooQueryWebSearch, self)._parse_result(result)
+        node = result.getElementsByTagName('Cache')
+        if node:
+            res['Cache'] = self._tags_to_dict(node[0], (('Url', None, None),
+                                                        ('Size', None, None)))
+        else:
+            res['Cache'] = None
+        return res
+
+class YahooQueryVideoSearch(YahooDOMResultParser):
+    """VideoSearch - DOM parser for Video Search
+
+    Each result is a dictionary populated with the extracted data from the
+    XML results. The following keys are always available:
+
+        Title            - The title of the video file.
+        Summary          - Summary text associated with the video file.
+        Url              - The URL for the video file or stream.
+        ClickUrl         - The URL for linking to the video file.
+        RefererUrl       - The URL of the web page hosting the content.
+        FileSize         - The size of the file, in bytes.
+        FileFormat       - One of avi, flash, mpeg, msmedia, quicktime
+                           or realmedia.
+        Duration         - The duration of the video file in seconds.
+        Streaming        - Whether the video file is streaming or not.
+
+    The following attributes are optional, and might not be set:
+
+        Height           - The height of the keyframe Yahoo! extracted
+                           from the video, in pixels.
+        Width            - The width of the keyframe Yahoo! extracted
+                           from the video, in pixels.
+        Channels         - Channels in the audio stream.
+        Thumbnail        - The URL of the thumbnail file.
+        Publisher        - The creator of the video file.
+        Restrictions     - Provides any restrictions for this media
+                           object. Restrictions include noframe and
+                           noinline.
+        Copyright        - The copyright owner.
+
+    If present, the Thumbnail value is in turn another dictionary, which will
+    have these keys:
+
+        Url             - URL of the thumbnail.
+        Height          - Height of the thumbnail in pixels (optional).
+        Width           - Width of the thumbnail in pixels (optional).
+
+
+    Example:
+        results = ws.parse_results(dom)
+        for res in results:
+            print "%s - %s bytes" % (res.Title, res.FileSize)
+    """
+    def _init_res_fields(self):
+        """Initialize the valid result fields."""
+        super(YahooQueryVideoSearch, self)._init_res_fields()
+        self._res_fields.extend((('RefererUrl', None, None),
+                                 ('FileSize', None, int),
+                                 ('FileFormat', None, str),
+                                 ('Height', 0, int),
+                                 ('Width', 0, int),
+                                 ('Streaming', None, string_to_bool),
+                                 ('Duration', None, float),
+                                 ('Channels', "", str),
+                                 ('Publisher', "", None),
+                                 ('Restrictions', "", str),
+                                 ('Copyright', "", None)))
+
+    def _parse_result(self, result):
+        """Internal method to parse one Result node"""
+        res = super(YahooQueryVideoSearch, self)._parse_result(result)
+        node = result.getElementsByTagName('Thumbnail')
+        if node:
+            res['Thumbnail'] = self._tags_to_dict(node[0], (('Url', None, None),
+                                                            ('Height', 0, int),
+                                                            ('Width', 0, int)))
+        else:
+            res['Thumbnail'] = None
+        return res
+
+# Class: Yahoo
+#   Generic interface to all YahooQuerySearch classes
+class Yahoo:
+
+    # Variable: meta
+    #   Information about lookup methods, their YahooQuerySearch class and the base URL
+    meta = {
+        'ImageSearch': [YahooQueryImageSearch, 'http://search.yahooapis.com/ImageSearchService/V1/imageSearch'],  
+        'PageData':    [YahooQueryPageData, 'http://search.yahooapis.com/SiteExplorerService/V1/pageData'],
+        'VideoSearch': [YahooQueryVideoSearch, 'http://search.yahooapis.com/VideoSearchService/V1/videoSearch'],  
+        'WebSearch':   [YahooQueryWebSearch, 'http://search.yahooapis.com/WebSearchService/V1/webSearch']
+    }
+    parser = None
+
+    def _get(self, app, parameters):
+        url  = self._url(app, parameters)
+        data = geturl(url)
+        return self._parse(app, data)
+
+    def _parse(self, app, data):
+        if not self.parser:
+            self.parser = xml.dom.minidom.parseString
+        xmlobj = self.parser(data)
+        parser = self.meta[app][0](app)
+        parser.parse_results(xmlobj)
+        return parser
+
+    def _url(self, app, parameters={}):
+        if not self.meta.has_key(app):
+            raise YahooException('Invalid service "%s"' % app)
+        if not cfg.get('appid'):
+            raise YahooException('No appid configured, see http://developer.yahoo.com/search/')
+        parameters['appid'] = cfg.get('appid')
+        return '%s?%s' % (self.meta[app][1], urllib.urlencode(parameters))
+
+    # Function: imageSearch
+    #   Search for an image by keyword on the web
+    #
+    # Parameters:
+    #   query - keywords to search for
+    #   format - image format to filter on
+    #   adult_ok - include adult content in the search result
+    #   results - limit the number of results
+    #
+    # Returns:
+    #   results
+    def imageSearch(self, query, format='any', adult_ok=0, results=10):
+        return self._get('ImageSearch', {'query': query, 'format': format, 'results': results, 'adult_ok': adult_ok})
+
+    def pageData(self, website, results=10):
+        return self._get('PageData', {'query': website, 'results': results})
+
+    # Function: webSearch
+    #   Search for a keyword on the web
+    #
+    # Parameters:
+    #   query - keywords to search for
+    #   results - limit the number of results
+    #
+    # Returns:
+    #   results
+    def webSearch(self, query, results=10):
+        return self._get('WebSearch', {'query': query, 'results': results})
+
+    # Function: videoSearch
+    #   Search for an video by keyword on the web
+    #
+    # Parameters:
+    #   query - keywords to search for
+    #   format - video format to filter on
+    #   adult_ok - include adult content in the search result
+    #   results - limit the number of results
+    #
+    # Returns:
+    #   results
+    def videoSearch(self, query, format='any', adult_ok=0, results=10):
+        return self._get('VideoSearch', {'query': query, 'format': format, 'results': results, 'adult_ok': adult_ok})
+
+yahoo = Yahoo()
+
+def handle_yahoo_image(bot, ievent):
+    adult_ok = 0
+    format = ''
+    formats = ['any', 'all', 'bmp', 'gif', 'jpeg', 'png']
+    args = ievent.args
+    try:
+        if '--adult' in args:
+            adult_ok = 1
+            args.remove('--adult')
+        if '--format' in args:
+            format = args.pop(args.index('--format')+1)
+            args.remove('--format')
+    except ValueError:
+        ievent.missing('[--adult] [--format [<format>] <query>')
+        return
+    if not ievent.args:
+        ievent.missing('[--adult] [--format [<format>] <query>')
+        return
+    if format and not format in formats:
+        ievent.reply('invalid format, available formats: %s' % ', '.join(formats))
+        return
+    try:
+        search = yahoo.imageSearch(' '.join(args), format, adult_ok)
+    except YahooException, e:
+        ievent.reply(str(e))
+        return
+    if search._total_results_returned > 0:
+        ievent.reply('search for %s ==> %d results available, showing 1 - %d' % \
+            (' '.join(args), search._total_results_available,
+            search._total_results_returned))
+        reply = []
+        for result in search._get_results():
+             reply.append('%d) %s - %s' % (len(reply)+1, result.Title, result.Url))
+        ievent.reply(', '.join(reply))
+    else:
+        ievent.reply('search for %s ==> no results' % ' '.join(args))
+
+cmnds.add('yahoo-image', handle_yahoo_image, 'USER')
+
+def handle_yahoo_search(bot, ievent):
+    if ievent.inqueue:
+        text = ' '.join(waitforqueue(ievent.inqueue, 5))
+    elif not ievent.args:
+        ievent.missing('<query>')
+        return
+    else:
+        text = ' '.join(ievent.args)
+    try:
+        search = yahoo.webSearch(text)
+    except YahooException, e:
+        ievent.reply(str(e))
+        return
+    if search._total_results_returned > 0:
+        ievent.reply('search for %s ==> %d results available, showing 1 - %d' % \
+            (text, search._total_results_available,
+            search._total_results_returned))
+        reply = []
+        for result in search._get_results():
+             reply.append('%d) %s - %s' % (len(reply)+1, result.Title, result.Url))
+        ievent.reply(', '.join(reply))
+    else:
+        ievent.reply('search for %s ==> no results' % ' '.join(ievent.args))
+
+cmnds.add('yahoo-search', handle_yahoo_search, 'USER')
+aliases.data['y!'] = 'yahoo-search'
+aliases.data['yahoo'] = 'yahoo-search'
+
+def handle_yahoo_pagedata(bot, ievent):
+    if not ievent.args:
+        ievent.missing('<url>')
+        return
+    try:
+        search = yahoo.pageData(' '.join(ievent.args))
+    except YahooException, e:
+        ievent.reply(str(e))
+        return
+    if search._total_results_returned > 0:
+        reply = []
+        for result in search._get_results():
+            reply.append('%d) %s, %dx%d px - %s' % (len(reply)+1, result.Title, 
+            result.Width, result.Height, result.Url))
+        ievent.reply(', '.join(reply))
+    else:
+        ievent.reply('pagedata for %s ==> no results' % ' '.join(ievent.args))
+
+cmnds.add('yahoo-pagedata', handle_yahoo_pagedata, ['USER'])
+
+
+def handle_yahoo_video(bot, ievent):
+    adult_ok = 0
+    format = ''
+    formats = ['any', 'all', 'avi', 'flash', 'mpeg', 'msmedia', 'quicktime', 'realmedia']
+    args = ievent.args
+    try:
+        if '--adult' in args:
+            adult_ok = 1
+            args.remove('--adult')
+        if '--format' in args:
+            format = args.pop(args.index('--format')+1)
+            args.remove('--format')
+    except ValueError:
+        ievent.missing('[--adult] [--format [<format>] <query>')
+        return
+    if not ievent.args:
+        ievent.missing('[--adult] [--format [<format>] <query>')
+        return
+    if format and not format in formats:
+        ievent.reply('invalid format, available formats: %s' % ', '.join(formats))
+        return
+    try:
+        search = yahoo.videoSearch(' '.join(args), format, adult_ok)
+    except YahooException, e:
+        ievent.reply(str(e))
+        return
+    if search._total_results_returned > 0:
+        ievent.reply('search for %s ==> %d results available, showing 1 - %d' % \
+            (' '.join(args), search._total_results_available,
+            search._total_results_returned))
+        reply = []
+        for result in search._get_results():
+             reply.append('%d) %s, %dx%d, %s - %s' % (len(reply)+1, result.Title, 
+             result.Width, result.Height, time.strftime('%T', time.localtime(result.Duration)), result.Url))
+        ievent.reply(', '.join(reply))
+    else:
+        ievent.reply('search for %s ==> no results' % ' '.join(args))
+
+cmnds.add('yahoo-video', handle_yahoo_video, 'USER')
+
--- gozerbot-0.99.1.orig/build/lib/gplugs/watcher.py
+++ gozerbot-0.99.1/build/lib/gplugs/watcher.py
@@ -0,0 +1,244 @@
+# waveplugs/watcher.py
+#
+#
+
+""" watch waves through xmpp. a wave is called a channel here. """
+
+## gozerlib imports
+
+from gozerbot.commands import cmnds
+from gozerbot.callbacks import callbacks, gn_callbacks
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.fleet import fleet
+from gozerbot.utils.log import rlog
+
+## basic imports
+
+import copy
+import logging
+
+cpy = copy.deepcopy
+
+class Watched(PlugPersist):
+
+    """ Watched object contains channels and subscribers. """
+
+    def __init__(self, filename):
+        PlugPersist.__init__(self, filename, {})
+        self.data.channels = self.data.channels or {}
+        self.data.whitelist = self.data.whitelist or []
+        self.data.descriptions = self.data.descriptions or {}
+
+    def subscribe(self, botname, channel, jid):
+
+        """ subscrive a jid to a channel. """ 
+
+        jid = unicode(jid)
+
+        if not self.data.channels.has_key(channel):
+            self.data.channels[channel] = []
+
+        if not [botname, jid] in self.data.channels[channel]:
+            self.data.channels[channel].append([botname, jid])
+            self.save()
+
+        return True
+
+    def unsubscribe(self, botname, channel, jid):
+
+        """ unsubscribe a jid from a channel. """ 
+
+        try:
+            self.data.channels[channel].remove([botname, unicode(jid)])
+
+        except (KeyError, TypeError):
+            return False
+
+        self.save()
+        return True
+
+    def check(self, channel):
+
+        """ check if channel is available (in whitelist) AND has subscribers. """
+
+        return self.data.channels.has_key(channel)
+
+    def subscribers(self, channel):
+
+        """ return all subscribers of a channel. """
+
+        try:
+            return self.data.channels[channel]
+        except KeyError:
+            return []
+
+    def enable(self, channel):
+
+        """ add channel to whitelist. """
+
+        if not channel in self.data.whitelist:
+            self.data.whitelist.append(channel)
+            self.save()
+
+    def disable(self, channel):
+ 
+        """ remove channel from whitelist. """
+
+        try:
+            self.data.whitelist.remove(channel)
+        except ValueError:
+            return False
+
+        self.save()
+        return True
+
+    def available(self, channel):
+
+        """ check if channel is on whitelist. """
+
+        return channel in self.data.whitelist
+
+    def channels(self, channel):
+ 
+        """ return channels on whitelist. """ 
+
+        res = []
+
+        for chan, targets in self.data.channels.iteritems():
+
+            if channel in str(targets):
+                res.append(chan)
+
+        return res
+
+watched = Watched('channels')
+
+def prewatchcallback(bot, event):
+
+    return watched.check(event.channel)
+
+def watchcallback(bot, event):
+
+    subscribers = watched.subscribers(event.channel)
+
+    if not subscribers:
+        return
+
+    watched.data.descriptions[event.channel] = event.title
+    rlog(10, "watcher", "watcher - out - %s - %s" % (str(subscribers), event.txt))
+
+    for item in subscribers:
+
+        try:
+            (botname, channel) = item
+        except ValueError:
+             continue
+
+        orig = event.nick or event.userhost
+
+        #if orig in [botname, bot.name]:
+        #    continue
+
+        txt = u"[%s] %s" % (orig, event.txt)
+
+        if txt.find('] [') > 1:
+            rlog(10, 'watcher', 'looping detected .. %s' % txt)
+            continue
+
+        outbot = fleet.byname(botname)
+
+        if not outbot:
+            rlog(10, 'watcher', "can't find %s bot in fleet" % botname)
+            continue
+
+        rlog(10, 'watcher', 'using %s (%s) bot' % (outbot.name, outbot.server))
+        outbot.say(channel, txt)
+
+gn_callbacks.add('BLIP_SUBMITTED', watchcallback, prewatchcallback, threaded=True)
+gn_callbacks.add('PRIVMSG', watchcallback, prewatchcallback, threaded=True)
+gn_callbacks.add('OUTPUT', watchcallback, prewatchcallback, threaded=True)
+
+def handle_watcherstart(bot, event):
+
+    if not event.rest:
+        event.missing('<channel>')
+        return
+
+    channel = event.rest
+
+    if '@' in channel:
+        event.reply("you are not allowed to watch JID")
+        return
+
+    if not event.msg:
+        watched.subscribe(bot.name, channel, event.channel)
+    else:
+        watched.subscribe(bot.name, channel, event.userhost)
+
+    watched.enable(channel)
+    event.done()
+
+cmnds.add('watcher-start', handle_watcherstart, 'USER')
+
+def handle_watcherstop(bot, event):
+
+    if not event.rest:
+        channel = event.channel
+    else:
+        channel = event.rest
+
+    if not event.msg:
+        watched.unsubscribe(bot.name, channel, event.channel)
+    else:
+        watched.unsubscribe(bot.name, channel, event.userhost)
+
+    watched.disable(channel)
+    event.done()
+
+cmnds.add('watcher-stop', handle_watcherstop, 'USER')
+
+def handle_watcherenable(bot, event):
+
+    if not event.rest:
+        channel = event.channel
+    else:
+        channel = event.rest
+
+    watched.enable(channel)
+    event.done()
+
+cmnds.add('watcher-enable', handle_watcherenable, ['WATCH', 'OPER'])
+
+def handle_watcherdisable(bot, event):
+
+    if not event.rest:
+        channel = event.channel
+    else:
+        channel = event.rest
+
+    watched.disable(channel)
+    event.done()
+    
+cmnds.add('watcher-disable', handle_watcherdisable, ['WATCH', 'OPER'])
+
+def handle_watcherchannels(bot, event):
+    chans = watched.channels(event.channel)
+
+    if chans:
+        res = []
+
+        for chan in chans:
+
+            try:
+                res.append("%s (%s)" % (chan, watched.data.descriptions[chan]))
+            except KeyError:
+                res.append(chan)
+
+        event.reply("channels watched on %s: " % event.channel, res)
+
+cmnds.add('watcher-channels', handle_watcherchannels, ['USER'])
+
+def handle_watcherlist(bot, event):
+    event.reply("watchers for %s: " % event.channel, watched.subscribers(event.channel))
+
+cmnds.add('watcher-list', handle_watcherlist, ['USER'])
--- gozerbot-0.99.1.orig/build/lib/gplugs/probe.py
+++ gozerbot-0.99.1/build/lib/gplugs/probe.py
@@ -0,0 +1,42 @@
+# plugs/probe.py
+#
+#
+
+""" check if host:port is open """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+
+import socket
+
+plughelp.add('probe', 'show if host:port is open')
+
+def handle_probe(bot, ievent):
+    """ probe <host> <port> .. check if host:port is open """
+    try:
+        (host, port) = ievent.args
+        port = int(port)
+    except ValueError:
+        ievent.missing('<host> <port>')
+        return
+    try:
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sock.settimeout(2)
+        sock.connect((host, port))
+        sock.close()
+    except socket.timeout:
+        ievent.reply('%s:%s is not up' % (host, port))
+        return
+    except Exception, ex:
+        ievent.reply('%s:%s is not up ==>  %s' % (host, port, str(ex)))
+        return
+    ievent.reply('%s:%s is up' % (host, port))
+
+cmnds.add('probe', handle_probe, ['OPER', 'PROBE'])
+examples.add('probe', 'probe <host> <port> // show if host:port is open', \
+'probe gozerbot.org 8088')
+tests.add('probe gozerbot.org 10101')
--- gozerbot-0.99.1.orig/build/lib/gplugs/greeting.py
+++ gozerbot-0.99.1/build/lib/gplugs/greeting.py
@@ -0,0 +1,168 @@
+# plugs/greeting.py
+#
+#
+
+""" say greet message when user joins """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.utils.generic import convertpickle
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.persist.pdol import Pdol
+from gozerbot.datadir import datadir
+from gozerbot.users import users
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.callbacks import callbacks, jcallbacks
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+## basic imports
+
+import random
+import os
+import logging
+
+plughelp.add('greeting', 'the greeting plugin allows users to set messages \
+to be said when they join a channel')
+
+## UPGRADE PART
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'greetings', \
+datadir + os.sep + 'plugs' + os.sep + 'greeting' + os.sep + 'greetings')
+
+cfg = PersistConfig()
+cfg.define('enable', [])
+
+greetings = None
+
+def init():
+    """ init the greeting plugin """
+    global greetings
+    greetings = Pdol(datadir + os.sep + 'plugs' + os.sep + 'greeting' + \
+os.sep + 'greetings')
+    if not greetings.data:
+        upgrade()
+        greetings = Pdol(datadir + os.sep + 'plugs' + os.sep + 'greeting' + \
+os.sep + 'greetings')
+    return 1
+
+def greetingtest(bot, ievent):
+    """ check if greeting callback should be called """
+    logging.warn("greeting - checking %s" % ievent.orig)
+    try:
+        if ievent.time < bot.timejoined[ievent.channel] + 5:
+            return 0
+    except KeyError:
+        return 0
+    if greetings and ievent.channel not in cfg.get('enable'):
+        return 0
+    if ievent.channel not in bot.state['joinedchannels']:
+        return 0
+    if ievent.fromm == bot.user:
+        return 0
+    if bot.type == 'xmpp':
+        logging.warn(ievent.c)
+        if ievent.c == 'http://jabber.org/protocol/caps':
+            return 0
+        if  ievent.type == "available":
+            return 1
+    else:
+        return 1
+    return 0
+
+def greetingcallback(bot, ievent):
+    """ do the greeting """
+    #username = users.getname(ievent.userhost)
+    try:
+        greetingslist = greetings[ievent.channel]
+
+        if greetingslist:
+
+            if bot.type == 'xmpp' and ievent.nick.rfind('guest') != -1:
+                return
+
+            bot.say(ievent.channel, ievent.nick + ', ' + random.choice(greetingslist))
+
+    except KeyError:
+        pass
+
+callbacks.add('JOIN', greetingcallback, greetingtest)
+callbacks.add('Presence', greetingcallback, greetingtest)
+
+def handle_greetingon(bot, ievent):
+    cfg['enable'].append(ievent.channel)
+    cfg.save()
+    ievent.done()
+
+cmnds.add('greeting-on', handle_greetingon, 'USER')
+examples.add('greeting-on', 'enable greeting in a channel', 'greeting-on')
+
+def handle_greetingoff(bot, ievent):
+    try:
+        cfg['enable'].remove(ievent.channel)
+        cfg.save()
+    except ValueError:
+        pass
+
+    ievent.done()
+
+cmnds.add('greeting-off', handle_greetingoff, 'USER')
+examples.add('greeting-off', 'disable  greeting in a channel', 'greeting-off')
+
+def handle_greetingadd(bot, ievent):
+    """ add greetings txt """
+    if not greetings:
+        ievent.reply('the greet plugin is not properly initialised')
+        return
+    if not ievent.rest:
+        ievent.missing('<txt>')
+        return
+    #username = users.getname(ievent.userhost)
+    greetings.add(ievent.channel, ievent.rest)
+    greetings.save()
+    ievent.reply('greeting message added')
+
+cmnds.add('greeting-add', handle_greetingadd, 'USER')
+examples.add('greeting-add', "add greeting message", 'greeting-add yooo dudes')
+tests.add('greetng-add boooo', 'added')
+
+def handle_greetingdel(bot, ievent):
+    """ delete greetings txt """
+    if not greetings:
+        ievent.reply('the greet plugin is not properly initialised')
+        return
+    try:
+        nr = int(ievent.args[0])
+    except (IndexError, ValueError):
+        ievent.missing('<nr>')
+        return
+    #username = users.getname(ievent.userhost)
+    try:
+        del greetings.data[ievent.channel][nr]
+    except (IndexError, KeyError):
+        ievent.reply("can't delete greeting %s" % nr)
+        return
+    greetings.save()
+    ievent.reply('greeting message %s removed' % nr)
+
+cmnds.add('greeting-del', handle_greetingdel, 'USER')
+examples.add('greeting-del', "delete greeting message", 'greeting-delete 1')
+tests.add('greeting-del 1')
+
+def handle_greetinglist(bot, ievent):
+    """ list the greetings list of an user """
+    if not greetings:
+        ievent.reply('the greet plugin is not properly initialised')
+        return
+    #username = users.getname(ievent.userhost)
+    result = greetings.get(ievent.channel)
+    if result:
+        ievent.reply("greetings: ", result, nr=0)
+    else:
+        ievent.reply('no greetings set')
+
+cmnds.add('greeting-list', handle_greetinglist, 'USER')
+examples.add('greeting-list', 'show greetings of user', 'greeting-list')
+tests.add('greeting-list', 'boo')
--- gozerbot-0.99.1.orig/build/lib/gplugs/away.py
+++ gozerbot-0.99.1/build/lib/gplugs/away.py
@@ -0,0 +1,108 @@
+# plugs/away.py
+#
+# 
+
+""" keep away messages """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import rlog
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.callbacks import callbacks
+from gozerbot.users import users
+from gozerbot.plugins import plugins
+from gozerbot.datadir import datadir
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+import time, os
+
+plughelp.add('away', "keep notice of who's away")
+
+lasttime = []
+
+# use datadir/away as pickle file
+awaydict = PlugPersist('away.data')
+
+# see if data attribute is set otherwise init it
+if not awaydict.data:
+    awaydict.data = {}
+if not awaydict.data.has_key('enable'):
+    awaydict.data['enable'] = 0
+    awaydict.save()
+
+def init():
+    """ init plugin """
+    if not awaydict.data['enable']:
+        rlog(0, 'away', 'away is disabled')
+        return 1
+    else:
+        rlog(0, 'away', 'away is enabled')
+    callbacks.add('PRIVMSG', doaway, awaytest)
+    callbacks.add('PRIVMSG', doback, backtest)
+    return 1
+
+def awaytest(bot, ievent):
+    """ test if away callback should be called """
+    if (len(ievent.txt) > 1 and ievent.txt[-1] == '\001' and \
+ievent.txt[-2] == '&' ) or ievent.txt.strip() == '&':
+        return 1
+        
+def doaway(bot, ievent):
+    """ away callback """
+    if not users.allowed(ievent.userhost, 'USER'):
+        return
+    # use username of user giving the command
+    name = users.getname(ievent.userhost)
+    if not name:
+        return
+    if awaydict.data.has_key((name, bot.name, ievent.channel)):
+        return
+    ievent.reply("ltrs %s" % ievent.nick)
+    # add away data to entry indexed by username, botname and channel
+    awaydict.data[(name, bot.name, ievent.channel)] = time.time()
+    awaydict.save()
+
+def backtest(bot, ievent):
+    """ test if we should say hello """
+    if 'back' == ievent.txt.strip() or 're' == ievent.txt.strip():
+        return 1
+    
+def doback(bot, ievent):
+    """ say hello """
+    if not users.allowed(ievent.userhost, 'USER'):
+        return
+    # reset away entry 
+    name = users.getname(ievent.userhost)
+    if not name:
+        return
+    if not awaydict.data.has_key((name, bot.name, ievent.channel)):
+        return
+    ievent.reply("welcome back %s" % ievent.nick)
+    try:
+        del awaydict.data[(name, bot.name, ievent.channel)]
+        awaydict.save()
+    except KeyError:
+        pass
+
+def handle_awayenable(bot, ievent):
+    """ away-enable .. enable away """
+    awaydict.data['enable'] = 1
+    awaydict.save()
+    plugins.reload('gplugs', 'away')
+    ievent.reply('away enabled')
+
+cmnds.add('away-enable', handle_awayenable, 'OPER', threaded=True)
+examples.add('away-enable' , 'enable the away plugin', 'away-enable')
+
+def handle_awaydisable(bot, ievent):
+    """ away-disable .. disable away """
+    awaydict.data['enable'] = 0
+    awaydict.save()
+    plugins.reload('gplugs', 'away')
+    ievent.reply('away disabled')
+
+cmnds.add('away-disable', handle_awaydisable, 'OPER')
+examples.add('away-disable', 'disable the away plugin', 'away-disable')
+tests.add('away-enable --chan #dunkbots', 'enabled').fakein(':dunker!mekker@127.0.0.1 PRIVMSG #dunkbots :&').fakein(':dunker!mekker@127.0.0.1 PRIVMSG #dunkbots :re').add('away-disable --chan #dunkbots', 'disabled')
--- gozerbot-0.99.1.orig/build/lib/gplugs/banner.py
+++ gozerbot-0.99.1/build/lib/gplugs/banner.py
@@ -0,0 +1,56 @@
+# gozerplugs/banner.py
+#
+# Description: check is host:port is open, and supply the first line or 'banner'
+# Author: Wijnand 'tehmaze' Modderman
+# Licsense: BSD
+
+""" show banner of <host> <port> """
+
+__author__ = "Wijnand 'tehmaze' Modderman"
+__license__ = "BSD"
+
+from gozerbot.commands import cmnds
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+import socket
+
+plughelp.add('banner', 'show if host:port is open')
+
+def handle_banner(bot, ievent):
+    """ banner <host> <port> .. check if host:port is open """
+    try:
+        (host, port) = ievent.args
+        port = int(port)
+    except ValueError:
+        ievent.missing('<host> <port>')
+        return
+    banner = None
+    try:
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        sock.settimeout(2)
+        sock.connect((host, port))
+    except socket.timeout:
+        ievent.reply('%s:%s is not up' % (host, port))
+        return
+    except Exception, ex:
+        ievent.reply('%s:%s is not up ==>  %s' % (host, port, str(ex)))
+        return
+    try:
+        msock = sock.makefile()
+        banner = msock.readline()
+    except:
+        pass
+    try:
+        sock.close()
+    except socket.error:
+        pass
+    if banner:
+        ievent.reply('%s:%s is up: %s' % (host, port, banner))
+    else:
+        ievent.reply('%s:%s is up' % (host, port))
+
+cmnds.add('banner', handle_banner, 'USER')
+examples.add('banner', 'banner <host> <port> // show if host:port is open', \
+'banner gozerbot.org 25')
+tests.add('banner gozerbot.org 25', 'up')
--- gozerbot-0.99.1.orig/build/lib/gplugs/echo.py
+++ gozerbot-0.99.1/build/lib/gplugs/echo.py
@@ -0,0 +1,22 @@
+# plugs/echo.py
+#
+#
+
+""" simple echo command """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.tests import tests
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+
+plughelp.add('echo', 'simply write back what you tell it')
+
+def handle_echo(bot, ievent):
+    """ say back what is being said """
+    ievent.reply(ievent.rest)
+
+cmnds.add('echo', handle_echo, 'USER')
+examples.add('echo', "echo Hello World!", 'echo')
+tests.add('echo booo', 'booo')
--- gozerbot-0.99.1.orig/build/lib/gplugs/links.py
+++ gozerbot-0.99.1/build/lib/gplugs/links.py
@@ -0,0 +1,72 @@
+# plugs/links.py
+#
+#
+
+""" link <item> to <otheritem> """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.redispatcher import rebefore
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.persist.pdol import Pdol
+from gozerbot.datadir import datadir
+import os
+
+plughelp.add('links', 'alias items to other items .. this is only used in \
+karma for now')
+
+links = Pdol(datadir + os.sep + 'links')
+
+def handle_linksadd(bot, ievent):
+    """ links-add <item> = <otheritem> """
+    try:
+        (item, otheritem) = ievent.groups
+    except ValueError:
+        ievent.missing('<item> = <otheritem>')
+        return
+    links.add(item, otheritem)
+    links.save()
+    ievent.reply('%s link added' % otheritem)
+
+rebefore.add(5, 'links-add (.*?) = (.*)', handle_linksadd, 'USER')
+examples.add('links-add', 'links-add <from> = <to> .. add a link', \
+'links-add mekker = miep bla')
+
+def handle_linksdel(bot, ievent):
+    """ links-del <item> = <otheritem> """
+    try:
+        (item, linkto) = ievent.groups
+    except ValueError:
+        ievent.missing('<item> = <link>')
+        return
+    itemlist = links[item]
+    if not itemlist:
+        ievent.reply('no links available for %s' % item)
+        return
+    for i in range(len(itemlist)-1, -1, -1):
+        if itemlist[i] == linkto:
+            del itemlist[i]
+            links.save()
+            ievent.reply('%s deleted' % linkto)
+            return
+            
+rebefore.add(5, 'links-del (.*?) = (.*)', handle_linksdel, ['LINKS', 'OPER'])
+examples.add('links-del', 'links-del <from> = <to> .. delete a link', \
+'links-del mekker = miep bla')
+
+def handle_linkslist(bot, ievent):
+    """ links-list <item> .. show link of <item> """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    result = links[ievent.rest]
+    if result:
+        ievent.reply("links for %s: " % ievent.rest, result)
+    else:
+        ievent.reply('no links found for %s' % ievent.rest)
+
+cmnds.add('links-list', handle_linkslist, 'USER')
+examples.add('links-list', 'links-list <item> .. show link of <item>', \
+'links-list mekker')
--- gozerbot-0.99.1.orig/build/lib/gplugs/register.py
+++ gozerbot-0.99.1/build/lib/gplugs/register.py
@@ -0,0 +1,70 @@
+# gozerplugs/plugs/register.py
+#
+#
+
+__license__ = 'this file is in the public domain'
+__gendocfirst__ = ['register-enable', ]
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.callbacks import callbacks
+from gozerbot.users import users
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+from gozerbot.plugs.throttle import state as throttlestate
+
+plughelp.add('register', 'allow registering of anon users')
+
+cfg = PersistConfig()
+cfg.define('enable', 0)
+cfg.define('perms', ['USER', ])
+
+def handle_register(bot, ievent):
+    if not cfg.get('enable'):
+        ievent.reply('register is not enabled')
+        return
+    if 'OPER' in cfg.get('perms'):
+        ievent.reply("can't use OPER permission in register command")
+        return
+    if not ievent.rest:
+        ievent.missing('<username>')
+        return
+    name = ievent.args[0]
+    if users.exist(name):
+        ievent.reply('we already have a user with the name %s' % name)
+        return
+    uh = ievent.userhost
+    username = users.getname(uh)
+    if username:
+        ievent.reply('we already have a user with userhost %s' % uh)
+        return
+    if users.add(name, [uh, ], perms = cfg.get('perms')):
+        throttlestate['level'][uh] = 10
+        ievent.reply('%s added to the user database with permission %s' % \
+(uh, cfg.get('perms')))
+    else:
+        ievent.reply('error adding %s (%s) in the user database' % (name, uh))
+
+cmnds.add('register', handle_register, 'ANY')
+examples.add('register', 'register yourself to the bot .. this only \
+works in jabber', 'register dunker')
+tests.add('register dunker')
+
+def handle_registerenable(bot, ievent):
+    cfg.set('enable', 1)
+    ievent.reply('register enabled')
+
+cmnds.add('register-enable', handle_registerenable, 'OPER')
+examples.add('register-enable', 'enable register command', 'register-enable')
+tests.add('register-enable')
+
+def handle_registerdisable(bot, ievent):
+    cfg.set('enable', 0)
+    ievent.reply('register disabled')
+
+cmnds.add('register-disable', handle_registerdisable, 'OPER')
+examples.add('register-disable', 'disable register command', \
+'register-disable')
+tests.add('register-disable')
--- gozerbot-0.99.1.orig/build/lib/gplugs/udp.py
+++ gozerbot-0.99.1/build/lib/gplugs/udp.py
@@ -0,0 +1,336 @@
+# plugs/udp.py
+#
+#
+
+"""
+    the bot has the capability to listen for udp packets which it will use
+    to /msg a given nick or channel.
+
+    1) setup
+
+        * do !reload udp to enable the udp plugin
+        * call !udp-cfgsave to generate a config file in gozerdata/plugs/udp/config
+        * edit this file .. esp. look at the udpallowednicks list
+        * run ./bin/gozerbot-udp -s to generate clientside config file "udp-send"
+        * edit this file
+        * test with:
+
+        ::
+
+            echo "YOOO" | ./bin/gozerbot-udp
+
+    2) limiter
+
+        on IRC the bot's /msg to a user/channel are limited to 1 per 3 seconds so the
+        bot will not excessflood on the server. you can use partyudp if you need no 
+        delay between sent messages, this will use dcc chat to deliver the message.
+        on jabber bots there is no delay
+
+"""
+
+
+__copyright__ = 'this file is in the public domain'
+
+# IMPORT SECTION
+
+from gozerbot.fleet import fleet
+from gozerbot.generic import rlog, handle_exception, strippedtxt, lockdec
+from gozerbot.config import config
+from gozerbot.plughelp import plughelp
+from gozerbot.partyline import partyline
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.contrib.rijndael import rijndael
+from gozerbot.persist.persistconfig import PersistConfig
+
+import socket, re, time, Queue
+
+# END IMPORT
+
+plughelp.add('udp' , 'run the udp listen thread')
+
+# VARS SECTION
+
+cfg = PersistConfig()
+cfg.define('udp', 1) # set to 0 to disnable
+cfg.define('udpparty', 0)
+cfg.define('udpipv6', 0)
+cfg.define('udpmasks', ['192.168*', ])
+cfg.define('udphost', "localhost")
+cfg.define('udpport', 5500)
+cfg.define('udpallow', ["127.0.0.1", ])
+cfg.define('udpallowednicks', ["#gozerbot", "dunker"])
+cfg.define('udppassword', "mekker", exposed=False)
+cfg.define('udpseed', "blablablablablaz", exposed=False) # needs to be 16 chars wide
+cfg.define('udpstrip', 1) # strip all chars < char(32)
+cfg.define('udpsleep', 0) # sleep in sendloop .. can be used to delay pack
+cfg.define('udpdblog', 0)
+cfg.define('udpbots', [cfg['udpbot'] or 'default', ])
+
+# END VARS
+
+def _inmask(addr):
+
+    """ check if addr matches a mask. """
+
+    if not cfg['udpmasks']:
+        return False
+    for i in cfg['udpmasks']:
+        i = i.replace('*', '.*')
+        if re.match(i, addr):
+            return True
+
+class Udplistener(object):
+
+    """ 
+        listen for udp messages.
+
+    """
+
+    def __init__(self):
+        self.outqueue = Queue.Queue()
+        self.queue = Queue.Queue()
+        self.stop = 0
+        if cfg['udpipv6']:
+            self.sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
+        else:
+            self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        try:
+            self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+        except:
+            pass
+        self.sock.setblocking(1)
+        self.sock.settimeout(1)
+        self.loggers = []
+
+    def _outloop(self):
+
+        """ 
+            loop controling the rate of outputted messages.
+
+            .. literalinclude:: ../../gozerplugs/udp.py
+                :pyobject: Udplistener._outloop
+
+        """
+
+        rlog(5, 'udp', 'starting outloop')
+        while not self.stop:
+            (printto, txt) = self.outqueue.get()
+            if self.stop:
+                return
+            self.dosay(printto, txt)
+        rlog(5, 'udp', 'stopping outloop')
+
+    def _handleloop(self):
+        while not self.stop:
+            (input, addr) = self.queue.get()
+            if not input or not addr:
+                continue
+            if self.stop:
+                break                
+            self.handle(input, addr)
+            if cfg['udpsleep']:
+                time.sleep(cfg['udpsleep'] or 0.01)
+        rlog(5, 'udp', 'shutting down udplistener')
+
+    def _listen(self):
+        """ listen for udp messages .. /msg via bot"""
+        if not cfg['udp']:
+            return
+        for botname in cfg['udpbots']:
+            if not fleet.byname(botname):
+                rlog(10, 'udp', "can't find %s bot" % botname)
+                
+        try:
+            fleet.startok.wait(5)
+            self.sock.bind((cfg['udphost'], cfg['udpport']))
+            rlog(10, 'udp', 'udp listening on %s %s' % (cfg['udphost'], \
+cfg['udpport']))
+            self.stop = 0
+        except IOError:
+            handle_exception()
+            self.sock = None
+            self.stop = 1
+            return
+        # loop on listening udp socket
+        while not self.stop:
+            try:
+                input, addr = self.sock.recvfrom(64000)
+            except socket.timeout:
+                continue
+            except Exception, ex:
+                try:
+                    (errno, errstr) = ex
+                except ValueError:
+                    errno = 0
+                    errstr = str(ex)
+                if errno == 4:
+                    rlog(10, self.name, str(ex))
+                    break
+                if errno == 35:
+                    continue
+                else:
+                    handle_exception()
+                    break
+            if self.stop:
+                break
+            self.queue.put((input, addr))
+        rlog(5, 'udp', 'shutting down main loop')
+
+    def handle(self, input, addr):
+
+        """ 
+            handle an incoming udp packet. 
+
+            :param input: txt in udp packet
+            :type input: string
+            :param addr: address info of udp packet
+            :type add: (host, port) tuple
+
+            .. literalinclude:: ../../gozerplugs/udp.py
+                :pyobject: Udplistener.handle
+        """
+
+        if cfg['udpseed']:
+            data = ""
+            for i in range(len(input)/16):
+                try:
+                    data += crypt.decrypt(input[i*16:i*16+16])
+                except Exception, ex:
+                    rlog(10, 'udp', "can't decrypt: %s" % str(ex))
+                    data = input
+                    break
+        else:
+            data = input
+        if cfg['udpstrip']:
+            data = strippedtxt(data)
+        # check if udp is enabled and source ip is in udpallow list
+        if cfg['udp'] and (addr[0] in cfg['udpallow'] or \
+_inmask(addr[0])):
+            # get printto and passwd data
+            header = re.search('(\S+) (\S+) (.*)', data)
+            if header:
+                # check password
+                if header.group(1) == cfg['udppassword']:
+                    printto = header.group(2)    # is the nick/channel
+                    # check if printto is in allowednicks
+                    if not printto in cfg['udpallowednicks']:
+                        rlog(10, 'udp', "udp denied %s" % printto )
+                        return
+                    rlog(0, 'udp', str(addr[0]) +  " udp allowed")
+                    text = header.group(3)    # is the text
+                    self.say(printto, text)
+                else:
+                    rlog(10, 'udp', "can't match udppasswd from " + \
+str(addr))
+            else:
+                rlog(10, 'udp', "can't match udp from " + str(addr[0]))
+        else:
+            rlog(10, 'udp', 'denied udp from ' + str(addr[0]))
+
+    def say(self, printto, txt):
+
+        """ 
+            send txt to printto. 
+ 
+            .. literalinclude:: ../../gozerplugs/udp.py
+                :pyobject: Udplistener.say
+
+        """
+
+        self.outqueue.put((printto, txt))
+
+    def dosay(self, printto, txt):
+
+        """ 
+            send txt to printto .. do some checks. 
+
+           .. literalinclude:: ../../gozerplugs/udp.py
+                :pyobject: Udplistener.dosay
+
+        """
+
+        if cfg['udpparty'] and partyline.is_on(printto):
+            partyline.say_nick(printto, txt)
+            return
+        if not cfg['udpbots']:
+            bots = [cfg['udpbot'], ]
+        else:
+            bots = cfg['udpbots']
+        for botname in bots:
+            bot = fleet.byname(botname)
+            if not bot:
+                rlog(10, 'udp', "can't find %s bot in fleet" % botname)
+                continue
+            #if not bot.jabber and not cfg['nolimiter']:
+            #    time.sleep(3)
+            bot.connectok.wait()
+            bot.say(printto, txt)
+            for i in self.loggers:
+                i.log(printto, txt)
+
+# the udplistener object
+if cfg['udp']:
+    udplistener = Udplistener()
+
+# initialize crypt object if udpseed is set in config
+if cfg['udp'] and cfg['udpseed']:
+    crypt = rijndael(cfg['udpseed'])
+
+def init():
+
+    """ 
+        init the udp plugin. 
+
+        .. literalinclude:: ../../gozerplugs/udp.py
+            :pyobject: init
+
+    """
+
+    if cfg['udp']:
+        start_new_thread(udplistener._listen, ())
+        start_new_thread(udplistener._handleloop, ())
+        start_new_thread(udplistener._outloop, ())
+    return 1
+    
+def shutdown():
+
+    """ 
+        shutdown the udp plugin.
+
+        .. literalinclude:: ../../gozerplugs/udp.py
+            :pyobject: init
+
+    """
+
+    if cfg['udp'] and udplistener:
+        udplistener.stop = 1
+        udplistener.outqueue.put_nowait((None, None))
+        udplistener.queue.put_nowait((None, None))
+    return 1
+
+if cfg['udp'] and cfg['udpdblog']:
+
+    from gozerbot.database.db import Db
+
+    class Udpdblog:
+
+        """ log udp data to database. """
+
+        # see tables/udplog for table definition and add udpdblog = 1 to 
+        # the config file
+        db = Db()
+
+        def log(self, printto, txt):
+
+            """ do the actual logging. """
+
+            try:
+                res = self.db.execute("""INSERT into udplog(time,printto,txt)
+values(%s,%s,%s) """, (time.time(), printto, txt))
+            except Exception, ex:
+                rlog(10, 'udp', 'failed to log to db: %s' % str(ex))
+            return res
+
+    udplistener.loggers.append(Udpdblog())
+    rlog(10, 'udp', 'registered database udp logger')
--- gozerbot-0.99.1.orig/build/lib/gplugs/gcollect.py
+++ gozerbot-0.99.1/build/lib/gplugs/gcollect.py
@@ -0,0 +1,92 @@
+# plugs/gcollect.py
+#
+#
+
+""" run garbage collector """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.periodical import periodical
+from gozerbot.generic import rlog
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.persist.persiststate import PlugState
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import gc, time
+
+plughelp.add('gcollect', 'help the garbage collector')
+
+state = PlugState()
+state.define('wait', 300)
+state.define('enable', 0)
+
+if state['enable']:
+    gc.enable()
+    rlog(10, 'gcollect', 'garbage collector enabled .. wait is %s' % state['wait'])
+
+def shutdown():
+    periodical.kill()
+
+def gcollect():
+    rlog(1, 'gcollect', 'running collector')
+    gc.collect()
+    time.sleep(5)
+    gc.collect()
+    time.sleep(5)
+    gc.collect()
+
+if state['enable']:
+    pid = periodical.addjob(state['wait'], 0, gcollect)
+else:
+    pid = None
+
+def handle_gcollectwait(bot, ievent):
+    try:
+        newwait = int(ievent.args[0])
+    except (IndexError, ValueError):
+        ievent.reply('gcollect wait is %s seconds' % state['wait'])
+        return
+    if newwait < 60:
+        ievent.reply('min. number of seconds is 60')
+        return
+    state['wait'] = newwait
+    state.save()
+    if pid:
+        periodical.changeinterval(pid, newwait)
+    ievent.reply('gcollect wait set to %s' % state['wait'])
+
+cmnds.add('gcollect-wait', handle_gcollectwait, 'OPER')
+examples.add('gcollect-wait', 'set wait of garbage collector', \
+'gcollect-wait 300')
+tests.add('gcollect-wait 300')
+
+def handle_gcollect(bot, ievent):
+    gcollect()
+    ievent.reply('collector runned')
+
+cmnds.add('gcollect', handle_gcollect, 'OPER', threaded=True)
+examples.add('gcollect', 'run garbage collector', 'gcollect')
+tests.add('gcollect')
+
+def handle_gcollectenable(bot, ievent):
+    global pid
+    state['enable'] = 1
+    state.save()
+    pid = periodical.addjob(state['wait'], 0, gcollect)
+    ievent.reply('gcollect enabled')
+
+cmnds.add('gcollect-enable', handle_gcollectenable, 'OPER')
+examples.add('gcollect-enable', 'enable the garbage collector', 'gcollect-enable')
+tests.add('gcollect-enable')
+
+def handle_gcollectdisable(bot, ievent):
+    state['enable'] = 0
+    state.save()
+    periodical.kill()
+    ievent.reply('gcollect disabled')
+
+cmnds.add('gcollect-disable', handle_gcollectdisable, 'OPER')
+examples.add('gcollect-disable', 'disable the garbage collector', 'gcollect-disable')
+tests.add('gcollect-disable')
--- gozerbot-0.99.1.orig/build/lib/gplugs/autoreply.py
+++ gozerbot-0.99.1/build/lib/gplugs/autoreply.py
@@ -0,0 +1,45 @@
+# plugins/autoreply.py
+#
+#
+
+""" do autoreply on incoming jabber private messages except commands. to enable
+ use autoreply-cfg txt <message to send>. """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.callbacks import jcallbacks
+from gozerbot.aliases import aliasset
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+
+cfg = PersistConfig()
+cfg.define('txt', "")
+
+plughelp.add('autoreply', 'jabber autoreply')
+
+def preautoreply(bot, ievent):
+    """ check where autoreply callbacks should fire """
+    if not ievent.usercmnd and cfg.get('txt') and not ievent.groupchat:
+        return 1
+
+def cbautoreply(bot, ievent):
+    """ do the auto reply """
+    bot.say(ievent.userhost, cfg.get('txt'))
+
+jcallbacks.add('Message', cbautoreply, preautoreply)
+
+def handle_autoreplydisable(bot, ievent):
+    """ disable autoreply """
+    cfg.set('txt', '')
+    ievent.reply('autoreply is disabled')
+    
+cmnds.add('autoreply-disable', handle_autoreplydisable, 'OPER')
+examples.add('autoreply-disable', 'disable the autoreply functionality', \
+'autoreply-disable')
+
+aliasset('autoreply-set', 'autoreply-cfg txt')
+aliasset('autoreply-enable', 'autoreply-cfg txt')
+tests.add('autoreply-enable mekker', 'set').add('autoreply-disable')
--- gozerbot-0.99.1.orig/build/lib/gplugs/8b.py
+++ gozerbot-0.99.1/build/lib/gplugs/8b.py
@@ -0,0 +1,48 @@
+# plugs/8b.py
+#
+#
+#
+
+""" eight ball """
+
+__copyright__ = 'this file is in the public domain'
+__revision__ = '$Id: m8b.py 1120 2006-12-30 12:00:00Z deck $'
+
+from gozerbot.generic import handle_exception
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+import re, random
+
+plughelp.add('8b', 'Ask the magic 8 ball')
+
+balltxt=[
+    "Signs point to yes.",
+    "Yes.",
+    "Most likely.",
+    "Without a doubt.",
+    "Yes - definitely.",
+    "As I see it, yes.",
+    "You may rely on it.",
+    "Outlook good.",
+    "It is certain.",
+    "It is decidedly so.",
+    "Reply hazy, try again.",
+    "Better not tell you now.",
+    "Ask again later.",
+    "Concentrate and ask again.",
+    "Cannot predict now.",
+    "My sources say no.",
+    "Very doubtful.",
+    "My reply is no.",
+    "Outlook not so good.",
+    "Don't count on it."
+    ]
+
+def handle_8b(bot, ievent):
+    ievent.reply(random.choice(balltxt))
+
+cmnds.add('8b', handle_8b, 'USER')
+examples.add('8b', 'show what the magic 8 ball has to say', '8b')
+tests.add('8b')
--- gozerbot-0.99.1.orig/build/lib/gplugs/timebomb.py
+++ gozerbot-0.99.1/build/lib/gplugs/timebomb.py
@@ -0,0 +1,121 @@
+# gozerplugs/timebomb.py
+#
+# Gozerbot Timebomb plugin v1.1 by Clone 2009 
+# Idea not so loosely based on jotham.read@gmail.com's eggdrop timebomb 
+
+""" do the timebomb dance. """
+
+__copyright__ = 'BSD'
+__author__ = 'clone at magtar.org'
+__depend__ = ['ops', ]
+
+from gozerbot.generic import getwho
+from gozerbot.commands import cmnds
+from gozerbot.plughelp import plughelp
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.aliases import aliasset
+
+from time import sleep, time
+from random import randint, shuffle
+
+plughelp.add('timebomb', 'blow your buddies to smithereens !timebomb <victim>')
+plughelp.add('cut', 'try to defuse a bomb placed with !timebomb by cutting a wire i.e. !cut blue')
+
+# define plugpersist outside localscope, you only want to initiate it once.
+bomb = PlugPersist('bomb')
+bomb.data = []
+
+# Adjustable variables
+wires = ['blue','black','red','green','purple','white','silver']
+kickchance = 80
+
+
+def timebomb(bot, ievent):
+    # check if we have ops
+    if ievent.channel not in bot.state['opchan']:
+        bot.action(ievent.channel, "bends over and farts in %s's general direction." % ievent.nick)
+        return
+    # check if we are already running a bomb
+    if bomb.data:
+        bot.action(ievent.channel ,"points at the bulge in %s's pants." % bomb.data[0])
+        return
+    try:
+        userhost = getwho(bot, ievent.args[0])
+    except IndexError:
+        ievent.reply('timebomb requires victim, see !help timebomb.')
+        return
+    # check if the victim userhost exists on this channel
+    if not userhost:
+         ievent.reply('no %s here.' % ievent.args[0])
+         return
+    else:
+        user = ievent.args[0]
+    # if bot gets targeted, switch target to caller
+    if ievent.args[0].lower() == bot.nick.lower():
+         userhost = ievent.ruserhost 
+         user = ievent.nick
+    # determine number of wires and pick random colors
+    shuffle(wires)
+    mywires = wires[0:randint(3,len(wires)-1)]
+    counter = 18 + 2 * len(mywires) + randint(1,12)
+    # determine time to mark instance
+    instancetime = time()
+    # plant bomb: (name to kick, which wires to choose from, which wire disarms, userhost)
+    bomb.data = [user, mywires, mywires[randint(0,len(mywires)-1)], userhost, counter, [], instancetime]
+    wires_pretty = ", ".join(map(str, mywires))
+    ievent.reply('%s places a bomb in %s\'s pants, the timer reads %s seconds. You see the wires %s.' % (ievent.nick, user, counter, wires_pretty))
+    # wait for timer to expire
+    sleep(counter)
+    
+    # check if persist data still exists (no cut event) and kick if so.
+    if bomb.data:
+        # data from different instance, dont cut
+        if not bomb.data[-1] == instancetime:
+           return
+        else: 
+            #kick victim
+            bot.sendraw('KICK %s %s :%s' % (ievent.channel, bomb.data[0], 'B000000M!'))
+            #ievent.reply('user: %s, userhost: %s' % (bomb.data[0], bomb.data[3]))
+            bomb.data = []
+
+def cut(bot, ievent):
+    # check if there is a timebomb running
+    if bomb.data:
+        # right userhost?
+        if bomb.data[3] == ievent.ruserhost:
+            # right wire?
+            if ievent.args[0] == bomb.data[2]:
+                bomb.data=[]
+                ievent.reply('%s has defused the bomb.' % ievent.nick)
+            elif ievent.args[0] in bomb.data[5]:
+            	ievent.reply('you already cut that wire, moron')      
+            elif ievent.args[0] not in bomb.data[1]:
+                ievent.reply('you don\'t see the %s wire, now do you?' % ievent.args[0]) 
+            else:
+                chance = randint(1,100)
+                if (chance < kickchance):
+		    msgnr = randint(1,4) 
+		    if msgnr == 1:
+                	message = 'no idiot, it was %s... *BOOOOOOOOOOM!*' % bomb.data[2] 
+		    if msgnr == 2:
+                	message = 'snip...B000000000M!'
+		    if msgnr == 3:
+                        message = 'snip...kadeng kadeng, kadeng kadeng... *PLof*'
+		    if msgnr == 4:
+                        message = 'no, %sKABOOOOOOOM!..' % bomb.data[2][0:3]
+                    bot.sendraw('KICK %s %s :%s' % (ievent.channel, bomb.data[0], message))
+                    bomb.data=[]
+		else:
+		    msgnr = randint(4,5) 
+		    if msgnr == 4:
+                	message = 'the force compells you to choose differently..'
+		    if msgnr == 5:
+                        timetogo = bomb.data[4] - (time() - bomb.data[-1])
+                	message = 'nothing happens, %d seconds to go!' % timetogo 
+                        bomb.data[5].append(ievent.args[0])
+                    ievent.reply(message)
+                    return
+            
+cmnds.add('timebomb', timebomb, 'OPER', threaded=True)
+aliasset('tb', 'timebomb')
+cmnds.add('cut', cut, 'USER', threaded=True)
--- gozerbot-0.99.1.orig/build/lib/gplugs/beats.py
+++ gozerbot-0.99.1/build/lib/gplugs/beats.py
@@ -0,0 +1,26 @@
+# gozerplugs/beats.py
+#
+#
+
+""" internet time .beats """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+import time, math
+
+plughelp.add('beats', 'show internet time')
+
+def handle_beats(bot, ievent):
+    """ beats .. show current internet time """
+    beats = ((time.time() + 3600) % 86400) / 86.4
+    beats = int(math.floor(beats))
+    ievent.reply('@' + str(beats))
+
+cmnds.add('beats', handle_beats, 'USER')
+examples.add('beats', 'show current internet time', 'beats')
+tests.add('beats' , '@')
--- gozerbot-0.99.1.orig/build/lib/gplugs/url.py
+++ gozerbot-0.99.1/build/lib/gplugs/url.py
@@ -0,0 +1,110 @@
+# plugs/url.py
+#
+#
+
+__depending__ = ['tinyurl', 'snarf', ]
+
+from gozerbot.generic import handle_exception, rlog, convertpickle
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.datadir import datadir
+from gozerbot.persist.persiststate import PlugState
+from gozerbot.tests import tests
+
+import re, os
+
+plughelp.add('url', 'maintain searchable logs of urls')
+re_url_match  = re.compile(u'((?:http|https)://\S+)')
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'url', \
+datadir + os.sep + 'plugs' + os.sep + 'url' + os.sep + 'state') 
+
+class URLcache(object):
+    state = None
+
+    def __init__(self):
+	self.state = PlugState()
+	self.state.define('urls', {})
+
+    def size(self):
+	s = 0
+	for i in self.state['urls'].values():
+	    for j in i.values():
+		s += len(j)
+	return str(s)
+
+    def add(self, bot, ievent, i):
+        if not self.state['urls'].has_key(bot.name):
+            self.state['urls'][bot.name] = {}
+        if not self.state['urls'][bot.name].has_key(ievent.printto):
+            self.state['urls'][bot.name][ievent.printto] = []
+        self.state['urls'][bot.name][ievent.printto].append(i)  
+	self.state.save()
+
+    def fetch(self, bot, ievent):
+	try:
+	    return self.state['urls'][bot.name][ievent.printto][-1]
+	except KeyError:
+	    return
+
+    def search(self, bot, ievent):
+	urls = []
+
+	if bot and ievent:
+	    try:
+		urls = self.state['urls'][bot.name][ievent.printto]
+	    except KeyError:
+		pass
+	return urls
+
+
+cache = URLcache()
+
+def urlpre(bot, ievent):
+    return re_url_match.findall(ievent.txt)
+
+def urlcb(bot, ievent):
+    try:
+        test_urls = re_url_match.findall(ievent.txt)
+        for i in test_urls:
+	    cache.add(bot, ievent, i)
+    except Exception, ex:
+        handle_exception()
+
+callbacks.add('PRIVMSG', urlcb, urlpre, threaded=True)
+
+def handle_urlsearch(bot, ievent):
+    if not ievent.rest:
+        ievent.missing('<what>')
+        return
+
+    result = []
+    try:
+        for url in cache.search(bot, ievent):
+            if ievent.rest in url:
+                result.append(url)
+    except Exception, ex:
+        ievent.reply(str(ex))
+        return
+    if result:
+        ievent.reply('results matching %s: ' % ievent.rest, result, nr=True)
+    else:
+        ievent.reply('no result found')
+        return
+
+cmnds.add('url-search', handle_urlsearch, ['USER', 'WEB', 'CLOUD'])
+examples.add('url-search', 'search matching url entries', 'url-search gozerbot')
+tests.add('url-search gozerbot')
+
+def size():
+    return cache.size()
+
+def handle_urlsize(bot, ievent):
+    ievent.reply(cache.size())
+
+cmnds.add('url-size', handle_urlsize, 'OPER')
+examples.add('url-size', 'show number of urls in cache', 'url-size')
+tests.add('url-size')
--- gozerbot-0.99.1.orig/build/lib/gplugs/dns.py
+++ gozerbot-0.99.1/build/lib/gplugs/dns.py
@@ -0,0 +1,152 @@
+# plugs/dns.py
+#
+# 
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples 
+from gozerbot.plughelp import plughelp
+import copy
+import re
+import socket
+
+plughelp.add('dns', 'do ip or host lookup')
+
+_re_hexip = re.compile('^[\da-f]{8}$', re.I)
+
+def handle_hostname(bot, ievent):
+    """ hostname <ipnr> .. get hostname of ip number"""
+    try:
+        item = ievent.args[0]
+    except IndexError:
+        ievent.missing('<ipnr>')
+        return
+    try:
+        hostname = socket.gethostbyaddr(item)
+        ievent.reply(hostname[0])
+    except:
+        ievent.reply("can't match " + str(item))
+
+cmnds.add('host', handle_hostname, 'USER')
+examples.add('host', 'get hostname for ip', 'host 194.109.129.219')
+
+def handle_ip(bot, ievent):
+    """ ip <hostname> .. get ip of hostname """
+    try:
+        item = ievent.args[0]
+    except IndexError:
+        ievent.missing('<hostname>')
+        return
+    try:
+        ipnr = socket.gethostbyname(item)
+        ievent.reply(ipnr)
+    except:
+        ievent.reply("can't match " + str(item))
+
+cmnds.add('ip', handle_ip, 'USER')
+examples.add('ip', 'show ip number of host', 'ip gozerbot.org')
+
+def handle_dns(bot, ievent):
+    """ <host|ip> performs a DNS lookup an ip or hostname. """
+    if not ievent.args:
+        ievent.missing('<host | ip>')
+    else:
+        is_a   = None
+        result = None
+        # If we support IPv6 ...
+        if socket.has_ipv6:
+            # ... then check if this is an IPv6 ip
+            try:
+                socket.inet_pton(socket.AF_INET6, ievent.args[0])
+                is_a = 'ipv6'
+            except AttributeError:
+                pass
+            except socket.error:
+                pass
+        # Ah not an IPv6 ip ...
+        if not is_a:
+            # ... maybe IPv4 ?
+            try:
+                socket.inet_aton(ievent.args[0])
+                is_a = 'ipv4'
+            except AttributeError:
+                pass
+            except socket.error:
+                pass
+        # Not an ip, must be a hostname then
+        if not is_a:
+            is_a = 'host'
+        # If it was an ip ...
+        if is_a in ['ipv4', 'ipv6']:
+            try:
+                # ... try to resolve it
+                result = socket.gethostbyaddr(ievent.args[0])
+                if result[1]:
+                    result = 'primary: %s, aliases: %s' % \
+                        (result[0], ', '.join(result[1]))
+                else:
+                    result = result[0]
+                ievent.reply('%s ip %s resolves to %s' % \
+                    (is_a, ievent.args[0], result))
+            except Exception, e:
+                ievent.reply('could not resolve %s address %s: %s' % \
+                    (is_a, ievent.args[0], e[1]))
+        # Oh it's a host, lets resolve that
+        elif is_a == 'host':
+            try:
+                result = []
+                for info in socket.getaddrinfo(ievent.args[0], None):
+                    if info[0] in [socket.AF_INET, socket.AF_INET6] and \
+                        (info[1] == socket.SOCK_STREAM or info[1] == 0): # 0 under windows
+                        ip = info[4][0]
+                        if not ip in result:
+                            result.append(ip)
+                if not result:
+                    ievent.reply('could not resolve hostname %s: not found' % \
+ievent.args[0])
+                else:
+                    ievent.reply('%s resolves to: %s' % (ievent.args[0], \
+', '.join(result)))
+            except Exception, e:
+                ievent.reply('could not resolve hostname %s: %s' % \
+                    (ievent.args[0], e[1]))
+        else:
+            ievent.reply('lookup failed, no valid data found')
+
+cmnds.add('dns', handle_dns, 'USER')
+examples.add('dns', 'look up an ip or hostname', 'dns gozerbot.org')
+
+def handle_hexip(bot, ievent):
+    """ <ip|hex ip> returns the reverse of the given argument. """
+    if not ievent.args:
+        return ievent.missing('<ip | hex ip>')
+    is_a = None
+    if _re_hexip.match(ievent.args[0]):
+        is_a = 'hexip'
+    else:
+        try:
+            socket.inet_pton(socket.AF_INET, ievent.args[0])
+            is_a = 'defip'
+        except socket.error:
+            pass
+    if not is_a:
+        ievent.missing('<ip | hex ip>')
+        return
+    if is_a == 'hexip':
+        ip = []
+        for i in range(4):
+            ip.append(str(int(ievent.args[0][i*2:i*2+2], 16)))
+        ip = '.'.join(ip)
+        nevent = copy.deepcopy(ievent)
+        nevent.args = [ip]
+        handle_dns(bot, nevent)
+    else:
+        test = ievent.args[0].split('.')
+        ip = 16777216 * int(test[0]) + 65536 * int(test[1]) + 256 * \
+int(test[2]) + int(test[3])
+        ievent.reply('ip %s = %08x' % (ievent.args[0], ip))
+
+cmnds.add('hexip', handle_hexip, 'USER')
+examples.add('hexip', 'return the hex ip notation of an ip, or vice versa', \
+'hexip 7F000001')
--- gozerbot-0.99.1.orig/build/lib/gplugs/wikipedia.py
+++ gozerbot-0.99.1/build/lib/gplugs/wikipedia.py
@@ -0,0 +1,93 @@
+# plugs/wikipedia.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import geturl, striphtml, splittxt, handle_exception, \
+fromenc
+from gozerbot.commands import cmnds
+from gozerbot.aliases import aliases
+from gozerbot.examples import examples
+from gozerbot.utils.rsslist import rsslist
+from gozerbot.plughelp import plughelp
+from urllib import quote
+import re
+
+plughelp.add('wikipedia', 'query wikipedia')
+
+wikire = re.compile('start content(.*?)end content', re.M)
+
+def searchwiki(txt, lang='en'):
+    for i in txt.split():
+        if i.startswith('-'):
+            if len(i) != 3:
+                continue
+            else:
+                lang = i[1:]
+            continue
+    txt = txt.replace("-%s" % lang, '')
+    txt = txt.strip().capitalize()
+    what = txt.strip().replace(' ', '_')
+    url = 'http://%s.wikipedia.org/wiki/Special:Export/%s' % (lang, \
+quote(what.encode('utf-8')))
+    url2 = 'http://%s.wikipedia.org/wiki/%s' % (lang, \
+quote(what.encode('utf-8')))
+    txt = getwikidata(url)
+    if not txt:
+        return None
+    if 'from other capitalisation' in txt:
+        what = what.title()
+        url = 'http://%s.wikipedia.org/wiki/Special:Export/%s' % (lang, \
+quote(what.encode('utf-8')))
+        url2 = 'http://%s.wikipedia.org/wiki/%s' % (lang, \
+quote(what.encode('utf-8')))
+        txt = getwikidata(url)
+    if '#REDIRECT' in txt or '#redirect' in txt:
+        redir = ' '.join(txt.split()[1:])
+        url = 'http://%s.wikipedia.org/wiki/Special:Export/%s' % (lang, \
+quote(redir.encode('utf-8')))
+        url2 = 'http://%s.wikipedia.org/wiki/%s' % (lang, \
+quote(redir.encode('utf-8')))
+        txt = getwikidata(url)
+    return (txt, url2)
+
+def getwikidata(url):
+    """ fetch wiki data """
+    result = fromenc(geturl(url))
+    if not result:
+        return
+    res = rsslist(result)
+    txt = ""
+    for i in res:
+        try:
+            txt = i['text']
+            break
+        except:
+            pass
+    if not txt:
+        return
+    #txt = re.sub('\[\[Image:([^\[\]]+|\[\[[^\]]+\]\])*\]\]', '', txt)
+    txt = txt.replace('[[', '')
+    txt = txt.replace(']]', '')
+    txt = re.sub('\s+', ' ', txt)
+    return txt
+
+def handle_wikipedia(bot, ievent):
+    """ wikipedia <what> .. search wikipedia for <what> """
+    if not ievent.rest:
+        ievent.missing('<what>')
+        return
+    res = searchwiki(ievent.rest)
+    if not res:
+        ievent.reply('no result found')
+        return
+    txt, url = res
+    res = ['%s ===> ' % url, ]
+    res += splittxt(striphtml(txt).strip())
+    ievent.reply(res)
+
+cmnds.add('wikipedia', handle_wikipedia, 'USER')
+examples.add('wikipedia', 'wikipedia ["-" <countrycode>] <what> .. search \
+wikipedia for <what>','1) wikipedia gozerbot 2) wikipedia -nl bot')
+aliases.data['wiki'] = 'wikipedia'
--- gozerbot-0.99.1.orig/build/lib/gplugs/lns.py
+++ gozerbot-0.99.1/build/lib/gplugs/lns.py
@@ -0,0 +1,92 @@
+# http://ln-s.net short ln-s
+# (c) Wijnand "tehmaze" Modderman - http://tehmaze.com
+# BSD License
+
+from gozerbot.aliases import aliases
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.generic import rlog
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.persist.persiststate import PlugState
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+
+import re
+import urllib, urllib2
+
+plughelp.add('lns', 'use the ln-s.net redirector')
+
+re_url_match = re.compile(r'((?:http|https|ftp)://\S+)')
+
+cfg = PersistConfig()
+cfg.define('url-api', 'http://ln-s.net/home/api.jsp')
+cfg.define('url-len', 64)
+
+state = None
+
+def init():
+    global state
+    state = PlugState()
+    state.define('ln-s', {})
+    return 1
+
+def shutdown():
+    if state:
+        state.save()
+        return 1
+
+def lnsurl(url):
+    req = urllib2.Request(url=cfg.get('url-api'),
+        data=urllib.urlencode({'url': url}))
+    out = urllib2.urlopen(req)
+    ret = out.read().strip()
+    return ret.split(' ', 1)[1]
+
+def lnscb(bot, ievent):
+    if not state:
+        return
+    if not bot.name in state['ln-s']:
+        return
+    if not ievent.channel.lower() in state['ln-s'][bot.name]:
+        return
+    if not state['ln-s'][bot.name][ievent.channel.lower()]:
+        return
+    try:
+        test_urls = re_url_match.findall(ievent.txt)
+        for url in test_urls:
+            if len(url) >= cfg.get('url-len'):
+                host = url.split(':')[1].lstrip('/').split('/')[0]
+                short = lnsurl(url)
+                ievent.reply('%s (at %s)' % (short, host))
+    except Exception,e:
+        rlog(10, 'lns', 'EXCEPTION: %s' % str(e))
+
+def handle_ln_on(bot, ievent):
+    if not state:
+        return
+    if not bot.name in state['ln-s']:
+        state['ln-s'][bot.name] = {}
+    if not ievent.channel.lower() in state['ln-s'][bot.name]:
+        state['ln-s'][bot.name][ievent.channel.lower()] = True
+    ievent.reply('ok')
+
+def handle_ln_off(bot, ievent):
+    if not state:
+        return
+    if not bot.name in state['ln-s']:
+        state['ln-s'][bot.name] = {}
+    if not ievent.channel.lower() in state['ln-s'][bot.name]:
+        state['ln-s'][bot.name][ievent.channel.lower()] = False
+    ievent.reply('ok')
+
+callbacks.add('PRIVMSG', lnscb)
+cmnds.add('ln-on', handle_ln_on, 'USER')
+examples.add('ln-on', 'enable ln in channel the command was given in', 'ln-on')
+tests.add('ln-on')
+cmnds.add('ln-off', handle_ln_off, 'USER')
+examples.add('ln-off', 'diable ln in channel the command was given in', \
+'ln-off')
+tests.add('ln-off')
+aliases.data['lns-on'] = 'ln-on'
+aliases.data['lns-off'] = 'lns-off'
--- gozerbot-0.99.1.orig/build/lib/gplugs/kickban.py
+++ gozerbot-0.99.1/build/lib/gplugs/kickban.py
@@ -0,0 +1,128 @@
+from gozerbot.tests import tests
+from gozerbot.generic import getwho, rlog
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.aliases import aliases
+from gozerbot.callbacks import callbacks
+from gozerbot.plughelp import plughelp
+import Queue
+import time
+
+plughelp.add('kickban', 'channel ban list management')
+
+bans      = {}
+cachetime = 300
+timeout   = 10 
+
+def handle_367(bot, ievent):
+    rlog(0, '367', str(ievent))
+    channel = ievent.arguments[1].lower()
+    if not bot.name in bans or not channel in bans[bot.name]:
+        return # not requested by this plugin
+    bans[bot.name][channel].append(ievent.txt.split()[0])
+
+def handle_mode(bot, ievent):
+    rlog(0, 'mode', str(ievent))
+    # [18 Jan 2008 13:41:29] (mode) cmnd=MODE prefix=maze!wijnand@2833335b.cc9dd561.com.hmsk postfix=#eth0-test +b *!*@je.moeder.ook arguments=[u'#eth0-test', u'+b', u'*!*@je.moeder.ook'] nick=maze user=wijnand userhost=wijnand@2833335b.cc9dd561.com.hmsk channel=#eth0-test txt= command= args=[] rest= speed=5 options={}
+
+def get_bans(bot, channel):
+    # :ironforge.sorcery.net 367 basla #eth0 *!*@71174af5.e1d1a3cf.net.hmsk eth0!eth0@62.212.76.127 1200657224
+    # :ironforge.sorcery.net 367 basla #eth0 *!*@6ca5f0a3.14055a38.89.123.imsk eth0!eth0@62.212.76.127 1200238584
+    # :ironforge.sorcery.net 368 basla #eth0 :End of Channel Ban List
+    channel = channel.lower()
+    if not bot.name in bans:
+        bans[bot.name] = {}
+    bans[bot.name][channel] = []
+    queue368 = Queue.Queue()
+    bot.wait.register('368', channel, queue368)
+    bot.sendraw('MODE %s +b' % (channel, ))
+    # wait for End of Channel Ban List
+    try:
+        res = queue368.get(1, timeout)
+    except Queue.Empty:
+        return None
+    return bans[bot.name][channel]
+
+def get_bothost(bot):
+    return getwho(bot, bot.nick).split('@')[-1].lower()
+
+def handle_ban_list(bot, ievent):
+    banslist = get_bans(bot, ievent.channel)
+    if not banslist:
+        ievent.reply('the ban list for %s is empty' % ievent.channel)
+    else:
+        ievent.reply('bans on %s: ' % ievent.channel, banslist, nr=True)
+
+def handle_ban_remove(bot, ievent):
+    channel = ievent.channel.lower()
+    if len(ievent.args) != 1 or not ievent.args[0].isdigit():
+        ievent.missing('<banlist index>')
+        return
+    if not bot.name in bans or not channel in bans[bot.name]:
+        banslist = get_bans(bot, ievent.channel)
+    else:
+        banslist = bans[bot.name][channel]
+        index = int(ievent.args[0])-1
+        if len(banslist) <= index:
+            ievent.reply('ban index out of range')
+        else:
+            unban = banslist[index]
+            banslist.remove(unban)
+            bot.sendraw('MODE %s -b %s' % (channel, unban))
+            ievent.reply('unbanned %s' % (unban, ))
+
+def handle_ban_add(bot, ievent):
+    if not ievent.args:
+        ievent.missing('<nick>')
+        return
+    if ievent.args[0].lower() == bot.nick.lower():
+        ievent.reply('not going to ban myself')
+        return
+    userhost = getwho(bot, ievent.args[0])
+    if userhost:
+        host = userhost.split('@')[-1].lower()
+        if host == get_bothost(bot):
+            ievent.reply('not going to ban myself')
+            return
+        bot.sendraw('MODE %s +b *!*@%s' % (ievent.channel, host))
+        ievent.reply('banned %s' % (host, ))
+    else:
+        ievent.reply('can not get userhost of %s' % ievent.args[0])
+
+def handle_kickban_add(bot, ievent):
+    if not ievent.args:
+        ievent.missing('<nick> [<reason>]')
+        return
+    if ievent.args[0].lower() == bot.nick.lower():
+        ievent.reply('not going to kickban myself')
+        return
+    userhost = getwho(bot, ievent.args[0])
+    reason = len(ievent.args) > 1 and ' '.join(ievent.args[1:]) or 'Permban requested, bye'
+    if userhost:
+        host = userhost.split('@')[-1].lower()
+        if host == get_bothost(bot):
+            ievent.reply('not going to kickban myself')
+            return
+        bot.sendraw('MODE %s +b *!*@%s' % (ievent.channel, host))
+        bot.sendraw('KICK %s %s :%s' % (ievent.channel, ievent.args[0], reason))
+    else:
+        ievent.reply('can not get userhost of %s' % ievent.args[0])
+
+callbacks.add('367', handle_367)
+callbacks.add('MODE', handle_mode)
+aliases.data['ban'] = 'ban-add'
+aliases.data['bans'] = 'ban-list'
+aliases.data['unban'] = 'ban-remove'
+aliases.data['kb'] = 'ban-kickban'
+aliases.data['kickban'] = 'ban-kickban'
+cmnds.add('ban-add', handle_ban_add, 'OPER')
+examples.add('ban-add', 'adds a host to the ban list', 'ban-add *!*@lamers.are.us')
+tests.add('ban-add *!*@lamer', 'added')
+cmnds.add('ban-list', handle_ban_list, 'OPER', threaded=True)
+tests.add('ban-list', 'lamer')
+cmnds.add('ban-remove', handle_ban_remove, 'OPER', threaded=True)
+examples.add('ban-remove', 'removes a host from the ban list', 'ban-remove 1')
+tests.add('ban-remove', '*!*@lamer')
+cmnds.add('ban-kickban', handle_kickban_add, 'OPER')
+examples.add('ban-kickban', 'kickbans the given nick', 'kickban Lam0r Get out of here')
+tests.add('ban-kickban', 'ban-kickban exec')
--- gozerbot-0.99.1.orig/build/lib/gplugs/botsnack.py
+++ gozerbot-0.99.1/build/lib/gplugs/botsnack.py
@@ -0,0 +1,88 @@
+# plugs/botsnack.py
+#
+#
+
+""" eat it """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.utils.generic import convertpickle
+from gozerbot.datadir import datadir
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+import random, os
+
+plughelp.add('botsnack', 'give the bot a snack')
+
+## UPGRADE PART
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'botsnacklist', \
+datadir + os.sep  + "plugs" + os.sep + "botsnack" + os.sep + 'botsnacklist')
+
+## END UPGRADE PART
+
+bsl = PlugPersist('botsnacklist')
+
+if not bsl.data:
+    bsl = PlugPersist('botsnacklist')
+    if not bsl.data:
+        bsl.data = []
+
+def handle_botsnack(bot, ievent):
+    """ botsnack .. give botsnack reply """
+    if bsl.data:
+        result = random.choice(bsl.data)
+        result = result.replace('<nick>', ievent.nick)
+        result = result.replace('<host>', ievent.userhost)
+        ievent.reply(result)
+    else:
+        ievent.reply('smikkel ;]')
+
+cmnds.add('botsnack', handle_botsnack, ['USER', 'CLOUD'])
+examples.add('botsnack', 'give the bot a snack ;] .. botsnack responses \
+can be added with botsnack-add', 'botsnack')
+tests.add('botsnack')
+def handle_addbotsnack(bot, ievent):
+    """ botsnack-add <reply> .. add botsnack reply """
+    if not ievent.rest:
+        ievent.missing('<what>')
+        return
+    # append and save
+    bsl.data.append(ievent.rest)
+    bsl.save()
+    ievent.reply('botsnack added')
+
+cmnds.add('botsnack-add', handle_addbotsnack, 'OPER', allowqueue=False)
+examples.add('botsnack-add', 'botsnack-add <what> .. add a botsnack \
+response, <nick> can be used to show nick of user giving the command', \
+'botsnack-add thnx <nick> ;]')
+tests.add('botsnack-add mekker', 'added').add('botsnack-del mekker', 'removed')
+
+def handle_listbotsnack(bot, ievent):
+    """ botscnack-list .. list botsnack replies """
+    ievent.reply(str(bsl.data))
+
+cmnds.add('botsnack-list', handle_listbotsnack, 'OPER')
+examples.add('botsnack-list', 'show list of botsnack replies', 'botsnack-list')
+tests.add('botsnack-add bla').add('botsnack-list', 'bla').add('botsnack-del bla')
+
+def handle_delbotsnack(bot, ievent):
+    """ botsnack-del <reply> .. delete botsnack reply """
+    if not ievent.rest:
+        ievent.missing('<txt>')
+        return
+    try:
+        bsl.data.remove(ievent.rest)
+        bsl.save()
+    except ValueError:
+        ievent.reply('i have no %s in botsnacklist' % ievent.rest)
+        return
+    ievent.reply('botsnack %s removed' % ievent.rest)
+
+cmnds.add('botsnack-del', handle_delbotsnack, 'OPER')
+examples.add('botsnack-del', 'delete entry from botsnack list', 'botsnack-del \
+thnx <nick> ;]')
--- gozerbot-0.99.1.orig/build/lib/gplugs/umode.py
+++ gozerbot-0.99.1/build/lib/gplugs/umode.py
@@ -0,0 +1,120 @@
+# plugs/umode.py
+# 
+#
+
+__author__ = "Wijnand 'tehmaze' Modderman - http://tehmaze.com"
+__license__ = 'BSD'
+__gendoclast__ = ['usermode-del', ]
+
+from gozerbot.utils.generic import convertpickle
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.persist.pdol import Pdol
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+
+import os
+import types
+
+plughelp.add('umode', 'on-connect bot usermode')
+
+## UPGRADE PART
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'umode', datadir + os.sep + 'plugs' + os.sep + 'umode' + \
+os.sep + 'umode')
+
+## END UPGRADE PART
+
+class UModes(Pdol):
+
+    """ umodes object """
+
+    def __init__(self):
+        Pdol.__init__(self, datadir + os.sep + 'plugs' + os.sep + 'umode' + \
+os.sep + 'umode')
+
+    def addmode(self, bot, modes):
+        """ add a mode to the bot """
+        if type(modes) == types.StringType:
+            modes = list(modes)
+        if not self.get(bot.name):
+            self.new(bot.name)
+        for mode in modes:
+            if not mode in self.data[bot.name]:
+                self.add(bot.name, mode)
+        self.save()
+
+    def delmode(self, bot, modes):
+        """ delete mode from the bot """
+        if type(modes) == types.StringType:
+            modes = list(modes)
+        if not self.get(bot.name):
+            return
+        for mode in modes:
+            if mode in self.data[bot.name]:
+                self.data[bot.name].remove(mode)
+        self.save()
+
+    def getmode(self, bot):
+        """ get mode of the bot """
+        return self.get(bot.name) or []
+
+    def domode(self, bot):
+        """ set bot mode on server """
+        modes = self.getmode(bot)
+        if modes:
+            bot.sendraw('MODE %s +%s' % (bot.nick, ''.join(modes)))
+
+    def handle_001(self, bot, ievent):
+        """ call on connect to server """
+        self.domode(bot)
+
+umodes = UModes()
+if not umodes.data:
+    umodes = UModes()
+
+def handle_usermodeadd(bot, ievent):
+    """ add mode to bot """
+    if not ievent.args:
+        ievent.missing('<mode(s)>')
+        return
+    umodes.addmode(bot, ' '.join(ievent.args).replace(' ', ''))
+    umodes.domode(bot)
+    ievent.reply('ok')
+
+cmnds.add('usermode-add', handle_usermodeadd, 'OPER', threaded=True)
+examples.add('usermode-add', 'add a usermode', 'usermode-add I')
+tests.add('usermode-add I')
+
+def handle_usermodedel(bot, ievent):
+    """ delete mode from bot """
+    if not ievent.args:
+        ievent.missing('<mode(s)>')
+        return
+    modes = list(' '.join(ievent.args).replace(' ', ''))
+    umodes.delmode(bot, modes)
+    bot.sendraw('MODE %s -%s' % (bot.nick, ''.join(modes)))
+    ievent.reply('ok')
+
+cmnds.add('usermode-del', handle_usermodedel, 'OPER', threaded=True)
+examples.add('usermode-del', 'remove a usermode', 'usermode-del I')
+tests.add('usermode-del I')
+
+def handle_usermodelist(bot, ievent):
+    """ list modes of bot """
+    modes = umodes.getmode(bot)
+    if not modes:
+        ievent.reply('no modes set')
+    else:
+        modes.sort()
+        ievent.reply('mode +%s' % ''.join(modes))
+
+cmnds.add('usermode-list', handle_usermodelist, 'OPER')
+examples.add('usermode-list', 'show user modes', 'usermode-list')
+tests.add('usermode-list')
+
+# callbacks
+callbacks.add('001', umodes.handle_001)
--- gozerbot-0.99.1.orig/build/lib/gplugs/fans.py
+++ gozerbot-0.99.1/build/lib/gplugs/fans.py
@@ -0,0 +1,101 @@
+# gozerplugs/fans.py
+#
+#
+
+__depend__ = ['karma', ]
+
+from gozerbot.config import config
+if config.get('db_driver') == "olddb": from gplugs.olddb.karma import karma
+else: from gplugs.alchemy.karma import karma
+from gozerbot.aliases import aliases
+from gozerbot.commands import cmnds
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import shlex
+
+plughelp.add('fans', 'show the lovers and haters of a karma item')
+
+cfg = PersistConfig()
+cfg.define('dehighlight', 1)
+
+def dehighlight(nick):
+    l = len(nick)
+    if l > 1:
+        return nick[0:l//2] + '' + nick[l//2:]
+    else:
+        return nick
+
+def getkarma(item):
+    nicks = {}
+    ups = karma.getwhoup(item) or []
+    dns = karma.getwhodown(item) or []
+    nicks = dict((x, 0) for x in set(ups+dns))
+    for nick in ups: nicks[nick] += 1
+    for nick in dns: nicks[nick] -= 1
+    return nicks
+
+def handle_fans(bot, ievent):
+    if ievent.args:
+        who = ' '.join(ievent.args)
+    else:
+        who = ievent.nick
+    users = getkarma(who)
+    fans = sorted(x for x in users if users[x] > 0)
+    if fans:
+        if cfg.get('dehighlight'): fans = map(dehighlight, fans)
+        ievent.reply('the fanclub of %s consists of: ' % (who,), fans, dot=', ')
+    else:
+        ievent.reply('%s has no fans' % who)
+
+def handle_haters(bot, ievent):
+    if ievent.args:
+        who = ' '.join(ievent.args)
+    else:
+        who = ievent.nick
+    users = getkarma(who)
+    hate = sorted(x for x in users if users[x] < 0)
+    if hate:
+        if cfg.get('dehighlight'): hate = map(dehighlight, hate)
+        ievent.reply('the hateclub of %s consists of: ' % (who,), hate, dot=', ')
+    else:
+        ievent.reply('%s has no haters' % who)
+
+def handle_vs(bot, ievent):
+    lex = shlex.shlex(ievent.rest, posix=False)
+    try:
+        args = [x.replace('\x00', '') for x in shlex.split(ievent.rest)]
+    except ValueError, e:
+        ievent.reply(str(e))
+        return
+    if len(args) < 2:
+        ievent.missing('<item1> <item2> [...<itemX>]')
+    else:
+        items = list(reversed(sorted((karma.get(x) or 0, x) for x in args)))
+        karmas = []
+        for x in xrange(0, len(items)):
+            if karmas:
+                if items[x][0] == items[x-1][0]:
+                    karmas.append('==')
+                else:
+                    karmas.append('>')
+            karmas.append(items[x][1])
+        ievent.reply(' '.join(karmas))
+
+cmnds.add('fans', handle_fans, 'USER')
+examples.add('fans', 'show fans of karma item', 'fans gozerbot')
+tests.add('fans')
+
+aliases.data['love'] = 'fans'
+cmnds.add('haters', handle_haters, 'USER')
+tests.add('haters')
+
+examples.add('haters', 'show haters of karma item', 'haters gozerbot')
+aliases.data['hate'] = 'haters'
+cmnds.add('karma-vs', handle_vs, 'USER')
+examples.add('vs', 'show lovers versus haters of a karma item', 'karma-vs gozerbot \
+vs supybot')
+aliases.data['vs'] = 'karma-vs'
+tests.add('karma-vs gozerbot supybot')
--- gozerbot-0.99.1.orig/build/lib/gplugs/bender.py
+++ gozerbot-0.99.1/build/lib/gplugs/bender.py
@@ -0,0 +1,80 @@
+# plugs/bender.py
+#
+#
+#
+
+""" uses the random lib """
+
+__copyright__ = 'this file is in the public domain'
+__revision__ = '$Id: bender.py 517 2007-02-04 11:17:00Z deck $'
+
+from gozerbot.generic import handle_exception
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+import re, random
+
+plughelp.add('bender', 'display a bender quote')
+
+benders=["Bite my shiny, metal ass!",
+ "Bite my glorious, golden ass!",
+ "Bite my shiny, colossal ass!",
+ "Bite my splintery, wooden ass!",
+ "Lick my frozen, metal ass!",
+ "Like most of life's problems, this one can be solved with bending.",
+ "Cheese it!",
+ "Well, I'm boned.",
+ "Hey, sexy mama...wanna kill all humans?",
+ "Oh! Your! God!",
+ "He's pending for a bending!",
+ "This is the worst kind of discrimination - the kind against me!",
+ "In case of emergency, my ass can be used as a flotation device.",
+ "In order to get busy at maximum efficiency, I need a girl with a big, 400-ton booty.",
+ "I'm sick of shaking my booty for these fat jerks!",
+ "Bite my red-hot glowing ass!",
+ "All I know is, this gold says it was the best mission ever.",
+ "Hey, guess what you're all accessories to.",
+ "Well, I don't have anything else planned for today. Let's get drunk!",
+ "Oh, no room for Bender, huh? Fine! I'll go build my own lunar lander! With blackjack and hookers! In fact, forget the lunar lander and the blackjack! Ah, screw the whole thing.",
+ "I found it in the street! Like all the food I cook.",
+ "I can't stand idly by while poor people get free food!",
+ "Congratulations Fry, you've snagged the perfect girlfriend. Amy's rich, she's probably got other characteristics...",
+ "You may need to metaphorically make a deal with the devil. By 'devil' I mean robot devil and by 'metaphorically' I mean get your coat.",
+ "Boy, who knew a cooler could also make a handy wang coffin?",
+ "Call me old fashioned but I like a dump to be as memorable as it is devastating.",
+ "My life, and by extension everyone else's is meaningless.",
+ "Do I preach to you while you're lying stoned in the gutter? No.",
+ "Everybody's a jerk. You, me, this jerk.",
+ "I hate the people that love me and they hate me.",
+ "I've personalized each of your meals. Amy, you're cute, so I baked you a pony!",
+ "Ahh, computer dating. It's like pimping, but you rarely have to use the phrase, 'upside your head'.",
+ "Court's kinda fun when it's not my ass on the line!",
+ "Maybe you can interface with my ass! By biting it!",
+ "Well, I'll go build my own theme park! With blackjack and hookers! In fact, forget the park!",
+ "Compare your lives to mine and then kill yourself!",
+ "I would give up my 8 other senses, even smision, for a sense of taste!",
+ "Stupid anti-pimping laws!",
+ "Blackmail's such an ugly word. I prefer extortion. The x makes it sound cool.",
+ "Great is ok, but amazing would be great!",
+ "The pie is ready. You guys like swarms of things, right?",
+ "Fry cracked corn, and I don't care; Leela cracked corn, I still don't care; Bender cracked corn, and he is great! Take that you stupid corn!",
+ "Stay away from our women. You got metal fever, baby, metal fever!",
+ "If it ain't black and white, peck, scratch and bite.",
+ "Life is hilariously cruel.",
+ "Pardon me, brother. Care to donate to the anti-mugging you fund?",
+ "I love this planet. I've got wealth, fame, and access to the depths of sleaze that those things bring.",
+ "C'mon, it's just like making love. Y'know, left, down, rotate sixty-two degrees, engage rotors...",
+ "Oh my God, I'm so excited I wish I could wet my pants.",
+ "Argh. The laws of science be a harsh mistress.",
+ "In the event of an emergency, my ass can be used as a floatation device.",
+ "Hey, I got a busted ass here! I don't see anyone kissing it.",
+ "I'm a fraud - a poor, lazy, sexy fraud.",
+ "This'll show those filthy bastards who's loveable!"]
+
+def handle_bender(bot, ievent):
+    ievent.reply(random.choice(benders))
+    
+cmnds.add('bender', handle_bender, 'USER')
+examples.add('bender', 'show a bender quote', 'bender')
+tests.add('bender')
--- gozerbot-0.99.1.orig/build/lib/gplugs/urban.py
+++ gozerbot-0.99.1/build/lib/gplugs/urban.py
@@ -0,0 +1,54 @@
+# plugs/urban.py
+#
+#
+
+""" query urbandictionary """
+
+__copyright__ = 'this file is in the public domain'
+__author__ = "Bas van Oostveen"
+
+from gozerbot.generic import geturl2
+from gozerbot.commands import cmnds
+from gozerbot.aliases import aliases
+from gozerbot.examples import examples
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import urllib, json
+
+plughelp.add('urban', 'query urbandictionary.com')
+
+url = "http://www.urbandictionary.com/iphone/search/define?term="
+
+def handle_urban(bot, ievent):
+    """ urban <what> .. search urban for <what> """
+    if len(ievent.args) > 0:
+	what = " ".join(ievent.args)
+    else:
+        ievent.missing('<search query>')
+        return
+
+    try:
+	data = geturl2(url + urllib.quote_plus(what))
+	if not data:
+	    ievent.reply("word not found: %s" % what)
+	    return
+
+	data = json.loads(data)
+	if data['result_type'] == 'no_results':
+	    ievent.reply("word not found: %s" % what)
+	    return
+
+	res = []
+	for r in data['list']:
+	    res.append(r['definition'])
+	ievent.reply(res, dot=True) # dot=" | ")
+    except:
+	raise
+
+cmnds.add('urban', handle_urban, 'USER')
+examples.add('urban', 'urban <what> .. search \
+urbandictionary for <what>','1) urban bot 2) urban shizzle')
+
+
--- gozerbot-0.99.1.orig/build/lib/gplugs/drinks.py
+++ gozerbot-0.99.1/build/lib/gplugs/drinks.py
@@ -0,0 +1,79 @@
+# plugs/drinks.py
+#
+#
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import os, string, random
+import urllib, urllib2, json, re
+
+plughelp.add('drinks', 'serve coffee/tea')
+
+wikipedia_url = "http://en.wikipedia.org/w/api.php?"
+wikipedia_url += "action=query&cmlimit=100&format=json"
+wikipedia_url += "&list=categorymembers&cmtitle="
+
+wikipedia_ns_main = '0'
+wikipedia_ns_cat = '14'
+
+coffee = []
+tea = []
+
+def init():
+    global tea
+
+    for tv in wikipedia_fetch('Category:Tea_varieties', wikipedia_ns_cat):
+        for t in wikipedia_fetch(tv, wikipedia_ns_main):
+            tea.append(t.strip())
+
+    for c in wikipedia_fetch('Category:Coffee_beverages', wikipedia_ns_main):
+        coffee.append(c.strip())
+
+def wikipedia_fetch(category, ns):
+    members = []
+
+    try:
+	args = urllib.quote_plus(category) + '&cmnamespace=' + ns
+	response = urllib2.urlopen(wikipedia_url + args)
+    except IOError:
+	return members
+
+    try:
+	result = json.loads(response.read())
+    except ValueError:
+	return members
+    for m in result['query']['categorymembers']:
+	if m['title'].startswith('List of'):
+	    continue
+	title = re.sub("\ \(.*\)$", '', m['title'])
+	members.append(title)
+
+    return members
+
+def handle_coffee(bot, ievent):
+    """ get a coffee """
+    if not coffee:
+	return
+    rand = random.randint(1,len(coffee))
+    bot.action(ievent.channel, 
+	"pours %s a cup of %s" % (ievent.nick, coffee[rand-1]))
+
+def handle_tea(bot, ievent):
+    """ get a tea """
+    if not tea:
+	return
+    rand = random.randint(1,len(tea))
+    bot.action(ievent.channel, 
+	"pours %s a cup of %s" % (ievent.nick, tea[rand-1]))
+    
+cmnds.add('coffee', handle_coffee, 'USER')
+examples.add('coffee', 'get a coffee', 'coffee')
+tests.add('coffee')
+
+cmnds.add('tea', handle_tea, 'USER')
+examples.add('tea', 'get a tea', 'tea')
+tests.add('tea')
+
--- gozerbot-0.99.1.orig/build/lib/gplugs/gcalc.py
+++ gozerbot-0.99.1/build/lib/gplugs/gcalc.py
@@ -0,0 +1,50 @@
+# plugins/gcalc.py
+# encoding: utf-8
+
+__copyright__ = 'This file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+from gozerbot.aliases import aliasset
+
+import urllib, urllib2, json, re
+
+url = "http://www.google.com/ig/calculator?oe=utf-8&q="
+
+plughelp.add('gcalc', 'use the google calculator')
+
+def handle_gcalc(bot, ievent):
+    if len(ievent.args) > 0:
+        expr = " ".join(ievent.args)
+    else:
+        ievent.missing('Missing an expression')
+        return
+
+    try:
+	response = urllib2.urlopen(url + urllib.quote_plus(expr)) 
+    except IOError:
+	ievent.reply('request failed')
+	return
+
+    try:
+	data = response.read()
+	# keys quotes fixup
+	data = re.sub("(['\"])?([a-zA-Z0-9]+)(['\"])?:", '"\\2":', data)
+	result = json.loads(data)
+    except ValueError:
+	ievent.reply('decoding failed')
+	return
+
+    if result['error']:
+        ievent.reply('request failed: ' + result['error'])
+    else:
+        ievent.reply("%s = %s" % (result['lhs'], result['rhs']))
+    return
+
+cmnds.add('gcalc', handle_gcalc, 'USER')
+examples.add('gcalc', 'Calculate an expression using the google calculator', 'gcalc 1 + 1')
+aliasset('calc', 'gcalc')
+
+#tests.add('gcalc 1 + 1')
--- gozerbot-0.99.1.orig/build/lib/gplugs/event.py
+++ gozerbot-0.99.1/build/lib/gplugs/event.py
@@ -0,0 +1,227 @@
+# plugs/event.py
+#
+#
+
+""" manage events """
+
+__copyright__ = 'this file is in the public domain'
+__gendocfirst__ = ['event.add', ]
+__gendoclast__ = ['event-del', ]
+
+from gozerbot.utils.generic import convertpickle
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.datadir import datadir
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import os
+
+plughelp.add('event', 'manage events and who is joining them .. can paste \
+events to topic')
+
+# UPGRADE PART
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'event', datadir + os.sep + 'plugs' + \
+os.sep + 'event' + os.sep + 'event')
+
+## END UPGRADE PART
+
+events = PlugPersist('event')
+if not events.data:
+    events = PlugPersist('event')
+    if not events.data:
+        events.data = {}
+
+if not events.data.has_key('eventdict'):
+    events.data['eventdict'] = {}
+
+def handle_eventadd(bot, ievent):
+    """ event-add <description> .. add event """
+    if not ievent.rest:
+        ievent.missing('<descr>')
+        return
+    event = {}
+    event['descr'] = ievent.rest.strip()
+    event['who'] = []
+    if not events.data['eventdict'].has_key(ievent.channel):
+        events.data['eventdict'][ievent.channel] = []
+    events.data['eventdict'][ievent.channel].append(event)
+    events.save()
+    ievent.reply('event added')
+    
+cmnds.add('event-add', handle_eventadd, 'USER')
+examples.add('event-add', 'add an event', 'event-add party bla')
+tests.add('event-add booo', 'event added')
+
+def handle_eventlist(bot, ievent):
+    """ event-list .. show al registered events """
+    result = []
+    teller = 1
+    if not events.data['eventdict'].has_key(ievent.channel):
+        ievent.reply('no events')
+        return
+    for i in events.data['eventdict'][ievent.channel]:
+        result.append("%s) %s" % (teller, i['descr']))
+        teller += 1
+    if result:
+        ievent.reply('events: ', result, dot=True)
+    else:
+        ievent.reply('no events')
+
+cmnds.add('event-list', handle_eventlist, 'USER')
+examples.add('event-list' , 'show all events', 'event-list')
+tests.add('event-list', 'events')
+
+def handle_eventdel(bot, ievent):
+    """ event-del <nr> .. delete event """
+    try:
+        eventnr = int(ievent.args[0])
+    except (IndexError, ValueError):
+        ievent.missing('<eventnr>')
+        return
+    try:
+        del events.data['eventdict'][ievent.channel][eventnr-1]
+        events.save()
+        ievent.reply('event %s deleted' % eventnr)
+    except (KeyError, IndexError):
+        ievent.reply("can't delete eventnr %s" % eventnr)
+
+cmnds.add('event-del', handle_eventdel, ['EVENT', 'OPER'])
+examples.add('event-del', 'delete event', 'event-del 2')
+#tests.add('event-del 1', 'event 1 deleted')
+
+def handle_eventjoin(bot, ievent):
+    """ event-join <nr> .. join an event .. add nick to eventlist"""
+    try:
+        eventnr = int(ievent.args[0])
+    except (IndexError, ValueError):
+        ievent.missing('<eventnr>')
+        return
+    try:
+        if ievent.nick in events.data['eventdict'][ievent.channel][eventnr-1]\
+['who']:
+            ievent.reply('%s is already joined' % ievent.nick)
+            return
+        events.data['eventdict'][ievent.channel][eventnr-1]['who'].\
+append(ievent.nick)
+        events.save()
+        ievent.reply('%s added to event %s ' % (ievent.nick, eventnr))
+    except (KeyError, IndexError):
+        ievent.reply("can't add %s to event %s" % (ievent.nick, eventnr))
+
+cmnds.add('event-join', handle_eventjoin, 'USER')
+examples.add('event-join', 'join an event', 'event-join 2')
+tests.add('event-join 1', 'added')
+
+def handle_eventadduser(bot, ievent):
+    """ event-adduser <nr> <nick> .. add nick to eventlist"""
+    try:
+        eventnr, nick = int(ievent.args[0]), ievent.args[1]
+    except (IndexError, ValueError):
+        ievent.missing('<eventnr>')
+        return
+    try:
+        if nick in events.data['eventdict'][ievent.channel][eventnr-1]\
+['who']:
+            ievent.reply('%s is already joined' % nick)
+            return
+        events.data['eventdict'][ievent.channel][eventnr-1]['who'].\
+append(nick)
+        events.save()
+        ievent.reply('%s added to event %s ' % (nick, eventnr))
+    except (KeyError, IndexError):
+        ievent.reply("can't add %s to event %s" % (nick, eventnr))
+
+cmnds.add('event-adduser', handle_eventadduser, ['OPER', 'EVENT'])
+examples.add('event-adduser', 'add nick to an event', 'event-adduser 2 dunk')
+tests.add('event-adduser 1 dunk', 'dunker added to event 1')
+
+def handle_eventpart(bot, ievent):
+    """ event-part <nr> .. leave an event .. delete nick from eventlist"""
+    try:
+        eventnr = int(ievent.args[0])
+    except (IndexError, ValueError):
+        ievent.missing('<eventnr>')
+        return
+    try:
+        events.data['eventdict'][ievent.channel][eventnr-1]['who'].\
+remove(ievent.nick)
+        events.save()
+        ievent.reply('%s removed from event %s ' % (ievent.nick, eventnr))
+    except (KeyError, IndexError, ValueError):
+        ievent.reply("can't remove %s from event %s" % (ievent.nick, eventnr))
+
+cmnds.add('event-part', handle_eventpart, 'USER')
+examples.add('event-part', 'unsubscribe from an event', 'event-part 2')
+tests.add('event-part 1', 'removed')
+ 
+def handle_eventwho(bot, ievent):
+    """ event-who .. show nicks of people registered to event """
+    try:
+        eventnr = int(ievent.args[0])
+    except (IndexError, ValueError):
+        ievent.missing('<eventnr>')
+        return
+    try:
+        who = events.data['eventdict'][ievent.channel][eventnr-1]['who']
+        what = events.data['eventdict'][ievent.channel][eventnr-1]['descr']
+        if who:
+            ievent.reply('%s: ' % what, who, dot=True)
+        else:
+            ievent.reply('no one joined event %s yet' % eventnr)
+    except (KeyError, IndexError):
+        ievent.reply("can't get data for event %s" % eventnr)
+
+cmnds.add('event-who', handle_eventwho, 'USER')
+examples.add('event-who', 'show who joined an event', 'event-who 2')
+tests.add('event-who 1')
+  
+def handle_eventremove(bot, ievent):
+    """ event-remove <nr> <nick> .. remove <nick> from eventlist """
+    try:
+        (eventnr, nick) = (int(ievent.args[0]), ievent.args[1])
+    except (IndexError, ValueError):
+        ievent.missing('<eventnr> <nick>')
+        return
+    try:
+        events.data['eventdict'][ievent.channel][eventnr-1]['who'].remove(nick)
+        events.save()
+        ievent.reply('%s removed from event %s ' % (nick, eventnr))
+    except (KeyError, IndexError, ValueError):
+        ievent.reply("can't remove %s from event %s" % (nick, eventnr))
+
+cmnds.add('event-remove', handle_eventremove, ['EVENT', 'OPER'])
+examples.add('event-remove', 'delete nick from an event', 'event-remove 3 dunker')
+tests.add('event-remove 1 dunk')
+
+def handle_eventtopic(bot, ievent):
+    """ event-topic .. add events to topic """
+    if not events.data['eventdict'].has_key(ievent.channel):
+        ievent.reply('no events for %s' % ievent.channel)
+        return
+    topic = bot.gettopic(ievent.channel)
+    if topic:
+        what = topic[0]
+    else:
+        what = None
+    topicstr = ""
+    for i in events.data['eventdict'][ievent.channel]:
+        if what and i['descr'] in what:
+            continue        
+        topicstr += "%s | " % i['descr']
+    if not topicstr:
+        ievent.reply('no events to set into topic')
+        return
+    if what:
+        totopic = what + ' | ' + topicstr[:-3]
+    else:
+        totopic = topicstr[:-3]
+    bot.send('TOPIC %s :%s' % (ievent.channel, totopic))
+    bot.done()
+
+cmnds.add('event-topic', handle_eventtopic, ['EVENT', 'OPER'], threaded=True)
+examples.add('event-topic', 'put events into the topic', 'event-topic')
+tests.add('event-topic')
--- gozerbot-0.99.1.orig/build/lib/gplugs/lag.py
+++ gozerbot-0.99.1/build/lib/gplugs/lag.py
@@ -0,0 +1,101 @@
+# plugs/lag.py
+#
+# (c) Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# BSD License
+
+""" gozerbot lag meter """
+
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples 
+from gozerbot.fleet import fleet
+from gozerbot.periodical import interval, periodical
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import time
+
+plughelp.add('lag', 'lag measuring')
+
+lag_wait = 300
+
+class Lagmeter:
+
+    """ lag meter class """
+
+    def __init__(self):
+        self.names = []
+        self.sent  = {}
+        self.lag   = {}
+        self.run   = True
+
+    def update_names(self):
+        """ grab all names from irc bots in the fleet """ 
+        self.names = [bot.name for bot in fleet.bots if bot.type == 'irc']
+
+    def getlag(self, name):
+        """ get lag of <botname> """
+        if self.lag.has_key(name):
+            return self.lag[name]
+        else:
+            return False
+
+    def measure(self, name):
+        """ measure lag of <botname> """
+        bot = fleet.byname(name)
+        if not bot:
+            return
+        if bot.connectok.isSet() and bot.connectok:
+            bot.sendraw('PING :LAG %f' % time.time())
+
+    def recieved(self, name, sent):
+        """ function called on received PONG """
+        self.lag[name] = time.time() - sent
+
+    @interval(lag_wait)
+    def loop(self):
+        """ lag meter loop """
+        fleet.startok.wait()
+        self.update_names()
+        for name in self.names:
+            self.measure(name)
+
+lagmeters = Lagmeter()
+
+def init():
+    """ start the lag meter loop """
+    lagmeters.loop()
+    return 1
+
+def shutdown():
+    """ kill all lag meter periodical jobs """ 
+    periodical.kill()
+
+def handle_lag(bot, ievent): 
+    """ show lag of bot the command is given on """
+    lag = lagmeters.getlag(bot.name)
+    if lag == False:
+        ievent.reply('no lag metered')
+    else:
+        ievent.reply('lag is %f seconds' % lag)
+
+def connectedcb(bot, ievent):
+    """ callback to be called when bot is connected """
+    lagmeters.update_names()
+    lagmeters.measure(bot.name)
+
+def pongcb(bot, ievent):
+    """ PONG callback """
+    if len(ievent.arguments) == 3:
+        if ievent.arguments[1].lstrip(':') == 'LAG':
+            try:
+                sent = float(ievent.arguments[2])
+                lagmeters.recieved(bot.name, sent) 
+            except ValueError:
+                pass
+
+cmnds.add('lag', handle_lag, ['USER'])
+examples.add('lag', 'shows the current lag', 'lag')
+tests.add('lag')
+callbacks.add('001', connectedcb)
+callbacks.add('PONG', pongcb)
--- gozerbot-0.99.1.orig/build/lib/gplugs/hex2ip.py
+++ gozerbot-0.99.1/build/lib/gplugs/hex2ip.py
@@ -0,0 +1,39 @@
+# plugs/hex2ip.py
+#
+#
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import struct, socket
+
+plughelp.add('hex2ip', 'convert a hexadecimal number to an ip addres')
+
+def handle_hex2ip(bot, ievent):
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        ievent.missing("<hexnr>")
+        return
+    try:
+        ipint = int(what, 16)
+        ipint = socket.ntohl(ipint)
+        packed = struct.pack('l', ipint)
+        ip = socket.inet_ntoa(str(packed))
+    except Exception, ex:
+        ievent.reply("can't make ipnr out of %s" % what)
+        return
+    ievent.reply('%s is %s' % (what, ip))
+    try:
+        hostname = socket.gethostbyaddr(ip)[0]
+    except:
+        ievent.reply("can't find hostname of %s" % ip)
+        return
+    ievent.reply('hostname is %s' % hostname)
+
+cmnds.add('hex2ip', handle_hex2ip, 'USER')
+examples.add('hex2ip', 'convert hexadecimal number to ip addres', 'hex2ip \
+54008c8a')
+#tests.add('hex2ip 54008c8a')
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gplugs/alarm.py
+++ gozerbot-0.99.1/build/lib/gplugs/alarm.py
@@ -0,0 +1,265 @@
+# plugs/alarm.py
+#
+#
+
+""" the alarm plugin allows for alarms that message the user giving the
+ command at a certain time or number of seconds from now
+"""
+
+__copyright__ = 'this file is in the public domain'
+__depending__ = ['todo', ]
+
+## IMPORT SECTION
+
+# gozerbot imports
+
+from gozerbot.generic import handle_exception, rlog, strtotime, striptime, jsonstring
+from gozerbot.utils.lazydict import LazyDict
+from gozerbot.persist.persist import Persist
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.utils.nextid import nextid
+from gozerbot.utils.locking import lockdec
+from gozerbot.fleet import fleet
+from gozerbot.datadir import datadir
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliases
+from gozerbot.periodical import periodical
+from gozerbot.tests import tests
+
+
+# basic imports
+
+import time, os, shutil, thread
+
+## END IMPORT
+
+plughelp.add('alarm', 'remind the user with given txt at a certain time')
+
+## LOCK SECTION
+
+alarmlock = thread.allocate_lock()
+alarmlocked = lockdec(alarmlock)
+
+# ============
+# UPGRADE PART
+
+def upgrade():
+    pass
+
+# END UPGRADE
+# ===========
+
+class Alarmitem(LazyDict):
+
+    """ item holding alarm data """
+
+    def __init__(self, botname='default', i=0, nick="", ttime=time.time(), txt="", \
+printto=None, d={}):
+        if not d:
+            LazyDict.__init__(self)
+        else:
+            LazyDict.__init__(self, d)
+        self.botname = self.botname or botname
+        self.idnr = self.idnr or i
+        self.nick = self.nick or nick
+        self.time = self.ttime or ttime
+        self.txt = self.txt or txt
+        self.printto = self.printto or printto or nick or ""
+
+    def __str__(self):
+        result = "%s %s %s %s %s" % (self.botname, self.idnr, self.nick, \
+self.time, self.txt)
+        return result
+
+class Alarms(Persist):
+
+    """ class that holds the alarms """
+
+    def __init__(self, fname):
+        Persist.__init__(self, fname)
+        if not self.data:
+            self.data = []
+        for i in self.data:
+            z = Alarmitem(d=i)
+            periodical.addjob(z.time - time.time(), 1, self.alarmsay, z.nick, \
+z)
+
+    def size(self):
+        """ return number of alarms """
+        return len(self.data)
+
+    def bynick(self, nick):
+        """ get alarms by nick """
+        nick = nick.lower()
+        result = []
+        for i in self.data:
+            z = Alarmitem(d=i)
+            if z.nick == nick:
+                result.append(z)
+        return result
+
+    def alarmsay(self, item):
+        """ say alarm txt """
+        bot = fleet.byname(item.botname)
+        if bot:
+            if item.printto:
+                bot.say(item.printto, "[%s] %s" % (item.nick, item.txt), \
+speed=1)
+            else:
+                bot.say(item.nick, item.txt, speed=1)
+        self.delete(item.idnr)
+
+    def add(self, botname, nick, ttime, txt, printto=None):
+        """ add alarm """
+        nick = nick.lower()
+        nrid = nextid.next('alarms')
+        item = Alarmitem(botname, nrid, nick, ttime, txt, printto=printto)
+        pid = periodical.addjob(ttime - time.time(), 1, self.alarmsay, nick, \
+item)
+        item.idnr = pid
+        self.data.append(item)
+        self.save()
+        return pid
+
+    def delete(self, idnr):
+        """ delete alarmnr """
+        for i in range(len(self.data)-1, -1, -1):
+            if Alarmitem(d=self.data[i]).idnr == idnr:
+                del self.data[i]
+                periodical.killjob(idnr)
+                self.save()
+                return 1
+
+alarms = Alarms(datadir + os.sep + 'plugs' + os.sep + 'alarm' + os.sep + 'alarms')
+if not alarms.data:
+    alarms = Alarms(datadir + os.sep + 'plugs' + os.sep + 'alarm' + os.sep + 'alarms')
+   
+def shutdown():
+    periodical.kill()
+
+def size():
+    """ return number of alarms """
+    return alarms.size()
+
+def handle_alarmadd(bot, ievent):
+    """ alarm <txt-with-time> | <+delta> <txt> .. add an alarm """
+    #if ievent.cmnd == 'DCC':
+    #    ievent.reply("sorry can't run alarm from dcc chat")
+    #    return 
+    if not ievent.rest:
+        ievent.reply('alarm <txt-with-time> or alarm <+delta> <txt>')
+        return
+    else:
+        alarmtxt = ievent.rest
+    # see if alarm time is given as delta aka starts with +
+    if alarmtxt[0] == '+':
+        try:
+            sec = int(ievent.args[0][1:]) # get nr of seconds to sleep
+        except ValueError:
+            ievent.reply('use +nrofsecondstosleep')
+            return
+        if len(ievent.args) < 2:
+            ievent.reply('i need txt to remind you')
+            return
+        try:
+            ttime = time.time() + sec
+            # check for time overflow
+            if ttime > 2**31:
+                ievent.reply("time overflow")
+                return
+            # add alarm 
+            if bot.jabber:
+                if ievent.groupchat:
+                    nrid = alarms.add(bot.name, ievent.nick, ttime, ' '.join(ievent.args[1:]), ievent.channel)
+                else:
+                    nrid = alarms.add(bot.name, ievent.jid, ttime, ' '.join(ievent.args[1:]))
+            else:
+                nrid = alarms.add(bot.name, ievent.nick, ttime, ' '.join(ievent.args[1:]), ievent.printto)
+            ievent.reply("alarm %s set at %s" % (nrid, time.ctime(ttime)))
+            return
+        except Exception, ex:
+            handle_exception(ievent)
+            return
+    # see if we can determine time from txt
+    alarmtime = strtotime(alarmtxt)
+    if not alarmtime:
+        ievent.reply("can't detect time")
+        return
+    # check if alarm txt is provided
+    txt = striptime(alarmtxt).strip()
+    if not txt:
+        ievent.reply('i need txt to remind you')
+        return
+    if time.time() > alarmtime:
+        ievent.reply("we are already past %s" % time.ctime(alarmtime))
+        return
+    # add alarm
+    if bot.jabber:
+        nrid = alarms.add(bot.name, ievent.jid, alarmtime, txt)
+    else:
+        nrid = alarms.add(bot.name, ievent.nick, alarmtime, txt, ievent.printto)
+    ievent.reply("alarm %s set at %s" % (nrid, time.ctime(alarmtime)))
+
+cmnds.add('alarm', handle_alarmadd, 'USER', allowqueue=False)
+examples.add('alarm', 'say txt at a specific time or time diff', \
+'1) alarm 12:00 lunchtime 2) alarm 3-11-2008 0:01 birthday ! 3) alarm +180 \
+egg ready')
+tests.add('alarm 23:59 sleeptime', 'alarm (\d+) set at').add('alarm-del %s')
+
+def handle_alarmlist(bot, ievent):
+    """ alarm-list .. list all alarms """
+    result = []
+    for alarmdata in alarms.data:
+        i = Alarmitem(d=alarmdata)
+        result.append("%s) %s: %s - %s " % (i.idnr, i.nick, \
+time.ctime(i.time), i.txt))
+    if result:
+        ievent.reply("alarmlist: ", result, dot=True)
+    else:
+        ievent.reply('no alarms')
+
+cmnds.add('alarm-list', handle_alarmlist, 'OPER')
+examples.add('alarm-list', 'list current alarms', 'alarm-list')
+tests.add('alarm 23:59 sleeptime', 'alarm (\d+) set at').add('alarm-list', 'sleeptime').add('alarm-del %s')
+
+def handle_myalarmslist(bot, ievent):
+    """ alarm-mylist .. show alarms of user giving the command """
+    result = []
+    if bot.jabber:
+        nick = ievent.jid.lower()
+    else:
+        nick = ievent.nick.lower()
+    for alarmdata in alarms.data:
+        i = Alarmitem(d=alarmdata)
+        if i.nick == nick:
+            result.append("%s) %s - %s " % (i.idnr, time.ctime(i.time), i.txt))
+    if result:
+        ievent.reply("your alarms: ", result, dot=True)
+    else:
+        ievent.reply('no alarms')
+
+cmnds.add('alarm-mylist', handle_myalarmslist, 'USER')
+examples.add('alarm-mylist', 'list alarms of user giving the commands', \
+'alarm-mylist')
+aliases.data['myalarms'] = 'alarm-mylist'
+tests.add('alarm 23:59 sleeptime', 'alarm (\d+) set at').add('alarm-mylist', 'sleeptime').add('alarm-del %s')
+
+def handle_alarmdel(bot, ievent):
+    """ alarm-del <nr> .. delete alarm """
+    try:
+        alarmnr = int(ievent.args[0])
+    except IndexError:
+        ievent.missing('<nr>')
+        return
+    except ValueError:
+        ievent.reply('argument needs to be an integer')
+        return
+    if alarms.delete(alarmnr):
+        ievent.reply('alarm with id %s deleted' % alarmnr)
+    else:
+        ievent.reply('failed to delete alarm with id %s' % alarmnr)
+
+cmnds.add('alarm-del', handle_alarmdel, 'OPER')
+examples.add('alarm-del', 'delete alarm with id <nr>', 'alarm-del 7')
+
--- gozerbot-0.99.1.orig/build/lib/gplugs/wikiquote.py
+++ gozerbot-0.99.1/build/lib/gplugs/wikiquote.py
@@ -0,0 +1,61 @@
+# plugs/wikiquote.py
+#
+#
+
+""" query wikiquote """
+
+__copyright__ = 'this file is in the public domain'
+__revision__ = '$Id: wikiquote.py 517 2007-02-04 16:13:00Z deck $'
+
+from gozerbot.generic import geturl, striphtml, splittxt
+from gozerbot.commands import cmnds
+from gozerbot.aliases import aliases
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+import re, random
+
+plughelp.add('wikiquote', 'fetch a wikipedia quote')
+
+wikire = re.compile('start content(.*?)end content', re.M)
+
+def handle_wikiquote(bot, ievent):
+    """ wikiquote <what> .. search wikiquote for <what> """
+    if not ievent.rest:
+        ievent.missing('<what>')
+        return
+    what = ""
+    lang = 'en'
+    for i in ievent.rest.split():
+        first = i[0].upper()
+        rest = i[1:]
+        if i.startswith('-'):
+            if len(i) != 3:
+                ievent.reply('invalid option')
+                return
+            lang = i[1:]
+            continue
+        what += "%s%s " % (first, rest)
+    what = what.strip().replace(' ', '_')
+    url = 'http://%s.wikiquote.org/w/wiki.phtml?title=%s' % (lang, what)
+    result = geturl(url)
+    if not result:
+        ievent.reply("can't find data for %s" % what)
+        return
+    result = result.replace('\n', ' ')
+    result = re.sub('\s+', ' ', result)
+    regresult = re.search(wikire, result)
+    if not regresult:
+        ievent.reply("can't match regular expression %s" % url)
+        return
+    txt = regresult.groups()[0]
+    try:
+        res = re.sub('\[.*?\]', '', striphtml(random.choice(re.findall('<li>(.*?)</li>',txt))))
+    except IndexError:
+        ievent.reply("can't find quote")
+        return
+    ievent.reply(res)
+
+cmnds.add('wikiquote', handle_wikiquote, 'USER')
+examples.add('wikiquote', 'wikiquote ["-" <countrycode>] <what> .. search \
+wikiquote for <what>','1) wikiquote george bush 2) wikiquote -nl Balkenende')
+aliases.data['wquote'] = 'wikiquote'
--- gozerbot-0.99.1.orig/build/lib/gplugs/facts.py
+++ gozerbot-0.99.1/build/lib/gplugs/facts.py
@@ -0,0 +1,754 @@
+# gozerplugs/facts.py
+#
+#
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import random
+
+plughelp.add('facts', 'show some facts')
+
+chucktxt = """
+Crop circles are Chuck Norris' way of telling the world that sometimes corn needs to lie  down.
+Chuck Norris is ten feet tall, weighs two-tons, breathes fire, and could eat a hammer and take a shotgun blast standing.
+The Great Wall of China was originally created to keep Chuck Norris out. It failed miserably.
+Contrary to popular belief, Chuck Norris, not the box jellyfish of northern Australia, is the most venomous creature on earth. Within 3 minutes of being bitten, a human being experiences the following symptoms: fever, blurred vision, beard rash, tightness of the jeans, and the feeling of being repeatedly kicked through a car windshield.
+Most people have 23 pairs of chromosomes. Chuck Norris has 72... and they're all poisonous.
+If you ask Chuck Norris what time it is, he always says, "Two seconds 'til." After you ask, "Two seconds 'til what?" he roundhouse kicks you in the face.
+Chuck Norris drives an ice cream truck covered in human skulls.
+When Chuck Norris sends in his taxes, he sends blank forms and includes only a picture of himself, crouched and ready to attack. Chuck Norris has not had to pay taxes, ever.
+The quickest way to a man's heart is with Chuck Norris' fist.
+Chuck Norris invented Kentucky Fried Chicken's famous secret recipe, with eleven herbs and spices. But nobody ever mentions the twelfth ingredient: Fear.
+CNN was originally created as the "Chuck Norris Network" to update Americans with on-the-spot ass kicking in real-time.
+Chuck Norris can win a game of Connect Four in only three moves.
+There is no theory of evolution, just a list of creatures Chuck Norris allows to live.
+Chuck Norris once ate three 72 oz. steaks in one hour. He spent the first 45 minutes having sex with his waitress.
+What was going through the minds of all of Chuck Norris' victims before they died? His shoe.
+Chuck Norris is the only man to ever defeat a brick wall in a game of tennis.
+Police label anyone attacking Chuck Norris as a Code 45-11.... a suicide.
+Chuck Norris doesn't churn butter. He roundhouse kicks the cows and the butter comes straight out.
+Chuck Norris doesn't wash his clothes, he disembowels them.
+A Handicapped parking sign does not signify that this spot is for handicapped people. It is actually in fact a warning, that the spot belongs to Chuck Norris and that you will be handicapped if you park there.
+Chuck Norris will attain statehood in 2009. His state flower will be the Magnolia.
+Someone once videotaped Chuck Norris getting pissed off. It was called Walker: Texas Chain Saw Masacre.
+If you spell Chuck Norris in Scrabble, you win. Forever.
+Chuck Norris originally appeared in the "Street Fighter II" video game, but was removed by Beta Testers because every button caused him to do a roundhouse kick. When asked bout this "glitch," Norris replied, "That's no glitch."
+Fool me once, shame on you. Fool Chuck Norris once and he will roundhouse you in the face.
+The opening scene of the movie "Saving Private Ryan" is loosely based on games of dodgeball Chuck Norris played in second grade.
+Chuck Norris once shot down a German fighter plane with his finger, by yelling, "Bang!"
+Chuck Norris once bet NASA he could survive re-entry without a spacesuit. On July 19th, 1999, a naked Chuck Norris re-entered the earth's atmosphere, streaking over 14 states and reaching a temperature of 3000 degrees. An embarrassed NASA publically claimed it was a meteor, and still owes him a beer.
+Chuck Norris has two speeds: Walk and Kill.
+Someone once tried to tell Chuck Norris that roundhouse kicks aren't the best way to kick someone. This has been recorded by historians as the worst mistake anyone has ever made.
+Contrary to popular belief, America is not a democracy, it is a Chucktatorship.
+Teenage Mutant Ninja Turtles is based on a true story: Chuck Norris once swallowed a turtle whole, and when he crapped it out, the turtle was six feet tall and had learned karate.
+Chuck Norris is not hung like a horse... horses are hung like Chuck Norris.
+Faster than a speeding bullet ... more powerful than a locomotive ... able to leap tall buildings in a single bound... yes, these are some of Chuck Norris's warm-up exercises.
+Chuck Norris is the only human being to display the Heisenberg uncertainty principle -- you can never know both exactly where and how quickly he will roundhouse-kick you in the face.
+In the Bible, Jesus turned water into wine. But then Chuck Norris turned that wine into beer.
+Chuck Norris can hit you so hard that he can actually alter your DNA. Decades from now your descendants will occasionally clutch their heads and yell "What The Hell was That?"
+Time waits for no man. Unless that man is Chuck Norris.
+Chuck Norris discovered a new theory of relativity involving multiple universes in which Chuck Norris is even more badass than in this one. When it was discovered by Albert Einstein and made public, Chuck Norris roundhouse-kicked him in the face. We know Albert Einstein today as Stephen Hawking.
+Chuck Norris doesn't shower, he only takes blood baths.
+The Chuck Norris military unit was not used in the game Civilization 4, because a single Chuck Norris could defeat the entire combined nations of the world in one turn.
+In an average living room there are 1,242 objects Chuck Norris could use to kill you, including the room itself.
+According to the Encyclopedia Brittanica, the Native American "Trail of Tears" has been redefined as anywhere that Chuck Norris walks.
+Chuck Norris does not teabag the ladies. He potato-sacks them.
+Pluto is actually an orbiting group of British soldiers from the American Revolution who entered space after the Chuck gave them a roundhouse kick to the face.
+When Chuck Norris goes to donate blood, he declines the syringe, and instead requests a hand gun and a bucket.
+There are no steroids in baseball. Just players Chuck Norris has breathed on.
+Chuck Norris once challenged Lance Armstrong in a "Who has more testicles?" contest. Chuck Norris won by 5.
+Chuck Norris was the fourth wise man, who gave baby Jesus the gift of beard, which he carried with him until he died. The other three wise men were enraged by the preference that Jesus showed to Chuck's gift, and arranged to have him written out of the bible. All three died soon after of mysterious roundhouse-kick related injuries.
+Chuck Norris sheds his skin twice a year.
+When Chuck Norris calls 1-900 numbers, he doesnt get charged. He holds up the phone and money falls out.
+Chuck Norris once ate a whole cake before his friends could tell him there was a stripper in it.
+Some people like to eat frogs' legs. Chuck Norris likes to eat lizard legs. Hence, snakes.
+There are no races, only countries of people Chuck Norris has beaten to different shades of black and blue.
+When Chuck Norris was denied an Egg McMuffin at McDonald's because it was 10:35, he roundhouse kicked the store so hard it became a Wendy's.
+Chuck Norris can't finish a "color by numbers" because his markers are filled with the blood of his victims. Unfortunately, all blood is dark red.
+A Chuck Norris-delivered Roundhouse Kick is the preferred method of execution in 16 states.
+When Chuck Norris falls in water, Chuck Norris doesn't get wet. Water gets Chuck Norris.
+Scientists have estimated that the energy given off during the Big Bang is roughly equal to 1CNRhK (Chuck Norris Roundhouse Kick)
+Chuck Norris' house has no doors, only walls that he walks through.
+When Chuck Norris has sex with a man, it won't be because he is gay. It will be because he has run out of women.
+How much wood would a woodchuck chuck if a woodchuck could Chuck Norris? ...All of it.
+Chuck Norris doesn't actually write books, the words assemble themselves out of fear.
+In honor of Chuck Norris, all McDonald's in Texas have an even larger size than the super-size. When ordering, just ask to be Chucksized. 
+Chuck Norris CAN believe it's not butter.
+If tapped, a Chuck Norris roundhouse kick could power the country of Australia for 44 minutes.
+Chuck Norris can divide by zero.
+The grass is always greener on the other side, unless Chuck Norris has been there. In that case the grass is most likely soaked in blood and tears.
+A picture is worth a thousand words. A Chuck Norris is worth 1 billion words.
+Newton's Third Law is wrong: Although it states that for each action, there is an equal and opposite reaction, there is no force equal in reaction to a Chuck Norris roundhouse kick.
+Chuck Norris invented his own type of karate. It's called Chuck-Will-Kill.
+When an episode of Walker Texas Ranger was aired in France, the French surrendered to Chuck Norris just to be on the safe side.
+While urinating, Chuck Norris is easily capable of welding titanium.
+Chuck Norris once sued the Houghton-Mifflin textbook company when it became apparent that their account of the war of 1812 was plagiarized from his autobiography.
+When Chuck Norris talks, everybody listens. And dies.
+When Steven Seagal kills a ninja, he only takes its hide. When Chuck Norris kills a ninja, he uses every part.
+Wilt Chamberlain claims to have slept with more than 20,000 women in his lifetime. Chuck Norris calls this "a slow Tuesday."
+Contrary to popular belief, there is indeed enough Chuck Norris to go around.
+Chuck Norris doesnt shave; he kicks himself in the face. The only thing that can cut Chuck Norris is Chuck Norris.
+For some, the left testicle is larger than the right one. For Chuck Norris, each testicle is larger than the other one.
+Chuck Norris always knows the EXACT location of Carmen SanDiego.
+When taking the SAT, write "Chuck Norris" for every answer. You will score over 8000.
+Chuck Norris invented black. In fact, he invented the entire spectrum of visible light. Except pink. Tom Cruise invented pink.
+When you're Chuck Norris, anything + anything is equal to 1. One roundhouse kick to the face.
+Chuck Norris has the greatest Poker-Face of all time. He won the 1983 World Series of Poker, despite holding only a Joker, a Get out of Jail Free Monopoloy card, a 2 of clubs, 7 of spades and a green #4 card from the game UNO.
+On his birthday, Chuck Norris randomly selects one lucky child to be thrown into the sun.
+Nobody doesn't like Sara Lee. Except Chuck Norris.
+Chuck Norris doesn't throw up if he drinks too much. Chuck Norris throws down!
+In the beginning there was nothing...then Chuck Norris Roundhouse kicked that nothing in the face and said "Get a job". That is the story of the universe.
+Chuck Norris has 12 moons. One of those moons is the Earth.
+Chuck Norris grinds his coffee with his teeth and boils the water with his own rage.
+Archeologists unearthed an old english dictionary dating back to the year 1236. It defined "victim" as "one who has encountered Chuck Norris"
+Chuck Norris ordered a Big Mac at Burger King, and got one.
+Chuck Norris and Mr. T walked into a bar. The bar was instantly destroyed, as that level of awesome cannot be contained in one building.
+If you Google search "Chuck Norris getting his ass kicked" you will generate zero results. It just doesn't happen.
+Chuck Norris can drink an entire gallon of milk in thirty-seven seconds.
+Little known medical fact: Chuck Norris invented the Caesarean section when he roundhouse-kicked his way out of his monther's womb.
+Chuck Norris doesn't bowl strikes, he just knocks down one pin and the other nine faint.
+The show Survivor had the original premise of putting people on an island with Chuck Norris. There were no survivors, and nobody is brave enough to go to the island to retrieve the footage.
+It takes Chuck Norris 20 minutes to watch 60 Minutes.
+You know how they say if you die in your dream then you will die in real life? In actuality, if you dream of death then Chuck Norris will find you and kill you.
+Chuck Norris has a deep and abiding respect for human life... unless it gets in his way.
+The Bermuda Triangle used to be the Bermuda Square, until Chuck Norris Roundhouse kicked one of the corners off.
+There are no weapons of mass destruction in Iraq, Chuck Norris lives in Oklahoma.
+Chuck Norris doesn't believe in Germany.
+When Chuck Norris is in a crowded area, he doesn't walk around people. He walks through them.
+Chuck Norris once ate an entire bottle of sleeping pills. They made him blink.
+James Cameron wanted Chuck Norris to play the Terminator. However, upon reflection, he realized that would have turned his movie into a documentary, so he went with Arnold Schwarzenegger.
+Chuck Norris can touch MC Hammer.
+Thousands of years ago Chuck Norris came across a bear. It was so terrified that it fled north into the arctic. It was also so terrified that all of its decendents now have white hair.
+Chuck Norris played Russian Roulette with a fully loaded gun and won.
+It takes 14 puppeteers to make Chuck Norris smile, but only 2 to make him destroy an orphanage.</ul>
+Chuck Norris is responsible for China's over-population. He hosted a Karate tournament in Beijing and all women within 1,000 miles became pregnant instantly.
+Some people wear Superman pajamas. Superman wears Chuck Norris pajamas.
+Chuck Norris once worked as a weatherman for the San Diego evening news. Every night he would make the same forecast: Partly cloudy with a 75% chance of Pain.
+Simply by pulling on both ends, Chuck Norris can stretch diamonds back into coal.
+When Chuck Norris does a pushup, he isn't lifting himself up, he's pushing the Earth down.
+Chuck Norris invented the bolt-action rifle, liquor, sexual intercourse, and football-- in that order.
+A high tide means Chuck Norris is flying over your coast. The tide is caused by God pissing his pants.
+Chuck Norris keeps his friends close and his enemies closer. Close enough to drop them with one round house kick to the face.
+There is in fact an "I" in Norris, but there is no "team" ...  not even close.
+Scotty in Star Trek often says "Ye cannae change the laws of physics." This is untrue. Chuck Norris can change the laws of physics. With his fists.
+An anagram for Walker Texas Ranger is KARATE WRANGLER SEX. I don't know what that is, but it sounds AWESOME.
+Chuck Norris doesn't stub his toes. He accidentally destroys chairs, bedframes, and sidewalks.
+Using his trademark roundhouse kick, Chuck Norris once made a fieldgoal in RJ Stadium in Tampa Bay from the 50 yard line of Qualcomm stadium in San Diego.
+Chuck Norris roundhouse kicks don't really kill people. They wipe out their entire existence from the space-time continuum.
+Chuck Norris does not own a stove, oven, or microwave , because revenge is a dish best served cold.
+Tom Clancy has to pay royalties to Chuck Norris because "The Sum of All Fears" is the name of Chuck Norris' autobiography.
+Chuck Norris can slam a revolving door.
+Chuck Norris is expected to win gold in every swimming competition at the 2008 Beijing Olympics, even though Chuck Norris does not swim. This is because when Chuck Norris enters the water, the water gets out of his way and Chuck Norris simply walks across the pool floor.
+Chuck Norris built a better mousetrap, but the world was too frightened to beat a path to his door.
+The original draft of The Lord of the Rings featured Chuck Norris instead of Frodo Baggins. It was only 5 pages long, as Chuck roundhouse-kicked Sauron's ass halfway through the first chapter.
+Hellen Keller's favorite color is Chuck Norris.
+Chuck Norris eats beef jerky and craps gunpowder. Then, he uses that gunpowder to make a bullet, which he uses to kill a cow and make more beef jerky. Some people refer to this as the "Circle of Life."
+If, by some incredible space-time paradox, Chuck Norris would ever fight himself, he'd win. Period.
+Chuck Norris is currently suing myspace for taking the name of what he calls everything around you.
+The crossing lights in Chuck Norris's home town say "Die slowly" and "die quickly". They each have a picture of Chuck Norris punching or kicking a pedestrian.
+Science Fact: Roundhouse kicks are comprised primarily of an element called Chucktanium.
+The Sherman tank was originaly called the Norris tank until Chuck Norris decided it wasn't tough enough to be associated with him. The Army, for fear of Chuck Norris, renamed the tank and promised to develop a weapon more fitting of his name. To date, no weapon created has been badass enough to be named after Chuck Norris.
+Chuck Norris proved that we are alone in the universe. We weren't before his first space expedition.
+Superman once watched an episode of Walker, Texas Ranger. He then cried himself to sleep.
+Chuck Norris doesn't step on toes. Chuck Norris steps on necks.
+The movie "Delta Force" was extremely hard to make because Chuck had to downplay his abilities. The first few cuts were completely unbelievable.
+Movie trivia: The movie "Invasion U.S.A." is, in fact, a documentary.
+Chuck Norris does not "style" his hair. It lays perfectly in place out of sheer terror.
+There is no such thing as global warming. Chuck Norris was cold, so he turned the sun up.
+A study showed the leading causes of death in the United States are: 1. Heart disease, 2. Chuck Norris, 3. Cancer
+It's widely believed that Jesus was Chuck Norris' stunt double for crucifixion due to the fact that it is impossible for nails to pierce Chuck Norris' skin.
+Chuck Norris did in fact, build Rome in a day.
+Along with his black belt, Chuck Norris often chooses to wear brown shoes. No one has DARED call him on it. Ever.
+Anytime someone is elected president in the United States, they must ask permission from Chuck Norris to live in the White House. The reason for this is because Chuck Norris had won every Federal, State, and Local election since 1777. He just allows others to run the country in his place.
+Once you go Norris, you are physically unable to go back.
+Ninjas want to grow up to be just like Chuck Norris. But usually they grow up just to be killed by Chuck Norris.
+Chuck Norris once sued Burger King after they refused to put razor wire in his Whopper Jr, insisting that that actually is "his" way.
+The last thing you hear before Chuck Norris gives you a roundhouse kick? No one knows because dead men tell no tales.
+Chuck Norris doesn't play god. Playing is for children.
+As a teen, Chuck Norris had sex with every nun in a convent tucked away in the hills of Tuscany. Nine months later the nuns gave birth to the 1972 Miami Dolphins, the only undefeated and untied team in professional football history.
+Chuck Norris is the only person in the world that can actually email a roundhouse kick.
+Chuck Norris won super bowls VII and VIII singlehandedly before unexpectedly retiring to pursue a career in ass-kicking.
+Wo hu cang long. The translation from Mandarin Chinese reads: "Crouching Chuck, Hidden Norris"
+Chuck Norris can set ants on fire with a magnifying glass. At night.
+Some kids play Kick the can. Chuck Norris played Kick the keg.
+'Icy-Hot' is too weak for Chuck Norris. After a workout, Chuck Norris rubs his muscles down with liquid-hot MAGMA.
+Chuck Norris cannot love, he can only not kill.
+When Chuck Norris was a baby, he didn't suck his mother's breast. His mother served him whiskey, straight out of the bottle.
+According to Einstein's theory of relativity, Chuck Norris can actually roundhouse kick you yesterday.
+Chuck Norris once pulled out a single hair from his beard and skewered three men through the heart with it.
+In an act of great philanthropy, Chuck made a generous donation to the American Cancer Society. He donated 6,000 dead bodies for scientific research.
+Chuck Norris' favourite cut of meat is the roundhouse.
+When J. Robert Oppenheimer said "I am become death, the destroyer Of worlds", He was not referring to the atomic bomb. He was referring to the Chuck Norris halloween costume he was wearing.
+Chuck Norris recently had the idea to sell his urine as a canned beverage. We know this beverage as Red Bull.
+In a recent survey it was discovered the 94% of American women lost their virginity to Chuck Norris. The other 6% were incredibly fat or ugly.
+Chuck Norris invented a language that incorporates karate and roundhouse kicks. So next time Chuck Norris is kicking your ass, don't be offended or hurt, he may be just trying to tell you he likes your hat.
+If at first you don't succeed, you're not Chuck Norris.
+If Chuck Norris were a calendar, every month would be named Chucktober, and every day he'd kick your ass.
+Fear is not the only emotion Chuck Norris can smell. He can also detect hope, as in "I hope I don't get a roundhouse kick from Chuck Norris."
+Chuck Norris's show is called Walker: Texas Ranger, because Chuck Norris doesn't run.
+MacGyver can build an airplane out of gum and paper clips, but Chuck Norris can roundhouse-kick his head through a wall and take it.
+Behind every successful man, there is a woman. Behind every dead man, there is Chuck Norris.
+What's known as the UFC, or Ultimate Fighting Championship, doesn't use its full name, which happens to be "Ultimate Fighting Championship, Non-Chuck-Norris-Division".
+Chuck Norris brushes his teeth with a mixture of iron shavings, industrial paint remover, and wood-grain alcohol.
+The easiest way to determine Chuck Norris' age is to cut him in half and count the rings.
+There is endless debate about the existence of the human soul. Well it does exist, and Chuck Norris finds it delicious.
+Most boots are made for walkin'. Chuck Norris' boots ain't that merciful.
+The US did not boycott the 1980 Summer Olympics in Moscow due to political reasons: Chuck Norris killed the entire US team with a single round-house kick during TaeKwonDo practice.
+Chuck Norris wears a live rattlesnake as a condom.
+The Bible was originally titled "Chuck Norris and Friends"
+Chuck Norris began selling the Total Gym as an ill-fated attempt to make his day-to-day opponents less laughably pathetic.
+Do you know why Baskin Robbins only has 31 flavors? Because Chuck Norris doesn't like Fudge Ripple.
+When Chuck Norris says "More cowbell", he  MEANS it.
+On the set of Walker Texas Ranger Chuck Norris brought a dying lamb back to life by nuzzling it with his beard. As the onlookers gathered, the lamb sprang to life. Chuck Norris then roundhouse kicked it, killing it instantly. This was just to prove that the good Chuck giveth, and the good Chuck, he taketh away.
+Chuck Norris was what Willis was talkin' about.
+Google won't search for Chuck Norris because it knows you don't find Chuck Norris, he finds you.
+Chuck Norris can lead a horse to water AND make it drink.
+Nagasaki never had a bomb dropped on it. Chuck Norris jumped out of a plane and punched the ground.
+It is scientifically impossible for Chuck Norris to have had a mortal father. The most popular theory is that he went back in time and fathered himself.
+Chuck Norris destroyed the periodic table, because Chuck Norris only recognizes the element of surprise.
+It is believed dinosaurs are extinct due to a giant meteor. That's true if you want to call Chuck Norris a giant meteor.
+Chuck Norris shot the sheriff, but he round house kicked the deputy.
+That's not Chuck Norris doing push-ups -- that's Chuck Norris moving the Earth away from the path of a deadly asteroid.
+Chuck Norris can judge a book by its cover.
+Nothing can escape the gravity of a black hole, except for Chuck Norris. Chuck Norris eats black holes. They taste like chicken.
+Chuck Norris does not play the lottery. It doesn't have nearly enough balls.
+Q: How many Chuck Norris' does it take to change a light bulb? A: None, Chuck Norris prefers to kill in the dark.
+As President Roosevelt said: "We have nothing to fear but fear itself. And Chuck Norris."
+Chuck Norris just says "no" to drugs. If he said "yes", it would collapse Colombia's infrastructure.
+Since 1940, the year Chuck Norris was born, roundhouse-kick related deaths have increased 13,000 percent.
+Crime does not pay - unless you are an undertaker following Walker, Texas Ranger, on a routine patrol.
+Chuck Norris invented the internet ...  just so he had a place to store his porn.
+Chuck Norris does not own a house. He walks into random houses and people move.
+It is better to give than to receive. This is especially true of a Chuck Norris roundhouse kick.
+Chuck Norris is the only person to ever win a staring contest against Ray Charles and Stevie Wonder at the same time.
+Industrial logging isn't the cause of deforestation. Chuck Norris needs toothpicks.
+Chuck Norris smells what the Rock is cooking... because the Rock is Chuck Norris' personal chef.
+When Chuck Norris plays Oregon Trail, his family does not die from cholera or dysentery, but rather, roundhouse kicks to the face. He also requires no wagon, since he carries the oxen, axels, and buffalo meat on his back. He always makes it to Oregon before you.
+Chuck Norris is the reason why Waldo is hiding.
+"Brokeback Mountain" is not just a movie. It's also what Chuck Norris calls the pile of dead ninjas in his front yard.
+When God said, "let there be light", Chuck Norris said, "say 'please'."
+Chuck Norris does not eat. Food understands that the only safe haven from Chuck Norris' fists is inside his own body.
+One day Chuck Norris walked down the street with a massive erection. There were no survivors.
+Chuck Norris built a time machine and went back in time to stop the JFK assassination. As Oswald shot, Chuck met all three bullets with his beard, deflecting them. JFK's head exploded out of sheer amazement.
+Chuck Norris doesn't read books. He stares them down until he gets the information he wants.
+Chuck Norris uses a night light. Not because Chuck Norris is afraid of the dark, but the dark is afraid of Chuck Norris.
+Chuck Norris is not capable of hitting a target on the broad side of a barn. Every time he tries, the whole damn barn falls down.
+Before each filming of Walker: Texas Ranger, Chuck Norris is injected with fourteen times the lethal dose of elephant tranquilzer. This is, of course, to limit his strength and mobility, in an attempt to lower the fatality rate of the actors he fights.
+When Bruce Banner gets mad, he turns into the Hulk. When the Hulk gets mad, he turns into Chuck Norris.
+Chuck Norris kills anyone that asks, "You want fries with that" because by now everyone should know that Chuck doesn't ever want fries with anything. Ever.
+Chuck Norris once kicked a horse in the chin. Its decendants are known today as Giraffes.
+Sticks and stones may break your bones, but a Chuck Norris glare will liquefy your kidneys.
+Human cloning is outlawed because if Chuck Norris were cloned, then it would be possible for a Chuck Norris roundhouse kick to meet another chuck Norris roundhouse kick. Physicists theorize that this contact would end the universe.
+Chuck Norris once went skydiving, but promised never to do it again. One Grand Canyon is enough.
+Chuck Norris's version of a "chocolate milkshake" is a raw porterhouse wrapped around ten Hershey bars, and doused in diesel fuel.
+If Chuck Norris round-house kicks you, you will die. If Chuck Norris' misses you with the round-house kick, the wind behind the kick will tear out your pancreas.
+In a fight between Batman and Darth Vader, the winner would be Chuck Norris.
+Chuck Norris puts his pants on one leg at a time, just like the rest of us. The only difference is, then he kills people.
+Everybody loves Raymond. Except Chuck Norris.
+Contrary to popular belief, the Titanic didn't hit an iceberg. The ship was off course and accidentally ran into Chuck Norris while he was doing the backstroke across the Atlantic.
+Chuck Norris got his drivers license at the age of 16. Seconds.
+The original title for Alien vs. Predator was Alien and Predator vs Chuck Norris. The film was cancelled shortly after going into preproduction. No one would pay nine dollars to see a movie fourteen seconds long.
+Chuck Norris' sperm is so badass, he had sex with Nicole Kidman, and 7 months later she prematurely gave birth to a Ford Excursion.
+Chuck Norris can win at solitaire with only 18 cards.
+Chuck Norris once shat blood - the blood of 11,940 natives he had killed and eaten.
+Maslow's theory of higher needs does not apply to Chuck Norris. He only has two needs: killing people and finding people to kill.
+The truth will set you free. Unless Chuck Norris has you, in which case, forget it buddy!
+For most people, home is where the heart is. For Chuck Norris, home is where he stores his collection of human skulls.
+Kryptonite has been found to contain trace elements of Chuck Norris roundhouse kicks to the face. This is why it is so deadly to Superman.
+Saddam Hussein was not found hiding in a "hole." Saddam was roundhouse-kicked in the head by Chuck Norris in Kansas, which sent him through the earth, stopping just short of the surface of Iraq.
+Coroners refer to dead people as "ABC's". Already Been Chucked.
+Chuck Norris doesn't look both ways before he crosses the street... he just roundhouses any cars that get too close.
+Chuck Norris does not have to answer the phone. His beard picks up the incoming electrical impulses and translates them into audible sound.
+How many roundhouse kicks does it take to get to the center of a tootsie pop? Just one. From Chuck Norris.
+Chuck Norris doesnt wear a watch, HE decides what time it is.
+The phrase 'break a leg' was originally coined by Chuck Norris's co-stars in Walker, Texas Ranger as a good luck charm, indicating that a broken leg might be the worst extent of their injuries. This never proved to be the case.
+When chuck Norris does division, there are no remainders.
+If you rearrange the letters in "Chuck Norris", they also spell "Crush Rock In". The words "with his fists" are understood.
+Never look a gift Chuck Norris in the mouth, because he will bite your damn eyes off.
+Give a man a fish, and you will feed him for a day. Give a man anything that is better than a fish, and Chuck Norris will beat his ass and take it.
+Chuck Norris used to play baseball. When Babe Ruth was hailed as the better player, Chuck Norris killed him with a baseball bat to the throat. Lou Gehrig got off easy.
+The original title for Star Wars was "Skywalker: Texas Ranger". Starring Chuck Norris.
+Guantuanamo Bay, Cuba, is the military code-word for "Chuck Norris' basement".
+The phrase 'balls to the wall' was originally conceived to describe Chuck Norris entering any building smaller than an aircraft hangar.
+Chuck Norris' roundhouse kick is so powerful, it can be seen from outer space by the naked eye.
+Ozzy Osbourne bites the heads off of bats. Chuck Norris bites the heads off of Siberian Tigers.
+He who lives by the sword, dies by the sword. He who lives by Chuck Norris, dies by the roundhouse kick.
+The best-laid plans of mice and men often go awry. Even the worst-laid plans of Chuck Norris come off without a hitch.
+The phrase 'dead ringer' refers to someone who sits behind Chuck Norris in a movie theater and forgets to turn their cell phone off.
+Chuck Norris' Roundhouse kick is so powerful, that on the set of Sidekicks he single-footedly destroyed Jonathan Brandis' Career.
+Staring at Chuck Norris for extended periods of time without proper eye protection will cause blindess, and possibly foot sized brusies on the face.
+Chuck Norris can taste lies.
+Chuck Norris does not kick ass and take names. In fact, Chuck Norris kicks ass and assigns the corpse a number. It is currently recorded to be in the billions.
+One time, Chuck Norris accidentally stubbed his toe. It destroyed the entire state of Ohio.
+Little Miss Muffet sat on her tuffet, until Chuck Norris roundhouse kicked her into a glacier.
+In 1990, Chuck Norris founded the non-profit organization "Kick Drugs Out of America". If the organization's name were "Roundhouse Kick Drugs out of America", there wouldn't be any drugs in the Western Hemisphere. Anywhere.
+Chuck Norris can blow bubbles with beef jerky.
+They had to edit the first ending of 'Lone Wolf McQuade' after Chuck Norris kicked David Carradine's ass, then proceeded to barbecue and eat him.
+Chuck Norris does, in fact, live in a round house.
+Chuck Norris was once on Jeopardy. This show is notable in that it was the first occasion in Jeopardy history that Alex Trebek had appeared without a mustache. And a head.
+When Chuck Norris works out on the Total Gym, the Total Gym feels like it's been raped.
+4 out of 5 doctors fail to recommend Chuck Norris as a solution to most problems. Also, 80% of doctors die unexplained, needlessly brutal deaths.
+Chuck Norris can skeletize a cow in two minutes.
+The only sure things are Death and Taxes ... and when Chuck Norris goes to work for the IRS, they'll be the same thing.
+Chuck Norris' first job was as a paperboy. There were no survivors.
+With the rising cost of gasoline, Chuck Norris is beginning to worry about his drinking habit.
+The square root of Chuck Norris is pain. Do not try to square Chuck Norris, the result is death.
+chuck Norris' testicles do not produce sperm. They produce tiny white ninjas that recognize only one mission: seek and destroy.
+To be or not to be? That is the question. The answer? Chuck Norris.
+Chuck Norris has never been in a fight, ever. Do you call one roundhouse kick to the face a fight?
+There are two types of people in the world... people that suck, and Chuck Norris.
+Chuck Norris never wet his bed as a child. The bed wet itself out of fear.
+If you were somehow able to land a punch on Chuck Norris your entire arm would shatter upon impact. This is only in theory, since, come on, who in their right mind would try this?
+70% of a human's weight is water. 70% of Chuck Norris' weight is his dick.
+Jean-Claude Van Damme once kicked Chuck Norris' ass. He was then awakened from his dream by a roundhouse kick to the face.
+The pie scene in "American Pie" is based on a dare Chuck Norris took when he was younger. However, in Chuck Norris' case, the "pie" was the molten crater of an active volcano.
+Chuck Norris uses 8'x10' sheets of plywood as toilet paper.
+Noah was the only man notified before Chuck Norris relieved himself in the Atlantic Ocean.
+Chuck Norris once invited all of the other badasses from TV to duke it out in order to see who was the supreme badass. Only two showed up-- Jack Bauer and MacGyver.
+MacGyver immediately tried to make a bomb out of some Q-Tips and Gatorade, but Chuck Norris roundhouse-kicked him in the solar plexus. MacGyver promptly threw up his own heart.
+Jack Bauer tried to use his detailed knowledge of torture techniques, but to no avail: Chuck Norris thrives on pain. Chuck Norris then ripped off Jack Bauer's arm and beat him to death with it. Game, set, match.
+Chuck Norris eats steak for every single meal. Most times he forgets to kill the cow.
+The First Law of Thermodynamics states that energy can neither be created nor destroyed... unless it meets Chuck Norris.
+Chuck Norris doesn't go on the internet, he has every internet site stored in his memory. He refreshes webpages by blinking.
+Fact: Chuck Norris doesn't consider it sex if the woman survives.
+It is said that looking into Chuck Norris' eyes will reveal your future. Unfortunately, everybody's future is always the same: death by a roundhouse-kick to the face.
+Chuck Norris knows everything there is to know - Except for the definition of mercy.
+Scientifically speaking, it is impossible to charge Chuck Norris with "obstruction of justice." This is because even Chuck Norris cannot be in two places at the same time.
+Chuck Norris never has to wax his skis because they're always slick with blood.
+When you say "no one's perfect", Chuck Norris takes this as a personal insult.
+Chuck Norris can win a game of Trivial Pursuit with one roll of the dice, and without answering a single question... just a nod of the head, and a stroke of the beard.
+182,000 Americans die from Chuck Norris-related accidents every year.
+Paper beats rock, rock beats scissors, and scissors beats paper, but Chuck Norris beats all 3 at the same time.
+Jesus can walk on water, but Chuck Norris can walk on Jesus.
+All roads lead to Chuck Norris. And by the transitive property, a roundhouse kick to the face.
+If you're driving down the road and you think Chuck Norris just cut you off, you better thank your lucky stars it wasn't the other way around.
+July 4th is Independence day. And the day Chuck Norris was born. Coincidence? i think not.
+Chuck Norris never goes to the dentist because his teeth are unbreakable. His enemies never go to the dentist because they have no teeth.
+In the medical community, death is referred to as "Chuck Norris Disease"
+Chuck Norris was once in a knife fight, and the knife lost.
+If you work in an office with Chuck Norris, don't ask him for his three-hole-punch.
+In the Words of Julius Caesar, "Veni, Vidi, Vici, Chuck Norris". Translation: I came, I saw, and I was roundhouse-kicked inthe face by Chuck Norris.
+The First rule of Chuck Norris is: you do not talk about Chuck Norris.
+Chuck Norris is widely predicted to be first black president. If you're thinking to yourself, "But Chuck Norris isn't black", then you are dead wrong. And stop being a racist.
+When Chuck Norris plays Monopoly, it affects the actual world economy.
+Chuck Norris can be unlocked on the hardest level of Tekken. But only Chuck Norris is skilled enough to unlock himself. Then he roundhouse kicks the Playstation back to Japan.
+Chuck Norris drinks napalm to quell his heartburn.
+Every time someone uses the word "intense", Chuck Norris always replies "you know what else is intense?" followed by a roundhouse kick to the face.
+As an infant, Chuck Norris' parents gave him a toy hammer. He gave the world Stonehenge.
+Chuck Norris once ordered a steak in a restaurant. The steak did what it was told.
+Most people fear the Reaper. Chuck Norris considers him "a promising Rookie".
+There are only two things that can cut diamonds: other diamonds, and Chuck Norris.
+President Roosevelt once rode his horse 100 miles. Chuck Norris carried his the same distance in half the time.
+Chuck Norris once ate four 30lb bowling balls without chewing.
+What many people dont know is chuck norris is the founder of planned parenthood. Not even unborn children can escape his wrath.
+Chuck Norris was banned from competitive bullriding after a 1992 exhibition in San Antonio, when he rode the bull 1,346 miles from Texas to Milwaukee Wisconsin to pick up his dry cleaning.
+Chuck Norris qualified with a top speed of 324 mph at the Daytona 500, without a car.
+Chuck Norris likes his coffee half and half: half coffee grounds, half wood-grain alcohol.
+Chuck Norris uses tabasco sauce instead of visine.
+The chemical formula for the highly toxic cyanide ion is CN-. These are also Chuck Norris' initials. This is not a coincidence.
+Chuck Norris' credit cards have no limit. Last weekend, he maxed them out.
+Think of a hot woman. Chuck Norris did her.
+A man once claimed Chuck Norris kicked his ass twice, but it was promptly dismissed as false - no one could survive it the first time.
+Chuck Norris sleeps with a pillow under his gun.
+Chuck Norris owns a chain of fast-food restaurants throughout the southwest. They serve nothing but barbecue-flavored ice cream and Hot Pockets.
+Chuck Norris doesn't chew gum. Chuck Norris chews tin foil.
+Aliens DO indeed exist. They just know better than to visit a planet that Chuck Norris is on.
+When in a bar, you can order a drink called a "Chuck Norris". It is also known as a "Bloody Mary", if your name happens to be Mary.
+Every time Chuck Norris smiles, someone dies. Unless he smiles while he's roundhouse kicking someone in the face. Then two people die.
+Some people ask for a Kleenex when they sneeze, Chuck Norris asks for a body bag.
+There's an order to the universe: space, time, Chuck Norris.... Just kidding, Chuck Norris is first.
+A man once asked Chuck Norris if his real name is "Charles". Chuck Norris did not respond, he simply stared at him until he exploded.
+Chuck Norris starts everyday with a protein shake made from Carnation Instant Breakfast, one dozen eggs, pure Colombian cocaine, and rattlesnake venom. He injects it directly into his neck with a syringe.
+In a tagteam match, Chuck Norris was teamed with Hulk Hogan against King Kong Bundy and Andre The Giant. He pinned all 3 at the same time.
+Chuck Norris doesn't see dead people. He makes people dead.
+Chuck Norris is the only person who can simultaneously hold and fire FIVE Uzis: One in each hand, one in each foot -- and the 5th one he roundhouse-kicks into the air, so that it sprays bullets.
+For undercover police work, Chuck Norris pins his badge underneath his shirt, directly into his chest.
+In the X-Men movies, none of the X-Men super-powers are done with special effects. Chuck Norris is the stuntman for every character.
+We live in an expanding universe. All of it is trying to get away from Chuck Norris.
+It is said that every time you masturbate, God kills a kitten. Every time God masturbates, Chuck Norris kills a lion.
+The word 'Kill' was invented by Chuck Norris. Other words were 'Die', 'Beer', and 'What'.
+Chuck Norris is a vegetarian. Meaning, he does not eat animals until first he puts them into vegetative state with his fists.
+The 11th commandment is "Thou shalt not piss off Chuck Norris" This commandment is rarely enforced, as it is impossible to accomplish.
+Chuck Norris is his own line at the DMV.
+Two wrongs don't make a right. Unless you're Chuck Norris. Then two wrongs make a roundhouse kick to the face.
+Who let the dogs out? Chuck Norris let the dogs out... and then roundhouse kicked them through an Oldsmobile.
+Chuck Norris can do a roundhouse kick faster than the speed of light. This means that if you turn on a light switch, you will be dead before the lightbulb turns on.
+When Chuck Norris goes to out to eat, he orders a whole chicken, but he only eats its soul.
+Chuck Norris sold his soul to the devil for his rugged good looks and unparalleled martial arts ability. Shortly after the transaction was finalized, Chuck roundhouse-kicked the devil in the face and took his soul back. The devil, who appreciates irony, couldn't stay mad and admitted he should have seen it coming. They now play poker every second Wednesday of the month.
+Chuck Norris has never won an Academy Award for acting... because he's not acting.
+If Chuck Norris wants your opinion, he'll beat it into you.
+Not everyone that Chuck Norris is mad at gets killed. Some get away. They are called astronauts.
+Chuck Norris has to register every part of his body as a separate lethal weapon. His spleen is considered a concealed weapon in over 50 states.
+A movie scene depicting Chuck Norris losing a fight with Bruce Lee was the product of history's most expensive visual effect. When adjusted for inflation, the effect cost more than the Gross National Product of Paraguay.
+Godzilla is a Japanese rendition of Chuck Norris' first visit to Tokyo.
+They once made a Chuck Norris toilet paper, but there was a problem-- It wouldn't take shit from anybody.
+Chuck Norris once rode a nine foot grizzly bear through an automatic car wash, instead of taking a shower.
+"Sweating bullets" is literally what happens when Chuck Norris gets too hot.
+Chuck Norris' sperm can be seen with the naked eye. Each one is the size of a quarter.
+After taking a steroids test doctors informed Chuck Norris that he had tested positive. He laughed upon receiving this information, and said "of course my urine tested positive, what do you think they make steroids from?"
+Chuck Norris doesn't daydream. He's too busy giving other people nightmares.
+When Arnold says the line "I'll be back" in the first Terminator movie it is implied that is he going to ask Chuck Norris for help.
+There are no such things as tornados. Chuck Norris just hates trailer parks.
+Chuck Norris' Penis is a third degree blackbelt, and an honorable 32nd-degree mason.
+Chuck Norris does not follow fashion trends, they follow him. But then he turns around and kicks their ass. Nobody follows Chuck Norris.
+The phrase 'break a leg' was originally coined by Chuck Norris's co-stars in Walker, Texas Ranger as a good luck charm indicating that a broken leg might be the worst extent of their injuries. This never proved to be the case.
+Chuck Norris' roundhouse kick is so powerful, it can be seen from outer space by the naked eye.
+Diamonds are not, despite popular belief, carbon. They are, in fact, Chuck Norris fecal matter. This was proven a recently, when scientific analysis revealed what appeared to be Jean-Claude Van Damme bone fragments inside the Hope Diamond.
+Chuck Norris once participated in the running of the bulls. He walked.
+The Drummer for Def Leppard's only got one arm. Chuck Norris needed a back scratcher.
+Chuck Norris was the orginal sculptor of Mount Rushmore. He completed the entire project using only a bottle opener and a drywall trowel.
+Chuck Norris once rode a bull, and nine months later it had a calf.
+Chuck Norris once lost the remote, but maintained control of the TV by yelling at it in between bites of his "Filet of Child" sandwich.
+For Spring Break '05, Chuck Norris drove to Madagascar, riding a chariot pulled by two electric eels.
+The Manhattan Project was not intended to create nuclear weapons, it was meant to recreate the destructive power in a Chuck Norris Roundhouse Kick. They didn't even come close.
+Chuck Norris has banned rainbows from the state of North Dakota.
+Divide Chuck Norris by zero and you will in fact get one........one bad-ass  that is.
+TNT was originally developed by Chuck Norris to cure indigestion.
+After returning from World War 2 unscathed, Bob Dole was congratulated by Chuck Norris with a handshake. The rest is history.
+Chuck Norris runs on batteries. Specifically, Die Hards.
+"Let the Bodies Hit the Floor" was originally written as Chuck Norris' theme song.
+Chuck Norris will never have a heart attack. His heart isn't nearly foolish enough to attack him.
+Only Chuck Norris can prevent forest fires.
+When Chuck Norris makes a burrito, its main ingredient is real toes.
+Chuck Norris is not Irish. His hair is soaked in the blood of his victims.
+In the movie "The Matrix", Chuck Norris is the Matrix. If you pay close attention in the green "falling code" scenes, you can make out the faint texture of his beard.
+Chuck Norris' dick is so big, it has it's own dick, and that dick is still bigger than yours.
+They say curiosity killed the cat. This is false. Chuck Norris killed the cat. Every single one of them.
+There is no such thing as a lesbian, just a woman who has never met Chuck Norris.
+Chuck Norris crossed the road. No one has ever dared question his motives.
+When Chuck Norris was born, he immediately had sex with the first nurse he saw. He was her first. She was his third. That afternoon.
+One time, at band camp, Chuck Norris ate a percussionist.
+Chuck Norris doesn't say "who's your daddy", because he knows the answer.
+Chuck Norris originally wrote the first dictionary. The definition for each word is as follows - A swift roundhouse kick to the face.
+Love does not hurt. Chuck Norris does.
+The term "Cleveland Steamer" got its name from Chuck Norris, when he took a dump while visiting the Rock and Roll Hall of fame and buried northern Ohio under a glacier of fecal matter.
+Chuck Norris once round-house kicked a salesman. Over the phone.
+The pen is mighter than the sword, but only if the pen is held by Chuck Norris.
+Chuck Norris doesn't kill two birds with one stone. Chuck Norris kills all birds, with two stones. The ones in his pants.
+Chuck Norris knows the last digit of pi.
+Those aren't credits that roll after Walker Texas Ranger. It is actually a list of fatalities that occurred during the making of the episode.
+The air around Chuck Norris is always a balmy 78 degrees.
+When Chuck Norris wants an egg, he cracks open a chicken.
+Chuck Norris plays racquetball with a waffle iron and a bowling ball.
+According to the Bible, God created the universe in six days. Before that, Chuck Norris created God by snapping his fingers.
+Chuck Norris doesn't believe in ravioli. He stuffs a live turtle with beef and smothers it in pig's blood.
+Count from one to ten. That's how long it would take Chuck Norris to kill you...Fourty seven times.
+The 1972 Miami Dolphins lost one game, it was an exhibition game vs. Chuck Norris and three seven year old girls. Chuck Norris won with a roundhouse-kick to the face in overtime.
+Chuck Norris is not Politically Correct. He is just Correct. Always.
+Mr. T pities the fool. Chuck Norris rips the fool's  head off.
+Chuck Norris had to stop washing his clothes in the ocean. The tsunamis were killing people.
+Chuck Norris has volunteered to remain on earth after the Rapture; he will spend his time fighting the Anti-Christ.
+They were going to release a Chuck Norris edition of Clue, but the answer always turns out to be "Chuck Norris. In The Library. With a Roundhouse Kick."
+Chuck Norris is the only known mammal in history to have an opposable thumb. On his penis.
+A man once taunted Chuck Norris with a bag of Lay's potato chips, saying "Betcha can't eat just one!" Chuck Norris proceeded to eat the chips, the bag, and the man in one deft move.
+Chuck Norris' favorite cereal is Kellogg's Nails 'N' Gravel.
+In the first Jurassic Park movie, the Tyrannosaurus Rex wasn't chasing the jeep. Chuck Norris was chasing the Tyrannosaurus AND the jeep.
+Chuck Norris has never been accused of murder for the simple fact that his roundhouse kicks are recognized world-wide as "acts of God."
+"Brokeback Mountain" is not just a movie. It's also what Chuck Norris calls the pile of dead ninjas in his front yard.
+Chuck Norris does not wear a condom. Because there is no such thing as protection from Chuck Norris.
+Chuck Norris once had sex with a cigarette machine in the Osaka airport.
+Rules of fighting: 1) Don't bring a knife to a gun fight. 2) Don't bring a gun to a Chuck Norris fight.
+Chuck Norris is the only man who has, literally, beaten the odds. With his fists.
+In ancient China there is a legend that one day a child will be born from a dragon, grow to be a man, and vanquish evil from the land. That man is not Chuck Norris, because Chuck Norris killed that man.
+Chuck Norris wipes his ass with chain mail and sandpaper.
+When you play Monopoly with Chuck Norris, you do not pass go, and you do not collect two hundred dollars. You will be lucky if you make it out alive.
+Chuck Norris describes human beings as "a sociable holder for blood and guts".
+Chuck Norris once got into a fight with a one-armed Ninja. Seeing that he had an unfair advantage, Chuck Norris ripped both of his arms off and one of his legs. He then roundhouse-kicked the ninja in the head, killing him instantly, and proceeded to sow his limbs back on using only a rusty tent spike and bailing wire.
+Chuck Norris likes his ice like he likes his skulls: crushed.
+Chuck Norris can kick through all 6 degrees of separation, hitting anyone, anywhere, in the face, at any time.
+Most tough men eat nails for breakfast. chuck Norris does all of his grocery shopping at Home Depot.
+Chuck Norris did not "lose" his virginity, he stalked it and then destroyed it with extreme prejudice.
+Everything King Midas touches turnes to gold. Everything Chuck Norris touches turns up dead.
+Chuck Norris' pulse is measured on the richter scale.
+Most people know that Descarte said, "I think, therefore I am." What most people don't know is that that quote continues, "...afraid of Chuck Norris."
+Chuck Norris once roundhouse-kicked a ten dollar bill into 200 nickels.
+For every movie about Vietnam starring Chuck Norris, the historical duration of the war decreases. Just 3 more "Missing in Action" sequels, and that war will have never actually existed.
+Chuck Norris' penis has a Hemi.
+Chuck Norris enjoys a good practical joke. His favorite is where he removes your lower intestine and pretends to make a balloon animal out of it. Then he cracks your skull open with a Volvo for not complimenting him on his balloon animal.
+Chuck Norris CAN in fact 'raise the roof'. And he can do it with one hand.
+Kenny G is allowed to live because Chuck Norris doesn't kill women.
+Life is not, in fact, like a box of chocolates. It is more like a box of Chuck Norris, roundhouse kicking you in the face. And if you receive a box of Chuck Norris, you ALWAYS know what you are going to get.
+For Chuck Norris, every street is "one way". HIS WAY.
+There are now five cup sizes at Starbucks: Short, Tall, Grande, Venti, and Chuck Norris.
+During the Vietnam War, Chuck Norris allowed himself to be captured. For torture, they made him eat his own entrails. He asked for seconds.
+Chuck Norris once created a flamethrower by urinating into a lighter.
+Instead of having a cigarette after sex, Chuck Norris heads outside and brands his cattle.
+Chuck Norris actually built the stairway to heaven.
+Whoever said "only the good die young" was probably in Chuck Norris's kindergarten class.
+Chuck Norris once skewered a man with the Eiffel tower.
+The best part of waking up, is not Folgers in your cup, but knowing that Chuck Norris didn't kill you in your sleep.
+Chuck Norris doesn't own a can opener, he just chews through the can.
+Occam's Razor says that the simplest answer tends to be the correct one. Norris' Razor involves a flick of the wrist and a Columbian Necktie.
+Chuck Norris needs a monkeywrench and a blowtorch to masturbate.
+Proponents of higher-order theories of consciousness argue that consciousness is explained by the relation between two levels of mental states in which a higher-order mental state takes another mental state. If you mention this to Chuck Norris, expect an explosive roundhouse kick to the face for spouting too much fancy-talk.
+Chuck Norris invented all 32 letters of the alphabet.
+Remember The Ultimate Warrior? He quit wrestling because Chuck Norris wanted his nickname back.
+If a tree falls in the forest, does anybody hear? Yes. Chuck Norris hears it. Chuck Norris can hear everything. Chuck Norris can hear the shrieking terror in your soul.
+Chuck Norris actually owns IBM. It was an extremely hostile takeover.
+He, who laughs last, laughs best. He who laughs at Chuck Norris  ...  dies.
+Chuck Norris is like a dog, not only because he can smell fear, but because he can piss on whatever he wants.
+Chuck Norris can jump-start a car using jumper cables attached to his nipples.
+Chuck Norris neither melts in your mouth nor in your hand. He shreds your trachea before ravaging your soul with a combination of chocolate, whickey, roundhouse kicks and death. Oh, and pain. Lots of pain.
+Chuck Norris doesn't have blood. He is filled with magma.
+Chuck Norris uses Tabasco Sauce for eye drops.
+Chuck Norris can get Blackjack with just one card.
+"One time I was with Norris in the back of a pickup truck, along with a live deer. Norris goes up to the deer and says, 'I'm Chuck Norris! SAY IT!' Then he manipulates the deer's lips in such a way as to make it say, 'ChuckNorris'
+People created the automobile to escape from Chuck Norris...Not to be outdone, Chuck Norris created the automobile accident.
+Chuck Norris roundhouse kicks people in the face first and asks questions later.
+When Chuck Norris was born, the only person who cried was the doctor. Never slap Chuck Norris.
+Chuck Norris can sneeze with his eyes open.
+Archeologists in India recently uncovered a new dinosaur. It's actually many dinosaurs but one is in the middle of all the others. The one in the middle is believed to have killed the others with a single roundhouse kick to the face. The archeologists wanted to call it ChuckNorrisaurs but the Indian government changed the name to Himotosaurous because it's simply not possible for Mr. Norris to be killed.
+Chuck Norris got a perfect score on his SAT's, simply by writing Chuck Norris for every answer.
+Chuck Norris has to use a stunt double when he does crying scenes.
+Chuck Norris successfully seperated twins conjoined at the head by roundkicking them in the face.
+Dinosaurs went extinct because of the Chuck Norrisaurus.
+People have often asked the United States, What is your secret weapon against terrorists? We simply reply...Chuck Norris
+Chuck Norris wears Orion's Belt around his pinky toe and he eats with the Big Dipper. 
+Chuck Norris eats lightning and farts thunder.
+Lightning never strikes twice in one place because Chuck Norris is looking for it. 
+Chuck Norris was once a knight in King Arthur's court.  He was known as Sir Beatdown.
+Chuck Norris once played rugby by himself.  He went undefeated. Chuck Norris once played rugby by himself.  He went undefeated.
+In Desert Storm the reason why the Iraqi army surrendered so quickly because they knew Chuck Norris was coming. 
+Chuck Norris has never looked a baby in the eyes cause it might him cry but if he does it also makes him want to punch a baby.
+Chuck norris doesnt go at the speed of light, he goes at the speed of Norris
+Chuck Norris does not know about this website. If he did he would have just deleted the internet.
+Before sliced bread, people used to say "Thats the greatest thing since Chuck Norris". But Chuck Norris was displeased by this. So he roundhouse kicked a loaf of bread into slices.
+Chuck Norris's sweat has burned holes in concrete.
+The wind of Chuck Norris's round house kick can be felt from 1600 million miles away
+Chuck Norris has held the World Championship in every weight class at the same time.
+There is no Control button on Chuck Norris' computer.  Chuck Norris is always in control.
+Chuck Norris is so bad he makes viruses sick.  As such, Chuck Norris is also responsible for the eradication of smallpox.
+There are four legal methods of execution in the United States:  lethal injection, gas chamber, electric chair and Chuck Norris.
+Earth's emergency defence plan in case of alien invasion is Chuck Norris.
+Chuck Norris stared evil in the face, and it backed down
+Chuck Norris can split the atom. With his bare hands.
+On the SAT if you put Chuck Norris for every answer you will score over 8000
+The United States could save billions in defense funding if they trade the Military for Chuck Norris
+When Chuck Norris spits out watermelon seeds, he puts a machine gun to shame
+Chuck Norris doesnt use after shave, he uses liquid hot magma.
+When Chuck norris found this web-site while surfing the internt, he round house kicked his computer...10 new facts were added instantly.including this one
+You can lead a horse to water but cannot make him drink, unless you're Chuck Norris
+No matter what your mother always said, Chuck Norris can tune a fish.
+Chuck Norris is '' The best a man can get ''
+On Valentine's Day, Chuck Norris gives his wife the still beating heart of one of his enemies. Being very romantic, Chuck Norris believes every day should be Valentine's Day.
+Scientists believe the world began with the "Big Bang". Chuck Norris shrugs it off as a "bad case of gas".
+Chuck Norris let the dogs out.
+Chuck Norris visits an active volcano every morning to get some of "the best damn espresso on Earth".
+Chuck Norris eats eight meals a day. Seven are steak, and the last is the rest of the cow.
+Chuck Norris does know what Willis is talking about!
+Chuck Norris don't open no can of whoopass.  He makes his own.
+Chuck Norris could shoot someone and still have time to roundhouse kick him in the face before the bullet hit.
+Chuck Norris's body temperature is 98.6 degrees... Celsius.
+The world's fastest car has 7 gears.  5, 6, and Chuck Norris.
+The active ingredient in Red Bull is Chuck Norris's sweat.
+The Seven Wonders of the ancient world were: Chuck Norris' left and right hands, his left and right feet, his belly button, his liver, and his beard.
+When Chuck Norris goes to Vegas, he doesn't have to gamble. The casinos just give him stacks of money.
+In an emergency, Chuck Norris can be used as a floatation device.
+When Chuck Norris is ready to wake up, he tells the sun to get the above the horizon.
+The speed of light was instituted because Chuck Norris didn't want get winded outrunning it. Chuck Norris hates to sweat.
+Chuck Norris once bench-pressed the entire state of Ohio, and all of its residents.
+Chuck Norris can hold his breathe for nine years.
+When somebody yells "Last one in is a rotten egg," Chuck Norris is never the rotten egg.
+Chuck Norris invented the question mark.
+Chuck Norris trick-or-treated as himself as a child.
+Chuck Norris has 3 knees on each leg.
+Chuck Norris likes long walks on the beach, Barry White music, Harlequin romance novels, songbirds, rainbows, and quiet time with his lady ... just before he roundhouse kicks her in the face.
+Chuck Norris can cook minute rice in 30 seconds.
+If you gave Chuck Norris a typewriter and 0.000000000000000000001th of a second he can write the Complete Works of Shakespeare
+Chuck Norris puts the laughter in manslaughter.
+Chuck Norris' beard hair is believed to be an aphrodisiac in China.
+The helicopter was invented after Chuck Norris was observed doing 8 roundhouse kicks a second.
+Cars were invented to have a faster way of fleeing from Chuck Norris. Not to be outdone, Chuck Norris invented the car accident.
+Chuck Norris brushes his teeth with barbed wire.
+Chuck Norris can watch an episode of 60 minutes in 22 seconds.
+Chuck Norris make onions CRY!!!
+Some people say that Chuck Norris is a myth. Those "some people" are now dead.
+When Chuck Norris sneeze, he don't say "Atchoo" he says "DIE EVERYONE!!!". That's what happens next.
+Chuck Norris eats a bowl of diamonds every morning.
+Chuck Norris is not only a noun, but a verb
+"""
+
+schneiertxt = """
+If Bruce Schneier wants your plaintext, he'll just squeeze it out of the ciphertext using his barehands
+Bruce Schneier got a perfect score on his comp-sci degree. Just by writing Bruce Schneier for every answer.
+Whitfield Diffie and Martin Hellman use only their surnames out of fear of Bruce Schneier
+Bruce Schneier can conduct secure multiparty computation... on his own
+Bruce Schneier mounts side-channel attacks through the front channel
+Bruce Schneier's discrete logarithms are uncountable and continuous
+Bruce Schneier always inhabits the soundness of error margin of your zero-knowledge crypto protocol
+When Bruce Schneier pre-computes S-box tables, he does it dynamically from the key... over breakfast.
+Bruce Schneier can determine the exact location and velocity of any particle that's being used by quantum cryptography.
+Quantum cryptography exchanged the Heisenberg Uncertainty Principle for the Schneier Dead Moral Certainty Principle when Bruce Schneier came to town.
+Bruce Schneier knows Alice and Bob's shared secret.
+Bruce Schneier eats 0s and 1s for breakfast. And snacks on pi.
+Bruce Schneier memorizes his one time pads
+Bruce Schneier assembled assembly...with his bare hands!
+Bruce Schneier is computationally infeasible.
+A mystery wrapped in an Enigma is no more puzzling to Bruce Schneier than a mystery wrapped in ROT-13.
+Bruce Schneier doesn't even trust Trent. Trent has to trust Bruce Schneier.
+Bruce Schneier once factored a prime number.
+As Bruce Schneier says there is no Oscar for security theatre.
+Bruce Schneier's secure handshake is so strong, you won't be able to exchange keys with anyone else for days.
+Most people use passwords. Some people use passphrases. Bruce Schneier uses an epic passpoem, detailing the life and works of seven mythical Norse heroes.
+Bruce Schneier's online purchases are so secure, his shopping cart is an M-1 tank.
+Bruce Schneier doesn't need steganography to hide data in innocent-looking files. He just pounds it in with his fist.
+Bruce Schneier can reverse any one-way cryptographic hash, just by staring it in the eye
+Bruce Schneier can solve NP-Complete problems in NlogN time.
+"When I wake up in the morning I piss cryptographic excellence." - Bruce Schneier
+Bruce Schneier's tears can burn holes through an OpenBSD firewall. Lucky for us, Bruce Schneier never cries.
+Bruce Schneier writes his books and essays by generating random alphanumeric text of an appropriate length and then decrypting it.
+Bruce Schneier decrypted the Bible. The plaintext read, "Bruce Schneier".
+If you use the digits of Pi to generate a visual image, it draws a picture of Bruce Schneier.
+The universe was created to serve as Bruce Schneier's crib text.
+Bruce Schneier's public and private keys are known as "Law" and "Order."
+SSL is invulnerable to man-in-the-middle attacks. Unless that man is Bruce Schneier.
+When he was three, Bruce Schneier built an Enigma machine out of Legos.
+Bruce Schneier once found the inverse of a trapdoor function counting only on the fingers of one hand
+A vigenere cipher with the Key "BRUCESCHNEIER" is in fact unbreakable.
+Bruce Schneier fully discloses his own vulnerabilities: none.
+Bruce Schneier knows your private key.
+Bruce Schneier's Twofish algorithm has 16 rounds, but he always gets a knockout in the first.
+The nuclear launch codes held by the President of the United States are secured by an unbreakable system: a plain brown envelope with a picture of Bruce Schneier on the flap.
+Ron Rivest wears Bruce Schneier pajamas.
+Bruce Schneier was only allowed to view the Kryptos sculpture at Langley for 1 second, in order not to spoil the fun other cryptographers. It was 0.9 seconds too much.
+Bruce Schneier doesn't have a chin under his beard -- just more ciphertext.
+If at first you don't succeed at breaking a cipher, you're not Bruce Schneier.
+In a fight between Ron Rivest and Adi Shamir, the winner would be Bruce Schneier.
+The output of Bruce Schneier's pseudorandom generator follows no describable pattern and cannot be compressed.
+There is no chin behind Bruce Schneier's beard. There is only another pseudorandom number generator and he's gonna use it to encrypt your face.
+When Bruce Schneier does modulo arithmetic, there are no remainders. Ever.
+It has recently been discovered that every possible hashing algorithm produces the same value for the phrase "Bruce Schneier" -- Bruce Schneier.
+Bruce Schneier made Bell-LaPadula do a brutal doodle.
+Bruce Schneier once broke AES using nothing but six feet of rusty barbed wire, a toothpick, and the front axle from a 1962 Ford Falcon.
+Every time Bruce Schneier smiles, an amateur cryptographer dies.
+Mr. T pities the fool. Bruce Schneier just pities his data.
+Bruce Schneier can change most random distributions. With his fists.
+Geologists recently discovered that "earthquakes" are nothing more than Bruce Schneier and Chuck Norris communicating via a roundhouse kick-based cryptosystem.
+Sweeping NSA reforms will soon require all employees to grow a Bruce Schneier beard.
+Bruce Schneier mounts chosen-ciphertext attacks without choosing the ciphertext
+As initialization vectors, 'Bruce Schneier' and 'Chuck Norris' are interchangeable.
+When Bruce Schneier uses double ROT13 encryption, the ciphertext is totally unbreakable.
+The final Beale Cipher, written 175 years ago, detailing the rightful owners of a cache of gold, has just two words in its plaintext: Bruce Schneier.
+Autographed copies of "Applied Cryptography" reguarly sell for twice the going rate for enigma machines on eBay
+Bruce Schneier sneers and solves Godel's incompleteness theorems.
+When Bruce Schneier clicks "Random Fact" the outcome is never random.
+Humboldt squids have sensors capable of detecting clothing worn by Bruce Schneier at 800 yards - to trigger their flight response.
+Beyond computational complexity, there is Schneiertational complexity
+Bruce Schneier can straighten out an elliptic curve with nothing but his teeth
+Bruce Schneier makes abstract algebra look like elementary algebra.
+"""
+
+theotxt = """
+Write more code.
+Make more commits.
+That's because you have been slacking.
+slacker!
+That's what happens when you're lazy.
+idler!
+slackass!
+lazy bum!
+Stop slacking you lazy bum!
+slacker slacker lazy bum bum bum slacker!
+I could search... but I'm a lazy bum ;)
+sshutup sshithead, ssharpsshooting susshi sshplats ssharking assholes.
+Lazy bums slacking on your asses.
+35 commits an hour? That's pathetic!
+Fine software takes time to prepare.  Give a little slack.
+I am just stating a fact
+you bring new meaning to the terms slackass. I will have to invent a new term.
+if they cut you out, muddy their back yards
+Make them want to start over, and play nice the next time.
+It is clear that this has not been thought through.
+avoid using abort().  it is not nice.
+That's the most ridiculous thing I've heard in the last two or three minutes!
+I'm not just doing this for crowd response. I need to be right.
+I'd put a fan on my bomb.. And blinking lights...
+I love to fight
+No sane people allowed here.  Go home.
+you have to stop peeing on your breakfast
+feature requests come from idiots
+henning and darren / sitting in a tree / t o k i n g / a joint or three
+KICK ASS. TIME FOR A JASON LOVE IN!  WE CAN ALL GET LOST IN HIS HAIR!
+shame on you for following my rules.
+altq's parser sucks dead whale farts through the finest chemistry pipette's
+screw this operating system shit, i just want to drive!
+Search for fuck.  Anytime you see that word, you have a paragraph to write.
+Yes, but the ports people are into S&M.
+Buttons are for idiots.
+We are not hackers. We are turd polishing craftsmen.
+who cares.  style(9) can bite my ass
+It'd be one fucking happy planet if it wasn't for what's under this fucking sticker.
+I would explain, but I am too drunk.
+you slackers don't deserve pictures yet
+Vegetarian my ass
+Wait a minute, that's a McNally's!
+don't they recognize their moral responsibility to entertain me?
+#ifdef is for emacs developers.
+Many well known people become net-kooks in their later life, because they lose touch with reality.
+You're not allowed to have an opinion.
+tweep tweep tweep
+Quite frankly, SSE's alignment requirement is the most utterly retarded idea since eating your own shit.
+Holy verbose prom startup Batman.
+Any day now, when we sell out.
+optimism in man kind does not belong here
+First user who tries to push this button, he pounds into the ground with a rant of death.
+we did farts.  now we do sperm.  we are cutting edge.
+the default configuration is a mixture of piss, puke, shit, and bloody entrails.
+Stop wasting your time reading people's licenses.
+doing it with environment variables is OH SO SYSTEM FIVE LIKE OH MY GOD PASS ME THE SPOON
+Linux is fucking POO, not just bad, bad REALLY REALLY BAD
+penguins are not much more than chickens that swim.
+i am a packet sniffing fool, let me wipe my face with my own poo
+Whiners.  They scale really well.
+in your world, you would have a checklist of 50 fucking workarounds just to make a coffee.
+for once, I have nothing to say.
+You have no idea how fucked we are
+You can call it fart if you want to.
+wavelan is a battle field
+You are in a maze of gpio pins, all alike, all undocumented, and a few are wired to bombs.
+And that is why humppa sucks... cause it has no cause.
+cache aliasing is a problem that would have stopped in 1992 if someone had killed about 5 people who worked at Sun.
+"""
+
+chuck = ['booo', ]
+schneier = ['booo', ]
+theo = ['booo', ]
+
+def init():
+    global chuck
+    global schneier
+    global theo
+    chuck = chucktxt.splitlines()
+    schneier = schneiertxt.splitlines()
+    theo = theotxt.splitlines()
+    return 1
+
+def handle_chuck(bot, ievent):
+    """ get chuck norris fact """
+    rand = random.randint(1,len(chuck))
+    ievent.reply(chuck[rand-1].strip())
+
+def handle_schneier(bot, ievent):
+    """ get schneier fact """
+    rand = random.randint(1,len(schneier))
+    ievent.reply(schneier[rand-1].strip())
+
+def handle_theo(bot, ievent):
+    """ get theo """
+    rand = random.randint(1,len(theo))
+    ievent.reply(theo[rand-1].strip())
+
+cmnds.add('chuck', handle_chuck, 'USER')
+examples.add('chuck', 'generate chuck norris fact', 'chuck')
+tests.add('chuck')
+
+cmnds.add('schneier', handle_schneier, 'USER')
+examples.add('schneier', 'generate bruce schneier fact', 'schneier')
+tests.add('schneier')
+
+cmnds.add('theo', handle_theo, 'USER')
+examples.add('theo', 'generate theo de raadt fact', 'theo')
+tests.add('theo')
--- gozerbot-0.99.1.orig/build/lib/gplugs/shop.py
+++ gozerbot-0.99.1/build/lib/gplugs/shop.py
@@ -0,0 +1,285 @@
+# plugs/shop.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+__gendocfirst__ = ['shop', ]
+
+from gozerbot.utils.generic import convertpickle
+from gozerbot.generic import getwho, jsonstring
+from gozerbot.users import users
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.datadir import datadir
+from gozerbot.persist.pdol import Pdol
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import os
+
+plughelp.add('shop', ' maintain shopping lists per user')
+
+## UPGRADE PART
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'shops',  datadir + os.sep + 'plugs' + \
+os.sep + 'shop' + os.sep + 'shops')
+
+## END UPGRADE PART
+
+shops = Pdol(datadir + os.sep + 'plugs' + os.sep + 'shop' + os.sep + 'shops')
+
+## END UPGRADE PART
+
+def size():
+    """ return number of shops entries """
+    return len(shops.data)
+
+def sayshop(bot, ievent, shoplist):
+    """ output shoplist """
+    if not shoplist:
+        ievent.reply('nothing to shop ;]')
+        return
+    result = []
+    teller = 0
+    for i in shoplist:
+        result.append('%s) %s' % (teller, i))
+        teller += 1
+    ievent.reply("shoplist: ", result)
+
+def handle_shop(bot, ievent):
+    """ shop [<item>] .. show shop list or add <item> """
+    if len(ievent.args) != 0:
+        handle_shop2(bot, ievent)
+        return
+    shop = []
+    username = users.getname(ievent.userhost)
+    shop = shops[username]
+    sayshop(bot, ievent, shop)
+
+cmnds.add('shop', handle_shop, 'USER')
+tests.add('shop food').add('shop', 'food')
+
+def handle_shop2(bot, ievent):
+    """ add items to shop list """
+    if not ievent.rest:
+        ievent.missing('<shopitem>')
+        return
+    else:
+        what = ievent.rest
+    username = users.getname(ievent.userhost)
+    shops[username] = what
+    shops.save()
+    ievent.reply('shop item added')
+
+examples.add('shop', 'shop [<item>] .. show shop items or add a shop item', \
+'1) shop 2) shop bread')
+
+def handle_shopchan(bot, ievent):
+    """ shop-chan [<item>] .. show channel shop list or add <item> """
+    if len(ievent.args) != 0:
+        handle_shopchan2(bot, ievent)
+        return
+    shop = shops[jsonstring((bot.name, ievent.channel))]
+    sayshop(bot, ievent, shop)
+
+cmnds.add('shop-chan', handle_shopchan, 'USER')
+examples.add('shop-chan', 'shop-chan [<item>] .. show channel shop list or \
+add <item>', '1) shop-chan 2) shop-chan milk')
+tests.add('shop-chan food').add('shop-chan', 'food')
+
+def handle_shopchan2(bot, ievent):
+    """ add items to shop list """
+    if not ievent.rest:
+        ievent.missing('<shopitem>')
+        return
+    else:
+        what = ievent.rest
+    shops[jsonstring((bot.name, ievent.channel))] = what
+    shops.save()
+    ievent.reply('shop item added')
+
+def handle_addshop(bot, ievent):
+    """ shop-add <username> <item> .. add items to shop list of <username>"""
+    if len(ievent.args) < 2:
+        ievent.missing('<username> <item>')
+        return
+    else:
+        who = ievent.args[0]
+        what = ' '.join(ievent.args[1:])
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % who)
+        return
+    # get username of use giviing the command
+    username = users.getname(ievent.userhost)
+    # get username of person we want to knwo the shop list of
+    whoname = users.getname(userhost)
+    if not whoname:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    if users.permitted(userhost, username, 'shop'):
+        shops[whoname] = what
+        shops.save()
+        ievent.reply('shop item added')
+    else:
+        ievent.reply("%s does not share shopping list with %s" % (who, \
+username))
+
+cmnds.add('shop-add', handle_addshop, 'USER')
+examples.add('shop-add', 'shop-add <username> <item> .. add shop item of \
+someone else', '1) shop-add test milk')
+tests.add('shop-add exec milk')
+
+def handle_getshop(bot, ievent):
+    """ shop-get <name> .. get items of someone elses shop list """
+    if not ievent.rest:
+        ievent.missing('<username>')
+        return
+    who = ievent.rest
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % who)
+        return
+    username = users.getname(ievent.userhost)
+    whoname = users.getname(userhost)
+    if not whoname:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    if users.permitted(userhost, username, 'shop'):
+        shop = shops[whoname]
+        sayshop(bot, ievent, shop)
+    else:
+        ievent.reply("%s does not share shopping list with %s" % (who, \
+username))
+
+cmnds.add('shop-get', handle_getshop, ['USER', 'WEB'])
+examples.add('shop-get', 'shop-get <name> .. get shop items of someone \
+else', '1) shop-get test')
+tests.add('shop-get exec')
+
+def handle_delshop(bot, ievent):
+    """ shop-del <username> <listofnrs> .. delete items of someone elses \
+        shop list """
+    if len(ievent.args) < 2:
+        ievent.missing('<username> <listofnrs>')
+        return
+    else:
+        who = ievent.args[0]
+    try:
+        nrs = []
+        for i in ievent.args[1:]:
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % who)
+        return
+    username = users.getname(ievent.userhost)
+    whoname = users.getname(userhost)
+    if not whoname:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    if users.permitted(userhost, username, 'shop'):
+        try:
+            shop = shops[whoname]
+        except KeyError:
+            ievent.reply('nothing to shop ;]')
+            return
+        nrs.sort()
+        nrs.reverse()
+        for i in range(len(shop)-1, -1 , -1):
+            if i in nrs:
+                try:
+                    del shop[i]
+                except IndexError:
+                    pass
+        shops.save()
+        ievent.reply('shop item deleted')
+    else:
+        ievent.reply("%s does not share shopping list with %s" % (who, \
+username))
+
+cmnds.add('shop-del', handle_delshop, 'USER')
+examples.add('shop-del', 'shop-del <username> <listofnrs> .. delete shop \
+item of someone else', '1) shop-del test 2 4 5')
+tests.add('shop-del exec 1 2')
+
+def handle_got(bot, ievent):
+    """ got <listofnrs> .. remove items from shoplist """
+    if len(ievent.args) == 0:
+        ievent.missing('<list of nrs>')
+        return
+    try:
+        nrs = []
+        for i in ievent.args:
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    username = users.getname(ievent.userhost)
+    try:
+        shop = shops[username]
+    except KeyError:
+        ievent.reply('nothing to shop ;]')
+        return
+    if not shop:
+        ievent.reply("nothing to shop ;]")
+        return
+    nrs.sort()
+    nrs.reverse()
+    teller = 0
+    for i in range(len(shop)-1, -1 , -1):
+        if i in nrs:
+            try:
+                del shop[i]
+                teller += 1
+            except IndexError:
+                pass
+    shops.save()
+    ievent.reply('%s shop item(s) deleted' % teller)
+
+cmnds.add('got', handle_got, 'USER')
+examples.add('got', 'got <listofnrs> .. remove item <listofnrs> from shop \
+list','1) got 3 2) got 1 6 8')
+tests.add('got 1')
+
+def handle_gotchan(bot, ievent):
+    """ got-chan <listofnrs> .. remove items from channel shoplist """
+    if len(ievent.args) == 0:
+        ievent.missing('<list of nrs>')
+        return
+    try:
+        nrs = []
+        for i in ievent.args:
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    try:
+        shop = shops[jsonstring((bot.name, ievent.channel))]
+    except KeyError:
+        ievent.reply("nothing to shop")
+        return
+    if not shop:
+        ievent.reply("nothing to shop")
+        return
+    nrs.sort()
+    nrs.reverse()
+    teller = 0
+    for i in range(len(shop)-1, -1 , -1):
+        if i in nrs:
+            try:
+                del shop[i]
+                teller += 1
+            except IndexError:
+                pass
+    shops.save()
+    ievent.reply('%s shop item(s) deleted' % teller)
+
+cmnds.add('got-chan', handle_gotchan, 'USER')
+examples.add('got-chan', 'got-chan <listofnrs> .. remove listofnrs from \
+channel shop list', '1) got-chan 3 2) got-chan 1 6 8')
+tests.add('got-chan 1')
--- gozerbot-0.99.1.orig/build/lib/gplugs/trac.py
+++ gozerbot-0.99.1/build/lib/gplugs/trac.py
@@ -0,0 +1,23 @@
+# gozerplugs/trac.py
+#
+#
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.aliases import aliasset
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.tests import tests
+
+cfg = PersistConfig()
+cfg.define('baseurl', 'http://dev.gozerbot.org')
+
+def handle_tracwiki(bot, ievent):
+    if not ievent.rest:
+        ievent.missing("<item>")
+        return
+    ievent.reply('%s/wiki/%s' % (cfg.get('baseurl'), ievent.rest))
+
+cmnds.add('trac-wiki', handle_tracwiki, 'USER')
+examples.add('trac-wiki', 'give t.e.o wiki url', 'trac-wiki TracAdmin')
+aliasset('wiki', 'trac-wiki')
+tests.add('trac-wiki README')
--- gozerbot-0.99.1.orig/build/lib/gplugs/topic.py
+++ gozerbot-0.99.1/build/lib/gplugs/topic.py
@@ -0,0 +1,239 @@
+# plugs/topic.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+__gendocfirst__ = ['topic-set', ]
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import time
+
+plughelp.add('topic', 'manage the topic of a channel')
+
+def checktopicmode(bot, ievent):
+    """ callback for change in channel topic mode """
+    chan = ievent.channel
+    mode = bot.channels.get(chan, 'mode')
+    if mode and 't' in mode:
+        if chan not in bot.state['opchan']:
+            ievent.reply("i'm not op on %s" % chan)
+            return 0
+    return 1
+
+def handle_gettopic(bot, ievent):
+    """ topic [<channel>] .. get topic """
+    try:
+        channel = ievent.args[0]
+    except IndexError:
+        channel = ievent.channel
+    result = bot.gettopic(channel)
+    if not result:
+        ievent.reply("can't get topic data of channel %s" % channel)
+    else:
+        (what, who, when) = result
+        ievent.reply('topic on %s is %s made by %s on %s' % \
+(channel, what, who, time.ctime(when)))
+
+cmnds.add('topic', handle_gettopic, 'USER', threaded=True)
+examples.add('topic', 'topic [<channel>] .. get topic', '1) topic 2) topic \
+#dunkbots')
+tests.add('topic')
+
+def handle_topicset(bot, ievent):
+    """ topic-set .. set the topic """
+    if not bot.jabber and not checktopicmode(bot, ievent):
+        return
+    if not ievent.rest:
+        ievent.missing('<what>')
+        return
+    bot.settopic(ievent.channel, ievent.rest)
+
+cmnds.add('topic-set', handle_topicset, 'USER', allowqueue=False)
+examples.add('topic-set', 'set channel topic', 'topic-set Yooo')
+tests.add('topic-set boooo')
+
+def handle_topicadd(bot, ievent):
+    """ topic-add <txt> .. add topic item """
+    if not bot.jabber and not checktopicmode(bot, ievent):
+        return
+    if not ievent.rest:
+        ievent.missing("<what>")
+        return
+    result = bot.gettopic(ievent.channel)
+    if not result:
+        ievent.reply("can't get topic data")
+        return
+    what = result[0]
+    what += " | %s" % ievent.rest
+    bot.settopic(ievent.channel, what)
+
+cmnds.add('topic-add', handle_topicadd, 'USER', threaded=True)
+examples.add('topic-add', 'topic-add <txt> .. add a topic item', \
+'topic-add mekker')
+tests.add('topic-add booooo')
+
+def handle_topicdel(bot, ievent):
+    """ topic-del <topicnr> .. delete topic item """
+    if not bot.jabber and not checktopicmode(bot, ievent):
+        return
+    try:
+        topicnr = int(ievent.args[0])
+    except (IndexError, ValueError):
+        ievent.reply('i need a integer as argument')
+        return
+    if topicnr < 1:
+        ievent.reply('topic items start at 1')
+        return
+    result = bot.gettopic(ievent.channel)
+    if not result:
+        ievent.reply("can't get topic data")
+        return
+    what = result[0].split(' | ')
+    if topicnr > len(what):
+        ievent.reply('there are only %s topic items' % len(what))
+        return
+    del what[topicnr-1]
+    newtopic = ' | '.join(what)
+    bot.settopic(ievent.channel, newtopic)
+
+cmnds.add('topic-del', handle_topicdel, 'USER', threaded=True)
+examples.add('topic-del', 'topic-del <topicnr> .. delete topic item', \
+'topic-del 1')
+tests.add('topic-del 1')
+
+def handle_topicmove(bot, ievent):
+    """ topic-move <nrfrom> <nrto> .. move topic item """
+    if not bot.jabber and not checktopicmode(bot, ievent):
+        return
+    try:
+        (topicfrom, topicto) = ievent.args
+    except ValueError:
+        ievent.missing('<from> <to>')
+        return
+    try:
+        topicfrom = int(topicfrom)
+        topicto = int(topicto)
+    except ValueError:
+        ievent.reply('i need two integers as arguments')
+        return
+    if topicfrom < 1 or topicto < 1:
+        ievent.reply('topic items start at 1')
+        return
+    topicdata = bot.gettopic(ievent.channel)
+    if not topicdata:
+        ievent.reply("can't get topic data")
+        return
+    splitted = topicdata[0].split(' | ')
+    if topicfrom > len(splitted) or topicto > len(splitted):
+        ievent.reply('max item is %s' % len(splitted))
+        return
+    tmp = splitted[topicfrom-1]
+    del splitted[topicfrom-1]
+    splitted.insert(topicto-1, tmp)
+    newtopic = ' | '.join(splitted)
+    bot.settopic(ievent.channel, newtopic)
+
+cmnds.add('topic-move', handle_topicmove, 'USER', threaded=True)
+examples.add('topic-move', 'topic-move <nrfrom> <nrto> .. move topic \
+items', 'topic-move 3 1')
+tests.add('topic-move 2 1')
+
+def handle_topiclistadd(bot, ievent):
+    """ topic-listadd <topicnr> <person> .. add a person to a topic list """
+    if not bot.jabber and not checktopicmode(bot, ievent):
+        return
+    try:
+        (topicnr, person) = ievent.args
+    except ValueError:
+        ievent.missing('<topicnr> <person>')
+        return
+    try:
+        topicnr = int(topicnr)
+    except ValueError:
+        ievent.reply('i need an integer as topicnr')
+        return
+    if topicnr < 1:
+        ievent.reply('topic items start at 1')
+        return
+    topicdata = bot.gettopic(ievent.channel)
+    if not topicdata:
+        ievent.reply("can't get topic data")
+        return
+    splitted = topicdata[0].split(' | ')
+    if topicnr > len(splitted):
+        ievent.reply('max item is %s' % len(splitted))
+        return
+    try:
+        topic = splitted[topicnr-1]
+    except IndexError:
+        ievent.reply('no %s topic found' % str(topicnr))
+        return
+    if topic.strip().endswith(':'):
+        topic += " %s" % person
+    else:
+        topic += ",%s" % person
+    splitted[topicnr-1] = topic
+    newtopic = ' | '.join(splitted)
+    bot.settopic(ievent.channel, newtopic)
+
+cmnds.add('topic-listadd', handle_topiclistadd, 'USER', threaded=True)
+examples.add('topic-listadd', 'topic-listadd <toicnr> <person> .. add user to \
+topiclist', 'topic-listadd 1 bart')
+tests.add('topic-listadd 1 dunker')
+
+def handle_topiclistdel(bot, ievent):
+    """ topic-listdel <topicnr> <person> .. remove person from topic list """
+    if not bot.jabber and not checktopicmode(bot, ievent):
+        return
+    try:
+        (topicnr, person) = ievent.args
+    except ValueError:
+        ievent.missing('<topicnr> <person>')
+        return
+    try:
+        topicnr = int(topicnr)
+    except ValueError:
+        ievent.reply('i need an integer as topicnr')
+        return
+    if topicnr < 1:
+        ievent.reply('topic items start at 1')
+        return
+    topicdata = bot.gettopic(ievent.channel)
+    if not topicdata:
+        ievent.reply("can't get topic data")
+        return
+    splitted = topicdata[0].split(' | ')
+    if topicnr > len(splitted):
+        ievent.reply('max item is %s' % len(splitted))
+        return
+    try:
+        topic = splitted[topicnr-1]
+    except IndexError:
+        ievent.reply('no %s topic found' % str(topicnr))
+        return
+    if not person in topic:
+        ievent.reply('%s is not on the list' % person)
+        return
+    l = topic.rsplit(':', 1)
+    try:
+        persons = l[-1].split(',')
+        persons = [i.strip() for i in persons]
+        persons.remove(person)
+    except ValueError:
+        ievent.reply('no %s in list' % person)
+        return
+    except IndexError:
+        ievent.reply('i need a : in the topic to work properly')
+        return
+    splitted[topicnr-1] = "%s: %s" % (l[0], ','.join(persons))
+    newtopic = ' | '.join(splitted)
+    bot.settopic(ievent.channel, newtopic)
+
+cmnds.add('topic-listdel', handle_topiclistdel, 'USER', threaded=True)
+examples.add('topic-listdel', 'topic-listdel <topicnr> <person> .. delete \
+ user from topiclist', 'topic-listdel 1 bart')
+tests.add('topic-listdel 1 dunker')
--- gozerbot-0.99.1.orig/build/lib/gplugs/hello.py
+++ gozerbot-0.99.1/build/lib/gplugs/hello.py
@@ -0,0 +1,20 @@
+# plugs/hello.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('hello', 'hello world like plugin (used as example)')
+
+def handle_hello(bot, ievent):
+    """ say hello nickname """
+    ievent.reply('hello ' + ievent.nick)
+
+cmnds.add('hello', handle_hello, 'USER')
+examples.add('hello', "hello 'world' example", 'hello')
+tests.add('hello', 'hello')
--- gozerbot-0.99.1.orig/build/lib/gplugs/projecttracker.py
+++ gozerbot-0.99.1/build/lib/gplugs/projecttracker.py
@@ -0,0 +1,490 @@
+# gozerplugs/projecttracker.py
+#
+# Hans van Kranenburg <hans@knorrie.org>
+
+
+""" track hours spent working on projects
+
+Persitent data is stored in a gozerbot Persist object, 'projects'
+
+user is owner of a project:
+   projects.data[username][project] exists
+   contrib.data[username][project] MUST NOT exist
+
+   projects.data[username][project]['hours'] may exist
+       dict: {user: total hours, ...}
+   projects.data[username][project]['desc'] may exist
+       string: project description
+   projects.data[username][project]['share'] may exist
+       list: other contributing users
+
+
+user contributes to a project of another user:
+   contrib.data[username][project] exists
+       string: project owner username
+   projects.data[username][project] MUST NOT exist
+
+
+"""
+
+__copyright__ = 'this file is in the public domain'
+__gendocfirst__ = ['pt-add', ]
+__gendoclast__ = ['pt-del', ]
+
+from gozerbot.utils.generic import convertpickle
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.users import users
+from gozerbot.datadir import datadir
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('projecttracker', 'track hours spent working on projects')
+
+## UPGRADE PART
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'pt-projects', \
+datadir + os.sep + 'plugs' + os.sep + 'projecttracker' + os.sep + 'pt-projects')
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'pt-contrib', \
+datadir + os.sep + 'plugs' + os.sep + 'projecttracker' + os.sep + 'pt-contrib')
+
+## END UPGRADE PART
+
+import os
+
+projects = PlugPersist('pt-projects')
+contrib  = PlugPersist('pt-contrib') 
+if not projects.data:
+    projects = PlugPersist('pt-projects')
+    if not projects.data:
+        projects.data = {}
+if not contrib.data:
+    contrib.data = {}
+
+def size():
+    """ return number of projects """
+    size = 0
+    for userprojects in projects.data:
+        size += len(userprojects)
+    return size
+
+#
+# projects we pwn
+#
+
+def addproject(username, project, desc):
+    """ add project to projects of username """
+    if not projects.data.has_key(username):
+        projects.data[username] = {}
+    if not projects.data[username].has_key(project):
+        projects.data[username][project] = {}
+    if desc:
+        projects.data[username][project]['desc'] = desc
+    projects.save()
+
+def hasproject(username, project):
+    """ look if this user owns a project """
+    if projects.data.has_key(username) and \
+    projects.data[username].has_key(project):
+        return True
+    return False
+
+def delproject(username, project):
+    """ delete a project """
+    try:
+        if projects.data[username].has_key(project):
+            # delete contributions
+            if projects.data[username][project].has_key('share'):
+                for otheruser in \
+                projects.data[username][project]['share']:
+                    try:
+                        del contrib.data[otheruser][project]
+                    except KeyError:
+                        pass
+            # delete project
+            del projects.data[username][project]
+    except KeyError:
+        pass
+    projects.save()
+    contrib.save()
+
+def getprojects(username):
+    """ return projects owned by username """
+    try:
+        return projects.data[username].keys()
+    except KeyError:
+        return []
+
+def setdesc(username, project, desc):
+    """ alter project description """
+    try:
+        projects.data[username][project]['desc'] = desc
+	projects.save()
+    except KeyError:
+        pass
+
+def getdesc(username, project):
+    """ return description of project """
+    try:
+        return projects.data[username][project]['desc']
+    except KeyError:
+        return None
+
+#
+# project sharing
+#
+
+def addshare(username, project, otheruser):
+    """ share our project with another user
+    make sure that 1) we own the project and 2) the other user has
+    no project with this name and does not contribute to a project
+    with the same name before calling this function    
+    """
+    # add other user to the sharelist of the project
+    if not projects.data[username][project].has_key('share'):
+        projects.data[username][project]['share'] = [otheruser, ]
+    else:
+        projects.data[username][project]['share'].append(otheruser)
+    projects.save()
+    # add project and project owner to otherusers contrib-list
+    if not contrib.data.has_key(otheruser):
+        contrib.data[otheruser] = {project: username}
+    else:
+        contrib.data[otheruser][project] = username
+    contrib.save()
+
+
+def delshare(username, project, otheruser):
+    """ stop sharing our project with another user """
+    # remove other user from the sharelist
+    try:
+        projects.data[username][project]['share'].remove(otheruser)
+        projects.save()
+    except KeyError:
+        pass
+    try:
+        del contrib.data[otheruser][project]
+        contrib.save()
+    except KeyError:
+        pass
+
+def hascontrib(username, project):
+    """ does this user contribute to a project with this name? """
+    try:
+        return contrib.data[username].has_key(project)
+    except KeyError:
+        return False
+
+def getowner(username, project):
+    """ get owner of a project we contribute to """
+    if hascontrib(username, project):
+        return contrib.data[username][project]
+    return None
+
+def getcontrib(username):
+    """ get names of projects we contribute to """
+    try:
+        return contrib.data[username].keys()
+    except KeyError:
+        return []
+
+def delcontrib(username, project):
+    """ stop contributing to a project of someone else """
+    if hascontrib(username, project):
+        owner = getowner(username, project)
+        delshare(owner, project, username)
+
+def getsharelist(username, project):
+    """ get users sharing a project with """
+    if projects.data[username][project].has_key('share'):
+        return projects.data[username][project]['share']
+    else:
+        return []
+
+#
+# do some work... actually ;]
+#
+
+def addhours(owner, project, username, hours):
+    """ add work hours to a project """
+
+    if not projects.data[owner][project].has_key('hours'):
+        projects.data[owner][project]['hours'] = {}
+    if not projects.data[owner][project]['hours'].has_key(username):
+        projects.data[owner][project]['hours'][username] = hours
+    else:
+        projects.data[owner][project]['hours'][username] += hours
+    projects.save()
+    return projects.data[owner][project]['hours'][username]
+
+def gethourslist(username, project):
+    """ get list of contributors and hours of work
+        for a project
+    """
+    result = []
+    if hasproject(username, project):
+        owner = username
+    elif hascontrib(username, project):
+        owner = getowner(username, project)
+    else:
+        result.append("unknown project %s" % project)
+        return result
+    if projects.data[owner][project].has_key('hours'):
+        # (h)ours(l)ist
+        hl = projects.data[owner][project]['hours']
+        if hl:
+            # (c)ontributor to the project
+            for c in hl:
+                if hl[c] != 0:
+                    result.append('%s (%s)' % (c, hl[c]))
+    if not result:
+        result.append("no work done yet")
+    return result
+
+#
+# command handlers
+#
+
+def handle_projectadd(bot, ievent):
+    """ pt-add <projectname> <description> .. add project """
+    if not ievent.rest:
+        ievent.missing('<projectname> [<description>]')
+        return
+    username = users.getname(ievent.userhost)
+    try:
+        project, desc = ievent.rest.split(' ', 1)
+    except ValueError:
+        project = ievent.rest
+        desc = None
+    project = project.strip().lower()
+    if hasproject(username, project) or hascontrib(username, project):
+        ievent.reply('project %s already exists' % project)
+        return
+    if desc:
+        desc = desc.strip()
+    addproject(username, project, desc)
+    ievent.reply('project %s added' % (project))
+
+cmnds.add('pt-add', handle_projectadd, 'USER')
+examples.add('pt-add', 'pt-add <projectname> [<description>] .. \
+add a project to the project tracker', 'pt-add gc Gozerbot coden ;]')
+tests.add('pt-add gozerbot coden', ' added|already')
+
+def handle_projectlist(bot, ievent):
+    """ show available projects """
+    username = users.getname(ievent.userhost)
+    result = []
+    l = getprojects(username)
+    for project in l:
+        desc = getdesc(username, project)
+        if desc:
+            result.append('%s (%s)' % (desc, project))
+        else:
+            result.append(project)
+    l = getcontrib(username)
+    for project in l:
+        owner = getowner(username, project)
+        desc = getdesc(owner, project)
+        if desc:
+            result.append('%s (%s, owner=%s)' % (desc, project, \
+            owner))
+        else:
+            result.append('%s, owner=%s' % (project, owner))
+    if result:
+        ievent.reply('', result, dot=True)
+    else:
+        ievent.reply('no projects found')
+
+cmnds.add('pt-list', handle_projectlist, 'USER')
+examples.add('pt-list', 'list available projects', 'pt-list')
+tests.add('pt-list', 'gozerbot')
+
+def handle_projectdel(bot, ievent):
+    """ delete a project or stop contributing to it """
+    try:
+        project = ievent.rest.strip().lower()
+    except ValueError:
+        ievent.missing('<projectname>')
+        return
+    username = users.getname(ievent.userhost)
+    if hasproject(username, project):
+        delproject(username, project)
+        ievent.reply('project %s deleted' % (project))
+    elif hascontrib(username, project):
+        delcontrib(username, project)
+        ievent.reply('no longer contributing to %s' % (project))
+    else:
+        ievent.reply('no project %s' % project)
+
+cmnds.add('pt-del', handle_projectdel, 'USER')
+examples.add('pt-del', 'delete a project from the project tracker or \
+stop contibuting to it', 'pt-del mekker')
+tests.add('pt-del mekker')
+
+def handle_addhours(bot, ievent):
+    """ add hours to a project """
+    username = users.getname(ievent.userhost)
+    try:
+        project, rest = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<projectname> <hours> [<comment>]')
+        return
+    project = project.strip().lower()
+
+    if hasproject(username, project):
+        owner = username
+    elif hascontrib(username, project):
+        owner = getowner(username, project)
+    else:
+        ievent.reply('no project %s' % project)
+        return
+    try:
+        hours, comment = rest.split(' ', 1)
+    except ValueError:
+        hours = rest
+        comment = ''
+    try:
+        hours = float(hours)
+    except ValueError:
+        ievent.reply('%s is not a number' % hours)
+        return
+    total = addhours(owner, project, username, hours)
+    desc = getdesc(owner, project) or project
+#    h = 'hours'
+#    if abs(hours) == 1:
+#        h = 'hour'
+#    if hours < 0:
+#        ievent.reply('removed %s %s from %s' % (hours, h, project))
+#        return
+#    ievent.reply('added %s %s to %s' % (hours, h, project))
+     
+    ievent.reply('hours spent on %s is now: %s' % (desc, total))
+
+cmnds.add('pt', handle_addhours, 'USER')
+examples.add('pt', 'track time spent on a project', 'pt gc 4')
+tests.add('pt gozerbot coden 4')
+
+def handle_report(bot, ievent):
+    """ display project report """
+    username = users.getname(ievent.userhost)
+    if not ievent.rest:
+        result = []
+        l = getprojects(username)
+        for project in l:
+            desc = getdesc(username, project) or project
+            report = gethourslist(username, project)
+            result.append('%s: %s' % (desc, ' '.join(report)))
+        l = getcontrib(username)
+        for project in l:
+            owner = getowner(username, project)
+            desc = getdesc(owner, project) or project
+            report = gethourslist(owner, project)
+            result.append('%s: %s' % (desc, ' '.join(report)))
+        if result:
+            ievent.reply('', result, dot=True)
+        else:
+            ievent.reply('no projects found')
+    else:
+        project = ievent.rest.strip().lower()
+        if hasproject(username, project):
+            owner = username
+        elif hascontrib(username, project):
+            owner = getowner(username, project)
+        else:
+            ievent.reply('no project %s' % project)
+            return
+        desc = getdesc(owner, project) or project
+        report = gethourslist(owner, project)
+        ievent.reply('%s: ' % desc, report, dot=True)
+
+cmnds.add('pt-report', handle_report, 'USER')
+examples.add('pt-report', 'report hours of work on a project', \
+'1) pt-report 2) pt-report gc')
+tests.add('pt-report gozerbot coden')
+
+def handle_addshare(bot, ievent):
+    """ share a project with another user """
+    username = users.getname(ievent.userhost)
+    try:
+        project, otheruser = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<projectname> <user>')
+        return
+    project = project.strip().lower()
+    if hascontrib(username, project):
+        ievent.reply('only project owner can share a project')
+        return
+    if not hasproject(username, project):
+        ievent.reply('no project %s' % project)
+        return
+    if not users.exist(otheruser):
+        ievent.reply('unknown user %s' % otheruser)
+        return
+    if hasproject(otheruser, project) or \
+    hascontrib(otheruser, project):
+        ievent.reply('%s already has a project named %s' \
+        % (otheruser, project))
+        return
+    addshare(username, project, otheruser)
+    desc = getdesc(username, project) or project
+    ievent.reply('sharing %s with %s' % (desc, otheruser))
+
+cmnds.add('pt-share', handle_addshare, 'USER')
+examples.add('pt-share', 'share a project with another user', \
+'pt-share myproject knorrie')
+tests.add('pt-share gozerbot coden dunker')
+
+def handle_sharelist(bot, ievent):
+    """ get a list of users we share a project with """
+    username = users.getname(ievent.userhost)
+    if not ievent.rest:
+        ievent.missing('<projectname>')
+        return
+    project = ievent.rest.strip().lower()
+    if hasproject(username, project):
+        l = getsharelist(username, project)
+        desc = getdesc(username, project) or project
+	if not l:
+	    ievent.reply('not sharing %s' % desc)
+	else:
+            ievent.reply('sharing %s with: ' % desc, l)
+    elif hascontrib(username, project):
+        owner = getowner(username, project)
+        desc = getdesc(owner, project) or project
+        l = getsharelist(owner, project)
+        ievent.reply('owner is %s, sharing with: '\
+        % owner, l)
+    else:
+        ievent.reply('no project %s' % project)
+
+cmnds.add('pt-sharelist', handle_sharelist, 'USER')
+examples.add('pt-sharelist', 'get a list of users we share a project \
+with', 'pt-sharelist myproject')
+tests.add('pt-sharelist gozerbot coden')
+
+def handle_delshare(bot, ievent):
+    """ stop sharing a project with another user """
+    username = users.getname(ievent.userhost)
+    try:
+        project, otheruser = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<projectname> <user>')
+        return
+    project = project.strip().lower()
+    if not hasproject(username, project):
+        ievent.reply('no project %s' % project)
+        return
+    if not hascontrib(otheruser, project) or \
+    getowner(otheruser, project) != username:
+        ievent.reply('project not shared with %s' % otheruser)
+        return
+    delshare(username, project, otheruser)
+    desc = getdesc(username, project) or project
+    ievent.reply('stopped sharing %s with %s' % (desc, otheruser))
+
+cmnds.add('pt-delshare', handle_delshare, 'USER')
+examples.add('pt-delshare', 'stop sharing a project with another \
+user', 'pt-delshare myproject somebody')
+tests.add('pt-delshare gozerbot coden mekker')
--- gozerbot-0.99.1.orig/build/lib/gplugs/timer.py
+++ gozerbot-0.99.1/build/lib/gplugs/timer.py
@@ -0,0 +1,37 @@
+# plugs/timer.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plugins import plugins
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import time, copy
+
+plughelp.add('timer', 'do a timing of a command')
+
+def handle_timer(bot, ievent):
+    """ do a timing of a command """
+    if not ievent.rest:
+        ievent.reply('<cmnd>')
+        return
+    event = copy.deepcopy(ievent)
+    event.txt = ievent.rest
+    event.onlyqueues = True
+    starttime = time.time()
+    result = plugins.cmnd(bot, event, 60)
+    stoptime = time.time()
+    if not result:
+        ievent.reply('no result for %s' % ievent.rest)
+        return
+    result.insert(0, "%s seconds ==>" % str(stoptime-starttime))
+    ievent.reply('timer results: ', result)
+
+cmnds.add('timer', handle_timer, ['USER', 'WEB'], allowqueue=False, \
+threaded=True)
+examples.add('timer', 'time a command', 'timer version')
+tests.add('timer version')
--- gozerbot-0.99.1.orig/build/lib/gplugs/upgrade.py
+++ gozerbot-0.99.1/build/lib/gplugs/upgrade.py
@@ -0,0 +1,161 @@
+# plugs/upgrade.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.aliases import aliasset
+from gozerbot.fleet import fleet
+from gozerbot.plugins import plugins
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.generic import reboot_stateful, gozerpopen, lockdec, \
+handle_exception
+from gozerbot.eventhandler import mainhandler
+from gozerbot.plughelp import plughelp
+from gozerbot.config import config
+from gozerbot.utils.lockmanager import lockmanager
+from gozerbot.partyline import partyline
+import os, os.path, time
+
+plughelp.add('upgrade', "do a mercurial hg pull -u and see if \
+we need to reboot .. if only plugins are updated we don't need to reboot \
+because we can reload them")
+
+def gethgrev(path=None):
+    rev = None
+    try:
+        if not path:
+            proces = gozerpopen(['hg', 'tip'])
+        else:
+            proces = gozerpopen(['hg', 'tip', '-R%s' % path])
+        rev = int(proces.fromchild.readlines()[0].split(':')[1].strip())
+        proces.close()
+    except (OSError, IndexError):
+        return rev
+    except Exception, ex:
+        handle_exception()
+    return rev
+
+def handle_hgupgrade(bot, ievent, silent=None, path=None):
+    """ upgrade .. do a mercurial pull -u .. see if we need to reboot \
+        otherwise reload plugins """
+    if not path:
+         path = '.'
+    startrev = gethgrev(path)
+    if not startrev:
+        ievent.reply("can't fetch current revision")
+        return
+    ievent.reply('upgrading from revision %s' % str(startrev))
+    args = ['hg', 'pull', '-u', '-R%s' % path]
+    userargs = []
+    try:
+        proces = gozerpopen(args, userargs)
+    except Exception, ex:
+        ievent.reply('error running popen: %s' % str(ex))
+        return
+    nochange = 0
+    lines = proces.fromchild.readlines()
+    proces.close()
+    res = []
+    for i in lines:
+        if 'abort: error:' in i:
+            ievent.reply('failed to update ==>  %s' % i)
+            return
+        if 'no changes' in i:
+            nochange = 1
+        res.append(i.strip())
+    if nochange:
+        ievent.reply('no changes')
+        return
+    else:
+        not silent and ievent.reply(' .. '.join(res))
+    rev = gethgrev(path)
+    ievent.reply("new revision is %s" % rev)
+    args = ['hg', 'diff', '-r%s' % startrev, '-R%s' % path]
+    try:
+        proces = gozerpopen(args)
+    except Exception, ex:
+        ievent.reply('error running popen: %s' % str(ex))
+        return
+    data = proces.fromchild.readlines()
+    returncode = proces.close()
+    if returncode != 0:
+        ievent.reply("can't run hg diff")
+        return
+    files = []
+    plugs = []
+    needreboot = 0
+    for i in data:
+        if i.startswith('+++') or i.startswith('---'):
+            if len(i.split()) < 2:
+                continue
+            filename = '%s' % os.sep
+	    filename = filename.join(i.split()[1].split(os.sep)[1:])
+            if filename == 'dev/null':
+                continue
+            if filename not in files:
+                files.append(filename)
+            if not filename.endswith('.py'):
+                continue
+            if filename.startswith('gozerbot') and not 'plugs' in filename: 
+                needreboot = 1
+            elif filename.find('plugs') != -1 or path == 'gplugs':
+                if filename not in plugs:
+                    plugs.append(filename)
+    not silent and ievent.reply('files: ' + ' '.join(files))
+    summary = []
+    args = ['hg', 'log', '-r%s:%s' % (rev, startrev+1), '-R%s' % path]
+    try:
+        proces = gozerpopen(args)
+    except Exception, ex:
+        ievent.reply('error running popen: %s' % str(ex))
+        return
+    data = proces.fromchild.readlines()
+    returncode = proces.close()
+    if returncode == 0:
+        for i in data:
+            if i.startswith('summary:'):
+                summary.append(i.split('summary:')[1].strip())
+        not silent and ievent.reply("summaries: %s" % ' .. '.join(summary))
+    if needreboot:
+        ievent.reply('rebooting')
+        time.sleep(4)
+        try:
+            plugins.exit()
+            fleet.save()
+        finally:
+            time.sleep(1)
+            mainhandler.put(0, reboot_stateful, bot, ievent, fleet, partyline)
+            return
+    config.load()
+    if not plugs:
+        ievent.reply('nothing to reload')
+        return
+    ievent.reply("reloading %s" %  " .. ".join(plugs))
+    failed = plugins.listreload(plugs)
+    if failed:
+        ievent.reply("failed to reload %s" % ' .. '.join(failed))
+        return
+    else:
+        ievent.reply('done')
+
+cmnds.add('upgrade-hg', handle_hgupgrade, ['OPER', 'UPGRADE'])
+examples.add('upgrade-hg', 'do a mercurial upgrade', 'upgrade-hg')
+
+def handle_upgradeloud(bot, ievent):
+    """ do a verbose upgrade """
+    if ievent.rest == 'gozerplugs':
+        path = 'gozerplugs'
+    else:
+        path = None
+    lockmanager.acquire('up')
+    try:
+        handle_hgupgrade(bot, ievent, False, path)
+    except Exception, ex: 
+        handle_exception()
+    lockmanager.release('up')
+    return
+
+cmnds.add('upgrade-loud', handle_upgradeloud, ['OPER', 'UPGRADE'])
+examples.add('upgrade-loud', 'do a mercurial upgrade', 'upgrade-loud')
--- gozerbot-0.99.1.orig/build/lib/gplugs/country.py
+++ gozerbot-0.99.1/build/lib/gplugs/country.py
@@ -0,0 +1,333 @@
+# plugs/country.py
+#
+#
+
+""" show what country belongs to country code and reverse """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import rlog
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+import re
+
+plughelp.add('country', 'show country belonging to country code')
+
+countries = """
+AX   Aland Islands
+CAT  Catalan
+EU   Europe
+AP   Asia/Pacific Region
+AD   Andorra
+AE   United Arab Emirates
+AF   Afghanistan
+AG   Antigua and Barbuda
+AI   Anguilla
+AL   Albania
+AM   Armenia
+AN   Netherlands Antilles
+AO   Angola
+AQ   Antarctica
+AR   Argentina
+AS   American Samoa
+AT   Austria
+AU   Australia
+AW   Aruba
+AZ   Azerbaijan
+BA   Bosnia and Herzegovina
+BB   Barbados
+BD   Bangladesh
+BE   Belgium
+BF   Burkina Faso
+BG   Bulgaria
+BH   Bahrain
+BI   Burundi
+BJ   Benin
+BM   Bermuda
+BN   Brunei Darussalam
+BO   Bolivia
+BR   Brazil
+BS   Bahamas
+BT   Bhutan
+BV   Bouvet Island
+BW   Botswana
+BY   Belarus
+BZ   Belize
+CA   Canada
+CC   Cocos (Keeling) Islands
+CF   Central African Republic
+CG   Congo
+CH   Switzerland
+CI   Cote D'Ivoire (Ivory Coast)
+CK   Cook Islands
+CL   Chile
+CM   Cameroon
+CN   China
+CO   Colombia
+CR   Costa Rica
+CS   Czechoslovakia (former)
+CU   Cuba
+CV   Cape Verde
+CX   Christmas Island
+CY   Cyprus
+CZ   Czech Republic
+DE   Germany
+DJ   Djibouti
+DK   Denmark
+DM   Dominica
+DO   Dominican Republic
+DZ   Algeria
+EC   Ecuador
+EE   Estonia
+EG   Egypt
+EH   Western Sahara
+ER   Eritrea
+ES   Spain
+ET   Ethiopia
+FI   Finland
+FJ   Fiji
+FK   Falkland Islands (Malvinas)
+FM   Micronesia
+FO   Faroe Islands
+FR   France
+FX   France, Metropolitan
+GA   Gabon
+GB   Great Britain (UK)
+GD   Grenada
+GE   Georgia
+GF   French Guiana
+GH   Ghana
+GI   Gibraltar
+GL   Greenland
+GM   Gambia
+GN   Guinea
+GP   Guadeloupe
+GQ   Equatorial Guinea
+GR   Greece
+GS   S. Georgia and S. Sandwich Isls.
+GT   Guatemala
+GU   Guam
+GW   Guinea-Bissau
+GY   Guyana
+HK   Hong Kong
+HM   Heard and McDonald Islands
+HN   Honduras
+HR   Croatia (Hrvatska)
+HT   Haiti
+HU   Hungary
+ID   Indonesia
+IE   Ireland
+IL   Israel
+IN   India
+IO   British Indian Ocean Territory
+IQ   Iraq
+IR   Iran
+IS   Iceland
+IT   Italy
+JM   Jamaica
+JO   Jordan
+JP   Japan
+KE   Kenya
+KG   Kyrgyzstan
+KH   Cambodia
+KI   Kiribati
+KM   Comoros
+KN   Saint Kitts and Nevis
+KP   Korea (North)
+KR   Korea (South)
+KW   Kuwait
+KY   Cayman Islands
+KZ   Kazakhstan
+LA   Laos
+LB   Lebanon
+LC   Saint Lucia
+LI   Liechtenstein
+LK   Sri Lanka
+LR   Liberia
+LS   Lesotho
+LT   Lithuania
+LU   Luxembourg
+LV   Latvia
+LY   Libya
+MA   Morocco
+MC   Monaco
+MD   Moldova
+MG   Madagascar
+MH   Marshall Islands
+MK   Macedonia
+ML   Mali
+MM   Myanmar
+MN   Mongolia
+MO   Macau
+MP   Northern Mariana Islands
+MQ   Martinique
+MR   Mauritania
+MS   Montserrat
+MT   Malta
+MU   Mauritius
+MV   Maldives
+MW   Malawi
+MX   Mexico
+MY   Malaysia
+MZ   Mozambique
+NA   Namibia
+NC   New Caledonia
+NE   Niger
+NF   Norfolk Island
+NG   Nigeria
+NI   Nicaragua
+NL   Netherlands
+NO   Norway
+NP   Nepal
+NR   Nauru
+NT   Neutral Zone
+NU   Niue
+NZ   New Zealand (Aotearoa)
+OM   Oman
+PA   Panama
+PE   Peru
+PF   French Polynesia
+PG   Papua New Guinea
+PH   Philippines
+PK   Pakistan
+PL   Poland
+PM   St. Pierre and Miquelon
+PN   Pitcairn
+PR   Puerto Rico
+PT   Portugal
+PW   Palau
+PY   Paraguay
+QA   Qatar
+RE   Reunion
+RO   Romania
+RU   Russian Federation
+RW   Rwanda
+SA   Saudi Arabia
+Sb   Solomon Islands
+SC   Seychelles
+SD   Sudan
+SE   Sweden
+SG   Singapore
+SH   St. Helena
+SI   Slovenia
+SJ   Svalbard and Jan Mayen Islands
+SK   Slovak Republic
+SL   Sierra Leone
+SM   San Marino
+SN   Senegal
+SO   Somalia
+SR   Suriname
+ST   Sao Tome and Principe
+SU   USSR (former)
+SV   El Salvador
+SY   Syria
+SZ   Swaziland
+TC   Turks and Caicos Islands
+TD   Chad
+TF   French Southern Territories
+TG   Togo
+TH   Thailand
+TJ   Tajikistan
+TK   Tokelau
+TM   Turkmenistan
+TN   Tunisia
+TO   Tonga
+TP   East Timor
+TR   Turkey
+TT   Trinidad and Tobago
+TV   Tuvalu
+TW   Taiwan
+TZ   Tanzania
+UA   Ukraine
+UG   Uganda
+UK   United Kingdom
+UM   US Minor Outlying Islands
+US   United States
+UY   Uruguay
+UZ   Uzbekistan
+VA   Vatican City State (Holy See)
+VC   Saint Vincent and the Grenadines
+VE   Venezuela
+VG   Virgin Islands (British)
+VI   Virgin Islands (U.S.)
+VN   Viet Nam
+VU   Vanuatu
+WF   Wallis and Futuna Islands
+WS   Samoa
+YE   Yemen
+YT   Mayotte
+YU   Yugoslavia
+ZA   South Africa
+ZM   Zambia
+ZR   Zaire
+ZW   Zimbabwe
+COM   US Commercial
+EDU   US Educational
+GOV   US Government
+INT   International
+MIL   US Military
+NET   Network
+ORG   Non-Profit Organization
+ARPA   Old style Arpanet
+NATO   Nato field
+"""
+
+country = {}
+countryrev = {}
+
+def init():
+    """ init the country plugin """
+    # parse country string and create country dict
+    global country, countryrev
+    gg = countries.split('\n')
+    tt = 0
+    for h in gg:
+        i = re.search('(\S+)\s+(.*)', h)
+        if i:
+            tt += 1
+            country[i.group(1)] = i.group(2)
+            countryrev[i.group(2).lower()] = i.group(1)
+    rlog(0, 'country', str(tt))
+    return 1
+
+def handle_country(bot, ievent):
+    """ country <code> .. show what country belongs to country code """
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        ievent.missing('<countrycode>')
+        return
+    what = what.upper()
+    # allow .tld given as argument 
+    if what[0] == '.':
+        what = what[1:]
+    if country.has_key(what):
+        ievent.reply(what + ' is ' + country[what])
+    else:
+        if countryrev.has_key(what.lower()):
+            ievent.reply(what.capitalize() + ' is ' + countryrev[what.lower()])
+        else:
+            ievent.reply("can't find " + what.capitalize())
+
+cmnds.add('country', handle_country, ['USER', 'WEB', 'CLOUD'])
+examples.add('country', 'country <code> .. show country belonging to code', \
+'1) country nl 2) country .nl')
+tests.add('country nl', 'Netherlands').add('country .nl', 'Netherlands')
+
+def handle_countryrev(bot, ievent):
+    """ country-rev <country> .. show what country code belongs to country """
+    if not ievent.rest:
+        ievent.missing('<countryname>')
+        return
+    what = str(ievent.rest)
+    if countryrev.has_key(what):
+        ievent.reply(what + ' is ' + countryrev[what])
+    else:
+        ievent.reply("can't find " + what)
+
+cmnds.add('country-rev', handle_countryrev, ['USER', 'WEB', 'CLOUD'])
+examples.add('country-rev', 'country-rev <country> .. show code belonging to \
+country', 'country-rev netherlands')
+tests.add('country-re netherlands', 'NL')
--- gozerbot-0.99.1.orig/build/lib/gplugs/wowwiki.py
+++ gozerbot-0.99.1/build/lib/gplugs/wowwiki.py
@@ -0,0 +1,90 @@
+# plugs/wowwiki.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import geturl, striphtml, splittxt, handle_exception, \
+fromenc
+from gozerbot.commands import cmnds
+from gozerbot.aliases import aliases
+from gozerbot.examples import examples
+from gozerbot.utils.rsslist import rsslist
+from gozerbot.plughelp import plughelp
+from urllib import quote
+import re
+
+plughelp.add('wowwiki', 'query wowwiki')
+
+wikire = re.compile('start content(.*?)end content', re.M)
+
+def getwikidata(url, ievent):
+    """ fetch wiki data """
+    try:
+        result = fromenc(geturl(url))
+    except IOError, ex:
+        try:
+            errno = ex[0]
+        except IndexError:
+            handle_exception(ievent=ievent)
+            return
+        ievent.reply('invalid option')
+        return
+    if not result:
+        ievent.reply("can't find data for %s" % url)
+        return
+    res = rsslist(result)
+    txt = ""
+    for i in res:
+        try:
+            txt = i['text']
+            break
+        except:
+            pass
+    if not txt:
+        ievent.reply("no data found on %s" % url)
+        return
+    #txt = re.sub('\[\[Image:([^\[\]]+|\[\[[^\]]+\]\])*\]\]', '', txt)
+    txt = txt.replace('[[', '')
+    txt = txt.replace(']]', '')
+    txt = re.sub('\s+', ' ', txt)
+    return txt
+
+def handle_wowwiki(bot, ievent):
+    """ wikipedia <what> .. search wikipedia for <what> """
+    if not ievent.rest:
+        ievent.missing('<what>')
+        return
+    what = ""
+    lang = 'en'
+    for i in ievent.rest.split():
+        first = i[0].upper()
+        rest = i[1:]
+        if i.startswith('-'):
+            if len(i) != 3:
+                ievent.reply('invalid option')
+                return
+            lang = i[1:]
+            continue
+        what += "%s%s " % (first, rest)
+    what = what.strip().replace(' ', '_')
+    url = 'http://wowwiki.com/wiki/Special:Export/%s' % quote(what.encode('utf-8'))
+    url2 = 'http://wowwiki.com/wiki/%s' % quote(what.encode('utf-8'))
+    txt = getwikidata(url, ievent)
+    if not txt:
+        return
+    if '#REDIRECT' in txt or '#redirect' in txt:
+        redir = ' '.join(txt.split()[1:])
+        url = 'http://wowwiki.com/wiki/Special:Export/%s' % quote(redir.encode('utf-8'))
+        url2 = 'http://wowwiki.com/wiki/%s' % quote(redir.encode('utf-8'))
+        txt = getwikidata(url, ievent)
+    if not txt:
+        return
+    res = ['%s ===> ' % url2, ]
+    res += splittxt(striphtml(txt).strip())
+    ievent.reply(res)
+
+cmnds.add('wowwiki', handle_wowwiki, 'USER')
+examples.add('wowwiki', 'wowwiki <what> .. search wowwiki for <what>','1) wowwiki \
+gozerbot')
+aliases.data['wow'] = 'wowwiki'
--- gozerbot-0.99.1.orig/build/lib/gplugs/__init__.py
+++ gozerbot-0.99.1/build/lib/gplugs/__init__.py
@@ -0,0 +1,25 @@
+# gozerbot basic plugins
+#
+#
+
+""" register all .py files """
+
+__copyright__ = 'this file is in the public domain'
+
+import os
+
+(f, tail) = os.path.split(__file__)
+__all__ = []
+
+for i in os.listdir(f):
+    if i.endswith('.py'):
+        __all__.append(i[:-3])
+    elif os.path.isdir(f + os.sep + i) and not i.startswith('.') and not i in ['olddb', 'alchemy']:
+        __all__.append(i)
+
+try:
+    __all__.remove('__init__')
+except:
+    pass
+
+__plugs__ = __all__
--- gozerbot-0.99.1.orig/build/lib/gplugs/bash.py
+++ gozerbot-0.99.1/build/lib/gplugs/bash.py
@@ -0,0 +1,69 @@
+# gozerplugs/bash.py
+#
+# bash.org / qdb.us fetcher
+
+""" show quotes from bash.org """
+
+from gozerbot.commands import cmnds
+from gozerbot.generic import geturl2, striphtml
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+import re
+
+plughelp.add('bash', 'shows bash.org quotes')
+
+re_p = re.compile('<p class="qt">(.*)</p>', )
+
+def fetch(server, qid='random'):
+
+    """ fetch bash quotes from server.
+
+        :param server: server to fetch quotes from
+        :param qid: quote id
+        :type qid: number or 'random'
+        :rtype: html stripped quote
+    """
+
+    html = geturl2('http://%s/%s' % (server, qid))
+    text = ''
+    keep = False
+    for line in html.splitlines():
+        if len(line.split('</p>')) == 3:
+            return striphtml(line.split('</p>')[1])
+        elif line.startswith('<p class="quote">'):
+            if '<p class="qt">' in line:
+                if line.endswith('</p>'):
+                    return striphtml(re_p.findall(line)[0])
+                else:
+                    text = line.split('<p class="qt">')[1]
+                    keep = True
+        elif keep:
+            if '</p>' in line:
+                text = text + line.split('</p>')[0]
+                return striphtml(text.replace('<br />', ' '))
+            else:
+                text = text + line
+    if text:
+        return striphtml(text.replace('<br />', ' '))
+    else:
+        return 'no result'
+
+def handle_bash(bot, ievent):
+
+    """ handler function to handle the bash command.
+        ::
+
+            !bash [<id>]
+
+    """ 
+
+    if ievent.args:
+        if not ievent.args[0].isdigit():
+            ievent.missing('<id>')
+            return
+        qid = ievent.args[0]
+    else:
+        qid = 'random'
+    ievent.reply(fetch('bash.org', '?%s' % qid))
+
+cmnds.add('bash', handle_bash, 'USER')
--- gozerbot-0.99.1.orig/build/lib/gplugs/httpwatch.py
+++ gozerbot-0.99.1/build/lib/gplugs/httpwatch.py
@@ -0,0 +1,159 @@
+import hashlib
+import os
+
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.fleet import fleet
+from gozerbot.generic import geturl2
+from gozerbot.periodical import periodical
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.persist.pdod import Pdod
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+import gozerbot.threads.thr as thr
+
+plughelp.add('httpwatch', 'periodically check urls')
+
+cfg = PersistConfig()
+cfg.define('sleep', 300)
+cfg.define('run', True)
+
+class HttpWatch(Pdod):
+    
+    pid = None
+
+    def __init__(self):
+        self.datadir = datadir + os.sep + 'plugs' + os.sep + 'httpwatch'
+        Pdod.__init__(self, os.path.join(self.datadir, 'httpwatch.data'))
+        if not 'urls' in self.data:
+            self.data['urls'] = {}
+        if not 'send' in self.data:
+            self.data['send'] = {}
+            self.save()
+
+    def start(self):
+        self.pid = periodical.addjob(cfg.get('sleep'), 0, self.peek, 'httpwatch', 'httpwatch')
+ 
+    def stop(self):
+        if self.pid:
+            periodical.killjob(self.pid)
+            self.pid = None
+
+    def peek(self, *args, **kwargs):
+        if not self.data['urls']: return
+        for url in self.data['urls']:
+            try:
+                checksum = self.checksum(url)
+            except:
+                continue
+            
+            if checksum != self.data['urls'][url]:
+                self.data['urls'][url] = checksum
+                self.announce(url)
+        self.save()
+        return self.data['urls']
+
+    def checksum(self, url):
+        data = geturl2(url)
+        return hashlib.md5.new(data).hexdigest()
+
+    def announce(self, url):
+        for name in self.data['send'][url]:
+            bot = fleet.byname(name)
+            for chan in self.data['send'][url][name]:
+                bot.say(chan, '%s changed (new checksum: %s)' % (url, \
+self.data['urls'][url]))
+
+    def add(self, url, name, chan):
+        if not url in self.data['urls']:
+            self.data['urls'][url] = ''
+        if not url in self.data['send']:
+            self.data['send'][url] = {}
+        if not name in self.data['send'][url]:
+            self.data['send'][url][name] = []
+        if not chan in self.data['send'][url][name]:
+            self.data['send'][url][name].append(chan)
+            self.save()
+
+    def remove(self, url, name, chan):
+        if url not in self.data['send']:
+            return
+        if name not in self.data['send'][url]:
+            return
+        if chan in self.data['send'][url][name]:
+            self.data['send'][url][name].remove(chan)
+        if len(self.data['send'][url][name]) == 0:
+            del self.data['send'][url][name]
+        if len(self.data['send'][url]) == 0:
+            del self.data['send'][url]
+        self.save()
+
+httpwatch = HttpWatch()
+
+def init():
+    if cfg.get('run'):
+        thr.start_new_thread(httpwatch.start, ())
+    return 1
+
+def shutdown():
+    if httpwatch.pid:
+        httpwatch.stop()
+    return 1
+
+def handle_httpwatch_add(bot, ievent):
+    if len(ievent.args) != 1:
+        ievent.missing('<url>')
+    else:
+        try:
+            geturl2(ievent.args[0])
+            httpwatch.add(ievent.args[0], bot.name, ievent.channel)
+            ievent.reply('http watcher added')
+        except Exception, e:
+            ievent.reply('failed to add: %s' % (str(e),))
+
+def handle_httpwatch_del(bot, ievent):
+    if len(ievent.args) != 1:
+        ievent.missing('<url>')
+    else:
+        httpwatch.remove(ievent.args[0], bot.name, ievent.channel)
+        ievent.reply('http watcher removed')
+
+def handle_httpwatch_list(bot, ievent):
+    ievent.reply(str(httpwatch.data['send']))
+
+def handle_httpwatch_peek(bot, ievent):
+    ievent.reply('running httpwatch.peek()')
+    ievent.reply(str(httpwatch.peek()))
+
+def handle_httpwatch_start(bot, ievent):
+    if httpwatch.pid:
+        ievent.reply('watcher already running (pid: %s)' % (str(httpwatch.pid),))
+    else:
+        httpwatch.start()
+        ievent.reply('watcher started')
+
+def handle_httpwatch_stop(bot, ievent):
+    if httpwatch.pid:
+        httpwatch.stop()
+        ievent.reply('watcher stopped')
+    else:
+        ievent.reply('watcher not running')
+
+cmnds.add('httpwatch-add', handle_httpwatch_add, 'OPER')
+tests.add('httpwatch-add http://gozerbot.org')
+
+cmnds.add('httpwatch-del', handle_httpwatch_del, 'OPER')
+tests.add('httpwatch-del http://gozerbot.org')
+
+cmnds.add('httpwatch-list', handle_httpwatch_list, 'OPER')
+tests.add('httpwatch-list')
+
+cmnds.add('httpwatch-peek', handle_httpwatch_peek, 'OPER')
+tests.add('httpwatch-peek')
+
+cmnds.add('httpwatch-start', handle_httpwatch_start, 'OPER')
+tests.add('httpwatch-start')
+
+cmnds.add('httpwatch-stop', handle_httpwatch_stop, 'OPER')
+tests.add('httpwatch-stop')
--- gozerbot-0.99.1.orig/build/lib/gplugs/log.py
+++ gozerbot-0.99.1/build/lib/gplugs/log.py
@@ -0,0 +1,891 @@
+# plugs/log.py
+#
+#
+
+""" logging """
+
+__copyright__ = 'this file is in the public domain'
+__gendocfirst__ = ['log-on', ]
+__gendoclast__ = ['log-off', ]
+__depending__ = ['mail' , 'markov']
+
+from gozerbot.generic import rlog, handle_exception, elapsedstring, dmy, \
+hourmin, lockdec, strtotime
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.callbacks import callbacks, jcallbacks
+from gozerbot.plughelp import plughelp
+from gozerbot.irc.monitor import saymonitor
+from gozerbot.xmpp.monitor import xmppmonitor
+from gozerbot.aliases import aliases, aliasdel
+from gozerbot.users import users
+from gozerbot.tests import tests
+
+import glob, re, thread, pickle, os, mmap, time
+
+plughelp.add('log', 'logs related commands')
+
+# check if logs dir exists if not create it
+if not os.path.isdir('logs'):
+    os.mkdir('logs')
+
+loglock = thread.allocate_lock()
+locked = lockdec(loglock)
+
+class Logs(object):
+
+    """ hold handles to log files (per channel) """
+
+    def __init__(self, logdir):
+        self.logdir = logdir
+        self.maps = {}
+        self.files = {}
+        self.filenames = {}
+        self.lock = thread.allocate_lock()
+        self.loglist = []
+        try:
+            loglistfile = open(self.logdir + os.sep + 'loglist', 'r')
+            self.loglist = pickle.load(loglistfile)
+        except:
+            self.loglist = []
+        rlog(0, 'logs', 'loglist is %s' % str(self.loglist))
+        # open log files in append mode
+        for i in glob.glob(self.logdir + os.sep + '*.log'):
+            reresult = re.search('logs%s(.+)\.' % os.sep, i)
+            filename = reresult.group(1)
+            if not filename:
+                rlog(10, 'logs', "can't determine channel name")
+                continue
+            logfile = open(i, 'a')
+            if logfile:
+                self.files[filename] = logfile
+                self.filenames[filename.lower()] = i
+                rlog(1, 'logs', 'adding file %s' % i)
+            else:
+                rlog(10, 'logs', 'failed to open %s' % i)
+
+    def save(self):
+        """ save loglist """
+        try:
+            self.lock.acquire()
+            picklefile = open(self.logdir + os.sep + 'loglist', 'w')
+            pickle.dump(self.loglist, picklefile)
+            rlog(0, 'logs', 'loglist saved')
+        finally:
+            self.lock.release()
+
+    def close(self):
+        """ close log files """
+        try:
+            self.lock.acquire()
+            for i in self.files.keys():
+                rlog(10, 'logs', 'closing ' + str(i))
+                self.files[i].close()
+        finally:
+            self.lock.release()
+        self.save()
+
+    def size(self, channel):
+        """ get size of log file """
+        if channel[0] in ['#', '!', '&', '+']:
+            chan = channel[1:].lower()
+        else:
+            chan = channel.lower()
+        try:
+            size = os.stat(self.filenames[chan])[6]
+            return size
+        except (IOError, KeyError):
+            return 0
+
+    def add(self, channel):
+        """ add logfile for channel """
+        if channel[0] in ['#', '!', '&', '+']:
+            chan = channel[1:].lower()
+        else:
+            chan = channel.lower()
+        filename = self.logdir + os.sep + chan + '.log'
+        rlog(10, 'logs', 'adding logfile %s' % chan)
+        if self.files.has_key(chan):
+            rlog(10, 'logs', 'already opened file %s' % chan)
+            return 1
+        try:
+            logfile = open(filename,'a')
+            self.files[chan] = logfile
+            self.filenames[chan] = filename
+            if channel not in self.loglist:
+                self.loglist.append(channel)
+            return 1
+        except Exception, ex:
+            handle_exception()
+            return 0
+
+    def logbot(self, name, ttime, channel, txt):
+        """ log stuff spoken by the bot """
+        if channel not in self.loglist:
+            rlog(1, 'logs', "%s not in loglist" % channel)
+            return
+        if channel[0] in ['#', '!', '&', '+']:
+            chan = channel[1:].lower()
+        else:
+            chan = channel.lower()
+        filename = self.logdir + os.sep + chan + '.log'
+        if not self.files.has_key(chan):
+            if not self.add(channel):
+                rlog(1, 'logs', "can't create logfile %s" % filename)
+                return
+        logfile = self.files[chan]
+        logitem = (name, ttime, 'bot', 'bot@bot', txt)
+        rlog(-1, 'logs', 'logging [%s] <%s> %s ==> %s' % (name, 'bot', txt, \
+filename))
+        # write the data to file (comma seperated)
+        try:
+            self.lock.acquire()
+            logfile.write('%s,%s,%s,%s,%s\n' % logitem)
+            logfile.flush()
+        finally:
+            self.lock.release()
+
+    def log(self, name, ttime, ievent):
+        """ log ircevent """
+        if ievent.nick == ievent.bot.nick:
+            ievent.nick = 'bot'
+            ievent.userhost = 'bot@bot'
+        channel = ievent.channel
+        if channel not in self.loglist:
+            rlog(1, 'logs', "%s not in loglist" % channel)
+            return
+        if channel[0] in ['#', '!', '&', '+']:
+            chan = channel[1:].lower()
+        else:
+            chan = channel.lower()
+        filename = self.logdir + os.sep + chan + '.log'
+        if not self.files.has_key(chan):
+            if not self.add(ievent.channel):
+                rlog(1, 'logs', "can't create logfile %s" % filename)
+                return
+        # put ievent.cmnd as first txt
+        if ievent.cmnd == 'PRIVMSG' or ievent.cmnd == 'Message':
+            if ievent.usercmnd:
+                tmp = "CMND: " + ievent.txt
+            else:
+                if ievent.txt.startswith('\001ACTION'):
+                    txt = ievent.txt[7:-1]
+                    tmp = "PRIVMSG: /me " + txt
+                else:
+                    tmp = "PRIVMSG: " + ievent.txt
+        elif ievent.cmnd == 'MODE':
+            tmp = "MODE: " + ievent.postfix
+        elif ievent.cmnd == 'PART':
+            tmp = "PART: " + ievent.channel
+        elif ievent.cmnd == 'JOIN':
+            tmp = "JOIN: " + ievent.channel
+        else:
+            return
+        logfile = self.files[chan]
+        logitem = (name, ttime, ievent.nick, ievent.userhost, tmp)
+        rlog(-1, 'logs', 'logging [%s] <%s> %s ==> %s' % (name, ievent.nick, \
+ievent.txt, filename))
+        # write the data to file (comma seperated)
+        try:
+            self.lock.acquire()
+            logfile.write('%s,%s,%s,%s,%s\n' % logitem)
+            logfile.flush()
+        finally:
+            self.lock.release()
+
+    def getmmap(self, channel):
+        """ get an mmap of a channel .. as of 0.8 this just returns the 
+            open logfile
+        """
+        if not channel:
+            return
+        if channel[0] in ['#', '!', '&', '+']:
+            chan = channel[1:].lower()
+        else:
+            chan = channel.lower()
+        try:
+            filename = self.filenames[chan]
+        except KeyError:
+            rlog(10, 'log', 'logging is not enabled in %s' % channel)
+            return
+        logfile = open(filename, 'r')
+        #size = self.size(channel)
+        #if size == 0:  
+        #    return None
+        #logmap = mmap.mmap(logfile.fileno(), size, mmap.MAP_SHARED, \
+#access=mmap.ACCESS_READ)
+        return logfile
+
+    def loop(self, logmap, nrtimes, func, withbot=False, withcmnd=False):
+        """ loop over the logmap """
+        logmap.seek(0)
+        teller = 0
+        times = 0
+        for line in logmap:
+            teller += 1
+            if teller % 100000 == 0:
+                time.sleep(0.0001)
+            try:
+                (botname, ttime, nick, userhost, txt) = \
+line.strip().split(',', 4)
+            except ValueError:
+                continue
+            if not withbot and userhost == 'bot@bot':
+                continue
+            if not withcmnd and txt.startswith('CMND:'):
+                continue
+            try:
+                res = func(botname, ttime, nick, userhost, txt)
+            except ValueError:
+                continue
+            if res:
+                times += 1
+                if nrtimes and times > nrtimes:
+                    break
+        logmap.close()
+
+    def search(self, channel, what, nrtimes):
+        """ search through logfile """
+        res = []
+        if not channel:
+            return res
+        andre = re.compile(' and ', re.I)
+        ands = re.split(andre, what)
+        nrtimes = int(nrtimes)
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return res
+        res = []
+        def dofunc(botname, ttime, nick, userhost, txt):
+            """ search log line for matching txt """
+            for j in ands:
+                if txt.find(j.strip()) == -1:
+                    return
+            res.append((botname, ttime, nick, userhost, txt))
+            return 1
+        self.loop(logmap, nrtimes, dofunc)        
+        if res:
+            return res[:nrtimes]
+
+    def seen(self, channel, who):
+        """ get last line of who """
+        result = []
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return result
+        who = who.lower()
+        if '*' in who:
+            who = who.replace('*', '.*')
+            rewho = re.compile(who)
+            def dofunc(botname, ttime, nick, userhost, txt):
+                """ add line that matches mask """
+                if re.match(rewho, nick.lower()):
+                    result.append((botname, ttime, nick, userhost, txt))
+        else:
+            def dofunc(botname, ttime, nick, userhost, txt):
+                """ add line that matches nick """
+                if nick.lower() == who:
+                    result.append((botname, ttime, nick, userhost, txt))
+        self.loop(logmap, None, dofunc)
+        if result:
+            return result[-1]
+
+    def back(self, channel, what, nrtimes):
+        """ search through the logs backwards """
+        res = []
+        if not channel:
+            return res
+        andre = re.compile(' and ', re.I)
+        ands = re.split(andre, what)
+        nrtimes = int(nrtimes)
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return res
+        def dofunc(botname, ttime, nick, userhost, txt):
+            """ add line that matches """
+            for j in ands:
+                if txt.find(j.strip()) == -1:
+                    return
+            res.append((botname, ttime, nick, userhost, txt))
+            return 1
+        self.loop(logmap, None, dofunc)
+        result = []
+        if res:
+            if len(res) > nrtimes:
+                result = res[len(res)-nrtimes:]
+            else:
+                result = res
+        result.reverse()
+        return result
+
+    def bback(self, channel, what, nrtimes):
+        """ search through the bot logs backwards """
+        res = []
+        if not channel:
+            return res
+        andre = re.compile(' and ', re.I)
+        ands = re.split(andre, what)
+        nrtimes = int(nrtimes)
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return res
+        def dofunc(botname, ttime, nick, userhost, txt):
+            """ add line that matches """
+            if nick != 'bot':
+                return
+            for j in ands:
+                if txt.find(j.strip()) == -1:
+                    return
+            res.append((botname, ttime, nick, userhost, txt))
+            return 1
+        self.loop(logmap, None, dofunc, withbot=True)
+        result = []
+        if res:
+            if len(res) > nrtimes:
+                result = res[len(res)-nrtimes:]
+            else:
+                result = res
+        result.reverse()
+        return result
+
+    def fromtime(self, channel, ftime):
+        """ returns log items from a certain time """
+        res = []
+        if not channel:
+            return res
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return res
+        def dofunc(botname, ttime, nick, userhost, txt):
+            """ add line that is older then given time """
+            logtime = float(ttime)
+            if logtime > ftime:
+                res.append((botname, ttime, nick, userhost, txt))
+        self.loop(logmap, None, dofunc)
+        return res
+
+    def fromtimewithbot(self, channel, ftime):
+        """ returns log items from a certain time """
+        res = []
+        if not channel:
+            return res
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return res
+        def dofunc(botname, ttime, nick, userhost, txt):
+            """ add line that is older then given time including bot outout """
+            logtime = float(ttime)
+            if logtime > ftime:
+                res.append((botname, ttime, nick, userhost, txt))
+        self.loop(logmap, None, dofunc, withbot=True)
+        return res
+
+    def linesback(self, channel, nrtimes):
+        """ return nr log lines back """
+        result = []
+        if not channel:
+            return result
+        nrtimes = int(nrtimes)
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return result
+        def dofunc(botname, ttime, nick, userhost, txt):
+            """ add line """
+            result.append((botname, ttime, nick, userhost, txt))
+            return 1
+        self.loop(logmap, None, dofunc)
+        if len(result) > nrtimes:
+            return result[len(result)-nrtimes:]
+        else:
+            return result
+
+    def linesbacknick(self, channel, who, nrtimes):
+        """ return log lines for nick """
+        result = []
+        if not channel:
+            return result
+        nrtimes = int(nrtimes)
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return result
+        def dofunc(botname, ttime, nick, userhost, txt):
+            """ add line said by nick """
+            if nick.lower() == who.lower():
+                result.insert(0, (botname, ttime, nick, userhost, txt))
+                return 1
+        self.loop(logmap, None, dofunc)
+        return result[:nrtimes]
+
+    def linesbacknicksearch(self, channel, who, searchitem, nrtimes):
+        """ search logs for lines said by who """
+        result = []
+        if not channel:
+            return result
+        who = who.lower()
+        andre = re.compile(' and ', re.I)
+        ands = re.split(andre, searchitem)
+        nrtimes = int(nrtimes)
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return result
+        def dofunc(botname, ttime, nick, userhost, txt):
+            """ add line that is said by nick containing txt """
+            if nick.lower() == who.lower():
+                got = 0
+                for j in ands:
+                    if txt.find(j.strip()) == -1:
+                        got = 0
+                        break
+                    got = 1
+                if got:
+                    result.append((botname, ttime, nick, userhost, txt))
+                    return 1
+        self.loop(logmap, None, dofunc)
+        if len(result) > nrtimes:
+            return result[len(result)-nrtimes:]
+        else:
+            return result
+
+    def lastspoke(self, channel, userhost):
+        """ return time of last line spoken by user with userhost """
+        result = []
+        if not channel:
+            return result
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return result
+        def dofunc(botname, ttime, nick, uh, txt):
+            """ add line that matches userhost """
+            if userhost == uh:
+                result.append(int(float(ttime)))
+        self.loop(logmap, None, dofunc)
+        return result[-1]
+
+    def lastspokelist(self, channel, userhost, nrtimes):
+        """ return time of last line spoken by user with userhost """
+        result = []
+        if not channel:
+            return result
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return result
+        def dofunc(botname, ttime, nick, uh, txt):
+            """ add line that matches userhost """
+            if userhost == uh:
+                result.append(int(float(ttime)))
+        self.loop(logmap, None, dofunc)
+        return result[len(result)-nrtimes:]
+         
+    def lastnicks(self, channel, nrtimes):
+        """ return the nicks of last said lines """
+        result = []
+        if not channel:
+            return result
+        logmap = self.getmmap(channel)
+        if not logmap:
+            return result
+        def dofunc(botname, ttime, nick, userhost, txt):
+            """ add nicks  """
+            result.append(nick)
+        self.loop(logmap, None, dofunc)
+        if len(result) > nrtimes:
+            result = result[len(result)-nrtimes:]
+        result.reverse()
+        return result
+
+logs = Logs('logs')
+
+def shutdown():
+    logs.save()
+
+def prelogsay(botname, printto, txt, who, how, fromm):
+    """ determine if logsay callback needs to be called """
+    if printto in logs.loglist:
+        return 1
+
+def cblogsay(botname, printto, txt, who, how, fromm):
+    """ log the bots output """
+    logs.logbot(botname, time.time(), printto, txt)
+
+saymonitor.add('log', cblogsay, prelogsay)
+
+def jprelogsay(botname, msg):
+    """ jabber log precondition """
+    try:
+        to = str(msg.getTo())
+    except:
+        return
+    if to in logs.loglist:
+        return 1
+
+def jcblogsay(botname, msg):
+    """ log the jabber message """
+    try:
+        to = str(msg.getTo())
+        txt = msg.getBody()
+    except:
+        return
+    logs.logbot(botname, time.time(), to, txt)
+
+xmppmonitor.add('log', jcblogsay, jprelogsay)
+
+def prelog(bot, ievent):
+    """ log pre condition """
+    if ievent.channel and ievent.channel in logs.loglist:
+        return 1
+
+def logcb(bot, ievent):
+    """ callback that logs ievent """
+    logs.log(bot.name, time.time(), ievent)
+
+callbacks.add('ALL', logcb, prelog)
+jcallbacks.add('Message', logcb, prelog)
+
+def handle_logon(bot, ievent):
+    """ log-on .. enable logging in channel the command was given in """
+    if not ievent.channel in logs.loglist:
+        logs.loglist.append(ievent.channel)
+        ievent.reply('logging enabled in %s' % ievent.channel)
+    else:
+        ievent.reply('%s already in loglist' % ievent.channel)
+
+cmnds.add('log-on', handle_logon, 'OPER')
+examples.add('log-on', 'enable logging of the channel in which the command \
+was given', 'log-on')
+tests.add('log-on')
+
+def handle_logoff(bot, ievent):
+    """ log-off .. disable logging in channel the command was given in"""
+    try:
+        logs.loglist.remove(ievent.channel)
+        ievent.reply('logging disabled in %s' % ievent.channel)
+    except ValueError:
+        ievent.reply('%s not in loglist' % ievent.channel)
+
+cmnds.add('log-off', handle_logoff, 'OPER')
+examples.add('log-off', 'disable logging of the channel in which the command \
+was given', 'log-off')
+#tests.add('log-off')
+
+def handle_loglist(bot, ievent):
+    """ log-list .. show list of channels that are being logged """
+    ievent.reply(str(logs.loglist))
+
+cmnds.add('log-list', handle_loglist, 'OPER')
+examples.add('log-list', 'show list of current logged channels', 'log-list')
+tests.add('log-list')
+
+def handle_loglen(bot, ievent):
+    """ log-len show length of logfile for channel in which command was \
+        given """
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging not enabled in %s' % ievent.channel)
+        return
+    if ievent.channel[0] in ['#', '!', '&', '+']:
+        chan = ievent.channel[1:].lower()
+    else:
+        chan = ievent.channel.lower()
+    ievent.reply(str(logs.size(chan)))
+
+cmnds.add('log-len', handle_loglen, 'OPER')
+examples.add('log-len', 'show size of log file of the channel the command \
+was given in', 'log-len')
+aliases.data['log-size'] = 'log-len'
+tests.add('log-len')
+
+def sayresult(bot, ievent, result, withbot=False):
+    """ reply with result """
+    got = 0
+    if result:
+        res = []
+        for i in result:
+            try:
+                if not withbot and i[3] == 'bot@bot':
+                    continue
+                if not withbot and ('PRIVMSG' in i[4] or 'CMND' in i[4]):
+                    what = i[4].split(':', 1)[1].strip()
+                else:
+                    what = i[4].strip()
+                res.append("[%s %s] <%s> %s" % (dmy(float(i[1])), \
+hourmin(float(i[1])), i[2], what))
+                got += 1
+            except (ValueError, IndexError):
+                rlog(10, 'log', "can't parse %s" % i)
+        ievent.reply(res, dot=True)
+    if not got:
+        ievent.reply("nothing found")
+
+def handle_logback(bot, ievent):
+    """ log-back [<nrtimes>] <txt> .. search back through channel log """
+    if not ievent.channel:
+        ievent.reply("use chan <channelname> to set channel to search in")
+        return
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging not enabled in %s' % ievent.channel)
+        return
+    try:
+        nrtimes = int(ievent.args[0])
+        txt = ' '.join(ievent.args[1:])
+    except ValueError:
+        txt = ievent.rest
+        nrtimes = 100000
+    except IndexError:
+        ievent.missing('<searchitem> or <nrtimes> <searchitem>')
+        return
+    result = logs.back(ievent.channel, txt, nrtimes)
+    sayresult(bot, ievent, result)
+
+cmnds.add('log-back', handle_logback, ['USER', 'WEB', 'CLOUD'], speed=3)
+examples.add('log-back', "log-back [<nrlinesback>] <txt> .. search backwards in log \
+file of channel", '1) log-back http 2) log-back 1 http')
+aliases.data['b'] = 'log-back'
+aliases.data['back'] = 'log-back'
+tests.add('log-back gozerbot')
+
+def handle_logbback(bot, ievent):
+    """ log-botback [<nrtimes>] <txt> ['back' <bytesback>] .. search back \
+        through bot output in the channel log """
+    if not ievent.channel:
+        ievent.reply("use chan <channelname> to set channel to search in")
+        return
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging not enabled in %s' % ievent.channel)
+        return
+    try:
+        nrtimes = int(ievent.args[0])
+        txt = ' '.join(ievent.args[1:])
+    except ValueError:
+        txt = ievent.rest
+        nrtimes = 100000
+    except IndexError:
+        ievent.missing('<searchitem> or <nrtimes> <searchitem>')
+        return
+    result = logs.bback(ievent.channel, txt, nrtimes)
+    sayresult(bot, ievent, result, withbot=True)
+
+cmnds.add('log-bback', handle_logbback, ['USER', 'WEB', 'CLOUD'], speed=3)
+examples.add('bback', "log-bback [<nrtimes>] <txt> ['back' <bytesback>] .. \
+search backwards in the bot output of the channel log file", '1) log-back \
+http 2) log-back 1 http')
+aliases.data['bback'] = 'log-bback'
+tests.add('log-bback gozerbot')
+ 
+def handle_logsearch(bot, ievent):
+    """ log-search [<nrtimes>] <txt> ['back' <bytesback>] .. search the log \
+        from the beginning """
+    if not ievent.channel:
+        ievent.reply("use chan <channelname> to set channel to search in")
+        return
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging not enabled in %s' % ievent.channel)
+        return
+    try:
+        nrtimes = int(ievent.args[0])
+        txt = ' '.join(ievent.args[1:])
+    except ValueError:
+        txt = ievent.rest
+        nrtimes = 100000
+    except IndexError:
+        ievent.missing(' <searchitem> or <nrtimes> <searchitem>')
+        return
+    result = logs.search(ievent.channel, txt, nrtimes)
+    sayresult(bot, ievent, result)
+
+cmnds.add('log-search', handle_logsearch, ['USER', 'WEB', 'CLOUD'], speed=3)
+examples.add('log-search', 'log-search [<nrtimes>] <txt> .. search the log \
+from the beginning', '1) log-search http 2) log-search 10 http')
+aliasdel('search')
+tests.add('log-search gozerbot')
+
+def handle_loglast(bot, ievent):
+    """ log-last [<nr>] [<nick>] [<txt>] .. search log for last lines of
+        <nick> containing <txt> """
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging not enabled in %s' % ievent.channel)
+        return
+    result = []
+    try:
+        nrlines = int(ievent.args[0])
+        del ievent.args[0]
+    except (IndexError, ValueError):
+        nrlines = 1
+    try:
+        nick, txt = ievent.args
+    except ValueError:
+        txt = None
+        try:
+            nick = ievent.args[0]
+        except IndexError:
+            nick = None
+    if nick and txt:
+        result = logs.linesbacknicksearch(ievent.channel, nick, txt, \
+nrlines)
+    elif nick: 
+        result = logs.linesbacknick(ievent.channel, nick, nrlines)
+    else:
+        result = logs.linesback(ievent.channel, nrlines)
+    if result:
+        sayresult(bot, ievent, result)
+    else:
+        ievent.reply('no result found')
+
+cmnds.add('log-last', handle_loglast, ['USER', 'WEB', 'CLOUD'], speed=3)
+examples.add('log-last', 'log-last [<nr>] [<nick>] [<txt>] .. show lastlines \
+of channel or user', '1) log-last dunker 2) log-last 5 dunker 3) log-last \
+dunker http 4) log-last 5 dunker http')
+aliases.data['last'] = 'log-last'
+tests.add('log-last exec')
+
+def handle_logtime(bot, ievent):
+    """ show log from a certain time """
+    if not logs:
+        ievent.reply('log plugin is not enabled')
+        return
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging is not enabled in %s' % ievent.channel)
+        return
+    fromtime = strtotime(ievent.rest)
+    if not fromtime:
+        ievent.reply("can't detect time")
+        return
+    result = logs.fromtimewithbot(ievent.channel, fromtime)
+    if result:
+        username = users.getname(ievent.userhost)
+        res = []
+        for i in result:
+            if i[2] == 'bot':
+                txt = i[4]
+            else:
+                nr = i[4].find(' ')
+                txt = i[4][nr:].strip()
+            res.append("[%s] <%s> %s" % (hourmin(float(i[1])), i[2], txt))
+        ievent.reply(res)
+        return
+    ievent.reply('no data found')
+    
+cmnds.add('log-time', handle_logtime, ['USER', 'WEB', 'CLOUD'])
+examples.add('log-time', 'show log since given time', 'log-time 21:00')
+tests.add('log-time 00:00')
+
+def handle_active(bot, ievent):
+    """ active [<minback>] .. show who has been active, default is the 
+        last 15 min 
+    """
+    if not logs:
+        ievent.reply('log plugin is not enabled')
+        return
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging is not enabled in %s' % ievent.channel)
+        return
+    try:
+        channel = ievent.args[0].lower()
+    except IndexError:
+        channel = ievent.channel
+    minback = 15
+    result = [] 
+    for i in logs.fromtime(ievent.channel, time.time() - 15*60):
+        if i[2] not in result:
+            result.append(i[2])
+    if len(result) > 1:
+        ievent.reply("active in the last %s minutes: " % minback, result)
+    elif len(result) == 1:
+        ievent.reply("%s is active" % result[0])
+    else:
+        ievent.reply("nobody active")
+
+cmnds.add('active', handle_active, ['USER', 'WEB', 'CLOUD'])
+examples.add('active', 'active [<minutesback>] .. show who has been active \
+in the last 15 or <minutesback> minutes', '1) active 2) active 600')
+aliases.data['a'] = 'active'
+tests.add('active')
+
+def handle_line(bot, ievent):
+    """ line .. show activity of last hour """
+    if not logs:
+        ievent.reply('log plugin is not enabled')
+        return
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging is not enabled in %s' % ievent.channel)
+        return
+    now = time.time()
+    times = [0]*61
+    for i in logs.fromtime(ievent.channel, time.time() - 60*60):
+        try:
+            diff = float(now - float(i[1]))
+        except ValueError:
+            continue
+        times[int(diff/60)] += 1
+    result = ""
+    for j in range(61):
+        if times[j]:
+            result += "%s " % times[j]
+        else:
+            result += "- "
+    result += '(number of lines per minute for the last hour .. \
+most recent minute first)'
+    ievent.reply(result) 
+
+cmnds.add('line', handle_line, ['USER', 'WEB', 'CLOUD'])
+examples.add('line', 'show activity for the last hour', 'line')
+aliases.data['l'] = 'line'
+tests.add('line')
+
+# thnx to timp for this one
+def handle_dayline(bot, ievent):
+    """ dayline .. show activity for last 24 hours """
+    if not logs:
+        ievent.reply('log plugin is not enabled')
+        return
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging is not enabled in %s' % ievent.channel)
+        return
+    now = time.time()
+    times = [0]*25   
+    for i in logs.fromtime(ievent.channel, time.time() - 24*60*60):
+        diff = int(now/1440 - float(i[1])/1440)
+        if diff < 25:
+            times[diff] += 1
+    result = ""
+    for j in range(25):
+        if times[j]:   
+            result += "%s " % times[j]
+        else:
+            result += "- "
+    result += ' (nr lines per hour for the last day .. most recent hour first)'
+    ievent.reply(result)
+
+cmnds.add('dayline', handle_dayline, ['USER', 'WEB', 'CLOUD'])
+examples.add('dayline', 'show nr of lines spoken in last day', 'dl')
+aliases.data['dl'] = 'dayline'
+tests.add('dl')
+
+def handle_mono(bot, ievent):   
+    """ mono [<nick>] .. show length of monologue """
+    if not logs:
+        ievent.reply('log plugin is not enabled')
+        return
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging is not enabled in %s' % ievent.channel)
+        return
+    teller = 0
+    skip = 0
+    try:
+        nick = ievent.args[0].lower() 
+    except IndexError:
+        nick = ievent.nick.lower()
+    for i in logs.fromtime(ievent.channel, time.time() - 60*60):
+        if i[4].startswith('CMND:'):
+            continue
+        if i[2].lower() == nick:
+            teller += 1
+        else:
+            teller = 0
+    if teller > 4:
+        ievent.reply('%s lines of monologue' % teller)
+    else:
+        ievent.reply("%s is not making a monologue" % nick)
+
+cmnds.add('mono', handle_mono, ['USER', 'CLOUD'])
+examples.add('mono', 'mono [<nick>] .. show nr lines of monologue', \
+'1) mono 2) mono dunker')
+tests.add('mono').add('mono exec')
--- gozerbot-0.99.1.orig/build/lib/gplugs/ipcalc.py
+++ gozerbot-0.99.1/build/lib/gplugs/ipcalc.py
@@ -0,0 +1,433 @@
+# IP subnet calculator
+# (c) 2007 Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# BSD License
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('ipcalc', 'ip calculator')
+
+
+# IP subnet calculator
+# (C) 2007 Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# BSD License
+#
+# ABOUT
+#  This module allows you to perform network calculations.
+#
+# CHANGELOG
+#  2007-10-26: Added IPv6 support, as well as a lot of other functions, 
+#              refactored the calculations.
+#  2007-10-25: Initial writeup, because I could not find any other workable
+#              implementation.
+#
+# TODO
+#  * add CLI parser
+#
+# REFERENCES
+#  * http://www.estoile.com/links/ipv6.pdf
+#  * http://www.iana.org/assignments/ipv4-address-space
+#  * http://www.iana.org/assignments/multicast-addresses
+#  * http://www.iana.org/assignments/ipv6-address-space
+#  * http://www.iana.org/assignments/ipv6-tla-assignments
+#  * http://www.iana.org/assignments/ipv6-multicast-addresses
+#  * http://www.iana.org/assignments/ipv6-anycast-addresses
+#
+# THANKS (testing, tips)
+#  * Bastiaan (trbs)
+#  * Peter van Dijk (Habbie)
+#  * Hans van Kranenburg (Knorrie)
+#
+
+__version__ = '0.2a'
+
+import types, socket
+
+class IP(object):
+
+    # Hex-to-Bin conversion masks
+    _bitmask = {
+        '0': '0000', '1': '0001', '2': '0010', '3': '0011',
+        '4': '0100', '5': '0101', '6': '0110', '7': '0111',
+        '8': '1000', '9': '1001', 'a': '1010', 'b': '1011',
+        'c': '1100', 'd': '1101', 'e': '1110', 'f': '1111'
+        }
+
+    # IP range specific information, see IANA allocations.
+    _range = {
+        4: {
+            '01'                    : 'CLASS A',
+            '10'                    : 'CLASS B',
+            '110'                   : 'CLASS C',
+            '1110'                  : 'CLASS D MULTICAST',
+            '11100000'              : 'CLASS D LINKLOCAL',
+            '1111'                  : 'CLASS E',
+            '00001010'              : 'PRIVATE RFC1918', # 10/8
+            '101011000001'          : 'PRIVATE RFC1918', # 172.16/12
+            '1100000010101000'      : 'PRIVATE RFC1918', # 192.168/16
+            },
+        6: {
+            '00000000'              : 'RESERVED',       # ::/8
+            '00000001'              : 'UNASSIGNED',     # 100::/8
+            '0000001'               : 'NSAP',           # 200::/7
+            '0000010'               : 'IPX',            # 400::/7
+            '0000011'               : 'UNASSIGNED',     # 600::/7
+            '00001'                 : 'UNASSIGNED',     # 800::/5
+            '0001'                  : 'UNASSIGNED',     # 1000::/4
+            '0010000000000000'      : 'RESERVED',       # 2000::/16 Reserved
+            '0010000000000001'      : 'ASSIGNABLE',     # 2001::/16 Sub-TLA Assignments [RFC2450]
+            '00100000000000010000000': 'ASSIGNABLE IANA',  # 2001:0000::/29 - 2001:01F8::/29 IANA
+            '00100000000000010000001': 'ASSIGNABLE APNIC', # 2001:0200::/29 - 2001:03F8::/29 APNIC
+            '00100000000000010000010': 'ASSIGNABLE ARIN',  # 2001:0400::/29 - 2001:05F8::/29 ARIN
+            '00100000000000010000011': 'ASSIGNABLE RIPE',  # 2001:0600::/29 - 2001:07F8::/29 RIPE NCC
+            '0010000000000010'      : '6TO4',           # 2002::/16 "6to4" [RFC3056]
+            '0011111111111110'      : '6BONE TEST',     # 3ffe::/16 6bone Testing [RFC2471]
+            '0011111111111111'      : 'RESERVED',  # 3fff::/16 Reserved
+            '010'                   : 'GLOBAL-UNICAST', # 4000::/3
+            '011'                   : 'UNASSIGNED',     # 6000::/3
+            '100'                   : 'GEO-UNICAST',    # 8000::/3
+            '101'                   : 'UNASSIGNED',     # a000::/3
+            '110'                   : 'UNASSIGNED',     # c000::/3
+            '1110'                  : 'UNASSIGNED',     # e000::/4
+            '11110'                 : 'UNASSIGNED',     # f000::/5
+            '111110'                : 'UNASSIGNED',     # f800::/6
+            '1111110'               : 'UNASSIGNED',     # fc00::/7
+            '111111100'             : 'UNASSIGNED',     # fe00::/9
+            '1111111010'            : 'LINKLOCAL',      # fe80::/10
+            '1111111011'            : 'SITELOCAL',      # fec0::/10
+            '11111111'              : 'MULTICAST',      # ff00::/8
+            '0' * 96                : 'IPV4COMP',       # ::/96
+            '0' * 80 + '1' * 16     : 'IPV4MAP',        # ::ffff:0:0/96
+            '0' * 128               : 'UNSPECIFIED',    # ::/128
+            '0' * 127 + '1'         : 'LOOPBACK'        # ::1/128
+            }
+        }
+
+    def __init__(self, ip, mask=None, version=0):
+        self.mask = mask
+        self.v = 0
+        # Parse input
+        if isinstance(ip, IP):
+            self.ip = ip.ip
+            self.dq = ip.dq
+            self.v = ip.v
+            self.mask = ip.mask
+        elif type(ip) in [types.IntType, types.LongType]:
+            self.ip = long(ip)
+            if self.ip <= 0xffffffff:
+                self.v = version or 4
+                self.dq = self._itodq(ip)
+            else:
+                self.v = version or 4
+                self.dq = self._itodq(ip)
+        else:
+            # If string is in CIDR notation
+            if '/' in ip:
+                ip, mask = ip.split('/', 1)
+                self.mask = int(mask)
+            self.v = version or 0
+            self.dq = ip
+            self.ip = self._dqtoi(ip)
+            assert self.v != 0, 'Could not parse input'
+        # Netmask defaults to one ip
+        if self.mask is None:
+            self.mask = self.v == 4 and 32 or 128
+        # Validate subnet size
+        if self.v == 6:
+            self.dq = self._itodq(self.ip)
+            if self.mask < 0 or self.mask > 128:
+                raise ValueError, "IPv6 subnet size must be between 0 and 128"
+        elif self.v == 4:
+            if self.mask < 0 or self.mask > 32:
+                raise ValueError, "IPv4 subnet size must be between 0 and 32"
+
+    def bin(self):
+        '''
+        Full-length binary representation of the IP address.
+        '''
+        h = hex(self.ip).lower().rstrip('l')
+        b = ''.join(self._bitmask[x] for x in h[2:])
+        l = self.v == 4 and 32 or 128
+        return ''.join('0' for x in xrange(len(b), l)) + b
+
+    def hex(self):
+        '''
+        Full-length hexadecimal representation of the IP address.
+        '''
+        if self.v == 4:
+            return '%08x' % self.ip
+        else:
+            return '%032x' % self.ip
+
+    def subnet(self):
+        return self.mask
+
+    def version(self):
+        return self.v
+   
+    def info(self):
+        '''
+        Show IANA allocation information for the current IP address.
+        '''
+        b = self.bin()
+        l = self.v == 4 and 32 or 128
+        for i in range(len(b), 0, -1):
+            if self._range[self.v].has_key(b[:i]):
+                return self._range[self.v][b[:i]]
+        return 'UNKNOWN'
+ 
+    def _dqtoi(self, dq):
+        '''
+        Convert dotquad or hextet to long.
+        '''
+        # hex notation
+        if dq.startswith('0x'):
+            ip = long(dq[2:], 16)
+            if ip > 0xffffffffffffffffffffffffffffffffL:
+                raise ValueError, "%r: IP address is bigger than 2^128" % dq
+            if ip <= 0xffffffff:
+                self.v = 4
+            else:
+                self.v = 6
+            return ip
+
+        # IPv6
+        if ':' in dq:
+            hx = dq.split(':') # split hextets
+            if ':::' in dq:
+                raise ValueError, "%r: IPv6 address can't contain :::" % dq
+            # Mixed address (or 4-in-6), ::ffff:192.0.2.42
+            if '.' in dq:
+                return self._dqtoi(hx[-1])
+            if len(hx) > 8:
+                raise ValueError, "%r: IPv6 address with more than 8 hexletts" % dq
+            elif len(hx) < 8:
+                # No :: in address
+                if not '' in hx:
+                    raise ValueError, "%r: IPv6 address invalid: compressed format malformed" % dq
+                elif not (dq.startswith('::') or dq.endswith('::')) and len([x for x in hx if x == '']) > 1:
+                    raise ValueError, "%r: IPv6 address invalid: compressed format malformed" % dq
+                ix = hx.index('')
+                px = len(hx[ix+1:])
+                for x in xrange(ix+px+1, 8):
+                    hx.insert(ix, '0')
+            elif dq.endswith('::'):
+                pass
+            elif '' in hx:
+                raise ValueError, "%r: IPv6 address invalid: compressed format detected in full notation" % dq
+            ip = ''
+            hx = [x == '' and '0' or x for x in hx]
+            for h in hx:
+                if len(h) < 4:
+                    h = '%04x' % int(h, 16)
+                if 0 > int(h, 16) > 0xffff:
+                    raise ValueError, "%r: IPv6 address invalid: hextets should be between 0x0000 and 0xffff" % dq
+                ip += h
+            self.v = 6
+            return long(ip, 16)
+        elif len(dq) == 32:
+            # Assume full heximal notation
+            self.v = 6
+            return long(h, 16)
+        
+        # IPv4
+        if '.' in dq:
+            q = dq.split('.')
+            if len(q) > 4:
+                raise ValueError, "%r: IPv4 address invalid: more than 4 bytes" % dq
+            for x in q:
+                if 0 > int(x) > 255:
+                    raise ValueError, "%r: IPv4 address invalid: bytes should be between 0 and 255" % dq
+            self.v = 4
+            return long(q[0])<<24 | long(q[1])<<16 | long(q[2])<<8 | long(q[3])
+    
+        raise ValueError, "Invalid address input"
+       
+    def _itodq(self, n):
+        '''
+        Convert long to dotquad or hextet.
+        '''
+        if self.v == 4:
+            return '.'.join(map(str, [(n>>24) & 0xff, (n>>16) & 0xff, (n>>8) & 0xff, n & 0xff]))
+        else:
+            n = '%032x' % n
+            return ':'.join(n[4*x:4*x+4] for x in xrange(0, 8))
+
+    def __str__(self):
+        return self.dq
+
+    def __int__(self):
+        return int(self.ip)
+
+    def __long__(self):
+        return self.ip
+
+    def size(self):
+        return 1
+
+    def clone(self):
+        '''
+        Return a new <IP> object with a copy of this one.
+        '''
+        return IP(self)
+
+    def to_ipv4(self):
+        '''
+        Convert (a IPv6) IP address to an IPv4 address, if possible. Only works
+        for IPv4-compat (::/96) and 6-to-4 (2002::/16) addresses.
+        '''
+        if self.v == 4:
+            return self
+        else:
+            if self.bin().startswith('0' * 96):
+                return IP(long(self), version=4)
+            elif long(self) & 0x20020000000000000000000000000000L:
+                return IP((long(self)-0x20020000000000000000000000000000L)>>80, version=4)
+            else:
+                return ValueError, "%r: IPv6 address is not IPv4 compatible, nor a 6-to-4 IP" % self.dq
+
+    def to_ipv6(self, type='6-to-4'):
+        '''
+        Convert (a IPv4) IP address to an IPv6 address.
+        '''
+        assert type in ['6-to-4', 'compat'], 'Conversion type not supported'
+        if self.v == 4:
+            if type == '6-to-4':
+                return IP(0x20020000000000000000000000000000L | long(self)<<80, version=6)
+            elif type == 'compat':
+                return IP(long(self), version=6)
+        else:
+            return self
+
+    def to_tuple(self):
+        '''
+        Used for comparisons.
+        '''
+        return (self.dq, self.mask)
+    
+class Network(IP):
+    '''
+    Network slice calculations.
+    '''
+
+    def netmask(self):
+        '''
+        Network netmask derived from subnet size.
+        '''
+        if self.version() == 4:
+            return IP((0xffffffffL >> (32-self.mask)) << (32-self.mask), version=self.version())
+        else:
+            return IP((0xffffffffffffffffffffffffffffffffL >> (128-self.mask)) << (128-self.mask), version=self.version())
+
+    def network(self):
+        '''
+        Network address.
+        '''
+        return IP(self.ip & long(self.netmask()), version=self.version())
+    
+    def broadcast(self):
+        '''
+        Broadcast address.
+        '''
+        # XXX: IPv6 doesn't have a broadcast address, but it's used for other 
+        #      calculations such as <Network.host_last>.
+        if self.version() == 4:
+            return IP(long(self.network()) | (0xffffffff - long(self.netmask())), version=self.version())
+        else:
+            return IP(long(self.network()) | (0xffffffffffffffffffffffffffffffffL - long(self.netmask())), version=self.version())
+
+    def host_first(self):
+        '''
+        First available host in this subnet.
+        '''
+        if (self.version() == 4 and self.mask == 32) or (self.version() == 6 and self.mask == 128):
+            return self
+        return IP(long(self.network())+1, version=self.version())
+
+    def host_last(self):
+        '''
+        Last available host in this subnet.
+        '''
+        if (self.version() == 4 and self.mask == 32) or (self.version() == 6 and self.mask == 128):
+            return self
+        return IP(long(self.broadcast())-1, version=self.version())
+
+    def in_network(self, other):
+        '''
+        Check if the given IP address is within this network.
+        '''
+        other = Network(other)
+        return long(other) >= long(self) and long(other) < long(self) + self.size() - other.size() + 1
+
+    def __contains__(self, ip):
+        '''
+        Check if the given ip is part of the network.
+
+        >>> '192.0.2.42' in Network('192.0.2.0/24')
+        True
+        >>> '192.168.2.42' in Network('192.0.2.0/24')
+        False
+        '''
+        return self.in_network(ip)
+
+    def __lt__(self, other):
+        return self.size() < IP(other).size()
+
+    def __le__(self, other):
+        return self.size() <= IP(other).size()
+
+    def __gt__(self, other):
+        return self.size() > IP(other).size()
+
+    def __ge__(self, other):
+        return self.size() >= IP(other).size()
+
+    def __iter__(self):
+        '''
+        Generate a range of ip addresses within the network.
+
+        >>> for ip in Network('192.168.114.0/30'): print str(ip)
+        ... 
+        192.168.114.0
+        192.168.114.1
+        192.168.114.2
+        192.168.114.3
+        '''
+        for ip in [IP(long(self)+x) for x in xrange(0, self.size())]:
+            yield ip
+
+    def has_key(self, ip):
+        '''
+        Check if the given ip is part of the network.
+
+        >>> net = Network('192.0.2.0/24')
+        >>> net.has_key('192.168.2.0')
+        False
+        >>> net.has_key('192.0.2.42')
+        True
+        '''
+        return self.__contains__(ip)
+
+    def size(self):
+        '''
+        Number of ip's within the network.
+        '''
+        return 2 ** ((self.version() == 4 and 32 or 128) - self.mask)
+
+def handle_ipcalc(bot, ievent):
+    if not ievent.args:
+        ievent.missing('<ip>[/<size>]')
+        return
+    try:
+        net = Network(ievent.args[0])
+    except ValueError, e:
+        ievent.reply('error: %s' % e)
+        return
+    ievent.reply('version: %d, address: %s, network size: %d, network address: %s, netmask: %s, first host in network: %s, last host in network: %s, network info: %s' % \
+        (net.version(), str(net), net.mask, net.network(), net.netmask(), net.host_first(), net.host_last(), net.info()))
+
+cmnds.add('ipcalc', handle_ipcalc, 'USER')
+examples.add('ipcalc', 'ip calculator', 'ipcalc 127.0.0.1/12')
+tests.add('ipcalc 127.0.0.1/12', 'local')
--- gozerbot-0.99.1.orig/build/lib/gplugs/identify.py
+++ gozerbot-0.99.1/build/lib/gplugs/identify.py
@@ -0,0 +1,134 @@
+# rudimentary authentication trough nickserv
+# Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# BSD License
+
+from gozerbot.utils.generic import convertpickle
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.fleet import fleet
+from gozerbot.users import users
+from gozerbot.persist.pdod import Pdod
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import os
+
+plughelp.add('identify', 'auto-merges identified users')
+
+##3 UPGRADE PART
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'identify', \
+datadir + os.sep + 'plugs' + os.sep + 'identify' + os.sep + 'identify')
+
+## END UPGRADE PART
+
+class IdManager(Pdod):
+    def __init__(self):
+        Pdod.__init__(self, os.path.join(datadir, 'identify'))
+        self.setup()
+
+    def setup(self):
+        for bot in fleet.bots:
+            self.check(bot)
+
+    def check(self, bot):
+        if not self.data.has_key(bot.name):
+            self.data[bot.name] = {}
+
+    def add(self, bot, nick, user):
+        self.check(bot)
+        self.data[bot.name][nick] = user
+        self.save()
+
+    def get(self, bot, nick):
+        if not self.data.has_key(bot.name):
+            return None
+        if not self.data[bot.name].has_key(nick):
+            return None
+        return self.data[bot.name][nick]
+
+    def lookup(self, bot, nick, userhost):
+        user = self.get(bot, nick)
+        if user:
+            users.adduserhost(user, userhost)
+            return True
+        return False
+
+    def remove(self, bot, nick):
+        if not self.data.has_key(bot.name):
+            return False
+        if not self.data[bot.name].has_key(nick):
+            return False
+        del self.data[bot.name][nick]
+        self.save()
+        return True
+
+idmanager = IdManager()
+if not idmanager.data:
+    idmanager = IdManager()
+
+def handle_id(bot, ievent):
+    if not ievent.args:
+        ievent.missing('<nick>')
+        return
+    ievent.reply('requesting userinfo for %s' % ievent.args[0])
+    bot.sendraw('WHOIS %s' % ievent.args[0])
+
+cmnds.add('id', handle_id, ['OPER'])
+tests.add('id exec')
+
+def handle_idadd(bot, ievent):
+    if len(ievent.args) != 2:
+        ievent.missing('<nick> <user>')
+        return
+    if idmanager.get(bot, ievent.args[0]):
+        ievent.reply('%s is already known on %s' % (ievent.args[0], bot.name))
+        return
+    if not users.exist(ievent.args[1].lower()):
+        ievent.reply('user %s unknown' % ievent.args[1].lower())
+        return
+    else:
+        idmanager.add(bot, ievent.args[0], ievent.args[1].lower())
+        ievent.reply('ok')
+   
+cmnds.add('id-add', handle_idadd, 'OPER')
+tests.add('id-add')
+
+def handle_idlist(bot, ievent):
+    ievent.reply(str(idmanager.data))
+
+cmnds.add('id-list', handle_idlist, 'OPER')
+tests.add('id-list')
+
+def handle_JOIN(bot, ievent):
+    user = users.getname(ievent.userhost)
+    if not user:
+        user = idmanager.lookup(bot, ievent.nick, ievent.userhost)
+    if not user:
+        bot.sendraw('WHOIS %s' % ievent.nick)
+
+callbacks.add('JOIN', handle_JOIN)
+
+def handle_320_330(bot, ievent):
+    text = ' '.join(ievent.arguments[2:])
+    #bot.sendraw('PRIVMSG #dunkbots :%s' % str(ievent))
+    # IRC protocol sucks, no generic code for identified users :-(
+    # so,
+    if ievent.cmnd == '320' and 'is identified to services' in text:
+        # Freenode
+        nick = ievent.arguments[1]
+        userhost = bot.userhosts.data[nick]
+        idmanager.lookup(bot, nick, userhost) 
+        #bot.sendraw('PRIVMSG #dunkbots :%s is identified (320/freenode)' % nick)
+    elif ievent.cmnd == '330' and 'is logged in as' in text:
+        # Undernet
+        nick = ievent.arguments[1]
+        userhost = bot.userhosts.data[nick]
+        idmanager.lookup(bot, nick, userhost)
+        #bot.sendraw('PRIVMSG #dunkbots :%s is identified (330/undernet)' % nick)
+
+callbacks.add('320', handle_320_330)
+callbacks.add('330', handle_320_330)
+
--- gozerbot-0.99.1.orig/build/lib/gplugs/tel.py
+++ gozerbot-0.99.1/build/lib/gplugs/tel.py
@@ -0,0 +1,143 @@
+# plugs/tel.py
+#
+#
+
+""" telefone codes """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import geturl, striphtml, splittxt
+from gozerbot.commands import cmnds
+from gozerbot.aliases import aliases
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import re, random
+
+plughelp.add('tel', 'show country telephone codes')
+
+codes = [
+	("213", "ALGERIA", "DZ"),
+	("102", "ANTIGUA BARBUDA", ""),
+	("54", "ARGENTINA", "AR"),
+	("374", "ARMENIA", "AM"),
+	("297", "ARUBA", "AW"),
+	("61", "AUSTRALIA", "AU"),
+	("43", "AUSTRIA", "AT"),
+	("994", "AZERBAIJAN", "AZ"),
+	("103", "BAHAMAS", "BS"),
+	("104", "BARBADOS", "BB"),
+	("375", "BELARUS", "BY"),
+	("32", "BELGIUM", "BE"),
+	("105", "BERMUDA", "BM"),
+	("591", "BOLIVIA", "BO"),
+	("55", "BRAZIL", "BR"),
+	("673", "BRUNEI", ""),
+	("359", "BULGARIA", "BG"),
+	("107", "CANADA", "CA"),
+	("108", "CAYMAN ISLANDS", ""),
+	("38", "CHILE", "CL"),
+	("57", "COLOMBIA", "CO"),
+	("506", "COSTA RICA", ""),
+	("53", "CUBA", "CU"),
+	("357", "CYPRUS", "CY"),
+	("420", "CZECHREPUBLIC", ""),
+	("45", "DENMARK", "DK"),
+	("593", "ECUADOR", "EC"),
+	("20", "EGYPT", "EG"),
+	("503", "EL SALVADOR", ""),
+	("358", "FINLAND", "FI"),
+	("33", "FRANCE", "FR"),
+	("49", "GERMANY", "DE"),
+	("30", "GREECE", "GR"),
+	("111", "GRENADA", "GD"),
+	("502", "GUATEMALA", "GT"),
+	("592", "GUYANA", "GY"),
+	("504", "HONDURAS", "HN"),
+	("852", "HONG KONG", ""),
+	("36", "HUNGARY", "HU"),
+	("91", "INDIA", "IN"),
+	("62", "INDONESIA", "ID"),
+	("353", "IRELAND", "IE"),
+	("972", "ISRAEL", "IL"),
+	("39", "ITALY", "IT"),
+	("112", "JAMAICA", "JM"),
+	("81", "JAPAN", "JP"),
+	("962", "JORDAN", "JO"),
+	("850", "KOREA", ""),
+	("82", "KOREA SOUTH", ""),
+	("965", "KUWAIT", "KW"),
+	("352", "LUXEMBOURG", "LU"),
+	("60", "MALAYSIA", "MY"),
+	("52", "MEXICO", "MX"),
+	("599", "NETH ANTILLES", ""),
+	("31", "NETHERLANDS", "NL"),
+	("64", "NEW ZEALAND", ""),
+	("505", "NICARAGUA", "NI"),
+	("47", "NORWAY", "NO"),
+	("968", "OMAN", "OM"),
+	("92", "PAKISTAN", "PK"),
+	("507", "PANAMA", "PA"),
+	("595", "PARAGUAY", "PY"),
+	("51", "PERU", "PE"),
+	("63", "PHILIPPINES", "PH"),
+	("48", "POLAND", "PL"),
+	("351", "PORTUGAL", "PT"),
+	("852", "PRC", ""),
+	("40", "ROMANIA", "RO"),
+	("7", "RUSSIA", ""),
+	("966", "SAUDI ARABIA", ""),
+	("65", "SINGAPORE", "SG"),
+	("421", "SLOVAKIA", "SK"),
+	("386", "SLOVENIA", "SI"),
+	("27", "SOUTH AFRICA", ""),
+	("34", "SPAIN", "ES"),
+	("115", "ST KITTS NEVIS", ""),
+	("122", "ST LUCIA", ""),
+	("116", "ST VINCENT", ""),
+	("597", "SURINAME", "SR"),
+	("46", "SWEDEN", "SE"),
+	("41", "SWITZERLAND", "CH"),
+	("866", "TAIWAN", ""),
+	("66", "THAILAND", "TH"),
+	("117", "TRINIDAD TOBAGO", ""),
+	("90", "TURKEY", "TR"),
+	("118", "TURKS CAICOS", ""),
+	("44", "UNITED KINGDOM", "UK"),
+	("380", "UKRAINE", "UA"),
+	("971", "UNITED ARAB EMIRATES", ""),
+	("598", "URUGUAY", "UY"),
+	("1", "UNITED STATES OF AMERICA", "USA"),
+	("58", "VENEZUELA", "VE"),
+	("84", "VIETNAM", ""),
+	("106", "VIRGIN IS BRITISH", ""),
+	("123", "VIRGIN IS USA", ""),
+	("967", "YEMAN", ""),
+	("381", "YUGOSLAVIA", ""),
+	("666", "NUMBER OF THE BEAST", ""),
+]
+
+def handle_tel(bot, ievent):
+    if not ievent.rest:
+        ievent.missing('<what>')
+        return
+    l = ievent.rest.upper()
+    res = None
+    for c in codes:
+	if l in c:
+	    res = "%s has dialing prefix %s" % (c[1], c[0])
+	    break
+    if not res:
+	# match part of
+	for c in codes:
+	    if l in c[1]:
+		res = "%s has dialing prefix %s" % (c[1], c[0])
+		break
+    if not res:
+	res = "%s not found" % l
+    ievent.reply(res)
+
+cmnds.add('tel', handle_tel, 'USER')
+examples.add('tel', 'show country telephone code', 'tel 31')
+tests.add('tel 31')
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gplugs/weather.py
+++ gozerbot-0.99.1/build/lib/gplugs/weather.py
@@ -0,0 +1,104 @@
+""" show weather based on Google's weather API """
+
+__copyright__ = 'this file is in the public domain'
+__author__ = 'Landon Fowles'
+
+from gozerbot.generic import geturl, waitforuser, getwho, rlog
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.persist.persist import Persist
+from gozerbot.users import users
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.persist.persiststate import UserState
+from gozerbot.aliases import aliasset
+import time
+from xml.dom import minidom
+from urllib import urlencode
+
+plughelp.add('weather', 'show weather by zipcode/city name')
+
+def handle_weather(bot, ievent):
+    """ show weather using Google's weather API """
+    userhost = ""
+    loc = ""
+    try:
+        nick = ievent.options['--u']
+        if nick:
+            userhost = getwho(bot, nick)
+            if not userhost:
+                ievent.reply("can't determine username for %s" % nick)
+                return
+            else:
+                try:
+                    name = users.getname(userhost)
+                    if not name:
+                         ievent.reply("%s is not known with the bot" % nick)
+                         return
+                    us = UserState(name)
+                    loc = us['location']
+                except KeyError:
+                    ievent.reply("%s doesn't have his location set in \
+userstate" % nick)
+                    return
+    except KeyError:
+         pass
+    if not loc:
+        if ievent.rest:
+             loc = ievent.rest
+        else:
+             ievent.missing('--u <nick> or <location>')
+             return
+    query = urlencode({'weather':loc})
+    weathertxt = geturl('http://www.google.ca/ig/api?%s' % query)
+    if 'problem_cause' in weathertxt:
+        rlog(10, 'weather', 'ERROR: %s' % weathertxt)
+        ievent.reply('an error occured looking up data for %s' % loc)
+        return
+    resultstr = ""
+    if len(weathertxt) > 135:
+        gweather = minidom.parseString(weathertxt)
+        gweather = gweather.getElementsByTagName('weather')[0]
+        if ievent.command == "weather":
+            info = gweather.getElementsByTagName('forecast_information')[0]
+            if info:
+                city = info.getElementsByTagName('city')[0].attributes["data"].value
+                zip = info.getElementsByTagName('postal_code')[0].attributes["data"].value
+                time = info.getElementsByTagName('current_date_time')[0].attributes["data"].value
+
+                weather = gweather.getElementsByTagName('current_conditions')[0]
+                condition = weather.getElementsByTagName('condition')[0].attributes["data"].value
+                temp_f = weather.getElementsByTagName('temp_f')[0].attributes["data"].value
+                temp_c = weather.getElementsByTagName('temp_c')[0].attributes["data"].value
+                humidity = weather.getElementsByTagName('humidity')[0].attributes["data"].value
+                wind = weather.getElementsByTagName('wind_condition')[0].attributes["data"].value
+
+                try:
+                    wind_km = round(int(wind[-6:-4]) * 1.609344)
+                except ValueError:
+                    wind_km = ""
+
+                if (not condition == ""):
+                    condition = " Oh, and it's " + condition + "."
+
+                resultstr = "As of %s, %s (%s) has a temperature of %sC/%sF with %s. %s (%s km/h).%s" % (time, city, zip, temp_c, temp_f, humidity, wind, wind_km, condition)
+        elif ievent.command == "forecast":
+            forecasts = gweather.getElementsByTagName('forecast_conditions')
+            for forecast in forecasts:
+                condition = forecast.getElementsByTagName('condition')[0].attributes["data"].value
+                low_f = forecast.getElementsByTagName('low')[0].attributes["data"].value
+                high_f = forecast.getElementsByTagName('high')[0].attributes["data"].value
+                day = forecast.getElementsByTagName('day_of_week')[0].attributes["data"].value
+                low_c = round((int(low_f) - 32) * 5.0 / 9.0)
+                high_c = round((int(high_f) - 32) * 5.0 / 9.0)
+                resultstr += "[%s: F(%sl/%sh) C(%sl/%sh) %s]" % (day, low_f, high_f, low_c, high_c, condition)
+    if not resultstr:
+        ievent.reply('%s not found!' % loc)
+        return
+    else:
+        ievent.reply(resultstr)
+
+cmnds.add('weather', handle_weather, 'USER', options={'--u': ''})
+aliasset('forecast', 'weather')
+examples.add('weather', 'get weather for <LOCATION> or <nick>', '1) weather London, \
+England 2) weather dunker')
--- gozerbot-0.99.1.orig/build/lib/gplugs/sed.py
+++ gozerbot-0.99.1/build/lib/gplugs/sed.py
@@ -0,0 +1,121 @@
+# Description: Performs a sed-like substitution on the last message by the 
+#              calling user
+# Author: John Hampton <pacopablo@pacopablo.com>
+# Website: http://pacopablo.com
+# License: BSD
+
+__author__ = 'John Hampton <pacopablo@pacopablo.com>'
+__license__ = "BSD"
+
+# Standard Library Imports
+import os
+import time
+import re
+
+# Third Party Imports
+
+# Local Imports
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.persist.pdod import Pdod
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.redispatcher import rebefore
+
+plughelp.add('sed', 'Perform substitution on last message spoken')
+
+cfg = PersistConfig()
+cfg.define('cmd_req', 0)
+sed_expression = r'^s([/|#.:;])(.*?)\1(.*?)\1?([gi]*)$'
+sedre = re.compile(sed_expression)
+
+class LastLine(Pdod):
+    def __init__(self):
+        self.datadir = os.path.join(datadir, 'plugs', 'sed')
+        Pdod.__init__(self, os.path.join(self.datadir, 'sed.data'))
+        if not self.data:
+            self.data = {}
+
+    def handle_sed(self, bot, ievent):
+        """ Perform substitution """
+        channel = ievent.channel.lower()
+        nick = ievent.nick.lower()
+        try:
+            (delim, broke, fix, flags) = ievent.groups
+        except ValueError:
+            ievent.missing('<delim><broke><delim><fix><delim>')
+            return
+        try:
+            source = self.data[channel][nick]
+            if 'g' in flags:
+                count = 0
+            else:
+                count = 1
+            if 'i' in flags:
+                broke = '(?i)'+broke
+            new_text = re.sub(broke, fix, source, count)
+
+            if source != new_text:
+                ievent.reply("%s meant: %s" % (nick, new_text))
+                return
+        except KeyError:
+            bot.say(nick, 'I wasn\'t listening to you.  Try saying something first.')
+            return
+        except Exception, ex:
+            bot.say(nick, 'Error processing regex: %s' % str(ex))
+            return
+
+    def precb(self, bot, ievent):
+        if not ievent.usercmnd and not ievent.isctcp:
+            return 1
+
+    def privmsgcb(self, bot, ievent):
+        channel = ievent.channel.lower()
+        nick = ievent.nick.lower()
+        regex = sedre.match(ievent.origtxt)
+        if not cfg.get('cmd_req') and regex:
+            try:
+                (delim, broke, fix, flags) = regex.groups()
+            except ValueError:
+                return
+            try:
+                source = self.data[channel][nick]
+                if 'g' in flags:
+                    count = 0
+                else:
+                    count = 1
+                if 'i' in flags:
+                    broke = '(?i)'+broke
+                new_text = re.sub(broke, fix, source, count)
+                if source != new_text:
+                    ievent.reply("%s meant: %s" % (nick, new_text))
+                    return
+
+            except KeyError:
+                return
+            except Exception, ex:
+                ievent.reply('Error processing regex: %s' % str(ex))
+        self.data.setdefault(channel, {})
+        self.data[channel][nick] = ievent.origtxt
+
+lastline = None
+
+def handle_sed(bot, ievent):
+    global lastline
+    lastline.handle_sed(bot, ievent)
+
+def init():
+    global lastline
+    lastline = LastLine()
+    callbacks.add('PRIVMSG', lastline.privmsgcb, lastline.precb)
+    callbacks.add('Message', lastline.privmsgcb, lastline.precb)
+    rebefore.add(10, sed_expression, handle_sed, 'USER', allowqueue=False)
+    examples.add('s', 'Perform substitution on last message spoken.', 's/foo/bar/')
+    return 1
+
+def shutdown():
+    if lastline:
+        lastline.save()
+    
--- gozerbot-0.99.1.orig/build/lib/gplugs/twitter.py
+++ gozerbot-0.99.1/build/lib/gplugs/twitter.py
@@ -0,0 +1,1738 @@
+# Twitter post plugin
+# (c) Wijnand 'maze' Modderman <http://tehmaze.com>
+# BSD License
+#
+# I included the Twitter API, because I had to fix some minor issues. These
+# issues have been reported so maybe the API part will be removed from this
+# plugin at a later stadium.
+
+# IMPORT SECTION
+
+import os
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.examples import examples
+from gozerbot.persist.pdol import Pdol
+from gozerbot.plughelp import plughelp
+from gozerbot.utils.textutils import html_unescape
+from gozerbot.utils.generic import waitforqueue
+from gozerbot.plughelp import plughelp
+
+# END IMPORT
+
+plughelp.add('twitter', 'do the twitter')
+
+__version__ = '0.2'
+
+#
+# twitter-py stuff
+#
+# Twitter API
+# (c) DeWitt Clinton <dewitt@google.com>
+# Apache License 2.0
+
+import base64
+import hashlib
+import os
+import sys
+import tempfile
+import time
+import urllib
+import urllib2
+import urlparse
+import simplejson
+
+class TwitterError(Exception):
+  '''Base class for Twitter errors'''
+
+class Status(object):
+  '''A class representing the Status structure used by the twitter API.
+
+  The Status structure exposes the following properties:
+
+    status.created_at
+    status.created_at_in_seconds # read only
+    status.id
+    status.text
+    status.relative_created_at # read only
+    status.user
+
+
+  '''
+  def __init__(self,
+               created_at=None,
+               id=None,
+               text=None,
+               user=None,
+               now=None):
+    '''An object to hold a Twitter status message.
+
+    This class is normally instantiated by the twitter.Api class and
+    returned in a sequence.
+
+    Note: Dates are posted in the form "Sat Jan 27 04:17:38 +0000 2007"
+
+    Args:
+      created_at: The time this status message was posted
+      id: The unique id of this status message
+      text: The text of this status message
+      relative_created_at:
+        A human readable string representing the posting time
+      user:
+        A twitter.User instance representing the person posting the message
+      now:
+        The current time, if the client choses to set it.  Defaults to the
+        wall clock time.
+
+
+    '''
+    self.created_at = created_at
+    self.id = id
+    self.text = text
+    self.user = user
+    self.now = now
+
+  def GetCreatedAt(self):
+    '''Get the time this status message was posted.
+
+    Returns:
+      The time this status message was posted
+    '''
+    return self._created_at
+
+  def SetCreatedAt(self, created_at):
+    '''Set the time this status message was posted.
+
+    Args:
+      created_at: The time this status message was created
+    '''
+    self._created_at = created_at
+
+  created_at = property(GetCreatedAt, SetCreatedAt,
+                        doc='The time this status message was posted.')
+
+  def GetCreatedAtInSeconds(self):
+    '''Get the time this status message was posted, in seconds since the epoch.
+
+    Returns:
+      The time this status message was posted, in seconds since the epoch.
+    '''
+    return time.mktime(time.strptime(self.created_at, '%a %b %d %H:%M:%S +0000 %Y'))
+
+  created_at_in_seconds = property(GetCreatedAtInSeconds,
+                                   doc="The time this status message was "
+                                       "posted, in seconds since the epoch")
+
+  def GetId(self):
+    '''Get the unique id of this status message.
+
+    Returns:
+      The unique id of this status message
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this status message.
+
+    Args:
+      id: The unique id of this status message
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this status message.')
+
+  def GetText(self):
+    '''Get the text of this status message.
+
+    Returns:
+      The text of this status message.
+    '''
+    return self._text
+
+  def SetText(self, text):
+    '''Set the text of this status message.
+
+    Args:
+      text: The text of this status message
+    '''
+    self._text = text
+
+  text = property(GetText, SetText,
+                  doc='The text of this status message')
+
+  def GetRelativeCreatedAt(self):
+    '''Get a human redable string representing the posting time
+
+    Returns:
+      A human readable string representing the posting time
+    '''
+    fudge = 1.25
+    delta  = int(self.now) - int(self.created_at_in_seconds)
+
+    if delta < (1 * fudge):
+      return 'about a second ago'
+    elif delta < (60 * (1/fudge)):
+      return 'about %d seconds ago' % (delta)
+    elif delta < (60 * fudge):
+      return 'about a minute ago'
+    elif delta < (60 * 60 * (1/fudge)):
+      return 'about %d minutes ago' % (delta / 60)
+    elif delta < (60 * 60 * fudge):
+      return 'about an hour ago'
+    elif delta < (60 * 60 * 24 * (1/fudge)):
+      return 'about %d hours ago' % (delta / (60 * 60))
+    elif delta < (60 * 60 * 24 * fudge):
+      return 'about a day ago'
+    else:
+      return 'about %d days ago' % (delta / (60 * 60 * 24))
+
+  relative_created_at = property(GetRelativeCreatedAt,
+                                 doc='Get a human readable string representing'
+                                     'the posting time')
+
+  def GetUser(self):
+    '''Get a twitter.User reprenting the entity posting this status message.
+
+    Returns:
+      A twitter.User reprenting the entity posting this status message
+    '''
+    return self._user
+
+  def SetUser(self, user):
+    '''Set a twitter.User reprenting the entity posting this status message.
+
+    Args:
+      user: A twitter.User reprenting the entity posting this status message
+    '''
+    self._user = user
+
+  user = property(GetUser, SetUser,
+                  doc='A twitter.User reprenting the entity posting this '
+                      'status message')
+
+  def GetNow(self):
+    '''Get the wallclock time for this status message.
+
+    Used to calculate relative_created_at.  Defaults to the time
+    the object was instantiated.
+
+    Returns:
+      Whatever the status instance believes the current time to be,
+      in seconds since the epoch.
+    '''
+    if self._now is None:
+      self._now = time.mktime(time.gmtime())
+    return self._now
+
+  def SetNow(self, now):
+    '''Set the wallclock time for this status message.
+
+    Used to calculate relative_created_at.  Defaults to the time
+    the object was instantiated.
+
+    Args:
+      now: The wallclock time for this instance.
+    '''
+    self._now = now
+
+  now = property(GetNow, SetNow,
+                 doc='The wallclock time for this status instance.')
+
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.created_at == other.created_at and \
+             self.id == other.id and \
+             self.text == other.text and \
+             self.user == other.user
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.Status instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.Status instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.Status instance.
+
+    Returns:
+      A JSON string representation of this twitter.Status instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.Status instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.Status instance
+    '''
+    data = {}
+    if self.created_at:
+      data['created_at'] = self.created_at
+    if self.id:
+      data['id'] = self.id
+    if self.text:
+      data['text'] = self.text
+    if self.user:
+      data['user'] = self.user.AsDict()
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data: A JSON dict, as converted from the JSON in the twitter API
+    Returns:
+      A twitter.Status instance
+    '''
+    if 'user' in data:
+      user = User.NewFromJsonDict(data['user'])
+    else:
+      user = None
+    return Status(created_at=data.get('created_at', None),
+                  id=data.get('id', None),
+                  text=data.get('text', None),
+                  user=user)
+
+
+class User(object):
+  '''A class representing the User structure used by the twitter API.
+
+  The User structure exposes the following properties:
+
+    user.id
+    user.name
+    user.screen_name
+    user.location
+    user.description
+    user.profile_image_url
+    user.url
+    user.status
+  '''
+  def __init__(self,
+               id=None,
+               name=None,
+               screen_name=None,
+               location=None,
+               description=None,
+               profile_image_url=None,
+               url=None,
+               status=None):
+    self.id = id
+    self.name = name
+    self.screen_name = screen_name
+    self.location = location
+    self.description = description
+    self.profile_image_url = profile_image_url
+    self.url = url
+    self.status = status
+
+
+  def GetId(self):
+    '''Get the unique id of this user.
+
+    Returns:
+      The unique id of this user
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this user.
+
+    Args:
+      id: The unique id of this user.
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this user.')
+
+  def GetName(self):
+    '''Get the real name of this user.
+
+    Returns:
+      The real name of this user
+    '''
+    return self._name
+
+  def SetName(self, name):
+    '''Set the real name of this user.
+
+    Args:
+      name: The real name of this user
+    '''
+    self._name = name
+
+  name = property(GetName, SetName,
+                  doc='The real name of this user.')
+
+  def GetScreenName(self):
+    '''Get the short username of this user.
+
+    Returns:
+      The short username of this user
+    '''
+    return self._screen_name
+
+  def SetScreenName(self, screen_name):
+    '''Set the short username of this user.
+
+    Args:
+      screen_name: the short username of this user
+    '''
+    self._screen_name = screen_name
+
+  screen_name = property(GetScreenName, SetScreenName,
+                         doc='The short username of this user.')
+
+  def GetLocation(self):
+    '''Get the geographic location of this user.
+
+    Returns:
+      The geographic location of this user
+    '''
+    return self._location
+
+  def SetLocation(self, location):
+    '''Set the geographic location of this user.
+
+    Args:
+      location: The geographic location of this user
+    '''
+    self._location = location
+
+  location = property(GetLocation, SetLocation,
+                      doc='The geographic location of this user.')
+
+  def GetDescription(self):
+    '''Get the short text description of this user.
+
+    Returns:
+      The short text description of this user
+    '''
+    return self._description
+
+  def SetDescription(self, description):
+    '''Set the short text description of this user.
+
+    Args:
+      description: The short text description of this user
+    '''
+    self._description = description
+
+  description = property(GetDescription, SetDescription,
+                         doc='The short text description of this user.')
+
+  def GetUrl(self):
+    '''Get the homepage url of this user.
+
+    Returns:
+      The homepage url of this user
+    '''
+    return self._url
+
+  def SetUrl(self, url):
+    '''Set the homepage url of this user.
+
+    Args:
+      url: The homepage url of this user
+    '''
+    self._url = url
+
+  url = property(GetUrl, SetUrl,
+                 doc='The homepage url of this user.')
+
+  def GetProfileImageUrl(self):
+    '''Get the url of the thumbnail of this user.
+
+    Returns:
+      The url of the thumbnail of this user
+    '''
+    return self._profile_image_url
+
+  def SetProfileImageUrl(self, profile_image_url):
+    '''Set the url of the thumbnail of this user.
+
+    Args:
+      profile_image_url: The url of the thumbnail of this user
+    '''
+    self._profile_image_url = profile_image_url
+
+  profile_image_url= property(GetProfileImageUrl, SetProfileImageUrl,
+                              doc='The url of the thumbnail of this user.')
+
+  def GetStatus(self):
+    '''Get the latest twitter.Status of this user.
+
+    Returns:
+      The latest twitter.Status of this user
+    '''
+    return self._status
+
+  def SetStatus(self, status):
+    '''Set the latest twitter.Status of this user.
+
+    Args:
+      status: The latest twitter.Status of this user
+    '''
+    self._status = status
+
+  status = property(GetStatus, SetStatus,
+                  doc='The latest twitter.Status of this user.')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.id == other.id and \
+             self.name == other.name and \
+             self.screen_name == other.screen_name and \
+             self.location == other.location and \
+             self.description == other.description and \
+             self.profile_image_url == other.profile_image_url and \
+             self.url == other.url and \
+             self.status == other.status
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.User instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.User instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.User instance.
+
+    Returns:
+      A JSON string representation of this twitter.User instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.User instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.User instance
+    '''
+    data = {}
+    if self.id:
+      data['id'] = self.id
+    if self.name:
+      data['name'] = self.name
+    if self.screen_name:
+      data['screen_name'] = self.screen_name
+    if self.location:
+      data['location'] = self.location
+    if self.description:
+      data['description'] = self.description
+    if self.profile_image_url:
+      data['profile_image_url'] = self.profile_image_url
+    if self.url:
+      data['url'] = self.url
+    if self.status:
+      data['status'] = self.status.AsDict()
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data: A JSON dict, as converted from the JSON in the twitter API
+    Returns:
+      A twitter.User instance
+    '''
+    if 'status' in data:
+      status = Status.NewFromJsonDict(data['status'])
+    else:
+      status = None
+    return User(id=data.get('id', None),
+                name=data.get('name', None),
+                screen_name=data.get('screen_name', None),
+                location=data.get('location', None),
+                description=data.get('description', None),
+                profile_image_url=data.get('profile_image_url', None),
+                url=data.get('url', None),
+                status=status)
+
+class DirectMessage(object):
+  '''A class representing the DirectMessage structure used by the twitter API.
+
+  The DirectMessage structure exposes the following properties:
+
+    direct_message.id
+    direct_message.created_at
+    direct_message.created_at_in_seconds # read only
+    direct_message.sender_id
+    direct_message.sender_screen_name
+    direct_message.recipient_id
+    direct_message.recipient_screen_name
+    direct_message.text
+  '''
+
+  def __init__(self,
+               id=None,
+               created_at=None,
+               sender_id=None,
+               sender_screen_name=None,
+               recipient_id=None,
+               recipient_screen_name=None,
+               text=None):
+    '''An object to hold a Twitter direct message.
+
+    This class is normally instantiated by the twitter.Api class and
+    returned in a sequence.
+
+    Note: Dates are posted in the form "Sat Jan 27 04:17:38 +0000 2007"
+
+    Args:
+      id: The unique id of this direct message
+      created_at: The time this direct message was posted
+      sender_id: The id of the twitter user that sent this message
+      sender_screen_name: The name of the twitter user that sent this message
+      recipient_id: The id of the twitter that received this message
+      recipient_screen_name: The name of the twitter that received this message
+      text: The text of this direct message
+    '''
+    self.id = id
+    self.created_at = created_at
+    self.sender_id = sender_id
+    self.sender_screen_name = sender_screen_name
+    self.recipient_id = recipient_id
+    self.recipient_screen_name = recipient_screen_name
+    self.text = text
+
+  def GetId(self):
+    '''Get the unique id of this direct message.
+
+    Returns:
+      The unique id of this direct message
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this direct message.
+
+    Args:
+      id: The unique id of this direct message
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this direct message.')
+
+  def GetCreatedAt(self):
+    '''Get the time this direct message was posted.
+
+    Returns:
+      The time this direct message was posted
+    '''
+    return self._created_at
+
+  def SetCreatedAt(self, created_at):
+    '''Set the time this direct message was posted.
+
+    Args:
+      created_at: The time this direct message was created
+    '''
+    self._created_at = created_at
+
+  created_at = property(GetCreatedAt, SetCreatedAt,
+                        doc='The time this direct message was posted.')
+
+  def GetCreatedAtInSeconds(self):
+    '''Get the time this direct message was posted, in seconds since the epoch.
+
+    Returns:
+      The time this direct message was posted, in seconds since the epoch.
+    '''
+    return time.mktime(time.strptime(self.created_at, '%a %b %d %H:%M:%S +0000 %Y'))
+
+  created_at_in_seconds = property(GetCreatedAtInSeconds,
+                                   doc="The time this direct message was "
+                                       "posted, in seconds since the epoch")
+
+  def GetSenderId(self):
+    '''Get the unique sender id of this direct message.
+
+    Returns:
+      The unique sender id of this direct message
+    '''
+    return self._sender_id
+
+  def SetSenderId(self, sender_id):
+    '''Set the unique sender id of this direct message.
+
+    Args:
+      sender id: The unique sender id of this direct message
+    '''
+    self._sender_id = sender_id
+
+  sender_id = property(GetSenderId, SetSenderId,
+                doc='The unique sender id of this direct message.')
+
+  def GetSenderScreenName(self):
+    '''Get the unique sender screen name of this direct message.
+
+    Returns:
+      The unique sender screen name of this direct message
+    '''
+    return self._sender_screen_name
+
+  def SetSenderScreenName(self, sender_screen_name):
+    '''Set the unique sender screen name of this direct message.
+
+    Args:
+      sender_screen_name: The unique sender screen name of this direct message
+    '''
+    self._sender_screen_name = sender_screen_name
+
+  sender_screen_name = property(GetSenderScreenName, SetSenderScreenName,
+                doc='The unique sender screen name of this direct message.')
+
+  def GetRecipientId(self):
+    '''Get the unique recipient id of this direct message.
+
+    Returns:
+      The unique recipient id of this direct message
+    '''
+    return self._recipient_id
+
+  def SetRecipientId(self, recipient_id):
+    '''Set the unique recipient id of this direct message.
+
+    Args:
+      recipient id: The unique recipient id of this direct message
+    '''
+    self._recipient_id = recipient_id
+
+  recipient_id = property(GetRecipientId, SetRecipientId,
+                doc='The unique recipient id of this direct message.')
+
+  def GetRecipientScreenName(self):
+    '''Get the unique recipient screen name of this direct message.
+
+    Returns:
+      The unique recipient screen name of this direct message
+    '''
+    return self._recipient_screen_name
+
+  def SetRecipientScreenName(self, recipient_screen_name):
+    '''Set the unique recipient screen name of this direct message.
+
+    Args:
+      recipient_screen_name: The unique recipient screen name of this direct message
+    '''
+    self._recipient_screen_name = recipient_screen_name
+
+  recipient_screen_name = property(GetRecipientScreenName, SetRecipientScreenName,
+                doc='The unique recipient screen name of this direct message.')
+
+  def GetText(self):
+    '''Get the text of this direct message.
+
+    Returns:
+      The text of this direct message.
+    '''
+    return self._text
+
+  def SetText(self, text):
+    '''Set the text of this direct message.
+
+    Args:
+      text: The text of this direct message
+    '''
+    self._text = text
+
+  text = property(GetText, SetText,
+                  doc='The text of this direct message')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+          self.id == other.id and \
+          self.created_at == other.created_at and \
+          self.sender_id == other.sender_id and \
+          self.sender_screen_name == other.sender_screen_name and \
+          self.recipient_id == other.recipient_id and \
+          self.recipient_screen_name == other.recipient_screen_name and \
+          self.text == other.text
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.DirectMessage instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.DirectMessage instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.DirectMessage instance.
+
+    Returns:
+      A JSON string representation of this twitter.DirectMessage instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.DirectMessage instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.DirectMessage instance
+    '''
+    data = {}
+    if self.id:
+      data['id'] = self.id
+    if self.created_at:
+      data['created_at'] = self.created_at
+    if self.sender_id:
+      data['sender_id'] = self.sender_id
+    if self.sender_screen_name:
+      data['sender_screen_name'] = self.sender_screen_name
+    if self.recipient_id:
+      data['recipient_id'] = self.recipient_id
+    if self.recipient_screen_name:
+      data['recipient_screen_name'] = self.recipient_screen_name
+    if self.text:
+      data['text'] = self.text
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data: A JSON dict, as converted from the JSON in the twitter API
+    Returns:
+      A twitter.DirectMessage instance
+    '''
+    return DirectMessage(created_at=data.get('created_at', None),
+                         recipient_id=data.get('recipient_id', None),
+                         sender_id=data.get('sender_id', None),
+                         text=data.get('text', None),
+                         sender_screen_name=data.get('sender_screen_name', None),
+                         id=data.get('id', None),
+                         recipient_screen_name=data.get('recipient_screen_name', None))
+
+class Api(object):
+  '''A python interface into the Twitter API
+
+  By default, the Api caches results for 1 minute.
+
+  Example usage:
+
+    To create an instance of the twitter.Api class, with no authentication:
+
+      >>> import twitter
+      >>> api = twitter.Api()
+
+    To fetch the most recently posted public twitter status messages:
+
+      >>> statuses = api.GetPublicTimeline()
+      >>> print [s.user.name for s in statuses]
+      [u'DeWitt', u'Kesuke Miyagi', u'ev', u'Buzz Andersen', u'Biz Stone'] #...
+
+    To fetch a single user's public status messages, where "user" is either
+    a Twitter "short name" or their user id.
+
+      >>> statuses = api.GetUserTimeline(user)
+      >>> print [s.text for s in statuses]
+
+    To use authentication, instantiate the twitter.Api class with a
+    username and password:
+
+      >>> api = twitter.Api(username='twitter user', password='twitter pass')
+
+    To fetch your friends (after being authenticated):
+
+      >>> users = api.GetFriends()
+      >>> print [u.name for u in users]
+
+    To post a twitter status message (after being authenticated):
+
+      >>> status = api.PostUpdate('I love python-twitter!')
+      >>> print status.text
+      I love python-twitter!
+
+    There are many other methods, including:
+
+      >>> api.PostDirectMessage(user, text)
+      >>> api.GetUser(user)
+      >>> api.GetReplies()
+      >>> api.GetUserTimeline(user)
+      >>> api.GetStatus(id)
+      >>> api.DestroyStatus(id)
+      >>> api.GetFriendsTimeline(user)
+      >>> api.GetFriends(user)
+      >>> api.GetFollowers()
+      >>> api.GetFeatured()
+      >>> api.GetDirectMessages()
+      >>> api.PostDirectMessage(user, text)
+      >>> api.DestroyDirectMessage(id)
+      >>> api.DestroyFriendship(user)
+      >>> api.CreateFriendship(user)
+  '''
+
+  DEFAULT_CACHE_TIMEOUT = 60 # cache for 1 minute
+
+  _API_REALM = 'Twitter API'
+
+  def __init__(self,
+               username=None,
+               password=None,
+               input_encoding=None,
+               request_headers=None):
+    '''Instantiate a new twitter.Api object.
+
+    Args:
+      username: The username of the twitter account.  [optional]
+      password: The password for the twitter account. [optional]
+      input_encoding: The encoding used to encode input strings. [optional]
+      request_header: A dictionary of additional HTTP request headers. [optional]
+
+
+    '''
+    self._cache = _FileCache()
+    self._urllib = urllib2
+    self._cache_timeout = Api.DEFAULT_CACHE_TIMEOUT
+    self._InitializeRequestHeaders(request_headers)
+    self._InitializeUserAgent()
+    self._input_encoding = input_encoding
+    self.SetCredentials(username, password)
+
+  def GetPublicTimeline(self, since_id=None):
+    '''Fetch the sequnce of public twitter.Status message for all users.
+
+    Args:
+      since_id:
+        Returns only public statuses with an ID greater than (that is,
+        more recent than) the specified ID. [Optional]
+
+    Returns:
+      An sequence of twitter.Status instances, one for each message
+
+
+    '''
+    parameters = {}
+    if since_id:
+      parameters['since_id'] = since_id
+    url = 'http://twitter.com/statuses/public_timeline.json'
+    json = self._FetchUrl(url,  parameters=parameters)
+    data = simplejson.loads(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetFriendsTimeline(self, user=None, since=None):
+    '''Fetch the sequence of twitter.Status messages for a user's friends
+
+    The twitter.Api instance must be authenticated if the user is private.
+
+    Args:
+      user:
+        Specifies the ID or screen name of the user for whom to return
+        the friends_timeline.  If unspecified, the username and password
+        must be set in the twitter.Api instance.  [optional]
+      since:
+        Narrows the returned results to just those statuses created
+        after the specified HTTP-formatted date. [optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each message
+
+
+    '''
+    if user:
+      url = 'http://twitter.com/statuses/friends_timeline/%s.json' % user
+    elif not user and not self._username:
+      raise TwitterError("User must be specified if API is not authenticated.")
+    else:
+      url = 'http://twitter.com/statuses/friends_timeline.json'
+    parameters = {}
+    if since:
+      parameters['since'] = since
+    json = self._FetchUrl(url, parameters=parameters)
+    data = simplejson.loads(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetUserTimeline(self, user=None, count=None, since=None):
+    '''Fetch the sequence of public twitter.Status messages for a single user.
+
+    The twitter.Api instance must be authenticated if the user is private.
+
+    Args:
+      user:
+        either the username (short_name) or id of the user to retrieve.  If
+        not specified, then the current authenticated user is used. [optional]
+      count: the number of status messages to retrieve [optional]
+      since:
+        Narrows the returned results to just those statuses created
+        after the specified HTTP-formatted date. [optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each message up to count
+
+
+    '''
+    try:
+      if count:
+        int(count)
+    except:
+      raise TwitterError("Count must be an integer")
+    parameters = {}
+    if count:
+      parameters['count'] = count
+    if since:
+      parameters['since'] = since
+    if user:
+      url = 'http://twitter.com/statuses/user_timeline/%s.json' % user
+    elif not user and not self._username:
+      raise TwitterError("User must be specified if API is not authenticated.")
+    else:
+      url = 'http://twitter.com/statuses/user_timeline.json'
+    json = self._FetchUrl(url, parameters=parameters)
+    data = simplejson.loads(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetStatus(self, id):
+    '''Returns a single status message.
+
+    The twitter.Api instance must be authenticated if the status message is private.
+
+    Args:
+      id: The numerical ID of the status you're trying to retrieve.
+
+    Returns:
+      A twitter.Status instance representing that status message
+
+
+    '''
+    try:
+      if id:
+        int(id)
+    except:
+      raise TwitterError("id must be an integer")
+    url = 'http://twitter.com/statuses/show/%s.json' % id
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return Status.NewFromJsonDict(data)
+
+  def DestroyStatus(self, id):
+    '''Destroys the status specified by the required ID parameter.
+
+    The twitter.Api instance must be authenticated and thee
+    authenticating user must be the author of the specified status.
+
+    Args:
+      id: The numerical ID of the status you're trying to destroy.
+
+    Returns:
+      A twitter.Status instance representing the destroyed status message
+
+
+    '''
+    try:
+      if id:
+        int(id)
+    except:
+      raise TwitterError("id must be an integer")
+    url = 'http://twitter.com/statuses/destroy/%s.json' % id
+    json = self._FetchUrl(url, post_data={})
+    data = simplejson.loads(json)
+    return Status.NewFromJsonDict(data)
+
+  def PostUpdate(self, text):
+    '''Post a twitter status message from the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      text: The message text to be posted.  Must be less than 140 characters.
+
+    Returns:
+      A twitter.Status instance representing the message posted
+
+
+    '''
+    if not self._username:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    if len(text) > 140:
+      raise TwitterError("Text must be less than or equal to 140 characters.")
+    url = 'http://twitter.com/statuses/update.json'
+    data = {'status': text}
+    json = self._FetchUrl(url, post_data=data)
+    data = simplejson.loads(json)
+    return Status.NewFromJsonDict(data)
+
+  def GetReplies(self):
+    '''Get a sequence of status messages representing the 20 most recent
+    replies (status updates prefixed with @username) to the authenticating
+    user.
+
+    Returns:
+      A sequence of twitter.Status instances, one for each reply to the user.
+
+
+    '''
+    url = 'http://twitter.com/statuses/replies.json'
+    if not self._username:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetFriends(self, user=None):
+    '''Fetch the sequence of twitter.User instances, one for each friend.
+
+    Args:
+      user: the username or id of the user whose friends you are fetching.  If
+      not specified, defaults to the authenticated user. [optional]
+
+    The twitter.Api instance must be authenticated.
+
+    Returns:
+      A sequence of twitter.User instances, one for each friend
+
+
+    '''
+    if not self._username:
+      raise TwitterError("twitter.Api instance must be authenticated")
+    if user:
+      url = 'http://twitter.com/statuses/friends/%s.json' % user
+    else:
+      url = 'http://twitter.com/statuses/friends.json'
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return [User.NewFromJsonDict(x) for x in data]
+
+  def GetFollowers(self):
+    '''Fetch the sequence of twitter.User instances, one for each follower
+
+    The twitter.Api instance must be authenticated.
+
+    Returns:
+      A sequence of twitter.User instances, one for each follower
+
+
+    '''
+    if not self._username:
+      raise TwitterError("twitter.Api instance must be authenticated")
+    url = 'http://twitter.com/statuses/followers.json'
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return [User.NewFromJsonDict(x) for x in data]
+
+  def GetFeatured(self):
+    '''Fetch the sequence of twitter.User instances featured on twitter.com
+
+    The twitter.Api instance must be authenticated.
+
+    Returns:
+      A sequence of twitter.User instances
+
+
+    '''
+    url = 'http://twitter.com/statuses/featured.json'
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return [User.NewFromJsonDict(x) for x in data]
+
+  def GetUser(self, user):
+    '''Returns a single user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user: The username or id of the user to retrieve.
+
+    Returns:
+      A twitter.User instance representing that user
+
+
+    '''
+    url = 'http://twitter.com/users/show/%s.json' % user
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return User.NewFromJsonDict(data)
+
+  def GetDirectMessages(self, since=None):
+    '''Returns a list of the direct messages sent to the authenticating user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      since:
+        Narrows the returned results to just those statuses created
+        after the specified HTTP-formatted date. [optional]
+
+    Returns:
+      A sequence of twitter.DirectMessage instances
+
+
+    '''
+    url = 'http://twitter.com/direct_messages.json'
+    if not self._username:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    parameters = {}
+    if since:
+      parameters['since'] = since
+    json = self._FetchUrl(url, parameters=parameters)
+    data = simplejson.loads(json)
+    return [DirectMessage.NewFromJsonDict(x) for x in data]
+
+  def PostDirectMessage(self, user, text):
+    '''Post a twitter direct message from the authenticated user
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user: The ID or screen name of the recipient user.
+      text: The message text to be posted.  Must be less than 140 characters.
+
+    Returns:
+      A twitter.DirectMessage instance representing the message posted
+
+
+    '''
+    if not self._username:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    url = 'http://twitter.com/direct_messages/new.json'
+    data = {'text': text, 'user': user}
+    json = self._FetchUrl(url, post_data=data)
+    data = simplejson.loads(json)
+    return DirectMessage.NewFromJsonDict(data)
+
+  def DestroyDirectMessage(self, id):
+    '''Destroys the direct message specified in the required ID parameter.
+
+    The twitter.Api instance must be authenticated, and the
+    authenticating user must be the recipient of the specified direct
+    message.
+
+    Args:
+      id: The id of the direct message to be destroyed
+
+    Returns:
+      A twitter.DirectMessage instance representing the message destroyed
+
+
+    '''
+    url = 'http://twitter.com/direct_messages/destroy/%s.json' % id
+    json = self._FetchUrl(url, post_data={})
+    data = simplejson.loads(json)
+    return DirectMessage.NewFromJsonDict(data)
+
+  def CreateFriendship(self, user):
+    '''Befriends the user specified in the user parameter as the authenticating user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      The ID or screen name of the user to befriend.
+    Returns:
+      A twitter.User instance representing the befriended user.
+
+
+    '''
+    url = 'http://twitter.com/friendships/create/%s.json' % user
+    json = self._FetchUrl(url, post_data={})
+    data = simplejson.loads(json)
+    return User.NewFromJsonDict(data)
+
+  def DestroyFriendship(self, user):
+    '''Discontinues friendship with the user specified in the user parameter.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      The ID or screen name of the user  with whom to discontinue friendship.
+    Returns:
+      A twitter.User instance representing the discontinued friend.
+
+
+    '''
+    url = 'http://twitter.com/friendships/destroy/%s.json' % user
+    json = self._FetchUrl(url, post_data={})
+    data = simplejson.loads(json)
+    return User.NewFromJsonDict(data)
+
+  def SetCredentials(self, username, password):
+    '''Set the username and password for this instance
+
+    Args:
+      username: The twitter username.
+      password: The twitter password.
+
+
+    '''
+    self._username = username
+    self._password = password
+
+  def ClearCredentials(self):
+    '''Clear the username and password for this instance
+    '''
+    self._username = None
+    self._password = None
+
+  def SetCache(self, cache):
+    '''Override the default cache.  Set to None to prevent caching.
+
+    Args:
+      cache: an instance that supports the same API as the  twitter._FileCache
+
+
+    '''
+    self._cache = cache
+
+  def SetUrllib(self, urllib):
+    '''Override the default urllib implementation.
+
+    Args:
+      urllib: an instance that supports the same API as the urllib2 module
+
+
+    '''
+    self._urllib = urllib
+
+  def SetCacheTimeout(self, cache_timeout):
+    '''Override the default cache timeout.
+
+    Args:
+      cache_timeout: time, in seconds, that responses should be reused.
+
+
+    '''
+    self._cache_timeout = cache_timeout
+
+  def SetUserAgent(self, user_agent):
+    '''Override the default user agent
+
+    Args:
+      user_agent: a string that should be send to the server as the User-agent
+
+
+    '''
+    self._request_headers['User-Agent'] = user_agent
+
+  def SetXTwitterHeaders(self, client, url, version):
+    '''Set the X-Twitter HTTP headers that will be sent to the server.
+
+    Args:
+      client:
+         The client name as a string.  Will be sent to the server as
+         the 'X-Twitter-Client' header.
+      url:
+         The URL of the meta.xml as a string.  Will be sent to the server
+         as the 'X-Twitter-Client-URL' header.
+      version:
+         The client version as a string.  Will be sent to the server
+         as the 'X-Twitter-Client-Version' header.
+
+
+    '''
+    self._request_headers['X-Twitter-Client'] = client
+    self._request_headers['X-Twitter-Client-URL'] = url
+    self._request_headers['X-Twitter-Client-Version'] = version
+
+  def _BuildUrl(self, url, path_elements=None, extra_params=None):
+    # Break url into consituent parts
+    (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(url)
+
+    # Add any additional path elements to the path
+    if path_elements:
+      # Filter out the path elements that have a value of None
+      p = [i for i in path_elements if i]
+      if not path.endswith('/'):
+        path += '/'
+      path += '/'.join(p)
+
+    # Add any additional query parameters to the query string
+    if extra_params and len(extra_params) > 0:
+      extra_query = self._EncodeParameters(extra_params)
+      # Add it to the existing query
+      if query:
+        query += '&' + extra_query
+      else:
+        query = extra_query
+
+    # Return the rebuilt URL
+    return urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
+
+  def _InitializeRequestHeaders(self, request_headers):
+    if request_headers:
+      self._request_headers = request_headers
+    else:
+      self._request_headers = {}
+
+  def _InitializeUserAgent(self):
+    user_agent = 'Python-urllib/%s (python-twitter/0.5)' % \
+                 (self._urllib.__version__)
+    self.SetUserAgent(user_agent)
+
+  def _AddAuthorizationHeader(self, username, password):
+    if username and password:
+      basic_auth = base64.encodestring('%s:%s' % (username, password))[:-1]
+      self._request_headers['Authorization'] = 'Basic %s' % basic_auth
+
+  def _RemoveAuthorizationHeader(self):
+    if self._request_headers and 'Authorization' in self._request_headers:
+      del self._request_headers['Authorization']
+
+  def _GetOpener(self, url, username=None, password=None):
+    if username and password:
+      self._AddAuthorizationHeader(username, password)
+      handler = self._urllib.HTTPBasicAuthHandler()
+      (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(url)
+      handler.add_password(Api._API_REALM, netloc, username, password)
+      opener = self._urllib.build_opener(handler)
+    else:
+      opener = self._urllib.build_opener()
+    opener.addheaders = self._request_headers.items()
+    return opener
+
+  def _Encode(self, s):
+    if self._input_encoding:
+      return unicode(s, self._input_encoding).encode('utf-8')
+    else:
+      return unicode(s).encode('utf-8')
+
+  def _EncodeParameters(self, parameters):
+    '''Return a string in key=value&key=value form
+
+    Values of None are not included in the output string.
+
+    Args:
+      parameters:
+        A dict of (key, value) tuples, where value is encoded as
+        specified by self._encoding
+    Returns:
+      A URL-encoded string in "key=value&key=value" form
+
+
+    '''
+    if parameters is None:
+      return None
+    else:
+      return urllib.urlencode(dict([(k, self._Encode(v)) for k, v in parameters.items() if v is not None]))
+
+  def _EncodePostData(self, post_data):
+    '''Return a string in key=value&key=value form
+
+    Values are assumed to be encoded in the format specified by self._encoding,
+    and are subsequently URL encoded.
+
+    Args:
+      post_data:
+        A dict of (key, value) tuples, where value is encoded as
+        specified by self._encoding
+    Returns:
+      A URL-encoded string in "key=value&key=value" form
+
+
+    '''
+    if post_data is None:
+      return None
+    else:
+      return urllib.urlencode(dict([(k, self._Encode(v)) for k, v in post_data.items()]))
+
+  def _FetchUrl(self,
+                url,
+                post_data={},
+                parameters=None,
+                no_cache=None):
+    """Fetch a URL, optionally caching for a specified time.
+
+    Args:
+      url: The URL to retrieve
+      data: A dict of (str, unicode) key value pairs.  If set, POST will be used.
+      parameters: A dict of key/value pairs that should added to
+                  the query string. [OPTIONAL]
+      username: A HTTP Basic Auth username for this request
+      username: A HTTP Basic Auth password for this request
+      no_cache: If true, overrides the cache on the current request
+
+    Returns:
+      A string containing the body of the response.
+
+
+    """
+    # Add key/value parameters to the query string of the url
+    url = self._BuildUrl(url, extra_params=parameters)
+
+    # Get a url opener that can handle basic auth
+    opener = self._GetOpener(url, username=self._username, password=self._password)
+
+    if not 'source' in post_data:
+        post_data['source'] = 'gozerbot'
+    encoded_post_data = self._EncodePostData(post_data)
+
+    # Open and return the URL immediately if we're not going to cache
+    if encoded_post_data or no_cache or not self._cache or not self._cache_timeout:
+      url_data = opener.open(url, encoded_post_data).read()
+    else:
+      # Unique keys are a combination of the url and the username
+      if self._username:
+        key = self._username + ':' + url
+      else:
+        key = url
+
+      # See if it has been cached before
+      last_cached = self._cache.GetCachedTime(key)
+
+      # If the cached version is outdated then fetch another and store it
+      if not last_cached or time.time() >= last_cached + self._cache_timeout:
+        url_data = opener.open(url, encoded_post_data).read()
+        self._cache.Set(key, url_data)
+      else:
+        url_data = self._cache.Get(key)
+
+    # Always return the latest version
+    return url_data
+
+class _FileCacheError(Exception):
+  '''Base exception class for FileCache related errors'''
+
+class _FileCache(object):
+
+  DEPTH = 3
+
+  def __init__(self,root_directory=None):
+    self._InitializeRootDirectory(root_directory)
+
+  def Get(self,key):
+    path = self._GetPath(key)
+    if os.path.exists(path):
+      return open(path).read()
+    else:
+      return None
+
+  def Set(self,key,data):
+    path = self._GetPath(key)
+    directory = os.path.dirname(path)
+    if not os.path.exists(directory):
+      os.makedirs(directory)
+    if not os.path.isdir(directory):
+      raise _FileCacheError('%s exists but is not a directory' % directory)
+    temp_fd, temp_path = tempfile.mkstemp()
+    temp_fp = os.fdopen(temp_fd, 'w')
+    temp_fp.write(data)
+    temp_fp.close()
+    if not path.startswith(self._root_directory):
+      raise _FileCacheError('%s does not appear to live under %s' %
+                            (path, self._root_directory))
+    if os.path.exists(path):
+      os.remove(path)
+    os.rename(temp_path, path)
+
+  def Remove(self,key):
+    path = self._GetPath(key)
+    if not path.startswith(self._root_directory):
+      raise _FileCacheError('%s does not appear to live under %s' %
+                            (path, self._root_directory ))
+    if os.path.exists(path):
+      os.remove(path)
+
+  def GetCachedTime(self,key):
+    path = self._GetPath(key)
+    if os.path.exists(path):
+      return os.path.getmtime(path)
+    else:
+      return None
+
+  def _GetUsername(self):
+    '''Attempt to find the username in a cross-platform fashion.'''
+    return os.getenv('USER') or \
+        os.getenv('LOGNAME') or \
+        os.getenv('USERNAME') or \
+        'nobody'
+
+  def _GetTmpCachePath(self):
+    username = self._GetUsername()
+    cache_directory = 'python.cache_' + username
+    return os.path.join(tempfile.gettempdir(), cache_directory)
+
+  def _InitializeRootDirectory(self, root_directory):
+    if not root_directory:
+      root_directory = self._GetTmpCachePath()
+    root_directory = os.path.abspath(root_directory)
+    if not os.path.exists(root_directory):
+      os.mkdir(root_directory)
+    if not os.path.isdir(root_directory):
+      raise _FileCacheError('%s exists but is not a directory' %
+                            root_directory)
+    self._root_directory = root_directory
+
+  def _GetPath(self,key):
+    hashed_key = hashlib.md5.new(key).hexdigest()
+    return os.path.join(self._root_directory,
+                        self._GetPrefix(hashed_key),
+                        hashed_key)
+
+  def _GetPrefix(self,hashed_key):
+    return os.path.sep.join(hashed_key[0:_FileCache.DEPTH])
+
+#
+# gozerbot stuff
+#
+
+def twitterapi(*args, **kwargs):
+    api = Api(*args, **kwargs)
+    api.SetXTwitterHeaders('gozerbot', 'http://gozerbot.org', __version__)
+    return api
+
+class TwitterUser(Pdol):
+    def __init__(self):
+        Pdol.__init__(self, os.path.join(datadir + os.sep + 'plugs' + \
+os.sep + 'twitter', 'twitter'))
+
+    def add(self, user, username, password):
+        self.data[user] = [username, password]
+        self.save()
+
+    def remove(self, user):
+        if user in self.data:
+            del self.data[user]
+            self.save()
+
+    def size(self):
+        return len(self.data)
+
+    def __contains__(self, user):
+        return user in self.data
+
+# VARS SECTION
+
+twitteruser = TwitterUser()
+
+# END VARS
+
+def upgrade():
+    from gozerbot.utils.generic import convertpickle
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'twitter', \
+datadir + os.sep + 'plugs' + os.sep + 'twitter' + os.sep + 'twitter')
+
+def size():
+    return twitteruser.size()
+
+def handle_twitter(bot, ievent):
+
+    """ send a twitter message. """
+
+    if not ievent.user in twitteruser:
+        ievent.reply('you need a twitter account for this command, '
+                     'use "!twitter-id <username> <password>"'
+                     'first (in a private message!)')
+        return
+    if ievent.inqueue:
+        result = waitforqueue(ievent.inqueue, 30)
+    elif not ievent.rest:
+        ievent.missing('<text>')
+        return
+    else:
+        result = [ievent.rest, ]
+
+    try:
+        credentials = twitteruser.get(ievent.user)
+        api = twitterapi(username=credentials[0], password=credentials[1])
+        for txt in result:
+            status = api.PostUpdate(txt[:119])
+        ievent.reply('twitter posted to http://twitter.com/%s ' % (credentials[0],))
+    except (TwitterError, urllib2.HTTPError), e:
+        ievent.reply('twitter failed: %s' % (str(e),))
+
+cmnds.add('twitter', handle_twitter, 'USER')
+examples.add('twitter', 'adds a message to your twitter account', 
+    'twitter just found the http://gozerbot.org project')
+
+def handle_twitter_friends(bot, ievent):
+
+    """ show twitter friends. """
+
+    if not ievent.user in twitteruser:
+        ievent.reply('you need a twitter account for this command, '
+                     'use "!twitter-id <username> <password>" '
+                     'first (in a private message!)')
+    else:
+        credentials = twitteruser.get(ievent.user)
+        try:
+            api = twitterapi(username=credentials[0], password=credentials[1])
+            users = api.GetFriends()
+            users = ['%s (%s)' % (u.name, u.screen_name) for u in users]
+            if users:
+                users.sort()
+                ievent.reply('your twitter friends: ', users, dot=True)
+            else:
+                ievent.reply('poor you, no friends!')
+        except Exception, e:
+            ievent.reply('twitter failed: %s' % (str(e),))
+
+cmnds.add('twitter-friends', handle_twitter_friends, 'USER')
+examples.add('twitter-friends', 'shows your twitter friends', 'twitter-friends')
+
+def handle_twitter_get(bot, ievent):
+
+    """ get twitter messages. """
+
+    if not ievent.args:
+        ievent.missing('<username>')
+    else:
+        try:
+            credentials = twitteruser.get(ievent.user)
+            api = twitterapi(username=credentials[0], password=credentials[1])
+            statuses = api.GetUserTimeline(ievent.args[0])
+            for status in statuses:
+                if status.name == ievent.args[0]:
+                    ievent.reply([html_unescape(s.text) for s in status], dot=True)
+                    return
+            ievent.reply('no result')
+        except (TwitterError, urllib2.HTTPError), e:
+            ievent.reply('twitter failed: %s' % (str(e),))
+
+cmnds.add('twitter-get', handle_twitter_get, 'USER')
+examples.add('twitter-get', 'gets the twitter messages for a user', 'twitter-get tehmaze')
+
+def handle_twitter_id(bot, ievent):
+
+    """ set twitter id. """
+
+    if ievent.channel[0] in '#!&':
+        ievent.reply('%s: use a private message!' % (ievent.nick,))
+        return
+    elif len(ievent.args) != 2:
+        ievent.reply('twitter-id <username> <password>')
+    else:
+        twitteruser.add(ievent.user, ievent.args[0], ievent.args[1])
+        ievent.reply('ok')
+
+cmnds.add('twitter-id', handle_twitter_id, 'USER')
+examples.add('twitter-id', 'adds your twitter account', 'twitter-id example secret')
--- gozerbot-0.99.1.orig/build/lib/gplugs/identi.py
+++ gozerbot-0.99.1/build/lib/gplugs/identi.py
@@ -0,0 +1,1755 @@
+# gozerplugs/identi.py
+# 
+# based on the Twitter post plugin
+# (c) Wijnand 'maze' Modderman <http://tehmaze.com>
+# BSD License
+#
+# I included the Twitter API, because I had to fix some minor issues. These
+# issues have been reported so maybe the API part will be removed from this
+# plugin at a later stadium.
+
+# IMPORT SECTION
+
+import os
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.examples import examples
+from gozerbot.persist.pdol import Pdol
+from gozerbot.plughelp import plughelp
+from gozerbot.utils.textutils import html_unescape
+from gozerbot.utils.generic import waitforqueue
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+from gozerbot.users import users
+
+# END IMPORT
+
+plughelp.add('identi', 'do the identi.ca')
+
+__version__ = '0.2'
+
+#
+# twitter-py stuff
+#
+# Twitter API
+# (c) DeWitt Clinton <dewitt@google.com>
+# Apache License 2.0
+
+import base64
+import hashlib
+import os
+import sys
+import tempfile
+import time
+import urllib
+import urllib2
+import urlparse
+import simplejson
+
+class TwitterError(Exception):
+  '''Base class for Twitter errors'''
+
+class Status(object):
+  '''A class representing the Status structure used by the twitter API.
+
+  The Status structure exposes the following properties:
+
+    status.created_at
+    status.created_at_in_seconds # read only
+    status.id
+    status.text
+    status.relative_created_at # read only
+    status.user
+
+
+  '''
+  def __init__(self,
+               created_at=None,
+               id=None,
+               text=None,
+               user=None,
+               now=None):
+    '''An object to hold a Twitter status message.
+
+    This class is normally instantiated by the twitter.Api class and
+    returned in a sequence.
+
+    Note: Dates are posted in the form "Sat Jan 27 04:17:38 +0000 2007"
+
+    Args:
+      created_at: The time this status message was posted
+      id: The unique id of this status message
+      text: The text of this status message
+      relative_created_at:
+        A human readable string representing the posting time
+      user:
+        A twitter.User instance representing the person posting the message
+      now:
+        The current time, if the client choses to set it.  Defaults to the
+        wall clock time.
+
+
+    '''
+    self.created_at = created_at
+    self.id = id
+    self.text = text
+    self.user = user
+    self.now = now
+
+  def GetCreatedAt(self):
+    '''Get the time this status message was posted.
+
+    Returns:
+      The time this status message was posted
+    '''
+    return self._created_at
+
+  def SetCreatedAt(self, created_at):
+    '''Set the time this status message was posted.
+
+    Args:
+      created_at: The time this status message was created
+    '''
+    self._created_at = created_at
+
+  created_at = property(GetCreatedAt, SetCreatedAt,
+                        doc='The time this status message was posted.')
+
+  def GetCreatedAtInSeconds(self):
+    '''Get the time this status message was posted, in seconds since the epoch.
+
+    Returns:
+      The time this status message was posted, in seconds since the epoch.
+    '''
+    return time.mktime(time.strptime(self.created_at, '%a %b %d %H:%M:%S +0000 %Y'))
+
+  created_at_in_seconds = property(GetCreatedAtInSeconds,
+                                   doc="The time this status message was "
+                                       "posted, in seconds since the epoch")
+
+  def GetId(self):
+    '''Get the unique id of this status message.
+
+    Returns:
+      The unique id of this status message
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this status message.
+
+    Args:
+      id: The unique id of this status message
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this status message.')
+
+  def GetText(self):
+    '''Get the text of this status message.
+
+    Returns:
+      The text of this status message.
+    '''
+    return self._text
+
+  def SetText(self, text):
+    '''Set the text of this status message.
+
+    Args:
+      text: The text of this status message
+    '''
+    self._text = text
+
+  text = property(GetText, SetText,
+                  doc='The text of this status message')
+
+  def GetRelativeCreatedAt(self):
+    '''Get a human redable string representing the posting time
+
+    Returns:
+      A human readable string representing the posting time
+    '''
+    fudge = 1.25
+    delta  = int(self.now) - int(self.created_at_in_seconds)
+
+    if delta < (1 * fudge):
+      return 'about a second ago'
+    elif delta < (60 * (1/fudge)):
+      return 'about %d seconds ago' % (delta)
+    elif delta < (60 * fudge):
+      return 'about a minute ago'
+    elif delta < (60 * 60 * (1/fudge)):
+      return 'about %d minutes ago' % (delta / 60)
+    elif delta < (60 * 60 * fudge):
+      return 'about an hour ago'
+    elif delta < (60 * 60 * 24 * (1/fudge)):
+      return 'about %d hours ago' % (delta / (60 * 60))
+    elif delta < (60 * 60 * 24 * fudge):
+      return 'about a day ago'
+    else:
+      return 'about %d days ago' % (delta / (60 * 60 * 24))
+
+  relative_created_at = property(GetRelativeCreatedAt,
+                                 doc='Get a human readable string representing'
+                                     'the posting time')
+
+  def GetUser(self):
+    '''Get a twitter.User reprenting the entity posting this status message.
+
+    Returns:
+      A twitter.User reprenting the entity posting this status message
+    '''
+    return self._user
+
+  def SetUser(self, user):
+    '''Set a twitter.User reprenting the entity posting this status message.
+
+    Args:
+      user: A twitter.User reprenting the entity posting this status message
+    '''
+    self._user = user
+
+  user = property(GetUser, SetUser,
+                  doc='A twitter.User reprenting the entity posting this '
+                      'status message')
+
+  def GetNow(self):
+    '''Get the wallclock time for this status message.
+
+    Used to calculate relative_created_at.  Defaults to the time
+    the object was instantiated.
+
+    Returns:
+      Whatever the status instance believes the current time to be,
+      in seconds since the epoch.
+    '''
+    if self._now is None:
+      self._now = time.mktime(time.gmtime())
+    return self._now
+
+  def SetNow(self, now):
+    '''Set the wallclock time for this status message.
+
+    Used to calculate relative_created_at.  Defaults to the time
+    the object was instantiated.
+
+    Args:
+      now: The wallclock time for this instance.
+    '''
+    self._now = now
+
+  now = property(GetNow, SetNow,
+                 doc='The wallclock time for this status instance.')
+
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.created_at == other.created_at and \
+             self.id == other.id and \
+             self.text == other.text and \
+             self.user == other.user
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.Status instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.Status instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.Status instance.
+
+    Returns:
+      A JSON string representation of this twitter.Status instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.Status instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.Status instance
+    '''
+    data = {}
+    if self.created_at:
+      data['created_at'] = self.created_at
+    if self.id:
+      data['id'] = self.id
+    if self.text:
+      data['text'] = self.text
+    if self.user:
+      data['user'] = self.user.AsDict()
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data: A JSON dict, as converted from the JSON in the twitter API
+    Returns:
+      A twitter.Status instance
+    '''
+    if 'user' in data:
+      user = User.NewFromJsonDict(data['user'])
+    else:
+      user = None
+    return Status(created_at=data.get('created_at', None),
+                  id=data.get('id', None),
+                  text=data.get('text', None),
+                  user=user)
+
+
+class User(object):
+  '''A class representing the User structure used by the twitter API.
+
+  The User structure exposes the following properties:
+
+    user.id
+    user.name
+    user.screen_name
+    user.location
+    user.description
+    user.profile_image_url
+    user.url
+    user.status
+  '''
+  def __init__(self,
+               id=None,
+               name=None,
+               screen_name=None,
+               location=None,
+               description=None,
+               profile_image_url=None,
+               url=None,
+               status=None):
+    self.id = id
+    self.name = name
+    self.screen_name = screen_name
+    self.location = location
+    self.description = description
+    self.profile_image_url = profile_image_url
+    self.url = url
+    self.status = status
+
+
+  def GetId(self):
+    '''Get the unique id of this user.
+
+    Returns:
+      The unique id of this user
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this user.
+
+    Args:
+      id: The unique id of this user.
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this user.')
+
+  def GetName(self):
+    '''Get the real name of this user.
+
+    Returns:
+      The real name of this user
+    '''
+    return self._name
+
+  def SetName(self, name):
+    '''Set the real name of this user.
+
+    Args:
+      name: The real name of this user
+    '''
+    self._name = name
+
+  name = property(GetName, SetName,
+                  doc='The real name of this user.')
+
+  def GetScreenName(self):
+    '''Get the short username of this user.
+
+    Returns:
+      The short username of this user
+    '''
+    return self._screen_name
+
+  def SetScreenName(self, screen_name):
+    '''Set the short username of this user.
+
+    Args:
+      screen_name: the short username of this user
+    '''
+    self._screen_name = screen_name
+
+  screen_name = property(GetScreenName, SetScreenName,
+                         doc='The short username of this user.')
+
+  def GetLocation(self):
+    '''Get the geographic location of this user.
+
+    Returns:
+      The geographic location of this user
+    '''
+    return self._location
+
+  def SetLocation(self, location):
+    '''Set the geographic location of this user.
+
+    Args:
+      location: The geographic location of this user
+    '''
+    self._location = location
+
+  location = property(GetLocation, SetLocation,
+                      doc='The geographic location of this user.')
+
+  def GetDescription(self):
+    '''Get the short text description of this user.
+
+    Returns:
+      The short text description of this user
+    '''
+    return self._description
+
+  def SetDescription(self, description):
+    '''Set the short text description of this user.
+
+    Args:
+      description: The short text description of this user
+    '''
+    self._description = description
+
+  description = property(GetDescription, SetDescription,
+                         doc='The short text description of this user.')
+
+  def GetUrl(self):
+    '''Get the homepage url of this user.
+
+    Returns:
+      The homepage url of this user
+    '''
+    return self._url
+
+  def SetUrl(self, url):
+    '''Set the homepage url of this user.
+
+    Args:
+      url: The homepage url of this user
+    '''
+    self._url = url
+
+  url = property(GetUrl, SetUrl,
+                 doc='The homepage url of this user.')
+
+  def GetProfileImageUrl(self):
+    '''Get the url of the thumbnail of this user.
+
+    Returns:
+      The url of the thumbnail of this user
+    '''
+    return self._profile_image_url
+
+  def SetProfileImageUrl(self, profile_image_url):
+    '''Set the url of the thumbnail of this user.
+
+    Args:
+      profile_image_url: The url of the thumbnail of this user
+    '''
+    self._profile_image_url = profile_image_url
+
+  profile_image_url= property(GetProfileImageUrl, SetProfileImageUrl,
+                              doc='The url of the thumbnail of this user.')
+
+  def GetStatus(self):
+    '''Get the latest twitter.Status of this user.
+
+    Returns:
+      The latest twitter.Status of this user
+    '''
+    return self._status
+
+  def SetStatus(self, status):
+    '''Set the latest twitter.Status of this user.
+
+    Args:
+      status: The latest twitter.Status of this user
+    '''
+    self._status = status
+
+  status = property(GetStatus, SetStatus,
+                  doc='The latest twitter.Status of this user.')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.id == other.id and \
+             self.name == other.name and \
+             self.screen_name == other.screen_name and \
+             self.location == other.location and \
+             self.description == other.description and \
+             self.profile_image_url == other.profile_image_url and \
+             self.url == other.url and \
+             self.status == other.status
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.User instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.User instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.User instance.
+
+    Returns:
+      A JSON string representation of this twitter.User instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.User instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.User instance
+    '''
+    data = {}
+    if self.id:
+      data['id'] = self.id
+    if self.name:
+      data['name'] = self.name
+    if self.screen_name:
+      data['screen_name'] = self.screen_name
+    if self.location:
+      data['location'] = self.location
+    if self.description:
+      data['description'] = self.description
+    if self.profile_image_url:
+      data['profile_image_url'] = self.profile_image_url
+    if self.url:
+      data['url'] = self.url
+    if self.status:
+      data['status'] = self.status.AsDict()
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data: A JSON dict, as converted from the JSON in the twitter API
+    Returns:
+      A twitter.User instance
+    '''
+    if 'status' in data:
+      status = Status.NewFromJsonDict(data['status'])
+    else:
+      status = None
+    return User(id=data.get('id', None),
+                name=data.get('name', None),
+                screen_name=data.get('screen_name', None),
+                location=data.get('location', None),
+                description=data.get('description', None),
+                profile_image_url=data.get('profile_image_url', None),
+                url=data.get('url', None),
+                status=status)
+
+class DirectMessage(object):
+  '''A class representing the DirectMessage structure used by the twitter API.
+
+  The DirectMessage structure exposes the following properties:
+
+    direct_message.id
+    direct_message.created_at
+    direct_message.created_at_in_seconds # read only
+    direct_message.sender_id
+    direct_message.sender_screen_name
+    direct_message.recipient_id
+    direct_message.recipient_screen_name
+    direct_message.text
+  '''
+
+  def __init__(self,
+               id=None,
+               created_at=None,
+               sender_id=None,
+               sender_screen_name=None,
+               recipient_id=None,
+               recipient_screen_name=None,
+               text=None):
+    '''An object to hold a Twitter direct message.
+
+    This class is normally instantiated by the twitter.Api class and
+    returned in a sequence.
+
+    Note: Dates are posted in the form "Sat Jan 27 04:17:38 +0000 2007"
+
+    Args:
+      id: The unique id of this direct message
+      created_at: The time this direct message was posted
+      sender_id: The id of the twitter user that sent this message
+      sender_screen_name: The name of the twitter user that sent this message
+      recipient_id: The id of the twitter that received this message
+      recipient_screen_name: The name of the twitter that received this message
+      text: The text of this direct message
+    '''
+    self.id = id
+    self.created_at = created_at
+    self.sender_id = sender_id
+    self.sender_screen_name = sender_screen_name
+    self.recipient_id = recipient_id
+    self.recipient_screen_name = recipient_screen_name
+    self.text = text
+
+  def GetId(self):
+    '''Get the unique id of this direct message.
+
+    Returns:
+      The unique id of this direct message
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this direct message.
+
+    Args:
+      id: The unique id of this direct message
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this direct message.')
+
+  def GetCreatedAt(self):
+    '''Get the time this direct message was posted.
+
+    Returns:
+      The time this direct message was posted
+    '''
+    return self._created_at
+
+  def SetCreatedAt(self, created_at):
+    '''Set the time this direct message was posted.
+
+    Args:
+      created_at: The time this direct message was created
+    '''
+    self._created_at = created_at
+
+  created_at = property(GetCreatedAt, SetCreatedAt,
+                        doc='The time this direct message was posted.')
+
+  def GetCreatedAtInSeconds(self):
+    '''Get the time this direct message was posted, in seconds since the epoch.
+
+    Returns:
+      The time this direct message was posted, in seconds since the epoch.
+    '''
+    return time.mktime(time.strptime(self.created_at, '%a %b %d %H:%M:%S +0000 %Y'))
+
+  created_at_in_seconds = property(GetCreatedAtInSeconds,
+                                   doc="The time this direct message was "
+                                       "posted, in seconds since the epoch")
+
+  def GetSenderId(self):
+    '''Get the unique sender id of this direct message.
+
+    Returns:
+      The unique sender id of this direct message
+    '''
+    return self._sender_id
+
+  def SetSenderId(self, sender_id):
+    '''Set the unique sender id of this direct message.
+
+    Args:
+      sender id: The unique sender id of this direct message
+    '''
+    self._sender_id = sender_id
+
+  sender_id = property(GetSenderId, SetSenderId,
+                doc='The unique sender id of this direct message.')
+
+  def GetSenderScreenName(self):
+    '''Get the unique sender screen name of this direct message.
+
+    Returns:
+      The unique sender screen name of this direct message
+    '''
+    return self._sender_screen_name
+
+  def SetSenderScreenName(self, sender_screen_name):
+    '''Set the unique sender screen name of this direct message.
+
+    Args:
+      sender_screen_name: The unique sender screen name of this direct message
+    '''
+    self._sender_screen_name = sender_screen_name
+
+  sender_screen_name = property(GetSenderScreenName, SetSenderScreenName,
+                doc='The unique sender screen name of this direct message.')
+
+  def GetRecipientId(self):
+    '''Get the unique recipient id of this direct message.
+
+    Returns:
+      The unique recipient id of this direct message
+    '''
+    return self._recipient_id
+
+  def SetRecipientId(self, recipient_id):
+    '''Set the unique recipient id of this direct message.
+
+    Args:
+      recipient id: The unique recipient id of this direct message
+    '''
+    self._recipient_id = recipient_id
+
+  recipient_id = property(GetRecipientId, SetRecipientId,
+                doc='The unique recipient id of this direct message.')
+
+  def GetRecipientScreenName(self):
+    '''Get the unique recipient screen name of this direct message.
+
+    Returns:
+      The unique recipient screen name of this direct message
+    '''
+    return self._recipient_screen_name
+
+  def SetRecipientScreenName(self, recipient_screen_name):
+    '''Set the unique recipient screen name of this direct message.
+
+    Args:
+      recipient_screen_name: The unique recipient screen name of this direct message
+    '''
+    self._recipient_screen_name = recipient_screen_name
+
+  recipient_screen_name = property(GetRecipientScreenName, SetRecipientScreenName,
+                doc='The unique recipient screen name of this direct message.')
+
+  def GetText(self):
+    '''Get the text of this direct message.
+
+    Returns:
+      The text of this direct message.
+    '''
+    return self._text
+
+  def SetText(self, text):
+    '''Set the text of this direct message.
+
+    Args:
+      text: The text of this direct message
+    '''
+    self._text = text
+
+  text = property(GetText, SetText,
+                  doc='The text of this direct message')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+          self.id == other.id and \
+          self.created_at == other.created_at and \
+          self.sender_id == other.sender_id and \
+          self.sender_screen_name == other.sender_screen_name and \
+          self.recipient_id == other.recipient_id and \
+          self.recipient_screen_name == other.recipient_screen_name and \
+          self.text == other.text
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.DirectMessage instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.DirectMessage instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.DirectMessage instance.
+
+    Returns:
+      A JSON string representation of this twitter.DirectMessage instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.DirectMessage instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.DirectMessage instance
+    '''
+    data = {}
+    if self.id:
+      data['id'] = self.id
+    if self.created_at:
+      data['created_at'] = self.created_at
+    if self.sender_id:
+      data['sender_id'] = self.sender_id
+    if self.sender_screen_name:
+      data['sender_screen_name'] = self.sender_screen_name
+    if self.recipient_id:
+      data['recipient_id'] = self.recipient_id
+    if self.recipient_screen_name:
+      data['recipient_screen_name'] = self.recipient_screen_name
+    if self.text:
+      data['text'] = self.text
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data: A JSON dict, as converted from the JSON in the twitter API
+    Returns:
+      A twitter.DirectMessage instance
+    '''
+    return DirectMessage(created_at=data.get('created_at', None),
+                         recipient_id=data.get('recipient_id', None),
+                         sender_id=data.get('sender_id', None),
+                         text=data.get('text', None),
+                         sender_screen_name=data.get('sender_screen_name', None),
+                         id=data.get('id', None),
+                         recipient_screen_name=data.get('recipient_screen_name', None))
+
+class Api(object):
+  '''A python interface into the Twitter API
+
+  By default, the Api caches results for 1 minute.
+
+  Example usage:
+
+    To create an instance of the twitter.Api class, with no authentication:
+
+      >>> import twitter
+      >>> api = twitter.Api()
+
+    To fetch the most recently posted public twitter status messages:
+
+      >>> statuses = api.GetPublicTimeline()
+      >>> print [s.user.name for s in statuses]
+      [u'DeWitt', u'Kesuke Miyagi', u'ev', u'Buzz Andersen', u'Biz Stone'] #...
+
+    To fetch a single user's public status messages, where "user" is either
+    a Twitter "short name" or their user id.
+
+      >>> statuses = api.GetUserTimeline(user)
+      >>> print [s.text for s in statuses]
+
+    To use authentication, instantiate the twitter.Api class with a
+    username and password:
+
+      >>> api = twitter.Api(username='twitter user', password='twitter pass')
+
+    To fetch your friends (after being authenticated):
+
+      >>> users = api.GetFriends()
+      >>> print [u.name for u in users]
+
+    To post a twitter status message (after being authenticated):
+
+      >>> status = api.PostUpdate('I love python-twitter!')
+      >>> print status.text
+      I love python-twitter!
+
+    There are many other methods, including:
+
+      >>> api.PostDirectMessage(user, text)
+      >>> api.GetUser(user)
+      >>> api.GetReplies()
+      >>> api.GetUserTimeline(user)
+      >>> api.GetStatus(id)
+      >>> api.DestroyStatus(id)
+      >>> api.GetFriendsTimeline(user)
+      >>> api.GetFriends(user)
+      >>> api.GetFollowers()
+      >>> api.GetFeatured()
+      >>> api.GetDirectMessages()
+      >>> api.PostDirectMessage(user, text)
+      >>> api.DestroyDirectMessage(id)
+      >>> api.DestroyFriendship(user)
+      >>> api.CreateFriendship(user)
+  '''
+
+  DEFAULT_CACHE_TIMEOUT = 60 # cache for 1 minute
+
+  _API_REALM = 'Twitter API'
+
+  def __init__(self,
+               username=None,
+               password=None,
+               input_encoding=None,
+               request_headers=None):
+    '''Instantiate a new twitter.Api object.
+
+    Args:
+      username: The username of the twitter account.  [optional]
+      password: The password for the twitter account. [optional]
+      input_encoding: The encoding used to encode input strings. [optional]
+      request_header: A dictionary of additional HTTP request headers. [optional]
+
+
+    '''
+    self._cache = _FileCache()
+    self._urllib = urllib2
+    self._cache_timeout = Api.DEFAULT_CACHE_TIMEOUT
+    self._InitializeRequestHeaders(request_headers)
+    self._InitializeUserAgent()
+    self._input_encoding = input_encoding
+    self.SetCredentials(username, password)
+
+  def GetPublicTimeline(self, since_id=None):
+    '''Fetch the sequnce of public twitter.Status message for all users.
+
+    Args:
+      since_id:
+        Returns only public statuses with an ID greater than (that is,
+        more recent than) the specified ID. [Optional]
+
+    Returns:
+      An sequence of twitter.Status instances, one for each message
+
+
+    '''
+    parameters = {}
+    if since_id:
+      parameters['since_id'] = since_id
+    url = 'https://identi.ca/api/statuses/public_timeline.json'
+    json = self._FetchUrl(url,  parameters=parameters)
+    data = simplejson.loads(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetFriendsTimeline(self, user=None, since=None):
+    '''Fetch the sequence of twitter.Status messages for a user's friends
+
+    The twitter.Api instance must be authenticated if the user is private.
+
+    Args:
+      user:
+        Specifies the ID or screen name of the user for whom to return
+        the friends_timeline.  If unspecified, the username and password
+        must be set in the twitter.Api instance.  [optional]
+      since:
+        Narrows the returned results to just those statuses created
+        after the specified HTTP-formatted date. [optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each message
+
+
+    '''
+    if user:
+      url = 'https://identi.ca/api/statuses/friends_timeline/%s.json' % user
+    elif not user and not self._username:
+      raise TwitterError("User must be specified if API is not authenticated.")
+    else:
+      url = 'https://identi.ca/api/statuses/friends_timeline.json'
+    parameters = {}
+    if since:
+      parameters['since'] = since
+    json = self._FetchUrl(url, parameters=parameters)
+    data = simplejson.loads(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetUserTimeline(self, user=None, count=None, since=None):
+    '''Fetch the sequence of public twitter.Status messages for a single user.
+
+    The twitter.Api instance must be authenticated if the user is private.
+
+    Args:
+      user:
+        either the username (short_name) or id of the user to retrieve.  If
+        not specified, then the current authenticated user is used. [optional]
+      count: the number of status messages to retrieve [optional]
+      since:
+        Narrows the returned results to just those statuses created
+        after the specified HTTP-formatted date. [optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each message up to count
+
+
+    '''
+    try:
+      if count:
+        int(count)
+    except:
+      raise TwitterError("Count must be an integer")
+    parameters = {}
+    if count:
+      parameters['count'] = count
+    if since:
+      parameters['since'] = since
+    if user:
+      url = 'https://identi.ca/api/statuses/user_timeline/%s.json' % user
+    elif not user and not self._username:
+      raise TwitterError("User must be specified if API is not authenticated.")
+    else:
+      url = 'https://identi.ca/api/statuses/user_timeline.json'
+    json = self._FetchUrl(url, parameters=parameters)
+    data = simplejson.loads(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetStatus(self, id):
+    '''Returns a single status message.
+
+    The twitter.Api instance must be authenticated if the status message is private.
+
+    Args:
+      id: The numerical ID of the status you're trying to retrieve.
+
+    Returns:
+      A twitter.Status instance representing that status message
+
+
+    '''
+    try:
+      if id:
+        int(id)
+    except:
+      raise TwitterError("id must be an integer")
+    url = 'https://identi.ca/api/statuses/show/%s.json' % id
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return Status.NewFromJsonDict(data)
+
+  def DestroyStatus(self, id):
+    '''Destroys the status specified by the required ID parameter.
+
+    The twitter.Api instance must be authenticated and thee
+    authenticating user must be the author of the specified status.
+
+    Args:
+      id: The numerical ID of the status you're trying to destroy.
+
+    Returns:
+      A twitter.Status instance representing the destroyed status message
+
+
+    '''
+    try:
+      if id:
+        int(id)
+    except:
+      raise TwitterError("id must be an integer")
+    url = 'https://identi.ca/api/statuses/destroy/%s.json' % id
+    json = self._FetchUrl(url, post_data={})
+    data = simplejson.loads(json)
+    return Status.NewFromJsonDict(data)
+
+  def PostUpdate(self, text):
+    '''Post a twitter status message from the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      text: The message text to be posted.  Must be less than 140 characters.
+
+    Returns:
+      A twitter.Status instance representing the message posted
+
+
+    '''
+    if not self._username:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    if len(text) > 140:
+      raise TwitterError("Text must be less than or equal to 140 characters.")
+    url = 'https://identi.ca/api/statuses/update.json'
+    data = {'status': text}
+    json = self._FetchUrl(url, post_data=data)
+    data = simplejson.loads(json)
+    return Status.NewFromJsonDict(data)
+
+  def GetReplies(self):
+    '''Get a sequence of status messages representing the 20 most recent
+    replies (status updates prefixed with @username) to the authenticating
+    user.
+
+    Returns:
+      A sequence of twitter.Status instances, one for each reply to the user.
+
+
+    '''
+    url = 'https://identi.ca/api/statuses/replies.json'
+    if not self._username:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetFriends(self, user=None):
+    '''Fetch the sequence of twitter.User instances, one for each friend.
+
+    Args:
+      user: the username or id of the user whose friends you are fetching.  If
+      not specified, defaults to the authenticated user. [optional]
+
+    The twitter.Api instance must be authenticated.
+
+    Returns:
+      A sequence of twitter.User instances, one for each friend
+
+
+    '''
+    if not self._username:
+      raise TwitterError("twitter.Api instance must be authenticated")
+    if user:
+      url = 'https://identi.ca/api/statuses/friends/%s.json' % user
+    else:
+      url = 'https://identi.ca/api/statuses/friends.json'
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return [User.NewFromJsonDict(x) for x in data]
+
+  def GetFollowers(self):
+    '''Fetch the sequence of twitter.User instances, one for each follower
+
+    The twitter.Api instance must be authenticated.
+
+    Returns:
+      A sequence of twitter.User instances, one for each follower
+
+
+    '''
+    if not self._username:
+      raise TwitterError("twitter.Api instance must be authenticated")
+    url = 'https://identi.ca/api/statuses/followers.json'
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return [User.NewFromJsonDict(x) for x in data]
+
+  def GetFeatured(self):
+    '''Fetch the sequence of twitter.User instances featured on twitter.com
+
+    The twitter.Api instance must be authenticated.
+
+    Returns:
+      A sequence of twitter.User instances
+
+
+    '''
+    url = 'https://identi.ca/api/statuses/featured.json'
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return [User.NewFromJsonDict(x) for x in data]
+
+  def GetUser(self, user):
+    '''Returns a single user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user: The username or id of the user to retrieve.
+
+    Returns:
+      A twitter.User instance representing that user
+
+
+    '''
+    url = 'https://identi.ca/api/users/show/%s.json' % user
+    json = self._FetchUrl(url)
+    data = simplejson.loads(json)
+    return User.NewFromJsonDict(data)
+
+  def GetDirectMessages(self, since=None):
+    '''Returns a list of the direct messages sent to the authenticating user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      since:
+        Narrows the returned results to just those statuses created
+        after the specified HTTP-formatted date. [optional]
+
+    Returns:
+      A sequence of twitter.DirectMessage instances
+
+
+    '''
+    url = 'https://identi.ca/api/direct_messages.json'
+    if not self._username:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    parameters = {}
+    if since:
+      parameters['since'] = since
+    json = self._FetchUrl(url, parameters=parameters)
+    data = simplejson.loads(json)
+    return [DirectMessage.NewFromJsonDict(x) for x in data]
+
+  def PostDirectMessage(self, user, text):
+    '''Post a twitter direct message from the authenticated user
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user: The ID or screen name of the recipient user.
+      text: The message text to be posted.  Must be less than 140 characters.
+
+    Returns:
+      A twitter.DirectMessage instance representing the message posted
+
+
+    '''
+    if not self._username:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    url = 'https://identi.ca/api/direct_messages/new.json'
+    data = {'text': text, 'user': user}
+    json = self._FetchUrl(url, post_data=data)
+    data = simplejson.loads(json)
+    return DirectMessage.NewFromJsonDict(data)
+
+  def DestroyDirectMessage(self, id):
+    '''Destroys the direct message specified in the required ID parameter.
+
+    The twitter.Api instance must be authenticated, and the
+    authenticating user must be the recipient of the specified direct
+    message.
+
+    Args:
+      id: The id of the direct message to be destroyed
+
+    Returns:
+      A twitter.DirectMessage instance representing the message destroyed
+
+
+    '''
+    url = 'https://identi.ca/api/direct_messages/destroy/%s.json' % id
+    json = self._FetchUrl(url, post_data={})
+    data = simplejson.loads(json)
+    return DirectMessage.NewFromJsonDict(data)
+
+  def CreateFriendship(self, user):
+    '''Befriends the user specified in the user parameter as the authenticating user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      The ID or screen name of the user to befriend.
+    Returns:
+      A twitter.User instance representing the befriended user.
+
+
+    '''
+    url = 'https://identi.ca/api/friendships/create/%s.json' % user
+    json = self._FetchUrl(url, post_data={})
+    data = simplejson.loads(json)
+    return User.NewFromJsonDict(data)
+
+  def DestroyFriendship(self, user):
+    '''Discontinues friendship with the user specified in the user parameter.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      The ID or screen name of the user  with whom to discontinue friendship.
+    Returns:
+      A twitter.User instance representing the discontinued friend.
+
+
+    '''
+    url = 'https://identi.ca/api/friendships/destroy/%s.json' % user
+    json = self._FetchUrl(url, post_data={})
+    data = simplejson.loads(json)
+    return User.NewFromJsonDict(data)
+
+  def SetCredentials(self, username, password):
+    '''Set the username and password for this instance
+
+    Args:
+      username: The twitter username.
+      password: The twitter password.
+
+
+    '''
+    self._username = username
+    self._password = password
+
+  def ClearCredentials(self):
+    '''Clear the username and password for this instance
+    '''
+    self._username = None
+    self._password = None
+
+  def SetCache(self, cache):
+    '''Override the default cache.  Set to None to prevent caching.
+
+    Args:
+      cache: an instance that supports the same API as the  twitter._FileCache
+
+
+    '''
+    self._cache = cache
+
+  def SetUrllib(self, urllib):
+    '''Override the default urllib implementation.
+
+    Args:
+      urllib: an instance that supports the same API as the urllib2 module
+
+
+    '''
+    self._urllib = urllib
+
+  def SetCacheTimeout(self, cache_timeout):
+    '''Override the default cache timeout.
+
+    Args:
+      cache_timeout: time, in seconds, that responses should be reused.
+
+
+    '''
+    self._cache_timeout = cache_timeout
+
+  def SetUserAgent(self, user_agent):
+    '''Override the default user agent
+
+    Args:
+      user_agent: a string that should be send to the server as the User-agent
+
+
+    '''
+    self._request_headers['User-Agent'] = user_agent
+
+  def SetXTwitterHeaders(self, client, url, version):
+    '''Set the X-Twitter HTTP headers that will be sent to the server.
+
+    Args:
+      client:
+         The client name as a string.  Will be sent to the server as
+         the 'X-Twitter-Client' header.
+      url:
+         The URL of the meta.xml as a string.  Will be sent to the server
+         as the 'X-Twitter-Client-URL' header.
+      version:
+         The client version as a string.  Will be sent to the server
+         as the 'X-Twitter-Client-Version' header.
+
+
+    '''
+    self._request_headers['X-Twitter-Client'] = client
+    self._request_headers['X-Twitter-Client-URL'] = url
+    self._request_headers['X-Twitter-Client-Version'] = version
+
+  def _BuildUrl(self, url, path_elements=None, extra_params=None):
+    # Break url into consituent parts
+    (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(url)
+
+    # Add any additional path elements to the path
+    if path_elements:
+      # Filter out the path elements that have a value of None
+      p = [i for i in path_elements if i]
+      if not path.endswith('/'):
+        path += '/'
+      path += '/'.join(p)
+
+    # Add any additional query parameters to the query string
+    if extra_params and len(extra_params) > 0:
+      extra_query = self._EncodeParameters(extra_params)
+      # Add it to the existing query
+      if query:
+        query += '&' + extra_query
+      else:
+        query = extra_query
+
+    # Return the rebuilt URL
+    return urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
+
+  def _InitializeRequestHeaders(self, request_headers):
+    if request_headers:
+      self._request_headers = request_headers
+    else:
+      self._request_headers = {}
+
+  def _InitializeUserAgent(self):
+    user_agent = 'Python-urllib/%s (python-twitter/0.5)' % \
+                 (self._urllib.__version__)
+    self.SetUserAgent(user_agent)
+
+  def _AddAuthorizationHeader(self, username, password):
+    if username and password:
+      basic_auth = base64.encodestring('%s:%s' % (username, password))[:-1]
+      self._request_headers['Authorization'] = 'Basic %s' % basic_auth
+
+  def _RemoveAuthorizationHeader(self):
+    if self._request_headers and 'Authorization' in self._request_headers:
+      del self._request_headers['Authorization']
+
+  def _GetOpener(self, url, username=None, password=None):
+    if username and password:
+      self._AddAuthorizationHeader(username, password)
+      handler = self._urllib.HTTPBasicAuthHandler()
+      (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(url)
+      handler.add_password(Api._API_REALM, netloc, username, password)
+      opener = self._urllib.build_opener(handler)
+    else:
+      opener = self._urllib.build_opener()
+    opener.addheaders = self._request_headers.items()
+    return opener
+
+  def _Encode(self, s):
+    if self._input_encoding:
+      return unicode(s, self._input_encoding).encode('utf-8')
+    else:
+      return unicode(s).encode('utf-8')
+
+  def _EncodeParameters(self, parameters):
+    '''Return a string in key=value&key=value form
+
+    Values of None are not included in the output string.
+
+    Args:
+      parameters:
+        A dict of (key, value) tuples, where value is encoded as
+        specified by self._encoding
+    Returns:
+      A URL-encoded string in "key=value&key=value" form
+
+
+    '''
+    if parameters is None:
+      return None
+    else:
+      return urllib.urlencode(dict([(k, self._Encode(v)) for k, v in parameters.items() if v is not None]))
+
+  def _EncodePostData(self, post_data):
+    '''Return a string in key=value&key=value form
+
+    Values are assumed to be encoded in the format specified by self._encoding,
+    and are subsequently URL encoded.
+
+    Args:
+      post_data:
+        A dict of (key, value) tuples, where value is encoded as
+        specified by self._encoding
+    Returns:
+      A URL-encoded string in "key=value&key=value" form
+
+
+    '''
+    if post_data is None:
+      return None
+    else:
+      return urllib.urlencode(dict([(k, self._Encode(v)) for k, v in post_data.items()]))
+
+  def _FetchUrl(self,
+                url,
+                post_data={},
+                parameters=None,
+                no_cache=None):
+    """Fetch a URL, optionally caching for a specified time.
+
+    Args:
+      url: The URL to retrieve
+      data: A dict of (str, unicode) key value pairs.  If set, POST will be used.
+      parameters: A dict of key/value pairs that should added to
+                  the query string. [OPTIONAL]
+      username: A HTTP Basic Auth username for this request
+      username: A HTTP Basic Auth password for this request
+      no_cache: If true, overrides the cache on the current request
+
+    Returns:
+      A string containing the body of the response.
+
+
+    """
+    # Add key/value parameters to the query string of the url
+    url = self._BuildUrl(url, extra_params=parameters)
+
+    # Get a url opener that can handle basic auth
+    opener = self._GetOpener(url, username=self._username, password=self._password)
+
+    if not 'source' in post_data:
+        post_data['source'] = 'gozerbot'
+    encoded_post_data = self._EncodePostData(post_data)
+
+    # Open and return the URL immediately if we're not going to cache
+    if encoded_post_data or no_cache or not self._cache or not self._cache_timeout:
+      url_data = opener.open(url, encoded_post_data).read()
+    else:
+      # Unique keys are a combination of the url and the username
+      if self._username:
+        key = self._username + ':' + url
+      else:
+        key = url
+
+      # See if it has been cached before
+      last_cached = self._cache.GetCachedTime(key)
+
+      # If the cached version is outdated then fetch another and store it
+      if not last_cached or time.time() >= last_cached + self._cache_timeout:
+        url_data = opener.open(url, encoded_post_data).read()
+        self._cache.Set(key, url_data)
+      else:
+        url_data = self._cache.Get(key)
+
+    # Always return the latest version
+    return url_data
+
+class _FileCacheError(Exception):
+  '''Base exception class for FileCache related errors'''
+
+class _FileCache(object):
+
+  DEPTH = 3
+
+  def __init__(self,root_directory=None):
+    self._InitializeRootDirectory(root_directory)
+
+  def Get(self,key):
+    path = self._GetPath(key)
+    if os.path.exists(path):
+      return open(path).read()
+    else:
+      return None
+
+  def Set(self,key,data):
+    path = self._GetPath(key)
+    directory = os.path.dirname(path)
+    if not os.path.exists(directory):
+      os.makedirs(directory)
+    if not os.path.isdir(directory):
+      raise _FileCacheError('%s exists but is not a directory' % directory)
+    temp_fd, temp_path = tempfile.mkstemp()
+    temp_fp = os.fdopen(temp_fd, 'w')
+    temp_fp.write(data)
+    temp_fp.close()
+    if not path.startswith(self._root_directory):
+      raise _FileCacheError('%s does not appear to live under %s' %
+                            (path, self._root_directory))
+    if os.path.exists(path):
+      os.remove(path)
+    os.rename(temp_path, path)
+
+  def Remove(self,key):
+    path = self._GetPath(key)
+    if not path.startswith(self._root_directory):
+      raise _FileCacheError('%s does not appear to live under %s' %
+                            (path, self._root_directory ))
+    if os.path.exists(path):
+      os.remove(path)
+
+  def GetCachedTime(self,key):
+    path = self._GetPath(key)
+    if os.path.exists(path):
+      return os.path.getmtime(path)
+    else:
+      return None
+
+  def _GetUsername(self):
+    '''Attempt to find the username in a cross-platform fashion.'''
+    return os.getenv('USER') or \
+        os.getenv('LOGNAME') or \
+        os.getenv('USERNAME') or \
+        'nobody'
+
+  def _GetTmpCachePath(self):
+    username = self._GetUsername()
+    cache_directory = 'python.cache_' + username
+    return os.path.join(tempfile.gettempdir(), cache_directory)
+
+  def _InitializeRootDirectory(self, root_directory):
+    if not root_directory:
+      root_directory = self._GetTmpCachePath()
+    root_directory = os.path.abspath(root_directory)
+    if not os.path.exists(root_directory):
+      os.mkdir(root_directory)
+    if not os.path.isdir(root_directory):
+      raise _FileCacheError('%s exists but is not a directory' %
+                            root_directory)
+    self._root_directory = root_directory
+
+  def _GetPath(self,key):
+    hashed_key = hashlib.md5.new(key).hexdigest()
+    return os.path.join(self._root_directory,
+                        self._GetPrefix(hashed_key),
+                        hashed_key)
+
+  def _GetPrefix(self,hashed_key):
+    return os.path.sep.join(hashed_key[0:_FileCache.DEPTH])
+
+#
+# gozerbot stuff
+#
+
+def identiapi(**kwargs):
+    api = Api(**kwargs)
+    #api.SetXTwitterHeaders('gozerbot', 'http://gozerbot.org', __version__)
+    return api
+
+class IdentiUser(Pdol):
+    def __init__(self):
+        Pdol.__init__(self, os.path.join(datadir + os.sep + 'plugs' + \
+os.sep + 'identi', 'identi'))
+
+    def add(self, user, username, password):
+        self.data[user] = [username, password]
+        self.save()
+
+    def remove(self, user):
+        if user in self.data:
+            del self.data[user]
+            self.save()
+
+    def size(self):
+        return len(self.data)
+
+    def __contains__(self, user):
+        return user in self.data
+
+# VARS SECTION
+
+identiuser = IdentiUser()
+
+# END VARS
+
+def upgrade():
+    pass
+
+def size():
+    return identiuser.size()
+
+def handle_identi(bot, ievent):
+
+    """ send a identi.ca message. """
+
+    user = users.getname(ievent.userhost)
+
+    if not user:
+        ievent.reply("can't find user for %s" % ievent.userhost)
+        return
+
+    if not user in identiuser:
+        ievent.reply('you need a identi.ca account for this command, '
+                     'use "!identi-id <username> <password>"'
+                     'first (in a private message!)')
+        return
+    if ievent.inqueue:
+        result = waitforqueue(ievent.inqueue, 30)
+    elif not ievent.rest:
+        ievent.missing('<text>')
+        return
+    else:
+        result = [ievent.rest, ]
+    credentials = identiuser.get(user.name)
+    try:
+        api = identiapi(username=credentials[0], password=credentials[1])
+        for txt in result:
+            status = api.PostUpdate(txt[:119])
+        ievent.reply('blurp posted to https://identi.ca/%s ' % (credentials[0],))
+    except (TwitterError, urllib2.HTTPError), e:
+        ievent.reply('identi failed: %s' % (str(e),))
+
+cmnds.add('identi', handle_identi, 'USER')
+examples.add('identi', 'adds a message to your identi.ca account', 
+    'identi.ca just found the https://gozerbot.org project')
+
+def handle_identi_friends(bot, ievent):
+
+    """ show identi.ca friends. """
+
+    user = users.getname(ievent.userhost)
+
+    if not user:
+        ievent.reply("can't find user for %s" % ievent.userhost)
+        return
+
+    if not user in identiuser:
+        ievent.reply('you need a identi.ca account for this command, '
+                     'use "!identi-id <username> <password>" '
+                     'first (in a private message!)')
+    else:
+        credentials = identiuser.get(ievent.user)
+        try:
+            api = identiapi(username=credentials[0], password=credentials[1])
+            users = api.GetFriends()
+            users = ['%s (%s)' % (u.name, u.screen_name) for u in users]
+            if users:
+                users.sort()
+                ievent.reply('your identi.ca friends: ', users, dot=True)
+            else:
+                ievent.reply('poor you, no friends!')
+        except Exception, e:
+            ievent.reply('identi failed: %s' % (str(e),))
+
+cmnds.add('identi-friends', handle_identi_friends, 'USER')
+examples.add('identi-friends', 'shows your identi.ca friends', 'identi-friends')
+
+def handle_identi_get(bot, ievent):
+
+    """ get identi messages. """
+
+    if not ievent.args:
+        ievent.missing('<username>')
+    else:
+        try:
+            api = identiapi()
+            status = api.GetUserTimeline(ievent.args[0])
+            if status:
+                ievent.reply([html_unescape(s.text) for s in status], dot=True)
+            else:
+                ievent.reply('no result')
+        except (TwitterError, urllib2.HTTPError), e:
+            ievent.reply('identi failed: %s' % (str(e),))
+
+cmnds.add('identi-get', handle_identi_get, 'USER')
+examples.add('identi-get', 'gets the identi messages for a user', 'identi-get tehmaze')
+
+def handle_identi_id(bot, ievent):
+
+    """ set identi.ca id. """
+
+    user = users.getname(ievent.userhost)
+
+    if not user:
+        ievent.reply("can't find user for %s" % ievent.userhost)
+        return
+
+    if ievent.channel[0] in '#!&':
+        ievent.reply('%s: use a private message!' % (ievent.nick,))
+        return
+    elif len(ievent.args) != 2:
+        ievent.reply('identi-id <username> <password>')
+    else:
+        identiuser.add(user.name, ievent.args[0], ievent.args[1])
+        ievent.reply('ok')
+
+cmnds.add('identi-id', handle_identi_id, 'USER')
+examples.add('identi-id', 'adds your identi.ca account', 'identi-id example secret')
--- gozerbot-0.99.1.orig/build/lib/gplugs/ops.py
+++ gozerbot-0.99.1/build/lib/gplugs/ops.py
@@ -0,0 +1,175 @@
+# plugs/op.py
+#
+#
+
+""" for op to work for a user the user must have the channel name in his/hers
+ status .. use !user-addstatus <username> #channel
+ normally the bot doesnt op nicks that join after a split to prevent floods, 
+ this can be disabled by using ops-cfg oponsplit 1
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import getwho, rlog
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.callbacks import callbacks
+from gozerbot.users import users
+from gozerbot.plughelp import plughelp
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.tests import tests
+
+import time
+
+plughelp.add('ops', 'op with command or op on join')
+
+cfg = PersistConfig()
+cfg.define('oponsplit', 0)
+
+def opjoincb(bot, ievent):
+    """ see if we should op a user on join """
+    # don't try to op the bot
+    if ievent.nick == bot.nick:
+        return
+    chan = ievent.channel.lower()
+    if chan in bot.state['no-op']:
+        return
+    time.sleep(1)
+    if cfg.get('oponsplit') or ievent.nick.lower() not in bot.splitted:
+        if users.status(ievent.userhost, ievent.channel.upper()):
+            if chan not in bot.state['opchan']:
+                return
+            bot.doop(chan, ievent.nick)
+    else:
+        bot.splitted.remove(ievent.nick.lower())
+
+callbacks.add('JOIN', opjoincb, threaded=True)
+
+def handle_op1(bot, ievent):
+    """ op [<nick>] .. op an user """
+    chan = ievent.channel.lower()
+    if chan in bot.state['no-op']:
+        ievent.reply('opping is disabled in %s' % ievent.channel)
+        return
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        nick = ievent.nick
+    userhost = getwho(bot, nick)
+    if not userhost:
+        userhost = ievent.userhost
+    if users.status(userhost, ievent.channel.upper()):
+        bot.doop(chan, nick)
+    else:
+        ievent.reply("%s doesn't have %s status" % (nick, \
+ievent.channel.upper()))
+
+cmnds.add('op', handle_op1, 'USER', threaded=True, speed=9)
+examples.add('op', 'op [<nick>] .. give ops to <nick> or op the person \
+giving the command', '1) op 2) op dunker')
+tests.add('op').add('op exec')
+
+def handle_splitted(bot, ievent):
+    """ splitted .. show splitted list """
+    ievent.reply(str(bot.splitted))
+
+cmnds.add('splitted', handle_splitted, 'OPER')
+examples.add('splitted', 'show whos on the splitted list', 'splitted')
+tests.add('splitted')
+
+def handle_splittedclear(bot, ievent):
+    """ splitted-clear .. clear splitted list """
+    bot.splitted = []
+    ievent.reply('done')
+
+cmnds.add('splitted-clear', handle_splittedclear, 'OPER')
+examples.add('splitted-clear', 'clear the splitted list', 'splitted-clear')
+tests.add('splitted-clear', 'done')
+
+def handle_opsdisable(bot, ievent):
+    """ disable opping in channel """
+    try:
+        chan = ievent.args[0].lower()
+    except:
+        chan = ievent.channel.lower()
+    oplist = bot.state['no-op']
+    if chan not in oplist:
+        bot.state['no-op'].append(chan)
+        bot.state.save()
+        ievent.reply('opping in %s disabled' % chan)
+        if chan in bot.state['opchan']:
+            bot.delop(chan, bot.nick)
+    else:
+        ievent.reply('opping %s is already disabled' % chan)
+
+cmnds.add('ops-disable', handle_opsdisable, 'OPER')
+examples.add('ops-disable', 'ops-disable [<channel>] .. disable opping in \
+provided channel or the channel command was given in', '1) ops-disable 2) \
+ops-disable #dunkbots')
+tests.add('ops-disable').add('ops-disable #dunkbots')
+
+def handle_opsenable(bot, ievent):
+    """ enable opping in channel """
+    try:
+        chan = ievent.args[0].lower()
+    except:
+        chan = ievent.channel.lower()
+    oplist = bot.state['no-op']
+    if chan in oplist:
+        bot.state['no-op'].remove(chan)
+        bot.state.save()
+        ievent.reply('opping in %s is enabled' % chan)
+    else:
+        ievent.reply('opping in %s is already enabled' % chan)
+
+cmnds.add('ops-enable', handle_opsenable, 'OPER')
+examples.add('ops-enable', 'ops-enable [<channel>] .. enable opping in \
+provided channel or the channel command was given in', '1) ops-enable 2) \
+ops-enable #dunkbots')
+tests.add('ops-enable').add('ops-enable #dunkbots')
+
+def handle_opsnoop(bot, ievent):
+    """ show in which channels opping is disabled """
+    ievent.reply('opping is disabled in %s' % bot.state['no-op'])
+    
+cmnds.add('ops-list', handle_opsnoop, 'OPER')
+examples.add('ops-list', 'list in which channels opping is disabled', \
+'ops-list')
+tests.add('ops-list')
+
+def checkmode(bot, ievent):
+    """ check mode string """
+    plus = 0
+    teller = 0
+    try:
+        args = ievent.arguments
+        chan = args[0].lower()
+        modestr = args[1]
+        who = args[2:]
+    except:
+        rlog(10, 'op', 'unknow mode string format: %s' % str(ievent))
+        return
+    for i in modestr:
+        if i == '+':
+            plus = 1
+            continue
+        if i == '-':
+            plus = 0
+            continue
+        if i == 'o' and plus:
+            if who[teller].lower() == bot.nick.lower():
+                if ievent.channel in bot.state['no-op']:
+                    bot.delop(ievent.channel.lower(), bot.nick)
+                else:
+                    rlog(1, 'irc', 'opped on %s' % chan)
+                    bot.state['opchan'].append(chan)
+        if i == 'o' and not plus:
+            if who[teller].lower() == bot.nick.lower():
+                rlog(1, 'irc', 'deopped on %s' % chan)
+                try:
+                    bot.state['opchan'].remove(chan)
+                except ValueError:
+                    pass
+        teller += 1
+
+callbacks.add('MODE', checkmode)
--- gozerbot-0.99.1.orig/build/lib/gplugs/oneliner.py
+++ gozerbot-0.99.1/build/lib/gplugs/oneliner.py
@@ -0,0 +1,234 @@
+# plugs/oneliner.py
+#
+#
+#
+
+""" uses the random lib """
+
+__copyright__ = 'this file is in the public domain'
+__revision__ = '$Id: oneliner.py 517 2006-12-21 05:00:00Z deck $'
+
+from gozerbot.generic import handle_exception
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import re, random
+
+plughelp.add('oneliner', 'display a oneliner')
+
+oneliners=["100,000 sperm and you were the fastest?",
+	"42.7 percent of all statistics are made up on the spot.",
+	"99 percent of lawyers give the rest a bad name.",
+	"A bartender is just a pharmacist with a limited inventory.",
+	"A clean desk is a sign of a cluttered desk drawer.",
+	"A clear conscience is usually the sign of a bad memory.",
+	"A closed mouth gathers no foot.",
+	"A conclusion is the place where you got tired of thinking.",
+	"A day without sunshine is like, night.",
+	"A diplomat is someone who can tell you to go to hell in such a way that you will look forward to the trip.",
+	"A flashlight is a case for holding dead batteries.",
+	"All generalizations are false, including this one.",
+	"All men are idiots, and I married their King.",
+	"Always remember you're unique, just like everyone else.",
+	"Always try to be modest and be proud of it!",
+	"Anything worth taking seriously is worth making fun of.",
+	"Artificial Intelligence usually beats real stupidity.",
+	"Assassins do it from behind.",
+	"Atheism is a non-prophet organization.",
+	"Auntie Em, Hate you, hate Kansas, taking the dog. Dorothy.",
+	"Be nice to your kids. They'll choose your nursing home.",
+	"Beauty is in the eye of the beer holder.",
+	"Beer: It's not just for breakfast anymore.",
+	"Before you criticize someone, you should walk a mile in their shoes. That way, when you criticize them, you're a mile away and you have their shoes.",
+	"Better to understand a little than to misunderstand a lot.",
+	"Bills travel through the mail at twice the speed of checks",
+	"Borrow money from a pessimist, they don't expect it back.",
+	"Boycott shampoo! Demand the REAL poo!",
+	"C program run. C program crash. C programmer quit.",
+	"Change is inevitable, except from a vending machine.",
+	"Chocolate: the OTHER major food group.",
+	"Consciousness: That annoying time between naps.",
+	"Corduroy pillows: They're making headlines!",
+	"Could you drive any better if I shoved that cell phone up your ass?",
+	"Criminal Lawyer is a redundancy.",
+	"Daddy, why doesn't this magnet pick up this floppy disk?",
+	"Death is hereditary.",
+	"Despite the cost of living, have you noticed how popular it remains?",
+	"Did anyone see my lost carrier?",
+	"Diplomacy is the art of saying good doggie while looking for a bigger stick.",
+	"Do not walk behind me, for I may not lead. Do not walk ahead of me, for I may not follow. Do not walk beside me, either. Just leave me alone.",
+	"Don't be irreplaceable; if you can't be replaced, you can't be promoted.",
+	"Don't drink and drive. You might hit a bump and spill your drink.",
+	"Don't piss me off! I'm running out of places to hide the bodies.",
+	"Don't take life too seriously, you won't get out alive.",
+	"Double your drive space. Delete Windows!",
+	"Duct tape is like the force, it has a light side and a dark side and it holds the universe together.",
+	"Eagles may soar, but weasels don't get sucked into jet engines.",
+	"Energizer Bunny arrested and charged with battery.",
+	"Error, no keyboard. Press F1 to continue.",
+	"Ever notice how fast Windows runs? Neither did I.",
+	"Ever stop to think, and forget to start again?",
+	"Everyone has a photographic memory. Some don't have film.",
+	"Experience is something you don't get until just after you need it.",
+	"Experience is what you get when you didn't get what you wanted.",
+	"Few women admit their age. Few men act theirs.",
+	"For every action there is an equal and opposite criticism.",
+	"For Sale: Parachute. Only used once, never opened, small stain.",
+	"Forget world peace. Visualize using your turn signal.",
+	"Friends help you move. Real friends help you move bodies.",
+	"Friends may come and go, but enemies tend to accumulate.",
+	"Generally speaking, you aren't learning much when your mouth is moving.",
+	"Genius does what it must, talent does what it can, and you had best do what you're told.",
+	"Get a new car for your spouse; it'll be a great trade!",
+	"Give a man a fish and he will eat for a day. Teach him how to fish, and he will sit in a boat and drink beer all day.",
+	"Give me ambiguity or give me something else.",
+	"Good judgment comes from bad experience and a lot of that comes from bad judgment.",
+	"Hard work has a future payoff. Laziness pays off now.",
+	"He who laughs last thinks slowest.",
+	"Honk if you love peace and quiet.",
+	"Honk if you want to see my finger.",
+	"How do you tell when you run out of invisible ink?",
+	"How does Teflon stick to the pan?",
+	"How many of you believe in telekinesis? Raise my hand.",
+	"I am not a vegetarian because I love animals. I am a vegetarian because I hate plants.",
+	"I couldn't repair your brakes, so I made your horn louder.",
+	"I didn't say it was your fault. I said I was going to blame you.",
+	"I don't suffer from insanity. I enjoy every minute of it.",
+	"I feel like I'm diagonally parked in a parallel universe.",
+	"I get enough exercise just pushing my luck.",
+	"I just got lost in thought. It was unfamiliar territory.",
+	"I need someone really bad. Are you really bad?",
+	"I poured Spot remover on my dog. Now he's gone.",
+	"I took an IQ test and the results were negative.",
+	"I tried sniffing Coke once, but the ice cubes got stuck in my nose.",
+	"I used to be indecisive. Now I'm not sure.",
+	"I used to have a handle on life, and then it broke.",
+	"I used to have an open mind but my brains kept falling out.",
+	"I won't rise to the occasion, but I'll slide over to it.",
+	"I wouldn't be caught dead with a necrophiliac.",
+	"I'm as confused as a baby in a topless bar.",
+	"I'm not a complete idiot, some parts are missing!",
+	"I'm writing a book. I've got the page numbers done.",
+	"If at first you don't succeed, destroy all evidence that you tried.",
+	"If at first you don't succeed, skydiving is not for you.",
+	"If Barbie is so popular, why do you have to buy her friends?",
+	"If ignorance is bliss, you must be orgasmic.",
+	"If you can read this, I can slam on my brakes and sue you!",
+	"If you can't convince them, confuse them.",
+	"If you choke a smurf, what color does it turn?",
+	"If you get to it and you can't do it, well there you jolly well are, aren't you.",
+	"If you haven't much education you must use your brain.",
+	"If you lend someone $20, and never see that person again; it was probably worth it.",
+	"If you tell the truth you don't have to remember anything.",
+	"If you think nobody cares if you're alive, try missing a couple of car payments.",
+	"IRS: We've got what it takes to take what you've got.",
+	"It IS as bad as you think, and they ARE out to get you.",
+	"It is far more impressive when others discover your good qualities without your help.",
+	"It may be that your sole purpose in life is simply to serve as a warning to others.",
+	"It's always darkest before dawn. So if you're going to steal the neighbor's newspaper, that's the time to do it.",
+	"It's lonely at the top, but you eat better.",
+	"Jack Kevorkian for White House Physician.",
+	"Jesus loves you, but everyone else thinks you're an asshole.",
+	"Join the Army, meet interesting people, and kill them.",
+	"Keep honking. I'm reloading.",
+	"Laughing stock: cattle with a sense of humor.",
+	"Learn from your parents' mistakes: use birth control.",
+	"Lottery: A tax on people who are bad at math.",
+	"Love may be blind but marriage is a real eye-opener.",
+	"Make it idiot proof and someone will make a better idiot.",
+	"Monday is an awful way to spend 1/7th of your life.",
+	"Montana: At least our cows are sane!",
+	"More hay, Trigger? No thanks, Roy, I'm stuffed!",
+	"Multitasking means screwing up several things at once.",
+	"My hockey mom can beat up your soccer mom.",
+	"My mind is like a steel trap, rusty and illegal in 37 states.",
+	"Never ask a barber if he thinks you need a haircut.",
+	"Never do card tricks for the group you play poker with.",
+	"Never mess up an apology with an excuse.",
+	"Never miss a good chance to shut up.",
+	"Never test the depth of the water with both feet.",
+	"Never underestimate the power of stupid people in large groups.",
+	"No one is listening until you make a mistake.",
+	"Oh Lord, give me patience, and GIVE IT TO ME NOW!",
+	"Okay, who put a stop payment on my reality check?",
+	"On the other hand, you have different fingers.",
+	"Oops. My brain just hit a bad sector.",
+	"Out of my mind. Back in five minutes.",
+	"Pentiums melt in your PC, not in your hand.",
+	"Plan to be spontaneous, tomorrow.",
+	"Pride is what we have. Vanity is what others have.",
+	"Puritanism: The haunting fear that someone, somewhere may be happy.",
+	"Quantum mechanics: The dreams stuff is made of.",
+	"Quickly, I must hurry, for there go my people and I am their leader.",
+	"Reality is a crutch for people who can't handle drugs.",
+	"Remember half the people you know are below average.",
+	"Save the whales. Collect the whole set",
+	"Save your breath. You'll need it to blow up your date!",
+	"Sex is like air; it's not important unless you aren't getting any.",
+	"Shin: a device for finding furniture in the dark.",
+	"Smile, it's the second best thing you can do with your lips.",
+	"Smith & Wesson: The original point and click interface.",
+	"Some days you are the bug, some days you are the windshield.",
+	"Some drink at the fountain of knowledge. Others just gargle.",
+	"Some people are only alive because it is illegal to shoot them.",
+	"Success always occurs in private and failure in full view.",
+	"Suicidal twin kills sister by mistake!",
+	"Support bacteria, they're the only culture some people have.",
+	"The Bermuda Triangle got tired of warm weather. It moved to Finland. Now Santa Claus is missing.",
+	"The colder the x-ray table, the more of your body is required on it.",
+	"The early bird may get the worm, but the second mouse gets the cheese.",
+	"The hardness of butter is directly proportional to the softness of the bread.",
+	"The journey of a thousand miles begins with a broken fan belt and a flat tire.",
+	"The more you complain, the longer God makes you live.",
+	"The only substitute for good manners is fast reflexes.",
+	"The problem with the gene pool is that there is no lifeguard.",
+	"The quickest way to double your money is to fold it in half and put it back in your pocket.",
+	"The secret of the universe is @*&^^^ NO CARRIER",
+	"The severity of the itch is inversely proportional to the ability to reach it.",
+	"The sex was so good that even the neighbors had a cigarette.",
+	"The shortest distance between two points is under construction.",
+	"The sooner you fall behind the more time you'll have to catch up.",
+	"The universe is a figment of its own imagination. There's no future in time travel.",
+	"There are 3 kinds of people: those who can count & those who can't.",
+	"There are two theories to arguing with women. Neither one works.",
+	"There's too much blood in my caffeine system.",
+	"Things are more like they are now than they ever were before.",
+	"Time is the best teacher; unfortunately it kills all of its students.",
+	"Time is what keeps everything from happening at once.",
+	"Timing has an awful lot to do with the outcome of a rain dance.",
+	"To steal ideas from one person is plagiarism; to steal from many is research.",
+	"To succeed in politics, it is often necessary to rise above your principles.",
+	"Very funny Scotty, now beam down my clothes.",
+	"Wanted: Meaningful overnight relationship.",
+	"Warning: Dates in calendar are closer than they appear.",
+	"We have enough youth, how about a fountain of smart?",
+	"We were born naked, wet and hungry. Then things got worse.",
+	"Wear short sleeves! Support your right to bare arms!",
+	"What happens if you get scared half to death twice?",
+	"What is a free gift? Aren't all gifts free?",
+	"What's the speed of dark?",
+	"When everything's coming your way, you're in the wrong lane and going the wrong way.",
+	"When there's a will, I want to be in it.",
+	"When you don't know what you are doing, do it neatly.",
+	"Who is General Failure and why is he reading my hard disk?",
+	"Who stopped payment on my reality check?",
+	"Why do psychics have to ask you for your name?",
+	"Why is abbreviation such a long word?",
+	"Why isn't phonetic spelled the way it sounds?",
+	"Women who seek to be equal to men lack ambition.",
+	"You are depriving some poor village of its idiot.",
+	"You can do more with a kind word and a gun than with just a kind word.",
+	"You have the right to remain silent. Anything you say will be misquoted then used against you.",
+	"You're just jealous because the voices are talking to me and not you!",
+	"Your gene pool could use a little chlorine.",
+	"Your kid may be an honors student, but you're still an idiot."]
+
+def handle_oneliner(bot, ievent):
+    data = oneliners[random.randint(0,len(oneliners)-1)]
+    ievent.reply(data)
+
+cmnds.add('oneliner', handle_oneliner, 'USER')
+examples.add('oneliner', 'show oneliner', 'oneliner')
+tests.add('oneliner')
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gplugs/mailexceptions.py
+++ gozerbot-0.99.1/build/lib/gplugs/mailexceptions.py
@@ -0,0 +1,47 @@
+# plugs/mailexceptions.py
+#
+#
+
+""" mail exceptions in backlog """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.generic import exceptionlist
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import smtplib
+
+plughelp.add('mailexceptions', 'mail list of occured exceptions to \
+bart@gozerbot.org')
+
+def handle_mailexceptions(bot, ievent):
+    """ mailexceptions [<email>] .. mail exceptions in log """
+    if not len(exceptionlist):
+        ievent.reply("no exceptions available")
+        return   
+    try:
+        mailto = ievent.args[0]
+    except IndexError:
+        mailto = 'bart@gozerbot.org'
+    try:
+        mailserver = mailto.split('@')[1]
+    except IndexError:
+        ievent.reply("can't determine mailserver from %s" % mailto)
+        return
+    fromaddr = 'gozerbot@localhost'
+    msg = ("From: %s\r\nTo: %s\r\n\r\n"
+       % (fromaddr, mailto))
+    for i in exceptionlist:
+        msg += "+++ %s\r\n" % i 
+    server = smtplib.SMTP(mailserver)
+    server.sendmail(fromaddr, mailto, msg)
+    ievent.reply("%s exceptions send to %s" % (len(exceptionlist), mailto))
+
+cmnds.add('mailexceptions', handle_mailexceptions, 'OPER')
+examples.add('mailexceptions' , 'mailexceptions [<email>] .. mail exceptions \
+log to bart@gozerbot.org or to provided email', '1) mailexceptions 2) \
+mailexception bthate@gmail.com')
+tests.add('mailexceptions bthate@gmail.com', 'exceptions send to bthate@gmail.com')
--- gozerbot-0.99.1.orig/build/lib/gplugs/mail.py
+++ gozerbot-0.99.1/build/lib/gplugs/mail.py
@@ -0,0 +1,182 @@
+# plugs/mail.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+__depend__ = ['log', ]
+__gendocfirst__ = ['mail-set', ]
+
+from gozerbot.persist.persiststate import UserState
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.generic import waitforqueue, rlog, hourmin, strtotime
+from gozerbot.users import users
+from gozerbot.config import config
+from gozerbot.plugins import plugins
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliasset
+from gozerbot.tests import tests
+from gplugs.log import logs
+import smtplib, random, time, types
+
+plughelp.add('mail', 'mail related commands')
+
+rendezvous = {}
+
+def getemail(username):
+    try:
+        state = UserState(username)
+        if state:
+            return state['email']
+    except KeyError:
+        return
+
+class Mailservernotset(Exception):
+
+    """ exception to raise if mail server is not set """
+
+    def __str__(self):
+        return "config['mailserver'] is not set"
+
+def domail(mailto, txt, fromm=None, mailserver=None, subject=None):
+    """ sent the mail """
+    if not txt:
+        rlog(10, 'mail', 'no text to send')
+        return
+    if fromm:
+        fromaddr = fromm
+    else:
+        fromaddr = config['mailfrom']
+        if not fromaddr:
+            fromaddr = 'gozerbot@gozerbot.org'
+    if not mailserver:
+        mailserver = config['mailserver']
+    if not mailserver:
+        raise Mailservernotset
+    if type(txt) != types.ListType:
+        txt = [txt, ]
+    msg = ("From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n" % \
+(fromaddr, mailto, subject))
+    for i in txt:
+        msg += "%s\r\n" % i 
+    server = smtplib.SMTP(mailserver)
+    server.sendmail(fromaddr, mailto, msg)
+
+def handle_mail(bot, ievent):
+    """ mail result from pipeline to the user giving the command """
+    if not ievent.inqueue:
+        ievent.reply('use mail in a pipeline')
+        return
+    ievent.reply('waiting for input to mail')
+    result = waitforqueue(ievent.inqueue, 10)
+    if not result:
+        ievent.reply('no data to mail')
+        return
+    username = users.getname(ievent.userhost)
+    email = getemail(username)
+    if email:
+        try:
+            sub = "output of %s" % ievent.origtxt
+            domail(email, result, subject=sub)
+        except Exception, ex:
+            ievent.reply("can't send email: %s" % str(ex))
+            return
+        ievent.reply('%s lines sent' % len(result))
+    else:
+        ievent.reply("can't get email of %s" % username)
+ 
+cmnds.add('mail', handle_mail, ['MAIL', 'OPER'], threaded=True)
+examples.add('mail', 'mail pipelined data to user giving the command', \
+'todo | mail')
+tests.add('exceptions | mail')
+
+def handle_re(bot, ievent):
+    """ mail log since last spoken """
+    if not logs:
+        ievent.reply('log plugin is not enabled')
+        return
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging is not enabled in %s' % ievent.channel)
+        return
+    lastlist = logs.lastspokelist(ievent.channel, ievent.userhost, 100)
+    lasttime = time.time()
+    gotcha = None
+    for i in lastlist[::-1]:
+        delta = lasttime - i
+        if delta > 600:
+            gotcha = i
+            break
+        else:
+            lasttime = i
+    if gotcha:
+        result = logs.fromtimewithbot(ievent.channel, gotcha)
+        if result:
+            username = users.getname(ievent.userhost)
+            email = getemail(username)
+            if email:
+                try:
+                    res = []
+                    for i in result:
+                        if i[2] == 'bot':
+                            txt = i[4]
+                        else:
+                            nr = i[4].find(' ')
+                            txt = i[4][nr:].strip()
+                        res.append("[%s] <%s> %s" % \
+(hourmin(float(i[1])), i[2], txt))
+                    domail(email, res, subject="log of %s" % ievent.channel)
+                except Exception, ex:
+                    ievent.reply("can't send email: %s" % str(ex))
+                    return
+                ievent.reply('%s lines sent' % len(result))
+                return
+            else:
+                ievent.reply("can't get email of %s" % username)
+                return
+    ievent.reply('no data found')
+    
+cmnds.add('re', handle_re, ['MAIL', 'OPER'])
+examples.add('re', 'mail the log since last spoken word', 're')
+tests.add('re', 'lines sent')
+
+def handle_mailtime(bot, ievent):
+    """ mail log since a given time """
+    if not logs:
+        ievent.reply('log plugin is not enabled')
+        return
+    if ievent.channel not in logs.loglist:
+        ievent.reply('logging is not enabled in %s' % ievent.channel)
+        return
+    fromtime = strtotime(ievent.rest)
+    if not fromtime:
+        ievent.reply("can't detect time")
+        return
+    result = logs.fromtimewithbot(ievent.channel, fromtime)
+    if result:
+        username = users.getname(ievent.userhost)
+        email = getemail(username)
+        if email:
+            try:
+                res = []
+                for i in result:
+                    if i[2] == 'bot':
+                        txt = i[4]
+                    else:
+                        nr = i[4].find(' ')
+                        txt = i[4][nr:].strip()
+                    res.append("[%s] <%s> %s" % (hourmin(float(i[1])), i[2], \
+txt))
+                domail(email, res, subject="log of %s" % ievent.channel)
+            except Exception, ex:
+                ievent.reply("can't send email: %s" % str(ex))
+                return
+            ievent.reply('%s lines sent' % len(result))
+            return
+        else:
+            ievent.reply("can't get email of %s" % username)
+            return
+    ievent.reply('no data found')
+    
+cmnds.add('mail-time', handle_mailtime, ['MAIL', 'OPER'])
+examples.add('mail-time', 'mail the log since given time', 'mail-time 12:00')
+tests.add('mail-time 9:00')
--- gozerbot-0.99.1.orig/build/lib/gplugs/powernick.py
+++ gozerbot-0.99.1/build/lib/gplugs/powernick.py
@@ -0,0 +1,72 @@
+# gozerplugs/plugs/powernick.py
+#
+#
+
+""" relay log messages to nicks joined on the partyline (DCC CHAT) """
+
+from gozerbot.callbacks import callbacks
+from gozerbot.persist.persiststate import PlugState
+from gozerbot.commands import cmnds
+from gozerbot.users import users
+from gozerbot.examples import examples
+from gozerbot.partyline import partyline
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import gozerbot.generic
+
+plughelp.add('powernick', 'plugin used to monitor log messages')
+
+state = PlugState()
+state.define('nicks', {}) # username is key
+
+
+def logcallback(level, description, txt):
+    global state
+    for nick in state['nicks'].values():
+        partyline.say_nick(nick, "[%s] %s" % (description, txt)) 
+
+def init():
+    if not logcallback in gozerbot.utils.log.logcallbacks:
+        gozerbot.utils.log.logcallbacks.append(logcallback)
+
+def shutdown():
+    if logcallback in gozerbot.utils.log.logcallbacks:
+        gozerbot.utils.log.logcallbacks.remove(logcallback)
+
+def handle_powernick(bot, ievent):
+    global state
+    nick = ievent.nick
+    if not partyline.is_on(nick):
+        ievent.reply('%s is not joined on the partylist .. make a dcc chat\
+ connection to the bot' % nick)
+        return
+    username = users.getname(ievent.userhost)
+    state['nicks'][username] = nick
+    state.save()
+    ievent.reply('powernick set to %s' % nick)
+
+cmnds.add('powernick', handle_powernick, 'OPER')
+examples.add('powernick', 'set powernick (gets /msg of bot logs)', 'powernick')
+tests.add('powernick', 'not joined on partylist')
+
+def handle_powernickdel(bot, ievent):
+    global state
+    username = users.getname(ievent.userhost)
+    try:
+        del state['nicks'][username]
+        state.save()
+        ievent.reply('powernick removed')
+    except (ValueError, KeyError):
+         ievent.reply('no powernick set')
+ 
+cmnds.add('powernick-del', handle_powernickdel, 'OPER')
+examples.add('powernick-del', 'remove powernick (gets', 'powernick-del')
+tests.add('powernick-del')
+
+def handle_powernicklist(bot, ievent):
+    ievent.reply(state['nicks'].values())
+
+cmnds.add('powernick-list', handle_powernicklist, 'OPER')
+examples.add('powernick-list', 'show power nicks in use', 'powernick-list')
+tests.add('powernick-list')
--- gozerbot-0.99.1.orig/build/lib/gplugs/tcp.py
+++ gozerbot-0.99.1/build/lib/gplugs/tcp.py
@@ -0,0 +1,250 @@
+# plugs/tcp.py
+#
+#
+
+""" allow incoming tcp connection for messaging """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.fleet import fleet
+from gozerbot.generic import rlog, handle_exception, strippedtxt, lockdec
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.config import config
+from gozerbot.plughelp import plughelp
+from gozerbot.partyline import partyline
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.contrib.rijndael import rijndael
+import socket, re, time, Queue
+
+plughelp.add('tcp' , 'run the tcp listen thread')
+
+cfg = PersistConfig()
+cfg.define('tcp', 0) # set to 1 to enable
+cfg.define('tcpparty', 0)
+cfg.define('tcpipv6', 0)
+cfg.define('tcpmasks', ['192.168*', ]) 
+cfg.define('tcphost', "localhost")
+cfg.define('tcpport', 5500)
+cfg.define('tcpallow', ["127.0.0.1", ])
+cfg.define('tcpallowednicks', ["#gozerbot", "dunker"])
+cfg.define('tcppassword', "mekker", exposed=False)
+cfg.define('tcpseed', "blablablablablaz", exposed=False) # needs to be 16 chars
+cfg.define('tcpstrip', 1) # strip all chars < char(32)
+cfg.define('tcpsleep', 0) # sleep in sendloop .. can be used to delay packet traffic
+cfg.define('tdpdblog', 0)
+cfg.define('tcpbot', 'default')
+
+def _inmask(addr):
+    """ check if addr matches a mask """
+    if not cfg['tcpmasks']:
+        return False
+    for i in cfg['tcpmasks']:
+        i = i.replace('*', '.*')
+        if re.match(i, addr):
+            return True
+
+class Tcplistener(object):
+    """ listen for tcp messages """
+
+    def __init__(self):
+        self.outqueue = Queue.Queue()
+        self.queue = Queue.Queue()
+        self.stop = 0
+        if cfg['tcpipv6']:
+            self.sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
+        else:
+            self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        try:
+            self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+        except:
+            pass
+        self.sock.setblocking(1)
+        self.sock.settimeout(1)
+        self.loggers = []
+
+    def _outloop(self):
+        rlog(5, 'tcp', 'starting outloop')
+        while not self.stop:
+            (printto, txt) = self.outqueue.get()
+            if self.stop:
+                return
+            self.dosay(printto, txt)
+        rlog(5, 'tcp', 'stopping outloop')
+
+    def _handleloop(self):
+        while not self.stop:
+            (input, addr) = self.queue.get()
+            if not input or not addr:
+                continue
+            if self.stop:
+                break                
+            self._handle(input, addr)
+            if cfg['tcpsleep']:
+                time.sleep(cfg['tcpsleep'] or 0.001)
+        rlog(5, 'tcp', 'shutting down tcplistener')
+
+    def _listen(self):
+        """ listen for tcp messages .. /msg via bot"""
+        if not cfg['tcp']:
+            return
+        try:
+            fleet.startok.wait()
+            bot = fleet.byname(cfg['tcpbot'] or 'default')
+            if not bot:
+                rlog(10, 'tcp', "can't find main bot .. not starting")
+                return
+            # get listen socket on host were running on
+            self.sock.bind((cfg['tcphost'], cfg['tcpport']))
+            self.sock.listen(1)
+            rlog(10, 'tcp', 'tcp listening on %s %s' % (cfg['tcphost'], \
+cfg['tcpport']))
+            self.stop = 0
+        except IOError:
+            handle_exception()
+            self.sock = None
+            self.stop = 1
+            return
+        # loop on listening tcp socket
+        bot.connectok.wait()
+        while not self.stop:
+            try:
+                (sock, addr) = self.sock.accept()
+                rlog(10, 'tcp', 'connection from %s' % str(addr))
+            except socket.timeout:
+                continue
+            except Exception, ex:
+                if 'Invalid argument' in str(ex):
+                    continue
+                handle_exception()
+                break
+            if cfg['tcp'] and (addr[0] in cfg['tcpallow'] or \
+_inmask(addr[0])):
+                start_new_thread(self.handlesocket, (sock, addr))
+
+    def handlesocket(self, sock, addr):
+        while 1:
+            time.sleep(0.001)
+            try:
+                input = sock.recv(4096)
+                if not input:
+                    return
+            except socket.timeout:
+                continue
+            except Exception, ex:
+                try:
+                    (errno, errstr) = ex
+                except ValueError:
+                    errno = 0
+                    errstr = str(ex)
+                if errno == 4:
+                    rlog(10, self.name, str(ex))
+                    break
+                if errno == 35:
+                    continue
+                else:
+                    handle_exception()
+                    break
+            if self.stop:
+                break
+            self.queue.put((input, addr))
+        rlog(5, 'tcp', 'shutting down main loop')
+
+    def _handle(self, input, addr):
+        if cfg['tcpseed']:
+            data = ""
+            for i in range(len(input)/16):
+                try:
+                    data += crypt.decrypt(input[i*16:i*16+16])
+                except Exception, ex:
+                    rlog(10, 'tcp', "can't decrypt: %s" % str(ex))
+                    data = input
+                    break
+        else:
+            data = input
+        if cfg['tcpstrip']:
+            data = strippedtxt(data)
+        # check if tcp is enabled and source ip is in tcpallow list
+        if cfg['tcp'] and (addr[0] in cfg['tcpallow'] or \
+_inmask(addr[0])):
+            # get printto and passwd data
+            header = re.search('(\S+) (\S+) (.*)', data)
+            if header:
+                # check password
+                if header.group(1) == cfg['tcppassword']:
+                    printto = header.group(2)    # is the nick/channel
+                    # check if printto is in allowednicks
+                    if not printto in cfg['tcpallowednicks']:
+                        rlog(10, 'tcp', "tcp denied %s" % printto )
+                        return
+                    rlog(0, 'tcp', str(addr[0]) +  " tcp allowed")
+                    text = header.group(3)    # is the text
+                    self.say(printto, text)
+                else:
+                    rlog(10, 'tcp', "can't match tcppasswd from " + \
+str(addr))
+            else:
+                rlog(10, 'tcp', "can't match tcp from " + str(addr[0]))
+        else:
+            rlog(10, 'tcp', 'denied tcp from ' + str(addr[0]))
+
+    def say(self, printto, txt):
+        self.outqueue.put((printto, txt))
+
+    def dosay(self, printto, txt):
+        if cfg['tcpparty'] and partyline.is_on(printto):
+            partyline.say_nick(printto, txt)
+            return
+        bot = fleet.getmainbot()
+        if not bot.jabber and not bot.cfg['nolimiter']:
+            time.sleep(3)
+        bot.say(printto, txt)
+        for i in self.loggers:
+            i.log(printto, txt)
+
+if cfg['tcp']:
+    tcplistener = Tcplistener()
+
+if cfg['tcp'] and cfg['tcpseed']:
+    crypt = rijndael(cfg['tcpseed'])
+
+def init():
+    """ init the plugin """
+    if cfg['tcp']:
+        start_new_thread(tcplistener._listen, ())
+        start_new_thread(tcplistener._handleloop, ())
+        start_new_thread(tcplistener._outloop, ())
+    return 1
+    
+def shutdown():
+    """ shutdown the plugin """
+    if cfg['tcp']:
+        tcplistener.sock.close()
+        tcplistener.stop = 1
+        tcplistener.outqueue.put_nowait((None, None))
+        tcplistener.queue.put_nowait((None, None))
+        time.sleep(2)
+    return 1
+
+if cfg['tcp'] and cfg['tcpdblog']:
+
+    from gozerbot.database.db import db
+
+    class Tcpdblog:
+
+        """ log tcp data to database """
+
+        # see tables/tcplog for table definition and add tcpdblog = 1 to 
+        # the config file
+
+        def log(self, printto, txt):
+            """ do the actual logging """
+            try:
+                res = db.execute("""INSERT into tcplog(time,printto,txt)
+values(%s,%s,%s) """, (time.time(), printto, txt))
+            except Exception, ex:
+                rlog(10, 'tcp', 'failed to log to db: %s' % str(ex))
+            return res
+
+    tcplistener.loggers.append(Udpdblog())
+    rlog(10, 'tcp', 'registered database tcp logger')
--- gozerbot-0.99.1.orig/build/lib/gplugs/grab.py
+++ gozerbot-0.99.1/build/lib/gplugs/grab.py
@@ -0,0 +1,43 @@
+# plugs/grab.py
+
+""" quotes grab plugin """
+
+__copyright__ = 'this file is in the public domain'
+__depend__ = ['quote', ]
+
+from gozerbot.config import config
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.aliases import aliases
+from gozerbot.plughelp import plughelp
+if config.get('db_driver') == "olddb": from gplugs.olddb.quote import quotes
+else: from gplugs.alchemy.quote import quotes
+from gozerbot.tests import tests
+
+plughelp.add('grab', 'grab the last quote of an user')
+
+def handle_quotegrab(bot, ievent):
+    """ grab the last last from the given user """
+    try:
+        from gplugs.seen import seen
+        assert(seen)
+    except (ImportError, AssertionError, NameError):
+        ievent.reply("seen plugin not enabled")
+        return
+    if not quotes:
+        ievent.reply('quotes plugin not enabled')
+        return
+    if not ievent.args:
+        ievent.reply('missing <user> argument')
+        return
+    nick = ievent.args[0].lower()
+    if not seen.data.has_key(nick):
+        ievent.reply('nothing said by %s recently' % nick)
+        return
+    idnr = quotes.add(nick, ievent.userhost, seen.data[nick]['text'])
+    ievent.reply('grabbed %s from %s' % (idnr, nick))
+
+cmnds.add('quote-grab', handle_quotegrab, ['USER', 'QUOTEADD'], allowqueue=False)
+examples.add('quote-grab', 'quote-grab <user> .. add quote', 'quote-grab mekker')
+aliases.data['grab'] = 'quote-grab'
+tests.add('quote-grab')
--- gozerbot-0.99.1.orig/build/lib/gplugs/wisdom.py
+++ gozerbot-0.99.1/build/lib/gplugs/wisdom.py
@@ -0,0 +1,630 @@
+# plugs/wisdom.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+__thnx__ = 'thnx to snore for this one'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import os, string, random
+
+plughelp.add('wisdom', 'show some wisdom')
+
+excuses = ['booo', ]
+matrix = ['booo', ]
+motivation = ['booo', ]
+
+def init():
+    global excuses
+    global matrix
+    global motivation
+    excuses = excusestxt.splitlines()
+    matrix = matrixtxt.splitlines()
+    motivation = motivationtxt.splitlines()
+    return 1
+
+def handle_matrix(bot, ievent):
+    """ get a matrix quote """
+    rand = random.randint(1,len(matrix))
+    ievent.reply(matrix[rand-1].strip())
+
+def handle_excuse(bot, ievent):
+    """ get an excuse """
+    rand = random.randint(1,len(excuses))
+    ievent.reply(excuses[rand-1].strip())
+
+def handle_motivation(bot, ievent):
+    """ get despair  """
+    rand = random.randint(1,len(motivation))
+    ievent.reply(motivation[rand-1].strip())
+
+
+cmnds.add('matrix', handle_matrix, 'USER')
+examples.add('matrix', 'get a matrix quote', 'matrix')
+tests.add('matrix')
+cmnds.add('excuse', handle_excuse, 'USER')
+examples.add('excuse', 'get an excuse', 'excuse')
+tests.add('matrix')
+cmnds.add('motivation', handle_motivation, 'USER')
+examples.add('motivation', 'get motivated', 'motivation')
+tests.add('motivation')
+
+excusestxt = """
+clock speed
+solar flares
+electromagnetic radiation from satellite debris
+static from nylon underwear
+static from plastic slide rules
+global warming
+poor power conditioning
+static buildup
+doppler effect
+hardware stress fractures
+magnetic interferance from money/credit cards
+dry joints on cable plug
+we're waiting for [the phone company] to fix that line
+sounds like a Windows problem, try calling Microsoft support
+temporary routing anomoly
+somebody was calculating pi on the server
+fat electrons in the lines
+excess surge protection
+floating point processor overflow
+divide-by-zero error
+POSIX complience problem
+monitor resolution too high
+improperly oriented keyboard
+network packets travelling uphill (use a carrier pigeon)
+Decreasing electron flux
+first Saturday after first full moon in Winter
+radiosity depletion
+CPU radiator broken
+It works the way the Wang did, what's the problem
+positron router malfunction
+cellular telephone interference
+techtonic stress
+pizeo-electric interference
+(l)user error
+working as designed
+dynamic software linking table corrupted
+heavy gravity fluctuation, move computer to floor rapidly
+secretary plugged hairdryer into UPS
+terrorist activities
+not enough memory, go get system upgrade
+interrupt configuration error
+spaghetti cable cause packet failure
+boss forgot system password
+bank holiday - system operating credits  not recharged
+virus attack, luser responsible
+waste water tank overflowed onto computer
+Complete Transient Lockout
+bad ether in the cables
+Bogon emissions
+Change in Earth's rotational speed
+Cosmic ray particles crashed through the hard disk platter
+Smell from unhygenic janitorial staff wrecked the tape heads
+Little hamster in running wheel had coronary; waiting for replacement to be Fedexed from Wyoming
+Evil dogs hypnotized the night shift
+Plumber mistook routing panel for decorative wall fixture
+Electricians made popcorn in the power supply
+Groundskeepers stole the root password
+high pressure system failure
+failed trials, system needs redesigned
+system has been recalled
+not approved by the FCC
+need to wrap system in aluminum foil to fix problem
+not properly grounded, please bury computer
+CPU needs recalibration
+system needs to be rebooted
+bit bucket overflow
+descramble code needed from software company
+only available on a need to know basis
+knot in cables caused data stream to become twisted and kinked
+nesting roaches shorted out the ether cable
+The file system is full of it
+Satan did it
+Daemons did it
+You're out of memory
+There isn't any problem
+Unoptimized hard drive
+Typo in the code
+Yes, yes, its called a desgin limitation
+Look, buddy:  Windows 3.1 IS A General Protection Fault.
+That's a great computer you have there; have you considered how it would work as a BSD machine?
+Please excuse me, I have to circuit an AC line through my head to get this database working.
+Yeah, yo mama dresses you funny and you need a mouse to delete files.
+Support staff hung over, send aspirin and come back LATER.
+Someone is standing on the ethernet cable, causeing a kink in the cable
+Windows 95 undocumented "feature"
+Runt packets
+Password is too complex to decrypt
+Boss' kid fucked up the machine
+Electromagnetic energy loss
+Budget cuts
+Mouse chewed through power cable
+Stale file handle (next time use Tupperware(tm)!)
+Feature not yet implimented
+Internet outage
+Pentium FDIV bug
+Vendor no longer supports the product
+Small animal kamikaze attack on power supplies
+The vendor put the bug there.
+SIMM crosstalk.
+IRQ dropout
+Collapsed Backbone
+Power company testing new voltage spike (creation) equipment
+operators on strike due to broken coffee machine
+backup tape overwritten with copy of system manager's favourite CD
+UPS interrupted the server's power
+The electrician didn't know what the yellow cable was so he yanked the ethernet out.
+The keyboard isn't plugged in
+The air conditioning water supply pipe ruptured over the machine room
+The electricity substation in the car park blew up.
+The rolling stones concert down the road caused a brown out
+The salesman drove over the CPU board.
+The monitor is plugged into the serial port
+Root nameservers are out of sync
+electro-magnetic pulses from French above ground nuke testing.
+your keyboard's space bar is generating spurious keycodes.
+the real ttys became pseudo ttys and vice-versa.
+the printer thinks its a router.
+the router thinks its a printer.
+evil hackers from Serbia.
+we just switched to FDDI.
+halon system went off and killed the operators.
+because Bill Gates is a Jehovah's witness and so nothing can work on St. Swithin's day.
+user to computer ratio too high.
+user to computer ration too low.
+we just switched to Sprint.
+it has Intel Inside
+Sticky bits on disk.
+Power Company having EMP problems with their reactor
+The ring needs another token
+new management
+telnet: Unable to connect to remote host: Connection refused
+SCSI Chain overterminated
+It's not plugged in.
+because of network lag due to too many people playing deathmatch
+You put the disk in upside down.
+Daemons loose in system.
+User was distributing pornography on server; system seized by FBI.
+BNC (brain not  (user brain not connected)
+UBNC (user brain not connected)
+LBNC (luser brain not connected)
+disks spinning backwards - toggle the hemisphere jumper.
+new guy cross-connected phone lines with ac power bus.
+had to use hammer to free stuck disk drive heads.
+Too few computrons available.
+Flat tire on station wagon with tapes.  ("Never underestimate the bandwidth of a station wagon full of tapes hurling down the highway" Andrew S. Tanenbaum) 
+Communications satellite used by the military for star wars.
+Party-bug in the Aloha protocol.
+Insert coin for new game
+Dew on the telephone lines.
+Arcserve crashed the server again.
+Some one needed the powerstrip, so they pulled the switch plug.
+My pony-tail hit the on/off switch on the power strip.
+Big to little endian conversion error
+You can tune a file system, but you can't tune a fish (from most tunefs man pages)
+Dumb terminal
+Zombie processes haunting the computer
+Incorrect time syncronization
+Defunct processes
+Stubborn processes
+non-redundant fan failure 
+monitor VLF leakage
+bugs in the RAID
+no "any" key on keyboard
+root rot
+Backbone Scoliosis
+/pub/lunch
+excessive collisions & not enough packet ambulances
+le0: no carrier: transceiver cable problem?
+broadcast packets on wrong frequency
+popper unable to process jumbo kernel
+NOTICE: alloc: /dev/null: filesystem full
+pseudo-user on a pseudo-terminal
+Recursive traversal of loopback mount points
+Backbone adjustment
+OS swapped to disk
+vapors from evaporating sticky-note adhesives
+sticktion
+short leg on process table
+multicasts on broken packets
+ether leak
+Atilla the Hub
+endothermal recalibration
+filesystem not big enough for Jumbo Kernel Patch
+loop found in loop in redundant loopback
+system consumed all the paper for paging
+permission denied
+Reformatting Page. Wait...
+..disk or the processor is on fire.
+SCSI's too wide.
+Proprietary Information.
+Just type 'mv * /dev/null'.
+runaway cat on system.
+Did you pay the new Support Fee?
+We only support a 1200 bps connection.
+We only support a 28000 bps connection.
+Me no internet, only janitor, me just wax floors.
+I'm sorry a pentium won't do, you need an SGI to connect with us.
+Post-it Note Sludge leaked into the monitor.
+the curls in your keyboard cord are losing electricity.
+The monitor needs another box of pixels.
+RPC_PMAP_FAILURE
+kernel panic: write-only-memory (/dev/wom0) capacity exceeded.
+Write-only-memory subsystem too slow for this machine. Contact your local dealer.
+Just pick up the phone and give modem connect sounds. "Well you said we should get more lines so we don't have voice lines."
+Quantum dynamics are affecting the transistors
+Police are examining all internet packets in the search for a narco-net-traficer
+We are currently trying a new concept of using a live mouse.  Unfortuantely, one has yet to survive being hooked up to the computer.....please bear with us.
+Your mail is being routed through Germany ... and they're censoring us.
+Only people with names beginning with 'A' are getting mail this week (a la Microsoft)
+We didn't pay the Internet bill and it's been cut off.
+Lightning strikes.
+Of course it doesn't work. We've performed a software upgrade.
+Change your language to Finnish.
+Flourescent lights are generating negative ions. If turning them off doesn't work, take them out and put tin foil on the ends.
+High nuclear activity in your area.
+What office are you in? Oh, that one.  Did you know that your building was built over the universities first nuclear research site? And wow, are'nt you the lucky one, your office is right over where the core is buried!
+The MGs ran out of gas.
+The UPS doesn't have a battery backup.
+Recursivity.  Call back if it happens again.
+Someone thought The Big Red Button was a light switch.
+The mainframe needs to rest.  It's getting old, you know.
+I'm not sure.  Try calling the Internet's head office -- it's in the book.
+The lines are all busy (busied out, that is -- why let them in to begin with?).
+Jan  9 16:41:27 huber su: 'su root' succeeded for .... on /dev/pts/1
+It's those computer people in X {city of world}.  They keep stuffing things up.
+A star wars satellite accidently blew up the WAN.
+Fatal error right in front of screen
+That function is not currently supported, but Bill Gates assures us it will be featured in the next upgrade.
+wrong polarity of neutron flow
+Lusers learning curve appears to be fractal
+We had to turn off that service to comply with the CDA Bill.
+Ionisation from the air-conditioning
+TCP/IP UDP alarm threshold is set too low.
+Someone is broadcasting pigmy packets and the router dosn't know how to deal with them.
+The new frame relay network hasn't bedded down the software loop transmitter yet. 
+Fanout dropping voltage too much, try cutting some of those little traces
+Plate voltage too low on demodulator tube
+You did wha... oh _dear_....
+CPU needs bearings repacked
+Too many little pins on CPU confusing it, bend back and forth until 10-20% are neatly removed. Do _not_ leave metal bits visible!
+_Rosin_ core solder? But...
+Software uses US measurements, but the OS is in metric...
+The computer fletely, mouse and all.
+Your cat tried to eat the mouse.
+The Borg tried to assimilate your system. Resistance is futile.
+It must have been the lightning storm we had (yesterdy) (last week) (last month)
+Due to Federal Budget problems we have been forced to cut back on the number of users able to access the system at one time. (namely none allowed....)
+Too much radiation coming from the soil.
+Unfortunately we have run out of bits/bytes/whatever. Don't worry, the next supply will be coming next week.
+Program load too heavy for processor to lift.
+Processes running slowly due to weak power supply
+Our ISP is having {switching,routing,SMDS,frame relay} problems
+We've run out of licenses
+Interference from lunar radiation
+Standing room only on the bus.
+You need to install an RTFM interface.
+That would be because the software doesn't work.
+That's easy to fix, but I can't be bothered.
+Someone's tie is caught in the printer, and if anything else gets printed, he'll be in it too.
+We're upgrading /dev/null
+The Usenet news is out of date
+Our POP server was kidnapped by a weasel.
+It's stuck in the Web.
+Your modem doesn't speak English.
+The mouse escaped.
+All of the packets are empty.
+The UPS is on strike.
+Neutrino overload on the nameserver
+Melting hard drives
+Someone has messed up the kernel pointers
+The kernel license has expired
+Netscape has crashed
+The cord jumped over and hit the power switch.
+It was OK before you touched it.
+Bit rot
+U.S. Postal Service
+Your Flux Capacitor has gone bad.
+The Dilithium Cyrstals need to be rotated.
+The static electricity routing is acting up...
+Traceroute says that there is a routing problem in the backbone.  It's not our problem.
+The co-locator cannot verify the frame-relay gateway to the ISDN server.
+High altitude condensation from U.S.A.F prototype aircraft has contaminated the primary subnet mask. Turn off your computer for 9 days to avoid damaging it.
+Lawn mower blade in your fan need sharpening
+Electrons on a bender
+Telecommunications is upgrading. 
+Telecommunications is downgrading.
+Telecommunications is downshifting.
+Hard drive sleeping. Let it wake up on it's own...
+Interference between the keyboard and the chair.
+The CPU has shifted, and become decentralized.
+Due to the CDA, we no longer have a root account.
+We ran out of dial tone and we're and waiting for the phone company to deliver another bottle.
+You must've hit the wrong anykey.
+PCMCIA slave driver
+The Token fell out of the ring. Call us when you find it.
+The hardware bus needs a new token.
+Too many interrupts
+Not enough interrupts
+The data on your hard drive is out of balance.
+Digital Manipulator exceeding velocity parameters
+appears to be a Slow/Narrow SCSI-0 Interface problem
+microelectronic Riemannian curved-space fault in write-only file system
+fractal radiation jamming the backbone
+routing problems on the neural net
+IRQ-problems with the Un-Interruptable-Power-Supply
+CPU-angle has to be adjusted because of vibrations coming from the nearby road
+emissions from GSM-phones
+CD-ROM server needs recalibration
+firewall needs cooling
+asynchronous inode failure
+transient bus protocol violation
+incompatible bit-registration operators
+your process is not ISO 9000 compliant
+You need to upgrade your VESA local bus to a MasterCard local bus.
+The recent proliferation of Nuclear Testing
+Elves on strike. (Why do they call EMAG Elf Magic)
+Internet exceeded Luser level, please wait until a luser logs off before attempting to log back on.
+Your EMAIL is now being delivered by the USPS.
+Your computer hasn't been returning all the bits it gets from the Internet.
+You've been infected by the Telescoping Hubble virus.
+Scheduled global CPU outage
+Your Pentium has a heating problem - try cooling it with ice cold water.(Do not turn of your computer, you do not want to cool down the Pentium Chip while he isn't working, do you?)
+Your processor has processed too many intructions.  Turn it off emideately, do not type any commands!!
+Your packets were eaten by the terminator
+Your processor does not develop enough heat.
+We need a licensed electrician to replace the light bulbs in the computer room.
+The POP server is out of Coke
+Fiber optics caused gas main leak
+Server depressed, needs Prozak
+quatnum decoherence
+those damn racoons!
+suboptimal routing experience
+A plumber is needed, the network drain is clogged
+50% of the manual is in .pdf readme files
+the AA battery in the wallclock sends magnetic interference
+the xy axis in the trackball is coordinated with the summer soltice
+the butane lighter causes the pincushioning
+old inkjet cartridges emanate barium-based fumes
+manager in the cable duct
+We'll fix that in the next (upgrade, update, patch release, service pack).
+HTTPD Error 666 : BOFH was here
+HTTPD Error 4004 : very old Intel cpu - insufficient processing power
+The ATM board has run out of 10 pound notes.  We are having a whip round to refill it, care to contribute ?
+Network failure -  call NBC
+Having to manually track the satellite.
+Your/our computer(s) had suffered a memory leak, and we are waiting for them to be topped up.
+The rubber band broke
+We're on Token Ring, and it looks like the token got loose.
+Stray Alpha Particles from memory packaging caused Hard Memory Error on Server.
+paradigm shift...without a clutch
+PEBKAC (Problem Exists Between Keyboard And Chair)
+The cables are not the same length.
+Second-sytem effect.
+Chewing gum on /dev/sd3c
+Boredom in the Kernel.
+the daemons! the daemons! the terrible daemons!
+I'd love to help you -- it's just that the Boss won't let me near the computer. 
+struck by the Good Times virus
+YOU HAVE AN I/O ERROR -> Incompetent Operator error
+Your parity check is overdrawn and you're out of cache.
+Communist revolutionaries taking over the server room and demanding all the computers in the building or they shoot the sysadmin. Poor misguided fools.
+Plasma conduit breach
+Out of cards on drive D:
+Sand fleas eating the Internet cables
+parallel processors running perpendicular today
+ATM cell has no roaming feature turned on, notebooks can't connect
+Webmasters kidnapped by evil cult.
+Failure to adjust for daylight savings time.
+Virus transmitted from computer to sysadmins.
+Virus due to computers having unsafe sex.
+Incorrectly configured static routes on the corerouters.
+Forced to support NT servers; sysadmins quit.
+Suspicious pointer corrupted virtual machine
+Its the InterNIC's fault.
+Root name servers corrupted.
+Budget cuts forced us to sell all the power cords for the servers.
+Someone hooked the twisted pair wires into the answering machine.
+Operators killed by year 2000 bug bite.
+We've picked COBOL as the language of choice.
+Operators killed when huge stack of backup tapes fell over.
+Robotic tape changer mistook operator's tie for a backup tape.
+Someone was smoking in the computer room and set off the halon systems.
+Your processor has taken a ride to Heaven's Gate on the UFO behind Hale-Bopp's comet.
+t's an ID-10-T error
+Dyslexics retyping hosts file on servers
+The Internet is being scanned for viruses.
+Your computer's union contract is set to expire at midnight.
+Bad user karma.
+/dev/clue was linked to /dev/null
+Increased sunspot activity.
+We already sent around a notice about that.
+It's union rules. There's nothing we can do about it. Sorry.
+Interferance from the Van Allen Belt.
+Jupiter is aligned with Mars.
+Redundant ACLs. 
+Mail server hit by UniSpammer.
+T-1's congested due to porn traffic to the news server.
+Data for intranet got routed through the extranet and landed on the internet.
+We are a 100% Microsoft Shop.
+We are Microsoft.  What you are experiencing is not a problem; it is an undocumented feature.
+Sales staff sold a product we don't offer.
+Secretary sent chain letter to all 5000 employees.
+Sysadmin didn't hear pager go off due to loud music from bar-room speakers.
+Sysadmin accidentally destroyed pager with a large hammer.
+Sysadmins unavailable because they are in a meeting talking about why they are unavailable so much.
+Bad cafeteria food landed all the sysadmins in the hospital.
+Route flapping at the NAP.
+Computers under water due to SYN flooding.
+The vulcan-death-grip ping has been applied.
+Electrical conduits in machine room are melting.
+Traffic jam on the Information Superhighway.
+Radial Telemetry Infiltration
+Cow-tippers tipped a cow onto the server.
+tachyon emissions overloading the system
+Maintence window broken
+We're out of slots on the server
+Computer room being moved.  Our systems are down for the weekend.
+Sysadmins busy fighting SPAM.
+Repeated reboots of the system failed to solve problem
+Feature was not beta tested
+Domain controler not responding
+Someone else stole your IP address, call the Internet detectives!
+It's not RFC-822 compliant.
+operation failed because: there is no message for this error (#1014)
+stop bit received
+internet is needed to catch the etherbunny
+network down, IP packets delivered via UPS
+Firmware update in the coffee machine
+Temporal anomaly
+Mouse has out-of-cheese-error
+Borg implants are failing
+Borg nanites have infested the server
+error: one bad user found in front of screen
+Please state the nature of the technical emergency
+Internet shut down due to maintainance
+Daemon escaped from pentagram
+crop circles in the corn shell
+sticky bit has come loose
+Hot Java has gone cold
+Cache miss - please take better aim next time
+Hash table has woodworm
+Trojan horse ran out of hay
+Zombie processess detected, machine is haunted.
+overflow error in /dev/null
+Browser's cookie is corrupted -- someone's been nibbling on it.
+Mailer-daemon is busy burning your message in hell.
+According to Microsoft, it's by design
+vi needs to be upgraded to vii
+greenpeace free'd the mallocs
+Terorists crashed an airplane into the server room, have to remove /bin/laden. (rm -rf /bin/laden)
+"""
+
+matrixtxt = """
+<morpheus> If real is what you can feel, smell, taste and see, then 'real' is simply electrical signals interpreted by your brain
+<morpheus> What are you waiting for? You're faster than this. Don't think you are, know you are. Come on! Stop trying to hit me and hit me!
+<Morpheus> Unfortunately, no one can be told what the Matrix is. You have to see it for yourself.
+<morpheus> What you know you can't explain, but you feel it. You've felt it your entire life, that there's something wrong with the world. You don't know what it is, but it's there, like a splinter in your mind, driving you mad.
+<morpheus> You have the look of a man who accepts what he sees because he is expecting to wake up. Ironically, that's not far from the truth.
+<morpheus> I'm trying to free your mind, Neo. But I can only show you the door. You're the one that has to walk through it.
+<neo> Why do my eyes hurt? <morpheus> You've never used them before.
+<morpheus> There is a difference between knowing the path and walking the path.
+<neo> What are you trying to tell me? That I can dodge bullets? <morpheus> No, Neo. I'm trying to tell you that when you're ready, you won't have to.
+<morpheus> The Matrix is the world that has been pulled over your eyes to blind you from the truth.
+<morpheus> You've been living in a dream world, Neo.
+<morpheus> I imagine that right now you're feeling a bit like Alice, tumbling down the rabbit hole.
+<morpheus> What is "real"? How do you define "real"?
+<morpheus> Welcome to the desert of the real.
+<morpheus> You have to let it all go, Neo. Fear, doubt, and disbelief. Free your mind.
+<neo> Am I dead? <morpheus> Far from it.
+<morpheus> You are the One, Neo. You see, you may have spent the last few years looking for me, but I have spent my entire life looking for you.
+<morpheus> This is your last chance. After this, there is no turning back. You take the blue pill - the story ends, you wake up in your bed and believe whatever you want to believe. You take the red pill - you stay in Wonderland and I show you how deep the rabbit-hole goes.
+<morpheus> I've seen an agent punched through a concrete wall. Men have emptied entire clips at them and hit nothing but air, yet their strength and their speed are still based in a world that is built on rules. Because of that, they will never be as strong or as fast as you can be. 
+<rhineheart> You have a problem with authority, Mr. Anderson.
+<tank> Hey Mikey I think he likes it.
+<morpheus> It IS our destiny
+<agent smith> Never send a human to do a machine's job.
+<morpheus> Focus, trinity
+<agent smith> Do you hear that, Mr. Anderson? That is the sound of inevitability
+<spoon boy> There is no spoon. 
+<tank> So what do you need? Besides a miracle <neo> Guns. Lots of guns.
+<trinity> Neo... nobody has ever done this before. <neo> I know. That's why it's going to work.
+<neo> I know kung fu
+<neo> Okey dokey.. free my mind. Right, no problem, free my mind, free my mind, no problem, right...
+<cypher> Good shit, huh? It's good for two things: degreasing engines and killing brain cells.
+<cypher> All I see now is blonde, brunette, redhead.
+"""
+
+motivationtxt = """
+Achievement: You can do anything you set your mind to when you have vision, determination, and an endless supply of expendable labor. 
+Adversity: That which does not kill me postpones the inevitable. 
+Agony: Not all pain is gain. 
+Ambition: The journey of a thousand miles sometimes ends very, very badly.
+Apathy: If we don't take care of the customer,maybe they'll stop bugging us.
+Arrogance: The best leaders inspire by example. When that's not an option, brute intimidation works pretty well, too.
+Beauty: If you're attractive enough on the outside, people will forgive you for being irritating to the core.
+Bitterness: Never be afraid to share your dreams with the world, because there's nothing the world loves more than the taste of really sweet dreams.
+Blame: The secret to success is knowing who to blame for your failures.
+Burnout: Attitudes are contagious. Mine might kill you. 
+Change: It's a short trip from riding the waves of change to being torn apart by the jaws of defeat. 
+Change (winds): When the winds of change blow hard enough, the most trivial of things can become deadly projectiles.
+Cluelessness: There are no stupid questions, but there are a LOT of inquisitive idiots.
+Compromise: Let's agree to respect each others views, no matter how wrong yours may be.
+Conformity: When people are free to do as they please, they usually imitate each other.
+Consulting: If you're not a part of the solution,there's good money to be made in prolonging the problem. 
+Dare to Slack: When birds fly in the right formation, they need only exert half the effort. Even in nature, teamwork results in collective laziness.
+Defeat: For every winner, there are dozens of losers. Odds are you're one of them.
+Delusions: There is no greater joy than soaring high on the wings of your dreams, except maybe the joy of watching a dreamer who has nowhere to land but in the ocean of reality. 
+Demotivation: Sometimes the best solution to morale problems is just to fire all of the unhappy people. 
+Despair: It's always darkest just before it goes pitch black. 
+Destiny: You were meant for me. Perhaps as a punishment.
+Discovery: A company that will go to the ends of the Earth for its people will find it can hire them for about 10% of the cost of Americans.
+Disloyalty: There comes a time when every team must learn to make individual sacrifices.
+Disservice: It takes months to find a customer, but only seconds to lose one... the good news is that we should run out of them in no time.
+Do it Later: The early worm is for the birds.
+Doubt: In the battle between you and the world, bet on the world.
+Dreams: Dreams are like rainbows. Only idiots chase them. 
+Dysfunction: The only consistent feature in all of your dissatisfying relationships is you.
+Effort: Hard work never killed anybody, but it is illegal in some places. 
+Elitism: It's lonely at the top, but it's comforting to look down upon everyone at the bottom.
+Failure: When your best just isn't good enough. 
+Fear: Until you have the courage to lose sight of the shore, you will not know the terror of being forever lost at sea 
+Flattery: If you want to get to the top, prepare to kiss a lot of the bottom.
+Futility: You'll always miss 100% of the shots you don't take, and, statistically speaking, 99% of the shots you do. 
+Get To Work: You aren't being paid to believe in the power of your dreams. 
+Goals: It's best to avoid standing directly between a competitive jerk and his goals. 
+Hazards: There is an island of opportunity in the middle of every difficulty.  Miss that, though, and you're pretty much doomed. 
+Humiliation: The harder you try, the dumber you look. 
+Idiocy: Never underestimate the power of stupid people in large groups. 
+Ignorance: It's amazing how much easier it is for a team to work together when no one has any idea where they're going. 
+Incompetence: When you earnestly believe you can compensate for a lack of skill by doubling your efforts, there's no end to what you can't do. 
+Indifference: It takes 43 muscles to frown and 17 to smile, but it doesn't take any to just sit there with a dumb look on your face.
+Individuality: Always remember that you are unique. Just like everybody else. 
+Ineptitude: If you can't learn to do something well, learn to enjoy doing it poorly.
+Insanity: It's difficult to comprehend how insane some people can be. Especially when you're insane. 
+Inspiration: Genius is 1 percent inspiration and 99% perspiration, which is why engineers sometimes smell really bad. 
+Intimidation: No one can make you feel inferior without your consent, but you'd be a fool to withhold that from your superiors.
+Irresponsibility: No single raindrop believes it is to blame for the flood.
+Laziness: Success is a journey, not a destination. So stop running. 
+Leaders: Leaders are like eagles. We don't have either of them here. 
+Limitations: Until you spread your wings, you'll have no idea how far you can walk.
+Loneliness: If you find yourself struggling with loneliness, you're not alone. And yet you are alone. So very alone. 
+Losing: If at first you don't succeed, failure may be your style.
+Madness: Madness does not always howl. Sometimes, it is the quiet voice at the end of the day saying, "Hey, is there room in your head for one more?"
+Mediocrity: It takes a lot less time and most people won't notice the difference until it's too late. 
+Meetings: None of us is as dumb as all of us. 
+Misfortune: While good fortune often eludes you, this kind never misses. 
+Mistakes: It could be that the purpose of your life is only to serve as a warning to others.
+Motivation: If a pretty poster and a cute saying are all it takes to motivate you, you probably have a very easy job. The kind robots will be doing soon. 
+Nepotism: We promote family values here - almost as often as we promote family members. 
+Overconfidence: Before you attempt to beat the odds, be sure you could survive the odds beating you. 
+Pessimism: Every dark cloud has a silver lining, but lightning kills hundreds of people each year who are trying to find it. 
+Persistence: It's over, man. Let her go.
+Planning: Much work remains to be done before we can announce our total failure to make any progress. 
+Potential: Not everyone gets to be an astronaut when they grow up.
+Power: Power corrupts. Absolute power corrupts absolutely. But it rocks absolutely, too.
+Pressure: It can turn a lump of coal into a flawless diamond, or an average person into a perfect basketcase.
+Pretension: The downside of being better than everyone else is that people tend to assume you're pretentious. 
+Problems: No matter how great and destructive your problems may seem now, remember, you've probably only seen the tip of them 
+Procrastination: Hard work often pays off after time, but laziness always pays off now. 
+Quality: The race for quality has no finish line- so technically, it's more like a death march. 
+Regret: It hurts to admit when you make mistakes - but when they're big enough, the pain only lasts a second 
+Retirement: Because you've given so much of yourself to the Company that you don't have anything left we can use. 
+Risks: If you never try anything new, you'll miss out on many of life's great disappointments.
+Sacrifice: Your role may be thankless, but if you're willing to give it your all, you just might bring success to those who outlast you.
+Sacrifice (Temple): All we ask here is that you give us your heart. 
+Strife: As long as we have each other, we'll never run out of problems. 
+Stupidity: Quitters never win, winners never quit, but those who never win AND never quit are idiots.
+Success: Some people dream of success, while other people live to crush those dreams. 
+Teamwork: A few harmless flakes working together can unleash an avalanche of destruction.
+Trouble: Luck can't last a lifetime unless you die young. 
+Underachievement: The tallest blade of grass is the first to be cut by the lawnmower. 
+Wishes: When you wish upon a falling star, your dreams can come true. Unless it's really a meteorite hurtling to the Earth which will destroy all life. Then you're pretty much hosed no matter what you wish for. Unless it's death by meteor. 
+Worth: Just because you're necessary doesn't mean you're important.
+"""
--- gozerbot-0.99.1.orig/build/lib/gplugs/shakespear.py
+++ gozerbot-0.99.1/build/lib/gplugs/shakespear.py
@@ -0,0 +1,229 @@
+# plugs/shakespear.py
+#
+#
+
+""" uses the random lib """
+
+__copyright__ = 'this file is in the public domain'
+__revision__ = '$Id: shakespeare.py 517 2006-12-21 05:00:00Z deck $'
+
+from gozerbot.generic import handle_exception
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import re, random
+
+plughelp.add('shakespear', 'display a shakespearean insult')
+
+set_a=["Away I say",
+       "Bathe thyself",
+       "Be not deaf",
+       "Behold thy mirror",
+       "Beware my sting",
+       "Clean thine ears",
+       "Drink up eisel",
+       "Eat a crododile",
+       "Eat my knickers",
+       "Fie upon thee",
+       "Forsooth say I",
+       "Get thee gone",
+       "Get thee hence",
+       "Grow unsightly warts",
+       "Hear me now",
+       "Hear this pox alert",
+       "I'll see thee hang'd",
+       "Kiss my codpiece",
+       "Lead apes in hell",
+       "Methinks you stinks",
+       "My finger in thine eye",
+       ">>Phui<< I say",
+       "Remove thine ass hence",
+       "Resign not thy day gig",
+       "Sit thee on a spit",
+       "Sorrow on thee",
+       "Swim with leeches",
+       "Thou dost intrude",
+       "Thy mother wears armor",
+       "Trip on thy sword",
+       "Tune thy lute",
+       "Why, how now putz",
+       "Wipe thy ugly face"]
+set_b=["artless",
+       "bawdy",
+       "beslubbering",
+       "bootless",
+       "cankerous",
+       "churlish",
+       "cockered",
+       "clouted",
+       "craven",
+       "currish",
+       "dankish",
+       "dissembling",
+       "droning",
+       "errant",
+       "fawning",
+       "fobbing",
+       "fool-born",
+       "froward",
+       "frothy",
+       "gleeking",
+       "goatish",
+       "gorbellied",
+       "ill-nurtured",
+       "impertinent",
+       "incestuous",
+       "incurable",
+       "infectious",
+       "jarring",
+       "loggerheaded",
+       "lumpish",
+       "loutish",
+       "mammering",
+       "mangled",
+       "mewling",
+       "paunchy",
+       "pribbling",
+       "puking",
+       "puny",
+       "qualling",
+       "rank",
+       "reeky",
+       "roguish",
+       "rump-fed",
+       "ruttish",
+       "saucy",
+       "spleeny",
+       "spongy",
+       "surly",
+       "tardy-gaited",
+       "tottering",
+       "unmuzzled",
+       "vain",
+       "venomed",
+       "warped",
+       "wayward",
+       "weedy",
+       "whoreson",
+       "wretched",
+       "yeasty"]
+set_c=["addlepated",
+       "base-court",
+       "bat-fowling",
+       "beef-witted",
+       "beetle-headed",
+       "boil-brained",
+       "clapper-clawed",
+       "clay-brained",
+       "codpiece-sniffing",
+       "common-kissing",
+       "crook-pated",
+       "dismal-dreaming",
+       "dizzy-eyed",
+       "doghearted",
+       "dread-bolted",
+       "earth-vexing",
+       "elf-skinned",
+       "fat-kidneyed",
+       "fen-sucked",
+       "flap-mouthed",
+       "fly-bitten",
+       "folly-fallen",
+       "fool-born",
+       "foul-practicing",
+       "full-gorged",
+       "guts-griping",
+       "half-faced",
+       "hasty-witted",
+       "hedge-born",
+       "hell-hated",
+       "idle-headed",
+       "ill-breeding",
+       "ill-nurtured",
+       "knotty-pated",
+       "mad-brained",
+       "milk-livered",
+       "motley-minded",
+       "onion-eyed",
+       "plume-plucked",
+       "pottle-deep",
+       "pox-marked",
+       "reeling-ripe",
+       "rough-hewn",
+       "rude-growing",
+       "rump-fed",
+       "shard-borne",
+       "sheep-biting",
+       "spur-galled",
+       "swag-bellied",
+       "tardy-gaited",
+       "tickle-brained",
+       "toad-spotted",
+       "unchin-snouted",
+       "weather-bitten"]
+set_d=["apple-john",
+       "baggage",
+       "barnacle",
+       "bladder",
+       "boar-pig",
+       "bugbear",
+       "bum-bailey",
+       "canker-blossom",
+       "clack-dish",
+       "clotpole",
+       "coxcomb",
+       "codpiece",
+       "death-token",
+       "dewberry",
+       "dotard",
+       "flap-dragon",
+       "flax-wench",
+       "flea",
+       "flirt-gill",
+       "foot-licker",
+       "fustilarian",
+       "giglet",
+       "gudgeon",
+       "haggard",
+       "harpy",
+       "hedge-pig",
+       "horn-beast",
+       "hugger-mugger",
+       "jolthead",
+       "knave",
+       "lewdster",
+       "lout",
+       "maggot-pie",
+       "malt-worm",
+       "mammet",
+       "measle",
+       "minnow",
+       "miscreant",
+       "moldwarp",
+       "mumble-news",
+       "nit",
+       "nut-hook",
+       "pigeon-egg",
+       "pignut",
+       "pumpion",
+       "puttock",
+       "ratsbane",
+       "rudesby",
+       "scut",
+       "skainsmate",
+       "strumpet",
+       "varlot",
+       "vassal",
+       "wagtail",
+       "water-fly",
+       "whey-face",
+       "winter-cricket"]
+
+def handle_insult(bot, ievent):
+    ievent.reply(random.choice(set_a)+" "+random.choice(set_b)+" "+random.choice(set_c)+" "+random.choice(set_d))
+    
+cmnds.add('insult', handle_insult, 'USER')
+examples.add('insult', 'show a shakespearean insult', 'insult')
+tests.add('insult')
--- gozerbot-0.99.1.orig/build/lib/gplugs/lart.py
+++ gozerbot-0.99.1/build/lib/gplugs/lart.py
@@ -0,0 +1,37 @@
+# gozerplugs/lart.py
+#
+#
+
+from gozerbot.commands import cmnds
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.aliases import aliasset
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import random
+
+plughelp.add('lart', 'do the lart')
+
+cfg = PersistConfig()
+cfg.define('lartlist', ['booo', ])
+
+def handle_lart(bot, ievent):
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        ievent.missing('<who>')
+        return
+    try:
+        txt = random.choice(cfg.get('lartlist'))
+    except IndexError:
+        ievent.reply('lart list is empty .. use lart-add to add entries .. use "<who>" as a nick holder')
+        return
+    txt = txt.replace('<who>', who)
+    bot.action(ievent.channel, txt)
+
+cmnds.add('lart', handle_lart, 'USER')
+examples.add('lart', 'echo a lart message', 'lart dunker')
+aliasset('lart-add', 'lart-cfg lartlist add')
+aliasset('lart-del', 'lart-cfg lartlist remove')
+tests.add('lart', 'booo')
--- gozerbot-0.99.1.orig/build/lib/gplugs/eventnet.py
+++ gozerbot-0.99.1/build/lib/gplugs/eventnet.py
@@ -0,0 +1,213 @@
+# gozerplugs/eventnet.py
+#
+#
+
+## gozerbot imports
+
+from gozerbot.callbacks import callbacks, jcallbacks
+from gozerbot.utils.url import posturl, getpostdata
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.commands import cmnds
+from gozerbot.irc.monitor import outmonitor
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.rest.server import RestServer, RestRequestHandler
+from gozerbot.eventbase import EventBase
+from gozerbot.utils.exception import handle_exception
+from gozerbot.utils.log import rlog
+from gozerbot.utils.textutils import html_unescape
+
+## simplejson imports
+
+from simplejson import dumps
+
+## basic imports
+
+import socket
+import re
+
+## VARS
+
+outurl = "http://cmndtest.appspot.com/eventnet/"
+
+state = PlugPersist('eventnet')
+
+if not state.data:
+    state.data = {}
+if not state.data.has_key('relay'):
+    state.data['relay'] = []
+
+cfg = PersistConfig()
+cfg.define('enable', 0)
+cfg.define('host' , socket.gethostbyname(socket.getfqdn()))
+cfg.define('name' , socket.getfqdn())
+cfg.define('port' , 10102)
+cfg.define('disable', [])
+
+waitre = re.compile(' wait (\d+)', re.I)
+hp = "%s:%s" % (cfg.get('host'), cfg.get('port'))
+url = "http://%s" % hp
+
+## callbacks
+
+def preremote(bot, event):
+
+    if event.channel in state.data['relay']:
+        return True
+
+def handle_doremote(bot, event):
+
+    if event.isremote:
+        return
+
+    posturl(outurl, {}, {'event': event.tojson() })
+
+callbacks.add('PRIVMSG', handle_doremote, preremote, threaded=True)
+outmonitor.add('eventnet', handle_doremote, preremote, threaded=True)
+
+def handle_jabberin(bot, event):
+
+    if event.isremote or not event.txt:
+        return
+
+    try:
+        if event.txt.startswith('{'):
+            e = EventBase()
+            e.fromjsonstring(event.txt)
+            e.isremote = True
+            rlog(10, bot.name, 'got event on jabberin: %s - %s ' % (e.userhost, str(e)))
+            callbacks.check(bot, e)
+    except Exception, ex:
+        handle_exception()
+        print event.txt
+        return
+    
+jcallbacks.add('Message', handle_jabberin)
+
+## server part
+
+server = None
+
+def eventnet_POST(server, request):
+
+    try:
+        input = getpostdata(request)
+        eventin = input['event']
+    except KeyError, AttributeError:
+        rlog(10, 'eventnet', "can't determine eventin")
+        return dumps(["can't determine eventin"])
+
+    event = EventBase()
+    event.fromjsonstring(eventin)
+    callbacks.check(event)
+    return dumps(['ok',])
+
+def eventnet_GET(server, request):
+    try:
+        path, eventin = request.path.split('#', 1)
+    except ValueError:
+        rlog(10, 'eventnet', "can't determine eventin")
+        return dumps(["can't determine eventin", ])
+
+    try:
+        event = EventBase()
+        event.fromjsonstring(eventin)
+        callbacks.check(event)
+    except Exception, ex:
+        handle_exception()
+    return dumps(['ok', ])
+
+def startserver():
+
+    global server 
+
+    try:
+        rlog(10, 'eventnet', 'starting server at %s:%s' % (cfg.get('host'), cfg.get('port')))
+        server = RestServer((cfg.get('host'), cfg.get('port')), RestRequestHandler)
+
+        if server:
+            server.start()
+            rlog(10, 'eventnet', 'running at %s:%s' % (cfg.get('host'), cfg.get('port')))
+            server.addhandler('/eventnet/', 'POST', eventnet_POST)
+            server.addhandler('/eventnet/', 'GET', eventnet_GET)
+
+            for mount in cfg.get('disable'):
+                server.disable(mount)
+
+        else:
+            rlog(10, 'eventnet', 'failed to start server at %s:%s' % (cfg.get('host'), cfg.get('port')))
+
+    except socket.error, ex:
+        rlog(10, 'eventnet - server', str(ex))
+
+    except Exception, ex:
+        handle_exception()
+
+def stopserver():
+
+    try:
+        if not server:
+            rlog(10, 'eventnet', 'server is already stopped')
+            return
+
+        server.shutdown()
+
+    except Exception, ex:
+        handle_exception()
+        pass
+
+## plugin init
+
+def init():
+
+    if cfg['enable']:
+        startserver()
+
+def shutdown():
+
+    if cfg['enable']:
+        stopserver()
+
+def handle_eventnet_on(bot, event):
+
+    if not event.rest:
+        target = event.channel
+    else:
+        target = event.rest
+
+    if not target in state.data['relay']:
+        state.data['relay'].append(target)
+        state.save()
+
+    event.done()
+
+cmnds.add('eventnet-on', handle_eventnet_on, 'OPER')
+
+def handle_eventnet_off(bot, event):
+
+    if not event.rest:
+        target = event.channel
+    else:
+        target = event.rest
+
+    if target in state.data['relay']:
+        state.data['relay'].remove(target)
+        state.save()
+    event.done()
+
+cmnds.add('eventnet-off', handle_eventnet_off, 'OPER')
+
+def handle_eventnet_startserver(bot, event):
+    cfg['enable'] = 1
+    cfg.save()
+    startserver()
+    event.done()
+
+cmnds.add('eventnet-startserver', handle_eventnet_startserver, 'OPER')
+
+def handle_eventnet_stopserver(bot, event):
+    cfg['enable'] = 0
+    cfg.save()
+    stopserver()
+    event.done()
+
+cmnds.add('eventnet-stopserver', handle_eventnet_stopserver, 'OPER')
--- gozerbot-0.99.1.orig/build/lib/gplugs/seen.py
+++ gozerbot-0.99.1/build/lib/gplugs/seen.py
@@ -0,0 +1,143 @@
+# Description: tracks when a nick is last seen
+# Author: Wijnand 'tehmaze' Modderman
+# Website: http://tehmaze.com
+# License: BSD
+
+from gozerbot.callbacks import callbacks, jcallbacks
+from gozerbot.utils.log import rlog
+from gozerbot.commands import cmnds
+from gozerbot.datadir import datadir
+from gozerbot.persist.pdod import Pdod
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+
+import os, time
+
+plughelp.add('seen', 'remember what people said for the last time')
+
+cfg = PersistConfig()
+cfg.define('tz', '+0100')
+
+class Seen(Pdod):
+    def __init__(self):
+        self.datadir = datadir + os.sep + 'plugs' + os.sep + 'seen'
+        Pdod.__init__(self, os.path.join(self.datadir, 'seen.data'))
+
+    def handle_seen(self, bot, ievent):
+        if not ievent.args:
+            ievent.missing('<nick>')
+            return
+        nick = ievent.args[0].lower()
+        if not self.data.has_key(nick):
+            alts = [x for x in self.data.keys() if nick in x]
+            if alts:
+                alts.sort()
+                if len(alts) > 10:
+                    nums = len(alts) - 10
+                    alts = ', '.join(alts[:10]) + ' + %d others' % nums
+                else:
+                    alts = ', '.join(alts)
+                ievent.reply('no logs for %s, however, I remember seeing: %s' % (nick, alts))
+            else:
+                ievent.reply('no logs for %s' % nick)
+        else:
+            text = self.data[nick]['text'] and ': %s' % self.data[nick]['text'] or ''
+            try:
+                ievent.reply('%s was last seen on %s at %s, %s%s' % (nick, self.data[nick]['server'], 
+                    time.strftime('%a, %d %b %Y %H:%M:%S '+ str(cfg.get('tz')), time.localtime(self.data[nick]['time'])),
+                    self.data[nick]['what'], text))
+            except KeyError:
+                ievent.reply('%s was last seen at %s, %s%s' % (nick, 
+                    time.strftime('%a, %d %b %Y %H:%M:%S '+ str(cfg.get('tz')), time.localtime(self.data[nick]['time'])),
+                    self.data[nick]['what'], text))
+
+    def privmsgcb(self, bot, ievent):
+        self.data[ievent.nick.lower()] = {
+            'time':    time.time(),
+            'text':    ievent.origtxt,
+            'bot':     bot.name,
+            'server':  bot.server,
+            'channel': ievent.channel,
+            'what':    'saying',
+            }
+
+    def joincb(self, bot, ievent):
+        self.data[ievent.nick.lower()] = {
+            'time':    time.time(),
+            'text':    '',
+            'bot':     bot.name,
+            'server':  bot.server,
+            'channel': ievent.channel,
+            'what':    'joining %s' % ievent.channel,
+            }
+    
+    def partcb(self, bot, ievent):
+        self.data[ievent.nick.lower()] = {
+            'time':    time.time(),
+            'text':    ievent.txt,
+            'bot':     bot.name,
+            'server':  bot.server,
+            'channel': ievent.channel,
+            'what':    'parting %s' % ievent.channel,
+            }
+    
+    def quitcb(self, bot, ievent):
+        self.data[ievent.nick.lower()] = {
+            'time':    time.time(),
+            'text':    ievent.txt,
+            'bot':     bot.name,
+            'server':  bot.server,
+            'channel': ievent.channel,
+            'what':    'quitting',
+            }
+   
+    def xmppcb(self, bot, ievent):
+        if ievent.type == 'unavailable':
+           self.data[ievent.nick.lower()] = {
+               'time':    time.time(),
+               'text':    ievent.userhost,
+               'bot':     bot.name,
+               'server':  bot.server,
+               'channel': ievent.channel,
+               'what':    'saindo da sala %s' % ievent.channel,
+               }
+        else:
+           self.data[ievent.nick.lower()] = {
+               'time':    time.time(),
+               'text':    ievent.userhost,
+               'bot':     bot.name,
+               'server':  bot.server,
+               'channel': ievent.channel,
+               'what':    'entrando na sala %s' % ievent.channel,
+               }
+
+  
+    def size(self):
+        return len(self.data.keys())
+
+seen = None
+
+def init():
+    global seen
+    seen = Seen()
+    callbacks.add('PRIVMSG', seen.privmsgcb)
+    callbacks.add('JOIN', seen.joincb)
+    callbacks.add('PART', seen.partcb)
+    callbacks.add('QUIT', seen.quitcb)
+    callbacks.add('Presence', seen.xmppcb)
+    cmnds.add('seen', seen.handle_seen, ['USER', 'CLOUD'])
+    tests.add('seen exec')
+    examples.add('seen', 'show last spoken txt of <nikc>', 'seen dunker')
+    return 1
+
+def shutdown():
+    global seen
+    if seen:
+        seen.save()
+        del seen
+
+def size():
+    global seen
+    return seen.size()
--- gozerbot-0.99.1.orig/build/lib/gplugs/tinyurl.py
+++ gozerbot-0.99.1/build/lib/gplugs/tinyurl.py
@@ -0,0 +1,92 @@
+# plugs/tinyurl.py
+#
+#
+
+""" tinyurl.com feeder """
+
+__author__ = "Wijnand 'tehmaze' Modderman - http://tehmaze.com"
+__license__ = 'BSD'
+__depend__ = ['url', ]
+__depending__ = ['rss', ]
+
+from gozerbot.aliases import aliases
+from gozerbot.callbacks import callbacks
+from gozerbot.commands import cmnds
+from gozerbot.generic import striphtml, useragent, rlog
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.plugins import plugins
+
+import urllib, urllib2, urlparse, re
+
+plughelp.add('tinyurl', 'the tinyurl url provides a tiny url for the url \
+provided as argument or the last url in the log')
+
+re_url_match  = re.compile(u'((?:http|https)://\S+)')
+
+def valid_url(url):
+    """ check if url is valid """
+    if not re_url_match.search(url):
+        return False
+    parts = urlparse.urlparse(url)
+    cleanurl = '%s://%s' % (parts[0], parts[1])
+    if parts[2]:
+        cleanurl = '%s%s' % (cleanurl, parts[2])
+    if parts[3]:
+        cleanurl = '%s;%s' % (cleanurl, parts[3])
+    if parts[4]:
+        cleanurl = '%s?%s' % (cleanurl, parts[4])
+    return cleanurl
+
+def get_tinyurl(url):
+    """ grab a tinyurl """
+    postarray = [
+        ('submit', 'submit'),
+        ('url', url),
+        ]
+    postdata = urllib.urlencode(postarray)
+    req = urllib2.Request(url='http://tinyurl.com/create.php', data=postdata)
+    req.add_header('User-agent', useragent())
+    try:
+        res = urllib2.urlopen(req).readlines()
+        #raise Exception("mekker")
+    except urllib2.URLError, e:
+        rlog(10, 'tinyurl', 'URLError: %s' % str(e))
+        return
+    except urllib2.HTTPError, e:
+        rlog(10, 'tinyurl', 'HTTP error: %s' % str(e))
+        return
+    urls = []
+    for line in res:
+        if line.startswith('<blockquote><b>'):
+            urls.append(striphtml(line.strip()).split('[Open')[0])
+    if len(urls) == 3:
+        urls.pop(0)
+    return urls
+
+def handle_tinyurl(bot, ievent):
+    """ get tinyurl from argument or last url in log """
+    url = None
+
+    if ievent.rest:
+        url = ievent.rest
+    else:
+	if plugins['url']:
+	    url = plugins['url'].cache.fetch(bot, ievent)
+
+    if not url:
+        ievent.missing('<url>')
+        return
+    if not valid_url(url):
+        ievent.reply('invalid or bad URL')
+        return
+
+    tinyurl = get_tinyurl(url)
+    if tinyurl:
+        ievent.reply(' .. '.join(tinyurl))
+    else:
+        ievent.reply('failed to create tinyurl')
+
+cmnds.add('tinyurl', handle_tinyurl, 'USER', threaded=True)
+examples.add('tinyurl', 'show a tinyurl', 'tinyurl http://gozerbot.org')
+aliases.data['tu'] = 'tinyurl'
--- gozerbot-0.99.1.orig/build/lib/gplugs/idle.py
+++ gozerbot-0.99.1/build/lib/gplugs/idle.py
@@ -0,0 +1,85 @@
+# plugs/idle.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import elapsedstring, getwho, jsonstring
+from gozerbot.commands import cmnds
+from gozerbot.callbacks import callbacks, jcallbacks
+from gozerbot.examples import examples
+from gozerbot.datadir import datadir
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliases
+from gozerbot.tests import tests
+
+import time, os
+
+plughelp.add('idle', 'show how long a user or channel has been idle')
+
+idle = PlugPersist('idle.data')
+if not idle.data:
+    idle.data = {}
+
+def shutdown():
+    idle.save()
+
+def preidle(bot, ievent):
+    """ idle precondition aka check if it is not a command """
+    if ievent.usercmnd:
+        return 0
+    else:
+        return 1
+        
+def idlecb(bot, ievent):
+    """ idle PRIVMSG callback .. set time for channel and nick """
+    ttime = time.time()
+    idle.data[jsonstring((bot.name, ievent.channel))] = ttime
+    idle.data[jsonstring((bot.name, ievent.userhost))] = ttime
+
+callbacks.add('PRIVMSG', idlecb, preidle)
+jcallbacks.add('Message', idlecb, preidle)
+
+def handle_idle(bot, ievent):
+    """ idle [<nick>] .. show how idle an channel/user has been """
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        handle_idle2(bot, ievent)
+        return
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("can't get userhost of %s" % who)
+        return
+    try:
+        elapsed = elapsedstring(time.time() - idle.data[jsonstring((bot.name, userhost))])
+    except KeyError:
+        ievent.reply("i haven't seen %s" % who)
+        return
+    if elapsed:
+        ievent.reply("%s is idle for %s" % (who, elapsed))
+        return
+    else:
+        ievent.reply("%s is not idle" % who)
+        return   
+
+cmnds.add('idle', handle_idle, ['USER', 'WEB', 'CLOUD'])
+aliases.data['st'] = 'idle'
+tests.add('idle').add('idle exec')
+
+def handle_idle2(bot, ievent):
+    """ show how idle a channel has been """
+    chan = ievent.channel
+    try:
+        elapsed = elapsedstring(time.time()-idle.data[jsonstring((bot.name, chan))])
+    except KeyError:
+        ievent.reply("nobody said anything on channel %s yet" % chan)
+        return
+    if elapsed:
+        ievent.reply("channel %s is idle for %s" % (chan, elapsed))
+    else:
+        ievent.reply("channel %s is not idle" % chan)
+
+examples.add('idle', 'idle [<nick>] .. show how idle the channel is or show \
+how idle <nick> is', '1) idle 2) idle test')
--- gozerbot-0.99.1.orig/build/lib/gplugs/rss.py
+++ gozerbot-0.99.1/build/lib/gplugs/rss.py
@@ -0,0 +1,1363 @@
+# plugs/rss.py
+#
+#
+
+"""the rss mantra is of the following:
+
+as OPER:
+
+. add a url with rss-add
+. start the watcher with rss-watch
+
+now the user can start the bot sending messages of the feed to him with
+rss-start. if an OPER gives a rss-start command in a channel data will be
+send to the channel.
+ """
+
+__copyright__ = 'this file is in the public domain'
+__gendocfirst__ = ['rss-add', 'rss-watch', 'rss-start']
+__gendocskip__ = ['rss-dump', ]
+
+from gozerbot.utils.generic import convertpickle
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.generic import geturl2, handle_exception, rlog, lockdec, \
+strippedtxt, fromenc, striphtml, useragent, jsonstring
+from gozerbot.utils.rsslist import rsslist
+from gozerbot.utils.statdict import Statdict
+from gozerbot.utils.lazydict import LazyDict
+from gozerbot.fleet import fleet
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.datadir import datadir
+from gozerbot.utils.dol import Dol
+from gozerbot.persist.pdod import Pdod
+from gozerbot.persist.pdol import Pdol
+from gozerbot.plughelp import plughelp
+from gozerbot.periodical import periodical
+from gozerbot.aliases import aliasset
+from gozerbot.users import users
+from gozerbot.tests import tests
+
+from simplejson import loads
+try:
+    from gplugs.tinyurl import get_tinyurl
+except:
+    def get_tinyurl(url):
+        return url
+
+import gozerbot.compat.rss
+import feedparser
+import gozerbot.threads.thr as thr
+import time, os, types, thread, socket, xml
+
+plughelp.add('rss', 'manage rss feeds')
+
+## UPGRADE PART
+
+if hasattr(os, 'mkdir'):
+    if not os.path.isdir(datadir + os.sep + 'plugs' + os.sep + 'rss'):
+        os.mkdir(datadir + os.sep + 'plugs' + os.sep + 'rss')
+
+def upgrade():
+    rlog(10, 'rss', 'upgrading')
+    teller = 0
+    oldpickle = gozerbot.compat.rss.Rsswatcher(datadir + os.sep + \
+'old' + os.sep + 'rss')
+    for name, rssitem in oldpickle.data.iteritems():
+        newrssitem = Rssitem(rssitem.name, rssitem.url, rssitem.itemslist, rssitem.watchchannels, \
+rssitem.sleeptime, rssitem.running)
+        watcher.data[name] = newrssitem
+        teller += 1
+    watcher.save()
+    convertpickle(datadir + os.sep + 'rss.itemslist', datadir + os.sep + 'plugs' + \
+os.sep + 'rss' + os.sep + 'rss.itemslist')
+    convertpickle(datadir + os.sep + 'rss.markup', datadir + os.sep + 'plugs' + \
+os.sep + 'rss' + os.sep + 'rss.markup')
+    rlog(10, 'rss', 'upgraded %s items' % str(teller))
+
+## END UPGRADE PART
+
+savelist = []
+possiblemarkup = {'separator': 'set this to desired item separator', \
+'all-lines': "set this to 1 if you don't want items to be aggregated", \
+'tinyurl': "set this to 1 when you want to use tinyurls", 'skipmerge': \
+"set this to 1 if you want to skip merge commits", 'reverse-order': 'set \
+this to 1 if you want the rss items displayed with oldest item first', \
+'striphtml': 'strip html from output'}
+
+def txtindicts(result, d):
+    """ return lowlevel values in (nested) dicts """
+    for j in d.values():
+        if type(j) == types.DictType:
+            txtindicts(result, j) 
+        else:
+            result.append(j)
+
+def checkfordate(data, date):
+    for item in data:
+        try:
+            d = item['updated']
+        except KeyError:
+            continue
+        if date == d:
+            return True
+    return False
+
+rsslock = thread.allocate_lock()
+locked = lockdec(rsslock)
+
+class RssException(Exception):
+    pass
+
+class Rss301(RssException):
+    pass
+
+class RssStatus(RssException):
+    pass
+
+class RssBozoException(RssException):
+    pass
+
+class RssNoSuchItem(RssException):
+    pass
+
+class Rssitem(LazyDict):
+
+    """ item that contains rss data """
+
+    def __init__(self, name="", url="", itemslist=[], watchchannels=[], \
+sleeptime=30*60, running=0, d={}):
+        if not d:
+            LazyDict.__init__(self)
+            self['name'] = name
+            self['url'] = url
+            self['itemslist'] = list(itemslist)
+            self['watchchannels'] = list(watchchannels)
+            self['sleeptime'] = int(sleeptime)
+            self['running'] = int(running)
+            self['stoprunning'] = 0
+            self['botname'] = None
+        else:
+            LazyDict.__init__(self, d)
+
+class Rssdict(PlugPersist):
+
+    """ dict of rss entries """
+
+    def __init__(self, filename):
+        PlugPersist.__init__(self, filename)
+        if not self.data:
+            self.data = {}
+        else:
+            tmp = {}
+            for name, item in self.data.iteritems():
+                tmp[name] = Rssitem(d=item)
+            self.data = tmp
+        if self.data.has_key('itemslists'):
+            del self.data['itemslists']
+        self.itemslists = Pdol(datadir + os.sep + 'plugs' + os.sep + 'rss' + \
+os.sep + filename + '.itemslists')
+        self.handlers = {}
+        self.results = {}
+        self.jobids = {}
+        self.rawresults = {}
+        self.results = Dol()
+        self.modified = {}
+        self.etag = {}
+        self.markup = Pdod(datadir + os.sep + 'plugs' + os.sep + 'rss' + \
+os.sep + filename + '.markup')
+
+    def size(self):
+        """ return number of rss entries """
+        return len(self.data)
+
+    @locked
+    def add(self, name, url):
+        """ add rss item """
+        rlog(10, 'rss', 'adding %s %s' % (name, url))
+        self.data[name] = Rssitem(name, url, ['title', ])
+        self.save()
+
+    @locked
+    def delete(self, name):
+        """ delete rss item by name """
+        target = None
+        for j, i in self.data.iteritems():
+           if i.name == name:
+               target = i
+        if target:
+            try:
+                target.running = 0
+                del self.data[name]
+                self.save()
+            except:
+                pass
+
+    def byname(self, name):
+        """ return rss item by name """
+        try:
+            return self.data[name]
+        except:
+            return
+
+    def getdata(self, name):
+        """ get data of rss feed """
+        rssitem = self.byname(name)
+        if rssitem == None:
+            raise RssNoSuchItem("no %s rss item found" % name)
+        try:
+            modified = self.modified[name]
+        except KeyError:
+            modified = None
+        try:
+            etag = self.etag[name]
+        except KeyError:
+            etag = None
+        rlog(9, 'rss', 'fetching %s' % rssitem.url)
+        result = feedparser.parse(rssitem.url, modified=modified, etag=etag, \
+agent=useragent())
+        if result and result.has_key('bozo_exception'):
+            rlog(1, 'rss', '%s bozo_exception: %s' % (name, \
+result['bozo_exception']))
+        try:
+            status = result.status
+        except AttributeError:
+            status = 200
+        if status != 200 and status != 301 and status != 302 and status != 304:
+            raise RssStatus(status)
+        try:
+            self.modified[name] = result.modified
+        except AttributeError:
+            pass
+        try:
+            self.etag[name] = result.etag
+        except AttributeError:
+            pass
+        if status == 304:
+            rlog(0, 'rss', 'recieved 304 from %s rss feed' % name)
+            return self.rawresults[name]
+        else:
+            self.rawresults[name] = result.entries
+        return result.entries
+
+class Rsswatcher(Rssdict):
+
+    """ rss watchers """ 
+
+    def __init__(self, filename):
+        Rssdict.__init__(self, filename)
+        
+    def sync(self, name):
+        result = self.getdata(name)
+        if result:
+            self.results[name] = result
+
+    def changeinterval(self, name, interval):
+        periodical.changeinterval(self.jobids[name], interval)
+
+    @locked
+    def startwatchers(self):
+        """ start watcher threads """
+        for j, z in self.data.iteritems():
+            if z.running:
+                thr.start_new_thread(self.watch, (z.name, ))
+
+    @locked
+    def stopwatchers(self):
+        """ stop all watcher threads """
+        for j, z in self.data.iteritems():
+            if z.running:
+                z.stoprunning = 1
+        periodical.killgroup('rss')
+
+    def dowatch(self, name, sleeptime=1800):
+        rssitem = self.byname(name)
+        if not rssitem:
+            rlog(10, 'rss', "no %s rss item available" % name)
+            return
+        while 1:
+            try:
+                self.watch(name)
+            except Exception, ex:
+                rlog(100, 'rss', '%s feed error: %s' % (name, str(ex)))
+                rlog(100, 'rss', '%s sleeping %s seconds for retry' % \
+(name, sleeptime))
+                time.sleep(sleeptime)
+                if not rssitem.running:
+                    break
+            else:
+                break
+
+    def makeresult(self, name, target, data):
+        res = []
+        for j in data:
+            tmp = {}
+            if not self.itemslists[jsonstring([name, target])]:
+                return []
+            for i in self.itemslists[jsonstring([name, target])]:
+                try:
+                    tmp[i] = unicode(j[i])
+                except KeyError:
+                    continue
+            res.append(tmp)
+        return res
+
+    def watch(self, name):
+        """ start a watcher thread """
+        # get basic data
+        rlog(10, 'rss', 'trying %s rss feed watcher' % name)
+        try:
+            result = self.getdata(name)
+        except RssException, ex:
+            rlog(10, 'rss', "%s error: %s" % (name, str(ex)))
+            result = []
+        rssitem = self.byname(name)
+        if not rssitem:
+            raise RssNoItem()
+        # poll every sleeptime seconds
+        self.results[name] = result
+        pid = periodical.addjob(rssitem.sleeptime, 0, self.peek, name, name)
+        self.jobids[name] = pid
+        rssitem.running = 1
+        rssitem.stoprunning = 0
+        self.data[name] = rssitem
+        self.save()
+        rlog(10, 'rss', 'started %s rss watch' % name)
+
+    def makeresponse(self, name, res, channel, sep="\002||\002"):
+        # loop over result to make a response
+        result = u""
+        itemslist = self.itemslists[jsonstring([name, channel])]
+        if not itemslist:
+            rssitem = self.byname(name)
+            if not rssitem:
+                return "no %s rss item" % name
+            else:
+                self.itemslists.extend(jsonstring([name, channel]), rssitem.itemslist)
+                self.itemslists.save()
+        for j in res:
+            if self.markup.get(jsonstring([name, channel]), \
+'skipmerge') and 'Merge branch' in j['title']:
+                continue
+            resultstr = u""
+            for i in self.itemslists[jsonstring([name, channel])]:
+
+                try:
+                    item = unicode(j[i])
+
+                    if not item:
+                        continue
+
+                    if item.startswith('http://'):
+
+                        if self.markup.get(jsonstring([name, channel]), \
+'tinyurl'):
+                            try:
+                                tinyurl = get_tinyurl(item)
+
+                                if not tinyurl:
+                                    resultstr += u"<%s> - " % item
+                                else:
+                                    resultstr += u"<%s> - " % tinyurl[0]
+
+                            except Exception, ex:
+                                handle_exception()
+                                resultstr += u"<%s> - " % item
+
+                        else:
+                            resultstr += u"<%s> - " % item
+
+                    elif self.markup.get(jsonstring([name, channel]) , 'striphtml'):
+                        resultstr += u"%s - " % striphtml(item.strip())
+
+                    else:
+                        resultstr += u"%s - " % item.strip()
+                    
+                except KeyError:
+                    continue
+            resultstr = resultstr[:-3]
+            if resultstr:
+                result += u"%s %s " % (resultstr, sep)
+        return result[:-(len(sep)+2)]
+
+    def peek(self, name, *args):
+        rssitem = self.byname(name)
+        if not rssitem or not rssitem.running or rssitem.stoprunning:
+            return
+        try:
+            try:
+                res = self.getdata(name)
+            except socket.timeout:
+                rlog(10, 'rss', 'socket timeout of %s' % name)
+                return
+            except RssException, ex:
+                rlog(10, 'rss', '%s error: %s' % (name, str(ex)))
+                return
+            if not res:
+                return
+            res2 = []
+            for j in res:
+                try:
+                    d = j['updated'] 
+                except KeyError:
+                    if j not in self.results[name]:
+                        self.results[name].append(j)
+                        res2.append(j)
+                else:
+                    if not checkfordate(self.results[name], d):
+                        self.results[name].append(j)
+                        res2.append(j)
+            if not res2:
+                return
+            for item in rssitem.watchchannels:
+                try:
+                    (botname, channel) = item
+                except:
+                    try:
+                        (botname, channel) = loads(item)
+                    except:
+                        rlog(10, 'rss', '%s is not in the format \
+(botname,channel)' % str(item))
+                bot = fleet.byname(botname)
+                if not bot:
+                    continue
+                if self.markup.get(jsonstring([name, channel]), 'reverse-order'):
+                    res2 = res2[::-1]
+                if self.markup.get(jsonstring([name, channel]), 'all-lines'):
+                    for i in res2:
+                        response = self.makeresponse(name, [i, ], channel)
+                        bot.say(channel, "\002%s\002: %s" % \
+(rssitem.name, response), fromm=rssitem.name)
+                else:
+                    sep =  self.markup.get(jsonstring([name, channel]), 'separator')
+                    if sep:
+                        response = self.makeresponse(name, res2, channel, \
+sep=sep)
+                    else:
+                        response = self.makeresponse(name, res2, channel)
+                    bot.say(channel, "\002%s\002: %s" % (rssitem.name, \
+response), fromm=rssitem.name)
+        except Exception, ex:
+            handle_exception(txt=name)
+
+    @locked
+    def stopwatch(self, name):
+        """ stop watcher thread """
+        for i, z in self.data.iteritems():
+            if i == name:
+                z.running = 0
+                try:
+                    del self.results[name]
+                except KeyError:
+                    pass
+                self.data[i] = z
+                self.save()
+                try:
+                    periodical.killjob(self.jobids[i])
+                except KeyError:
+                    pass
+                return 1
+
+    @locked
+    def list(self):
+        """ return of rss names """
+        feeds = self.data.keys()
+        return feeds
+
+    @locked
+    def runners(self):	
+        """ show names/channels of running watchers """
+        result = []
+        for j, z in self.data.iteritems():
+            if z.running == 1 and not z.stoprunning: 
+                result.append((z.name, z.watchchannels))
+        return result
+
+    @locked
+    def feeds(self, botname, channel):
+        """ show names/channels of running watcher """
+        result = []
+        for j, z in self.data.iteritems():
+            if jsonstring([botname, channel]) in z.watchchannels or [botname, channel] in z.watchchannels:
+                result.append(z.name)
+        return result
+
+    @locked
+    def url(self, name):
+        """ return url of rssitem """
+        for j, z in self.data.iteritems():
+            if z.name == name:
+                return z.url
+
+    @locked
+    def seturl(self, name, url):
+        """ set url of rssitem """
+        for j, z in self.data.iteritems():
+            if z.name == name:
+                z.url = url
+                self.save()
+                return True
+
+    def scan(self, name):
+        """ scan a rss url for used xml items """
+        try:
+            result = self.getdata(name)
+        except RssException, ex:
+            rlog(10, 'rss', '%s error: %s' % (name, str(ex)))
+            return
+        if not result:
+            return
+        keys = []
+        for item in self.rawresults[name]:
+             for key in item.keys():
+                 keys.append(key)            
+        statdict = Statdict()
+        for key in keys:
+            statdict.upitem(key)
+        return statdict.top()  
+
+    def search(self, name, item, search):
+        res = []
+        for result in self.rawresults[name]:
+            try:
+                title = result['title']
+                txt = result[item]
+            except KeyError:
+                continue
+            if search in title.lower():
+                if txt:
+                   res.append(txt)
+        return res
+
+    def searchall(self, item, search):
+        res = []
+        for name, results in self.rawresults.iteritems():
+            for result in results:
+                try:
+                    title = result['title']
+                    txt = result[item]
+                except KeyError:
+                    continue
+                if search in title.lower():
+                    if txt:
+                        res.append("%s: %s" % (name, txt))
+        return res
+
+    def all(self, name, item):
+        res = []
+        for result in self.rawresults[name]:
+            try:
+                txt = result[item]
+            except KeyError:
+                continue
+            if txt:
+                res.append(txt)
+        return res
+
+watcher = Rsswatcher('rss')
+
+def init(): 
+    """ called after plugin import """
+    thr.start_new_thread(watcher.startwatchers, ())
+    return 1
+
+def size():
+    """ return number of watched rss entries """
+    return watcher.size()
+
+def shutdown():
+    """ called before plugin import """
+    watcher.stopwatchers()
+    return 1
+    
+def handle_rssadd(bot, ievent):
+    """ rss-add <name> <url> .. add a rss item """
+    try:
+        (name, url) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <url>')
+        return
+    watcher.add(name, url)
+    ievent.reply('rss item added')
+
+cmnds.add('rss-add', handle_rssadd, 'OPER')
+examples.add('rss-add', 'rss-add <name> <url> to the rsswatcher', 'rss-add \
+gozerbot http://core.gozerbot.org/hg/dev/0.9/rss-log')
+tests.add('rss-add dev http://core.gozerbot.org/hg/dev/0.9/rss-log')
+
+def handle_rssdel(bot, ievent):
+    """ rss-del <name> .. delete a rss item """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    if watcher.byname(name):
+        watcher.stopwatch(name)
+        watcher.delete(name)
+        ievent.reply('rss item deleted')
+    else:
+        ievent.reply('there is no %s rss item' % name)
+
+cmnds.add('rss-del', handle_rssdel, 'OPER')
+examples.add('rss-del', 'rss-del <name> .. remove <name> from the \
+rsswatcher', 'rss-del mekker')
+tests.add('rss-del mekker')
+
+def handle_rsswatch(bot, ievent):
+    """ rss-watch <name> .. start watcher thread """
+    if not ievent.channel:
+        ievent.reply('no channel provided')
+    try:
+        name, sleepsec = ievent.args
+    except ValueError:
+        try:
+            name = ievent.args[0]
+            sleepsec = 1800
+        except IndexError:
+            ievent.missing('<name> [secondstosleep]')
+            return
+    try:
+        sleepsec = int(sleepsec)
+    except ValueError:
+        ievent.reply("time to sleep needs to be in seconds")
+        return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss object" % name)
+        return
+    got = None
+    if not rssitem.running or rssitem.stoprunning:
+        if not rssitem.sleeptime:
+            rssitem.sleeptime = sleepsec
+        rssitem.running = 1
+        rssitem.stoprunning = 0
+        got = True
+        watcher.save()
+        try:
+            watcher.watch(name)
+        except Exception, ex:
+            ievent.reply(str(ex))
+            return
+    if got:
+        watcher.save()
+        ievent.reply('watcher started')
+    else:
+        ievent.reply('already watching %s' % name)
+
+cmnds.add('rss-watch', handle_rsswatch, 'OPER')
+examples.add('rss-watch', 'rss-watch <name> [seconds to sleep] .. go \
+watching <name>', '1) rss-watch gozerbot 2) rss-watch gozerbot 600')
+tests.add('rss-watch')
+
+def handle_rssstart(bot, ievent):
+    """ rss-start <name> .. start a rss feed to a user """
+    if ievent.rest == 'all':
+        targets = watcher.list()
+    elif not ievent.args:
+       ievent.missing('<list of feeds>')
+       return
+    else:
+       targets = ievent.args
+
+    started = []
+
+    for name in targets:
+        rssitem = watcher.byname(name)
+        if bot.jabber:
+            if ievent.msg:
+                target = ievent.userhost
+            else:
+                target = ievent.channel
+        else:
+            if users.allowed(ievent.userhost, ['OPER', ]) and not ievent.msg:
+                target = ievent.channel
+            else:
+                target = ievent.nick
+        if rssitem == None:
+            ievent.reply("we don't have a %s rss object" % name)
+            continue
+        watcher.watch(name)
+        if not rssitem.running:
+            ievent.reply('%s watcher is not running' % name)
+            continue
+        if jsonstring([bot.name, target]) in rssitem.watchchannels or [bot.name, target] in rssitem.watchchannels:
+            ievent.reply('we are already monitoring %s on (%s,%s)' % \
+(name, bot.name, target))
+            continue
+        rssitem.watchchannels.append([bot.name, target])
+        watcher.itemslists.adduniq(jsonstring([name, target]), 'title')
+        watcher.itemslists.adduniq(jsonstring([name, target]), 'link')
+        watcher.markup.set(jsonstring([name, target]), 'tinyurl', 1)
+        started.append(name)
+    watcher.itemslists.save()
+    watcher.markup.save()
+    watcher.save()
+    ievent.reply('started: ', started)
+
+cmnds.add('rss-start', handle_rssstart, ['RSS', 'USER'])
+examples.add('rss-start', 'rss-start <name> .. start a rss feed \
+(per user/channel) ', 'rss-start gozerbot')
+tests.add('rss-start dev')
+
+def handle_rssstop(bot, ievent):
+    """ rss-start <name> .. start a rss feed to a user """
+    if not ievent.rest:
+       ievent.missing('<feed name>')
+       return
+    name = ievent.rest
+    rssitem = watcher.byname(name)
+    if bot.jabber:
+        target = ievent.userhost
+    else:
+        if users.allowed(ievent.userhost, ['OPER', ]) and not ievent.msg:
+            target = ievent.channel
+        else:
+            target = ievent.nick
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss feed" % name)
+        return
+    if not rssitem.running:
+        ievent.reply('%s watcher is not running' % name)
+        return
+    try:
+        rssitem.watchchannels.remove([bot.name, target])
+    except ValueError:
+        try:
+            rssitem.watchchannels.remove([bot.name, target])
+        except ValueError:
+            ievent.reply('we are not monitoring %s on (%s,%s)' % \
+(name, bot.name, target))
+            return
+    watcher.save()
+    ievent.reply('%s stopped' % name)
+
+cmnds.add('rss-stop', handle_rssstop, ['RSS', 'USER'])
+examples.add('rss-stop', 'rss-stop <name> .. stop a rss feed \
+(per user/channel) ', 'rss-stop gozerbot')
+tests.add('rss-stop mekker')
+
+def handle_rsschannels(bot, ievent):
+    """ rss-channels <name> .. show channels of rss feed """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing("<name>") 
+        return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss object" % name)
+        return
+    if not rssitem.watchchannels:
+        ievent.reply('%s is not in watch mode' % name)
+        return
+    result = []
+    for i in rssitem.watchchannels:
+        result.append(str(i))
+    ievent.reply("channels of %s: " % name, result, dot=True)
+
+cmnds.add('rss-channels', handle_rsschannels, 'OPER')
+examples.add('rss-channels', 'rss-channels <name> .. show channels', \
+'rss-channels gozerbot')
+tests.add('rss-channels')
+
+def handle_rssaddchannel(bot, ievent):
+    """ rss-addchannel <name> [<botname>] <channel> .. add a channel to \
+        rss item """
+    try:
+        (name, botname, channel) = ievent.args
+    except ValueError:
+        try:
+            (name, channel) = ievent.args
+            botname = bot.name
+        except ValueError:
+            try:
+                name = ievent.args[0]
+                botname = bot.name
+                channel = ievent.channel
+            except IndexError:
+                ievent.missing('<name> [<botname>] <channel>')
+                return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss object" % name)
+        return
+    if not rssitem.running:
+        ievent.reply('%s watcher is not running' % name)
+        return
+    if jsonstring([botname, channel]) in rssitem.watchchannels or [botname, channel] in rssitem.watchchannels:
+        ievent.reply('we are already monitoring %s on (%s,%s)' % \
+(name, botname, channel))
+        return
+    rssitem.watchchannels.append([botname, channel])
+    watcher.save()
+    ievent.reply('%s added to %s rss item' % (channel, name))
+
+cmnds.add('rss-addchannel', handle_rssaddchannel, 'OPER')
+examples.add('rss-addchannel', 'rss-addchannel <name> [<botname>] <channel> \
+..add <channel> or <botname> <channel> to watchchannels of <name>', \
+'1) rss-addchannel gozerbot #dunkbots 2) rss-addchannel gozerbot main \
+#dunkbots')
+tests.add('rss-addchannel dev exec')
+
+def handle_rsssetitems(bot, ievent):
+    try:
+        (name, items) = ievent.args[0], ievent.args[1:]
+    except ValueError:
+        ievent.missing('<name> <items>')
+        return
+    if bot.jabber or users.allowed(ievent.userhost, ['OPER', ]):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    if not watcher.byname(name):
+        ievent.reply("we don't have a %s feed" % name)
+        return
+    watcher.itemslists.data[jsonstring([name, target])] = items
+    watcher.itemslists.save()
+    ievent.reply('%s added to (%s,%s) itemslist' % (items, name, target))
+
+cmnds.add('rss-setitems', handle_rsssetitems, ['RSS', 'USER'])
+examples.add('rss-setitems', 'set tokens of the itemslist (per user/channel)',\
+ 'rss-setitems gozerbot author author link pubDate')
+tests.add('rss-setitems dev link author')
+
+def handle_rssadditem(bot, ievent):
+    try:
+        (name, item) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <item>')
+        return
+    if bot.jabber or users.allowed(ievent.userhost, ['OPER', ]):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    if not watcher.byname(name):
+        ievent.reply("we don't have a %s feed" % name)
+        return
+    watcher.itemslists.adduniq(jsonstring([name, target]), item)
+    watcher.itemslists.save()
+    ievent.reply('%s added to (%s,%s) itemslist' % (item, name, target))
+
+cmnds.add('rss-additem', handle_rssadditem, ['RSS', 'USER'])
+examples.add('rss-additem', 'add a token to the itemslist (per user/channel)',\
+ 'rss-additem gozerbot link')
+tests.add('rss-additem dev link')
+
+def handle_rssdelitem(bot, ievent):
+    try:
+        (name, item) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <item>')
+        return
+    if users.allowed(ievent.userhost, ['OPER', 'RSS']):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    if not watcher.byname(name):
+        ievent.reply("we don't have a %s feed" % name)
+        return
+    try:
+        watcher.itemslists.remove(jsonstring([name, target]), item)
+        watcher.itemslists.save()
+    except RssNoSuchItem:
+        ievent.reply("we don't have a %s rss feed" % name)
+        return
+    ievent.reply('%s removed from (%s,%s) itemslist' % (item, name, target))
+
+cmnds.add('rss-delitem', handle_rssdelitem, ['RSS', 'USER'])
+examples.add('rss-delitem', 'remove a token from the itemslist \
+(per user/channel)', 'rss-delitem gozerbot link')
+tests.add('rss-delitem')
+
+def handle_rssmarkuplist(bot, ievent):
+    ievent.reply('possible markups ==> ' , possiblemarkup, dot=True)
+
+cmnds.add('rss-markuplist', handle_rssmarkuplist, 'USER')
+examples.add('rss-markuplist', 'show possible markup entries', \
+'rss-markuplist')
+tests.add('rss-markuplist')
+
+def handle_rssmarkup(bot, ievent):
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    if users.allowed(ievent.userhost, ['OPER', ]):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    try:
+        ievent.reply(str(watcher.markup[jsonstring([name, target])]))
+    except KeyError:
+        pass
+
+cmnds.add('rss-markup', handle_rssmarkup, ['RSS', 'USER'])
+examples.add('rss-markup', 'show markup list for a feed (per user/channel)', \
+'rss-markup gozerbot')
+tests.add('rss-markup dev')
+
+def handle_rssaddmarkup(bot, ievent):
+    try:
+        (name, item, value) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <item> <value>')
+        return
+    if users.allowed(ievent.userhost, ['OPER', ]):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    try:
+        value = int(value)
+    except ValueError:
+        pass
+    try:
+        watcher.markup.set(jsonstring([name, target]), item, value)
+        watcher.markup.save()
+        ievent.reply('%s added to (%s,%s) markuplist' % (item, name, target))
+    except KeyError:
+        ievent.reply("no (%s,%s) feed available" % (name, target))
+
+cmnds.add('rss-addmarkup', handle_rssaddmarkup, ['RSS', 'USER'])
+examples.add('rss-addmarkup', 'add a markup option to the markuplist \
+(per user/channel)', 'rss-addmarkup gozerbot all-lines 1')
+tests.add('rss-addmarkup dev')
+
+def handle_rssdelmarkup(bot, ievent):
+    try:
+        (name, item) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <item>')
+        return
+    if users.allowed(ievent.userhost, ['OPER', 'RSS']):
+        target = ievent.channel.lower()
+    else:
+        target = ievent.nick.lower()
+    try:
+        del watcher.markup[jsonstring([name, target])][item]
+    except (KeyError, TypeError):
+        ievent.reply("can't remove %s from %s feed's markup" %  (item, name))
+        return
+    watcher.markup.save()
+    ievent.reply('%s removed from (%s,%s) markuplist' % (item, name, target))
+
+cmnds.add('rss-delmarkup', handle_rssdelmarkup, ['RSS', 'USER'])
+examples.add('rss-delmarkup', 'remove a markup option from the markuplist \
+(per user/channel)', 'rss-delmarkup gozerbot all-lines')
+tests.add('rss-delmarkup dev all-lines')
+
+def handle_rssdelchannel(bot, ievent):
+    """ rss-delchannel <name> [<botname>] <channel> .. delete channel \
+        from rss item """
+    botname = None
+    try:
+        (name, botname, channel) = ievent.args
+    except ValueError:
+        try:
+            (name, channel) = ievent.args
+            botname = bot.name
+        except ValueError:
+            try:
+                name = ievent.args[0]
+                botname = bot.name
+                channel = ievent.channel
+            except IndexError:
+                ievent.missing('<name> [<botname>] [<channel>]')
+                return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss object" % name)
+        return
+    if jsonstring([botname, channel]) in rssitem.watchchannels:
+        rssitem.watchchannels.remove(jsonstring([botname, channel]))
+        ievent.reply('%s removed from %s rss item' % (channel, name))
+    elif [botname, channel] in rssitem.watchchannels:
+        rssitem.watchchannels.remove([botname, channel])
+        ievent.reply('%s removed from %s rss item' % (channel, name))
+    else:
+        ievent.reply('we are not monitoring %s on (%s,%s)' % (name, botname, \
+channel))
+        return
+    watcher.save()
+
+cmnds.add('rss-delchannel', handle_rssdelchannel, 'OPER')
+examples.add('rss-delchannel', 'rss-delchannel <name> [<botname>] \
+[<channel>] .. delete <channel> or <botname> <channel> from watchchannels of \
+<name>', '1) rss-delchannel gozerbot #dunkbots 2) rss-delchannel gozerbot \
+main #dunkbots')
+tests.add('rss-delchannel dev exec')
+
+def handle_rssstopwatch(bot, ievent):
+    """ rss-stopwatch <name> .. stop a watcher thread """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    rssitem = watcher.byname(name)
+    if not rssitem:
+        ievent.reply("there is no %s rssitem" % name)
+        return
+    if not watcher.stopwatch(name):
+        ievent.reply("can't stop %s watcher" % name)
+        return
+    ievent.reply('stopped %s rss watch' % name)
+
+cmnds.add('rss-stopwatch', handle_rssstopwatch, 'OPER')
+examples.add('rss-stopwatch', 'rss-stopwatch <name> .. stop polling <name>', \
+'rss-stopwatch gozerbot')
+tests.add('rss-stopwatch makker')
+
+def handle_rsssleeptime(bot, ievent):
+    """ rss-sleeptime <name> .. get sleeptime of rss item """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss item" % name)
+        return
+    try:
+        ievent.reply('sleeptime for %s is %s seconds' % (name, \
+str(rssitem.sleeptime)))
+    except AttributeError:
+        ievent.reply("can't get sleeptime for %s" % name)
+
+cmnds.add('rss-sleeptime', handle_rsssleeptime, 'OPER')
+examples.add('rss-sleeptime', 'rss-sleeptime <name> .. get sleeping time \
+for <name>', 'rss-sleeptime gozerbot')
+tests.add('rss-sleeptime dev')
+
+def handle_rsssetsleeptime(bot, ievent):
+    """ rss-setsleeptime <name> <seconds> .. set sleeptime of rss item """
+    try:
+        (name, sec) = ievent.args
+        sec = int(sec)
+    except ValueError:
+        ievent.missing('<name> <seconds>')
+        return
+    if sec < 60:
+        ievent.reply('min is 60 seconds')
+        return
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss item" % name)
+        return
+    rssitem.sleeptime = sec
+    if rssitem.running:
+        try:
+            watcher.changeinterval(name, sec)
+        except KeyError, ex:
+            ievent.reply("failed to set interval: %s" % str(ex))
+            return
+    watcher.save()
+    ievent.reply('sleeptime set')
+
+cmnds.add('rss-setsleeptime', handle_rsssetsleeptime, 'OPER')
+examples.add('rss-setsleeptime', 'rss-setsleeptime <name> <seconds> .. set \
+sleeping time for <name> .. min 60 sec', 'rss-setsleeptime gozerbot 600')
+tests.add('rss-setsleeptime dev 60')
+
+def handle_rssget(bot, ievent):
+    """ rss-get  <name> .. fetch rss data """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    channel = ievent.channel
+    rssitem = watcher.byname(name)
+    if rssitem == None:
+        ievent.reply("we don't have a %s rss item" % name)
+        return
+    try:
+        result = watcher.getdata(name)
+    except Exception, ex:
+        ievent.reply('%s error: %s' % (name, str(ex)))
+        return
+    if watcher.markup.get(jsonstring([name, channel]), 'reverse-order'):
+        result = result[::-1]
+    response = None
+    go = watcher.markup.get(jsonstring([name, channel]), 'all-lines')
+    if go:
+        for i in result:
+            response = watcher.makeresponse(name, [i, ], channel)
+            bot.say(channel, "\002%s\002: %s" % (rssitem.name, response), \
+fromm=rssitem.name)
+    else:
+        response = watcher.makeresponse(name, result, ievent.channel)
+        if response:
+            ievent.reply("results of %s: %s" % (name, response))
+        else:
+            ievent.reply("can't match watcher data")
+
+cmnds.add('rss-get', handle_rssget, ['RSS', 'USER'], threaded=True)
+examples.add('rss-get', 'rss-get <name> .. get data from <name>', \
+'rss-get gozerbot')
+tests.add('rss-get dev')
+
+def handle_rssrunning(bot, ievent):
+    """ rss-running .. show which watchers are running """
+    result = watcher.runners()
+    resultlist = []
+    teller = 1
+    for i in result:
+        resultlist.append("%s %s" % (i[0], i[1]))
+    if resultlist:
+        ievent.reply("running rss watchers: ", resultlist, nr=1)
+    else:
+        ievent.reply('nothing running yet')
+
+cmnds.add('rss-running', handle_rssrunning, ['RSS', 'USER'])
+examples.add('rss-running', 'rss-running .. get running rsswatchers', \
+'rss-running')
+tests.add('rss-running')
+
+def handle_rsslist(bot, ievent):
+    """ rss-list .. return list of rss items """
+    result = watcher.list()
+    result.sort()
+    if result:
+        ievent.reply("rss items: ", result, dot=True)
+    else:
+        ievent.reply('no rss items yet')
+
+cmnds.add('rss-list', handle_rsslist, ['RSS', 'USER'])
+examples.add('rss-list', 'get list of rss items', 'rss-list')
+tests.add('rss-list')
+
+def handle_rssurl(bot, ievent):
+    """ rss-url <name> .. return url of rss item """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    result = watcher.url(name)
+    if not result:
+        ievent.reply("can't fetch url for %s" % name)
+        return
+    try:
+        if ':' in result.split('@')[0]:
+            if not ievent.msg:
+                ievent.reply('run this command in a private message')
+                return
+            if not users.allowed(ievent.userhost, 'OPER'):
+                ievent.reply('you need have OPER perms')
+                return
+    except (TypeError, ValueError):
+        pass
+    ievent.reply('url of %s: %s' % (name, result))
+
+cmnds.add('rss-url', handle_rssurl, ['RSS', 'OPER'])
+examples.add('rss-url', 'rss-url <name> .. get url from rssitem with \
+<name>', 'rss-url gozerbot')
+tests.add('rss-url dev')
+
+def handle_rssseturl(bot, ievent):
+    """ rss-seturl <name> <url> .. set url of rss item """
+    try:
+        name = ievent.args[0]
+        url = ievent.args[1]
+    except IndexError:
+        ievent.missing('<name> <url>')
+        return
+    oldurl = watcher.url(name)
+    if not oldurl:
+        ievent.reply("no %s rss item found" % name)
+        return
+    if watcher.seturl(name, url):
+        watcher.sync(name)
+        ievent.reply('url of %s changed from %s to %s' % (name, oldurl, \
+url))
+    else:
+        ievent.reply('failed to set url of %s to %s' % (name, url))
+
+cmnds.add('rss-seturl', handle_rssseturl, ['RSS', 'OPER'])
+examples.add('rss-seturl', 'rss-seturl <name> <url> .. change url of rssitem',\
+'rss-seturl gozerbot http://core.gozerbot.org/hg/dev/0.9/rss-log')
+tests.add('rss-seturl dev http://core.gozerbot.org/hg/dev/0.9/rss-list')
+
+def handle_rssitemslist(bot, ievent):
+    """ rss-itemslist <name> .. show itemslist of rss item """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    try:
+        itemslist = watcher.itemslists[jsonstring([name, ievent.channel.lower()])]
+    except KeyError:
+        ievent.reply("no itemslist set for (%s, %s)" % (name, \
+ievent.channel.lower()))
+        return
+    ievent.reply("itemslist of (%s, %s): " % (name, ievent.channel.lower()), \
+itemslist, dot=True)
+
+cmnds.add('rss-itemslist', handle_rssitemslist, ['RSS', 'USER'])
+examples.add('rss-itemslist', 'rss-itemslist <name> .. get itemslist of \
+<name> ', 'rss-itemslist gozerbot')
+tests.add('rss-itemslist dev')
+
+def handle_rssscan(bot, ievent):
+    """ rss-scan <name> .. scan rss item for used xml items """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    if not watcher.byname(name):
+        ievent.reply('no %s feeds available' % name)
+        return
+    try:
+        result = watcher.scan(name)
+    except Exception, ex:
+        ievent.reply(str(ex))
+        return
+    if result == None:
+        ievent.reply("can't get data for %s" % name)
+        return
+    res = []
+    for i in result:
+        res.append("%s=%s" % i)
+    ievent.reply("tokens of %s: " % name, res)
+
+cmnds.add('rss-scan', handle_rssscan, 'OPER')
+examples.add('rss-scan', 'rss-scan <name> .. get possible items of <name> ', \
+'rss-scan gozerbot')
+tests.add('rss-scan dev')
+
+def handle_rsssync(bot, ievent):
+    """ rss-sync <name> .. sync rss item data """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    try:
+        result = watcher.sync(name)
+        ievent.reply('%s synced' % name)
+    except Exception, ex:
+        ievent.reply("%s error: %s" % (name, str(ex)))
+
+cmnds.add('rss-sync', handle_rsssync, 'OPER')
+examples.add('rss-sync', 'rss-sync <name> .. sync data of <name>', \
+'rss-sync gozerbot')
+tests.add('rss-sync dev')
+
+def handle_rssfeeds(bot, ievent):
+    """ rss-feeds <channel> .. show what feeds are running in a channel """
+    try:
+        channel = ievent.args[0]
+    except IndexError:
+        channel = ievent.printto
+    try:
+        result = watcher.feeds(bot.name, channel)
+        if result:
+            ievent.reply("feeds running in %s: " % channel, result, dot=True)
+        else:
+            ievent.reply('%s has no feeds running' % channel)
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+
+cmnds.add('rss-feeds', handle_rssfeeds, ['USER', 'RSS'])
+examples.add('rss-feeds', 'rss-feeds <name> .. show what feeds are running \
+in a channel', '1) rss-feeds 2) rss-feeds #dunkbots')
+tests.add('rss-feeds')
+
+def handle_rsslink(bot, ievent):
+    try:
+        feed, rest = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<feed> <words to search>')
+        return
+    rest = rest.strip().lower()
+    try:
+        res = watcher.search(feed, 'link', rest)
+        if not res:
+            res = watcher.search(feed, 'feedburner:origLink', rest)
+        if res:
+            ievent.reply(res, dot=" \002||\002 ")
+    except KeyError:
+        ievent.reply('no %s feed data available' % feed)
+        return
+
+cmnds.add('rss-link', handle_rsslink, ['RSS', 'USER'])
+examples.add('rss-link', 'give link of item which title matches search key', \
+'rss-link gozerbot gozer')
+tests.add('rss-link dev gozerbot')
+
+def handle_rssdescription(bot, ievent):
+    try:
+        feed, rest = ievent.rest.split(' ', 1)
+    except ValueError:
+        ievent.missing('<feed> <words to search>')
+        return
+    rest = rest.strip().lower()
+    res = ""
+    try:
+        ievent.reply(watcher.search(feed, 'description', rest), \
+dot=" \002||\002 ")
+    except KeyError:
+        ievent.reply('no %s feed data available' % feed)
+        return
+
+cmnds.add('rss-description', handle_rssdescription, ['RSS', 'USER'])
+examples.add('rss-description', 'give description of item which title \
+matches search key', 'rss-description gozerbot gozer')
+tests.add('rss-description')
+
+def handle_rssall(bot, ievent):
+    try:
+        feed = ievent.args[0]
+    except IndexError:
+        ievent.missing('<feed>')
+        return
+    try:
+        ievent.reply(watcher.all(feed, 'title'), dot=" \002||\002 ")
+    except KeyError:
+        ievent.reply('no %s feed data available' % feed)
+        return
+
+cmnds.add('rss-all', handle_rssall, ['RSS', 'USER'])
+examples.add('rss-all', "give titles of a feed", 'rss-all gozerbot')
+tests.add('rss-all dev')
+
+def handle_rsssearch(bot, ievent):
+    try:
+        txt = ievent.args[0]
+    except IndexError:
+        ievent.missing('<txt>')
+        return
+    try:        
+        ievent.reply(watcher.searchall('title', txt), dot=" \002||\002 ")
+    except KeyError:
+        ievent.reply('no %s feed data available' % feed)
+        return
+
+cmnds.add('rss-search', handle_rsssearch, ['RSS', 'USER'])
+examples.add('rss-search', "search titles of all current feeds", \
+'rss-search goz')
+tests.add('rss-search gozerbot')
+
+def handle_rssdump(bot, ievent):
+    try:
+        ievent.reply(str(watcher.rawresults[ievent.rest]))
+    except Exception, ex:
+        ievent.reply(str(ex))
+
+cmnds.add('rss-dump', handle_rssdump, 'OPER')
+examples.add('rss-dump', 'dump cached rss data', 'rss-dump')
+tests.add('rss-dump dev')
+
+def handle_rsspeek(bot, ievent):
+    if not ievent.rest:
+        ievent.missing('<feedname>')
+        return
+    watcher.peek(ievent.rest)
+
+cmnds.add('rss-peek', handle_rsspeek, 'OPER')
+tests.add('rss-peek dev')
--- gozerbot-0.99.1.orig/build/lib/gplugs/rblcheck.py
+++ gozerbot-0.99.1/build/lib/gplugs/rblcheck.py
@@ -0,0 +1,651 @@
+# Port from r3boot's rblcheck, with added threading support
+# (c) Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# BSD License
+# (c) Lex 'r3boot' van Roon - http://r3blog.nl
+
+rbls = {}
+rbls["wl"] = {}
+rbls["bl"] = {}
+
+rbls["wl"]["bondedsender"] = [
+    "query.bondedsender.org",
+    "http://www.bondedsender.org/"
+]
+rbls["wl"]["cml.anti-spam.org.cn"] = [
+    "cml.anti-spam.org.cn",
+    "http://anti-spam.org.cn/services/cml.php"
+]
+rbls["wl"]["dnswl"] = [
+    "list.dnswl.org",
+    "http://www.dnswl.org/"
+]
+rbls["wl"]["exemptions.ahbl"] = [
+    "exemptions.ahbl.org",
+    "http://www.ahbl.org/"
+]
+rbls["wl"]["iadb"] = [
+    "iadb.isipp.com",
+    "http://www.isipp.com/iadb.php"
+]
+rbls["wl"]["iadb2"] = [
+    "iadb2.isipp.com",
+    "http://www.isipp.com/iadb.php"
+]
+rbls["wl"]["iddb"] = [
+    "iddb.isipp.com",
+    "http://www.isipp.com/iadb.php"
+]
+rbls["wl"]["isoc"] = [
+    "dnswl.isoc.bg",
+    "http://dnsbl.isoc.bg/"
+]
+rbls["wl"]["isp.dns.nzl.net"] = [
+    "isp.dns.nzl.net",
+    "http://www.nzl.net/"
+]
+rbls["wl"]["nlwhitelist"] = [
+    "nlwhitelist.dnsbl.bit.nl",
+    "http://virbl.bit.nl/"
+]
+rbls["wl"]["spamblocked"] = [
+    "whitelist.spamblocked.com",
+    "http://www.spamblocked.com/"
+]
+rbls["wl"]["spf.trusted-forwarder.org"] = [
+    "spf.trusted-forwarder.org",
+    "http://www.trusted-forwarder.org/"
+]
+rbls["wl"]["whitelist.sci.kun.nl"] = [
+    "whitelist.sci.kun.nl",
+    "http://whitelist.sci.kun.nl"
+]
+rbls["bl"]["access.redhawk.org"] = [
+    "access.redhawk.org",
+    "http://access.redhawk.org"
+]
+rbls["bl"]["assholes.madscience.nl"] = [
+    "assholes.madscience.nl",
+    "http://assholes.madscience.nl"
+]
+rbls["bl"]["badconf.rhsbl.sorbs.net"] = [
+    "badconf.rhsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["bl.csma.biz"] = [
+    "bl.csma.biz",
+    "http://bl.csma.biz/"
+]
+rbls["bl"]["bl.deadbeef.com"] = [
+    "bl.deadbeef.com",
+    "http://spam.deadbeef.com/bl/"
+]
+rbls["bl"]["bl.spamcannibal.org"] = [
+    "bl.spamcannibal.org",
+    "http://spamcannibal.org/"
+]
+rbls["bl"]["bl.starloop.com"] = [
+    "bl.starloop.com",
+    "http://bl.starloop.com"
+]
+rbls["bl"]["bl.technovision.dk"] = [
+    "bl.technovision.dk",
+    "http://bl.technovision.dk"
+]
+rbls["bl"]["blackholes.five-ten-sg.com"] = [
+    "blackholes.five-ten-sg.com",
+    "http://www.five-ten-sg.com/blackhole.php"
+]
+rbls["bl"]["blackholes.intersil.net"] = [
+    "blackholes.intersil.net",
+    "http://blackholes.intersil.net"
+]
+rbls["bl"]["blackholes.mail-abuse.org"] = [
+    "blackholes.mail-abuse.org",
+    "http://www.mail-abuse.org/rss/"
+]
+rbls["bl"]["blackholes.sandes.dk"] = [
+    "blackholes.sandes.dk",
+    "http://blackholes.sandes.dk"
+]
+rbls["bl"]["blackholes.uceb.org"] = [
+    "blackholes.uceb.org",
+    "http://www.uceb.org"
+]
+rbls["bl"]["blacklist.sci.kun.nl"] = [
+    "blacklist.sci.kun.nl",
+    "http://blacklist.sci.kun.nl"
+]
+rbls["bl"]["blacklist.spambag.org"] = [
+    "blacklist.spambag.org",
+    "http://blacklist.spambag.org"
+]
+rbls["bl"]["block.dnsbl.sorbs.net"] = [
+    "block.dnsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["blocked.hilli.dk"] = [
+    "blocked.hilli.dk",
+    "http://blocked.hilli.dk"
+]
+rbls["bl"]["bogons.dnsiplists.completewhois.com"] = [
+    "bogons.dnsiplists.completewhois.com",
+    "http://bogons.dnsiplists.completewhois.com"
+]
+rbls["bl"]["cart00ney.surriel.com"] = [
+    "cart00ney.surriel.com",
+    "http://cart00ney.surriel.com"
+]
+rbls["bl"]["cbl.abuseat.org"] = [
+    "cbl.abuseat.org",
+    "http://cbl.abuseat.org"
+]
+rbls["bl"]["dev.null.dk"] = [
+    "dev.null.dk",
+    "http://dev.null.dk/"
+]
+rbls["bl"]["dialup.blacklist.jippg.org"] = [
+    "dialup.blacklist.jippg.org",
+    "http://dialup.blacklist.jippg.org"
+]
+rbls["bl"]["dialups.mail-abuse.org"] = [
+    "dialups.mail-abuse.org",
+    "http://www.mail-abuse.org/dul/"
+]
+rbls["bl"]["dialups.visi.com"] = [
+    "dialups.visi.com",
+    "http://dialups.visi.com"
+]
+rbls["bl"]["dnsbl-1.uceprotect.net"] = [
+    "dnsbl-1.uceprotect.net",
+    "http://www.uceprotect.net/en/"
+]
+rbls["bl"]["dnsbl-2.uceprotect.net"] = [
+    "dnsbl-2.uceprotect.net",
+    "http://www.uceprotect.net/en/"
+]
+rbls["bl"]["dnsbl-3.uceprotect.net"] = [
+    "dnsbl-3.uceprotect.net",
+    "http://www.uceprotect.net/en/"
+]
+rbls["bl"]["dnsbl.ahbl.org"] = [
+    "dnsbl.ahbl.org",
+    "http://www.ahbl.org/"
+]
+rbls["bl"]["dnsbl.antispam.or.id"] = [
+    "dnsbl.antispam.or.id",
+    "http://dnsbl.antispam.or.id"
+]
+rbls["bl"]["dnsbl.cyberlogic.net"] = [
+    "dnsbl.cyberlogic.net",
+    "http://dnsbl.cyberlogic.net"
+]
+rbls["bl"]["dnsbl.jammconsulting.com"] = [
+    "dnsbl.jammconsulting.com",
+    "http://www.jammconsulting.com/policies/dnsbl.shtml"
+]
+rbls["bl"]["dnsbl.kempt.net"] = [
+    "dnsbl.kempt.net",
+    "http://dnsbl.kempt.net"
+]
+rbls["bl"]["dnsbl.njabl.org"] = [
+    "dnsbl.njabl.org",
+    "http://dnsbl.njabl.org"
+]
+rbls["bl"]["dnsbl.sorbs.net"] = [
+    "dnsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["dsbl.dnsbl.net.au"] = [
+    "dsbl.dnsbl.net.au",
+    "http://dsbl.dnsbl.net.au"
+]
+rbls["bl"]["duinv.aupads.org"] = [
+    "duinv.aupads.org",
+    "http://duinv.aupads.org"
+]
+rbls["bl"]["dul.dnsbl.sorbs.net"] = [
+    "dul.dnsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["dul.maps.vix.com"] = [
+    "dul.maps.vix.com",
+    "http://dul.maps.vix.com/"
+]
+rbls["bl"]["dul.orca.bc.ca"] = [
+    "dul.orca.bc.ca",
+    "http://dul.orca.bc.ca/"
+]
+rbls["bl"]["dul.ru"] = [
+    "dul.ru",
+    "http://dul.ru"
+]
+rbls["bl"]["dun.dnsrbl.net"] = [
+    "dun.dnsrbl.net",
+    "http://dun.dnsrbl.net"
+]
+rbls["bl"]["dynablock.njabl.org"] = [
+    "dynablock.njabl.org",
+    "http://dynablock.njabl.org"
+]
+rbls["bl"]["fl.chickenboner.biz"] = [
+    "fl.chickenboner.biz",
+    "http://fl.chickenboner.biz"
+]
+rbls["bl"]["forbidden.icm.edu.pl"] = [
+    "forbidden.icm.edu.pl",
+    "http://forbidden.icm.edu.pl"
+]
+rbls["bl"]["hijacked.dnsiplists.completewhois.com"] = [
+    "hijacked.dnsiplists.completewhois.com",
+    "http://hijacked.dnsiplists.completewhois.com"
+]
+rbls["bl"]["hil.habeas.com"] = [
+    "hil.habeas.com",
+    "http://hil.habeas.com"
+]
+rbls["bl"]["http.dnsbl.sorbs.net"] = [
+    "http.dnsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["images-msrbls"] = [
+    "images.rbl.msrbl.net",
+    "http://www.msrbl.com/"
+]
+rbls["bl"]["intruders.docs.uu.se"] = [
+    "intruders.docs.uu.se",
+    "http://intruders.docs.uu.se"
+]
+rbls["bl"]["korea.services.net"] = [
+    "korea.services.net",
+    "http://korea.services.net"
+]
+rbls["bl"]["l1.spews.dnsbl.sorbs.net"] = [
+    "l1.spews.dnsbl.sorbs.net",
+    "http://l1.spews.dnsbl.sorbs.net"
+]
+rbls["bl"]["l2.spews.dnsbl.sorbs.net"] = [
+    "l2.spews.dnsbl.sorbs.net",
+    "http://l2.spews.dnsbl.sorbs.net"
+]
+rbls["bl"]["mail-abuse.blacklist.jippg.org"] = [
+    "mail-abuse.blacklist.jippg.org",
+    "http://mail-abuse.blacklist.jippg.org"
+]
+rbls["bl"]["map.spam-rbl.com"] = [
+    "map.spam-rbl.com",
+    "http://map.spam-rbl.com"
+]
+rbls["bl"]["misc.dnsbl.sorbs.net"] = [
+    "misc.dnsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["msgid.bl.gweep.ca"] = [
+    "msgid.bl.gweep.ca",
+    "http://msgid.bl.gweep.ca"
+]
+rbls["bl"]["msrbl"] = [
+    "combined.rbl.msrbl.net",
+    "http://www.msrbl.com/"
+]
+rbls["bl"]["no-more-funn.moensted.dk"] = [
+    "no-more-funn.moensted.dk",
+    "http://moensted.dk/spam/no-more-funn/"
+]
+rbls["bl"]["nomail.rhsbl.sorbs.net"] = [
+    "nomail.rhsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["ohps.dnsbl.net.au"] = [
+    "ohps.dnsbl.net.au",
+    "http://ohps.dnsbl.net.au"
+]
+rbls["bl"]["okrelays.nthelp.com"] = [
+    "okrelays.nthelp.com",
+    "http://okrelays.nthelp.com"
+]
+rbls["bl"]["omrs.dnsbl.net.au"] = [
+    "omrs.dnsbl.net.au",
+    "http://omrs.dnsbl.net.au"
+]
+rbls["bl"]["orid.dnsbl.net.au"] = [
+    "orid.dnsbl.net.au",
+    "http://orid.dnsbl.net.au"
+]
+rbls["bl"]["orvedb.aupads.org"] = [
+    "orvedb.aupads.org",
+    "http://orvedb.aupads.org"
+]
+rbls["bl"]["osps.dnsbl.net.au"] = [
+    "osps.dnsbl.net.au",
+    "http://osps.dnsbl.net.au"
+]
+rbls["bl"]["osrs.dnsbl.net.au"] = [
+    "osrs.dnsbl.net.au",
+    "http://osrs.dnsbl.net.au"
+]
+rbls["bl"]["owfs.dnsbl.net.au"] = [
+    "owfs.dnsbl.net.au",
+    "http://owfs.dnsbl.net.au"
+]
+rbls["bl"]["owps.dnsbl.net.au"] = [
+    "owps.dnsbl.net.au",
+    "http://owps.dnsbl.net.au"
+]
+rbls["bl"]["pdl.dnsbl.net.au"] = [
+    "pdl.dnsbl.net.au",
+    "http://pdl.dnsbl.net.au"
+]
+rbls["bl"]["phishing-msrbl"] = [
+    "phishing.rbl.msrbl.net",
+    "http://www.msrbl.com/"
+]
+rbls["bl"]["probes.dnsbl.net.au"] = [
+    "probes.dnsbl.net.au",
+    "http://probes.dnsbl.net.au"
+]
+rbls["bl"]["proxy.bl.gweep.ca"] = [
+    "proxy.bl.gweep.ca",
+    "http://proxy.bl.gweep.ca"
+]
+rbls["bl"]["psbl.surriel.com"] = [
+    "psbl.surriel.com",
+    "http://psbl.surriel.com"
+]
+rbls["bl"]["pss.spambusters.org.ar"] = [
+    "pss.spambusters.org.ar",
+    "http://pss.spambusters.org.ar"
+]
+rbls["bl"]["rbl-plus.mail-abuse.org"] = [
+    "rbl-plus.mail-abuse.org",
+    "http://rbl-plus.mail-abuse.org"
+]
+rbls["bl"]["rbl.cluecentral.net"] = [
+    "rbl.cluecentral.net",
+    "http://rbl.cluecentral.net"
+]
+rbls["bl"]["rbl.efnet.org"] = [
+    "rbl.efnet.org",
+    "http://rbl.efnet.org"
+]
+rbls["bl"]["rbl.jp"] = [
+    "rbl.jp",
+    "http://rbl.jp"
+]
+rbls["bl"]["rbl.maps.vix.com"] = [
+    "rbl.maps.vix.com",
+    "http://www.mail-abuse.org/rbl/"
+]
+rbls["bl"]["rbl.schulte.org"] = [
+    "rbl.schulte.org",
+    "http://rbl.schulte.org"
+]
+rbls["bl"]["rbl.snark.net"] = [
+    "rbl.snark.net",
+    "http://rbl.snark.net"
+]
+rbls["bl"]["rbl.triumf.ca"] = [
+    "rbl.triumf.ca",
+    "http://rbl.triumf.ca"
+]
+rbls["bl"]["rdts.dnsbl.net.au"] = [
+    "rdts.dnsbl.net.au",
+    "http://rdts.dnsbl.net.au"
+]
+rbls["bl"]["relays.bl.gweep.ca"] = [
+    "relays.bl.gweep.ca",
+    "http://relays.bl.gweep.ca"
+]
+rbls["bl"]["relays.bl.kundenserver.de"] = [
+    "relays.bl.kundenserver.de",
+    "http://relays.bl.kundenserver.de"
+]
+rbls["bl"]["relays.mail-abuse.org"] = [
+    "relays.mail-abuse.org",
+    "http://work-rss.mail-abuse.org/rss/"
+]
+rbls["bl"]["relays.nether.net"] = [
+    "relays.nether.net",
+    "http://relays.nether.net"
+]
+rbls["bl"]["relays.nthelp.com"] = [
+    "relays.nthelp.com",
+    "http://relays.nthelp.com"
+]
+#rbls["bl"]["relays.radparker.com"] = [
+#    "relays.radparker.com",
+#    "http://relays.radparker.com/"
+#]
+rbls["bl"]["rhsbl.sorbs.net"] = [
+    "rhsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["ricn.dnsbl.net.au"] = [
+    "ricn.dnsbl.net.au",
+    "http://ricn.dnsbl.net.au"
+]
+rbls["bl"]["rmst.dnsbl.net.au"] = [
+    "rmst.dnsbl.net.au",
+    "http://rmst.dnsbl.net.au"
+]
+rbls["bl"]["rsbl.aupads.org"] = [
+    "rsbl.aupads.org",
+    "http://rsbl.aupads.org"
+]
+rbls["bl"]["satos.rbl.cluecentral.net"] = [
+    "satos.rbl.cluecentral.net",
+    "http://satos.rbl.cluecentral.net"
+]
+rbls["bl"]["sbl-xbl.spamhaus.org"] = [
+    "sbl-xbl.spamhaus.org",
+    "http://sbl-xbl.spamhaus.org"
+]
+rbls["bl"]["sbl.csma.biz"] = [
+    "sbl.csma.biz",
+    "http://bl.csma.biz/"
+]
+rbls["bl"]["sbl.spamhaus.org"] = [
+    "sbl.spamhaus.org",
+    "http://www.spamhaus.org/sbl/"
+]
+rbls["bl"]["smtp.dnsbl.sorbs.net"] = [
+    "smtp.dnsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["socks.dnsbl.sorbs.net"] = [
+    "socks.dnsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["sorbs.dnsbl.net.au"] = [
+    "sorbs.dnsbl.net.au",
+    "http://sorbs.dnsbl.net.au"
+]
+rbls["bl"]["spam.dnsbl.sorbs.net"] = [
+    "spam.dnsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["spam.dnsrbl.net"] = [
+    "spam.dnsrbl.net",
+    "http://spam.dnsrbl.net"
+]
+rbls["bl"]["spam.olsentech.net"] = [
+    "spam.olsentech.net",
+    "http://spam.olsentech.net"
+]
+rbls["bl"]["spam.wytnij.to"] = [
+    "spam.wytnij.to",
+    "http://spam.wytnij.to"
+]
+rbls["bl"]["spamcop"] = [
+    "bl.spamcop.net",
+    "http://www.spamcop.net/bl.shtml"
+]
+rbls["bl"]["spamguard.leadmon.net"] = [
+    "spamguard.leadmon.net",
+    "http://spamguard.leadmon.net"
+]
+rbls["bl"]["spamsites.dnsbl.net.au"] = [
+    "spamsites.dnsbl.net.au",
+    "http://spamsites.dnsbl.net.au"
+]
+rbls["bl"]["spamsources.dnsbl.info"] = [
+    "spamsources.dnsbl.info",
+    "http://spamsources.dnsbl.info"
+]
+rbls["bl"]["spamsources.fabel.dk"] = [
+    "spamsources.fabel.dk",
+    "http://spamsources.fabel.dk"
+]
+rbls["bl"]["spews.dnsbl.net.au"] = [
+    "spews.dnsbl.net.au",
+    "http://spews.dnsbl.net.au"
+]
+rbls["bl"]["t1.dnsbl.net.au"] = [
+    "t1.dnsbl.net.au",
+    "http://www.dnsbl.net.au/t1/"
+]
+rbls["bl"]["ucepn.dnsbl.net.au"] = [
+    "ucepn.dnsbl.net.au",
+    "http://ucepn.dnsbl.net.au"
+]
+rbls["bl"]["virbl"] = [
+    "virbl.dnsbl.bit.nl",
+    "https://virbl.bit.nl/faq.php"
+]
+rbls["bl"]["virus-msrbl"] = [
+    "virus.rbl.msrbl.net",
+    "http://www.msrbl.com/"
+]
+rbls["bl"]["virus.rbl.jp"] = [
+    "virus.rbl.jp",
+    "http://virus.rbl.jp"
+]
+rbls["bl"]["web.dnsbl.sorbs.net"] = [
+    "web.dnsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+rbls["bl"]["whois.rfc-ignorant.org"] = [
+    "whois.rfc-ignorant.org",
+    "http://whois.rfc-ignorant.org"
+]
+rbls["bl"]["will-spam-for-food.eu.org"] = [
+    "will-spam-for-food.eu.org",
+    "http://will-spam-for-food.eu.org"
+]
+rbls["bl"]["xbl.spamhaus.org"] = [
+    "xbl.spamhaus.org",
+    "http://www.spamhaus.org/xbl/"
+]
+rbls["bl"]["zombie.dnsbl.sorbs.net"] = [
+    "zombie.dnsbl.sorbs.net",
+    "http://www.dnsbl.nl.sorbs.net/"
+]
+
+from socket    import gethostbyaddr
+from socket    import gethostbyname, gaierror
+from time      import time, sleep
+from Queue     import Queue, Empty
+from threading import Thread
+import re
+from gozerbot.commands      import cmnds
+from gozerbot.generic       import rlog
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.users         import users
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+
+plughelp.add('rblcheck', 'check blacklists')
+
+cfg = PersistConfig()
+cfg.define('throttle', 60)
+cfg.define('max-threads', 5)
+cfg.define('debug', 0)
+debug = 0
+
+def list_check(list, chkip):
+    results = []
+    for i in list.keys():
+        chk = "%s.%s" % (".".join(reversed(chkip.split("."))), list[i][0])
+        try: qr = gethostbyname("%s" % (chk))
+        except: qr = None
+        if qr:
+            results.append(list[i])
+            if cfg.get('debug'):
+                rlog(10, 'rblcheck', '%s result: %s' % (chk, str(qr)))
+    return results
+
+class pool_check(object):
+
+    timeout = 1.0
+
+    def __init__(self, lookups, ip):
+        self.cip = ip
+        self.rip = ".".join(reversed(self.cip.split(".")))
+        self.todo = Queue()
+        self.hits = Queue()
+        self.pool = []
+        self.fill(lookups)
+
+    def fill(self, lookups):
+        # propagate todo queue
+        for lookup in lookups:
+            self.todo.put([lookup, lookups[lookup]])
+
+    def run(self):
+        # start runner threads
+        for i in xrange(0, cfg.get('max-threads')):
+            runner = Thread(target=self.poll)
+            runner.start()
+            self.pool.append(runner)
+        # now we wait until all runners in the pool are done
+        while True:
+            if not self.pool:
+                break
+            sleep(self.timeout)
+        hits = []
+        while True:
+            try: hits.append(self.hits.get(block=False, timeout=0.01))
+            except Empty: break
+        return hits
+
+    def poll(self):
+        while True:
+            try:
+                item, info = self.todo.get(block=False, timeout=self.timeout)
+                try: listed = gethostbyname("%s.%s" % (self.rip, item))
+                except gaierror: listed = False
+                if listed: self.hits.put(info)
+            except Empty:
+                break # no more items in queue
+        self.pool.pop(0) # remove item from queue
+
+class RBLCheck(object):
+    
+    re_ip = re.compile('^(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$')
+    throttle = {}
+
+    def handle_rblcheck(self, bot, ievent):
+        if not self.re_ip.match(ievent.rest.strip()):
+            ievent.missing('<ip>')
+            return
+        user = users.getname(ievent.userhost)
+        if self.throttle.has_key(user) and self.throttle[user] >= time():
+            ievent.reply('throttled - you can only do one lookup each %d seconds' % cfg.get('throttle'))
+            return
+        self.throttle[user] = time() + cfg.get('throttle')
+        ip = ievent.rest.strip()
+        ievent.reply('checking %d blacklists' % len(rbls['bl']))
+        checks = pool_check(rbls['bl'], ip)
+        result = checks.run()
+        #result = list_check(rbls['bl'], ip)
+        if result:
+            results = []
+            for r in result:
+                results.append('%s (%s)' % (r[0], r[1]))
+            ievent.reply('%s is blacklisted: ' % ip, results)
+        else:
+            ievent.reply('%s is not blacklisted' % ip)
+
+rblcheck = RBLCheck()
+cmnds.add('rblcheck', rblcheck.handle_rblcheck, 'USER', threaded=True)
+examples.add('rblcheck', 'check <ip> with blacklists', 'rblcheck 127.0.0.1')
+
--- gozerbot-0.99.1.orig/build/lib/gplugs/pit.py
+++ gozerbot-0.99.1/build/lib/gplugs/pit.py
@@ -0,0 +1,85 @@
+# http://paste-it.net client for gozerbot (trough pipes)
+# Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# BSD License
+
+from gozerbot.commands import cmnds
+from gozerbot.config import config
+from gozerbot.generic import useragent, waitforqueue
+from gozerbot.plughelp import plughelp
+from gozerbot.persist.persistconfig import PersistConfig
+import copy
+import optparse
+import urllib
+import urllib2
+
+cfg = PersistConfig()
+cfg.define('url', 'http://www.paste-it.net/ajax/pit/')
+cfg.define('expiry', 604800)
+cfg.define('items', 50)
+cfg.define('waitforqueue', 50)
+cfg.define('useragent', 'paste-it.net command line client (Compatible; %s)' % ' '.join(config['version'].split()[0:2]))
+
+plughelp.add('pit', 'http://www.paste-it.net paste functionality')
+
+class PitOptionParser(optparse.OptionParser):
+    def __init__(self, ievent):
+        optparse.OptionParser.__init__(self)
+        self.ievent = ievent
+        self.ievent.stop = False
+        self.formatter = optparse.IndentedHelpFormatter(0, 24, None, 1)
+        self.formatter.set_parser(self)
+
+    # no wai!
+    def exit(self, status=0, msg=None):
+        pass
+
+    def error(self, msg):
+        if msg:
+            self.ievent.reply(msg)
+            self.ievent.stop = True
+
+    def format_epilog(self, formatter):
+        return formatter.format_epilog(self.epilog)
+
+    def print_help(self, file=None):
+        result = []
+        for option in self.option_list: 
+            result.append('%s: %s' % (', '.join(option._short_opts+option._long_opts), option.help))
+        self.ievent.reply(' .. '.join(result))
+        self.ievent.stop = True
+
+def handle_pit(bot, ievent):
+    if not ievent.inqueue:
+        ievent.reply('use pit in a pipeline')
+        return
+    result = waitforqueue(ievent.inqueue, cfg.get('waitforqueue'), cfg.get('items'))
+    if not result:
+        ievent.reply('no data to paste')
+    # parse options
+    pit_parser = PitOptionParser(ievent)
+    pit_parser.add_option("-p", "--public", dest="public", action="store_true", default=False, help="make paste public")
+    pit_parser.add_option("-s", "--subject", dest="subject", action="store", default="", help="set subject")
+    pit_parser.add_option("-e", "--expiry", dest="expiry", action="store", type="int", default=cfg.get('expiry'), help="expiry in seconds")
+    pit_parser.add_option("-x", "--syntax", dest="syntax", action="store", default="", help="syntax highlighting")
+    (options, args) = pit_parser.parse_args(ievent.rest.split())
+    if pit_parser.ievent.stop:
+        return
+    # interpret options
+    postarray = [
+        ('content', '\n'.join(result)),
+        ('nickname', ievent.nick),
+        ('subject', options.subject),
+        ('syntax', options.syntax),
+        ('expiry', options.expiry),
+        ]
+    # public paste?
+    if options.public:
+        postarray.append(("obscure","n"))
+    else:
+        postarray.append(("obscure","y"))
+    postdata = urllib.urlencode(postarray)
+    req = urllib2.Request(url=cfg.get('url'), data=postdata)
+    req.add_header('User-agent', cfg.get('useragent'))
+    ievent.reply(urllib2.urlopen(req).read())
+
+cmnds.add('pit', handle_pit, 'USER')
--- gozerbot-0.99.1.orig/build/lib/gplugs/shoutcast.py
+++ gozerbot-0.99.1/build/lib/gplugs/shoutcast.py
@@ -0,0 +1,227 @@
+# plugs/shoutcast.py
+#
+#
+
+""" shoutcast watcher """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.persist.persist import Persist
+from gozerbot.commands import cmnds
+from gozerbot.generic import geturl, striphtml, rlog, lockdec
+from gozerbot.datadir import datadir
+from gozerbot.fleet import fleet
+from gozerbot.examples import examples
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.plughelp import plughelp
+from gozerbot.persist.persistconfig import PersistConfig
+import os, time, thread
+
+plughelp.add('shoutcast', 'query a shoutcast server or periodically watch \
+them')
+
+cfg = PersistConfig()
+cfg.define('scwatch', 0)
+cfg.define('nodes', [])
+
+sclock = thread.allocate_lock()
+locked = lockdec(sclock)
+
+class SCwatcher(object):
+
+    def __init__(self):
+        self.stop = False
+        self.songsplayed = []
+
+    def run(self):
+        self.starttime = int(time.time())
+        res = ""
+        while cfg.get('scwatch') and not self.stop:
+            time.sleep(1)
+            if self.stop:
+                break
+            godo = []    
+            for botname, channel, name, node, polltime in cfg.get('nodes'):
+                if not (int(time.time()) - self.starttime) % int(polltime):
+                    godo.append((botname, channel, name, node))
+                    continue            
+            if godo:
+                rlog(0, 'shoutcast', 'running scan: %s' % str(godo))
+                start_new_thread(self.doscan, (godo, ))        
+
+    @locked
+    def doscan(self, scanlist):
+        for botname, channel, name, node in scanlist:            
+            try:
+                result = geturl('http://%s/7.html' % node)
+            except Exception, ex:
+                rlog(10, 'shoutcast', "can't get %s shoutcast data: %s" % \
+(node, str(ex)))
+                continue
+            try:
+                res = result.split(',')[6]
+            except IndexError:
+                rlog(10, 'shoutcast', "can't match %s shoutcast data" % node)
+                continue
+            song = striphtml(res).strip().replace('\n', '')
+            bot = fleet.byname(botname)
+            if bot and channel in bot.state['joinedchannels']:
+                got = False
+                for ttime, played in self.songsplayed:
+                    if played == song:
+                        got = True
+                if not got:
+                    self.songsplayed.append((time.time(), song))
+                    bot.say(channel, "now playing on %s: %s" % (name, song))
+                else:
+                    for ttime, played in self.songsplayed:
+                        if time.time() - ttime > 1800:
+                            self.songsplayed.remove((ttime, played))
+
+scwatcher = SCwatcher()
+ 
+def init():
+    if cfg.get('scwatch'):
+         start_new_thread(scwatcher.run, ())
+    return 1
+
+def shutdown():
+    rlog(10, 'shoutcast', 'shutting down watcher')
+    scwatcher.stop = True
+
+def handle_sc(bot, ievent):
+    try:
+        server = ievent.args[0]
+    except IndexError:
+        ievent.missing('<server>')
+        return
+    try:
+        result = geturl('http://%s/7.html' % server)
+    except Exception, ex:
+        ievent.reply("can't get shoutcast data: %s" % str(ex))
+        return
+    try:
+        res = result.split(',')[6]
+    except IndexError:
+        ievent.reply("can't extract shoutcast data")
+        return
+    ievent.reply(striphtml(res).strip())
+
+cmnds.add('sc', handle_sc, 'USER')
+examples.add('sc', 'sc <host:port> .. ask server:port for currently running \
+song', 'sc stream1.jungletrain.net:8000')
+
+def handle_sclist(bot, ievent):
+    ievent.reply("shoutcast nodes: %s" % cfg.get('nodes'))
+    
+cmnds.add('sc-list', handle_sclist, 'OPER')
+examples.add('sc-list', 'show list of watched shoutcast servers', 'sc-list')
+
+def handle_scadd(bot, ievent):
+    try:
+        name, node, polltime = ievent.args
+    except ValueError:
+        ievent.missing('<name> <host:port> <polltime>')
+        return
+    try:
+        polltime = int(polltime)
+    except ValueError:
+        ievent.reply('polltime needs to be an integer')
+        return
+    if polltime < 60:
+        ievent.reply('polltime in min. 60 seconds')
+        return
+    if not cfg.get('scwatch'):
+        cfg.set('scwatch', 1)
+        scwatcher.stop = False    
+        start_new_thread(scwatcher.run, ())
+    cfg.append('nodes', [bot.name, ievent.channel, name, node, polltime])
+    cfg.save()
+    ievent.reply('%s added' % node)
+    
+cmnds.add('sc-add', handle_scadd, 'OPER')
+examples.add('sc-add', 'sc-add <server:port> .. add server to watcher', \
+'sc-add jungletrain stream1.jungletrain.net 180')
+
+def handle_scdel(bot, ievent):
+    try:
+        name = ievent.args[0].lower()
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    got = 0
+    nodes = cfg.get('nodes')
+    for i in range(len(nodes)-1, -1, -1):
+        if nodes[i][2].lower() == name:
+            del nodes[i]
+            got = 1
+    if got:
+        cfg.save()
+        ievent.reply('%s deleted' % name)
+    else:
+        ievent.reply('%s is not in nodeslist' % name)
+
+cmnds.add('sc-del', handle_scdel, 'OPER')
+examples.add('sc-del', 'sc-del <name> .. remove node <name> from watcher', \
+'sc-del jungletrain')
+
+def handle_scsetpolltime(bot, ievent):
+    try:
+        name, sec = ievent.args
+        sec = int(sec)
+    except ValueError:
+        ievent.missing('<name> <secondstosleep>')
+        return
+    if sec < 60:
+        ievent.reply('minimun is 60 seconds')
+        return
+    name = name.lower()
+    got = False
+    for i in cfg.get('nodes'):
+        if i[2].lower() == name:
+            i[4] = sec
+            got = True
+    if got:
+        cfg.save()
+        ievent.reply('poll time set to %s' % sec)
+    else:
+        ievent.reply('%s is not in nodes list' % name)
+        
+cmnds.add('sc-setpolltime', handle_scsetpolltime, 'OPER')
+examples.add('sc-setpolltime', 'set poll time of the shoutcast watcher', \
+'sc-setpolltime jungletrain 120')
+
+def handle_scpolltime(bot, ievent):
+    try:
+        name = ievent.args[0].lower()
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    for i in cfg.get('nodes'):
+        if i[2].lower() == name:
+            ievent.reply("polltime of %s is %s" % (name, i[4]))
+            return
+            
+cmnds.add('sc-polltime', handle_scpolltime, 'OPER')
+examples.add('sc-polltime', 'get polltime of <name>', 'sc-polltime \
+jungletrain')
+
+def handle_scstartwatch(bot, ievent):
+    if cfg.get('scwatch'):
+        ievent.reply('shoutcast watcher is already running')
+        return
+    scwatcher.stop = False
+    cfg.set('scwatch', 1)
+    start_new_thread(scwatcher.run, ())
+    ievent.reply('watcher started')
+    
+cmnds.add('sc-startwatch', handle_scstartwatch, 'OPER')
+examples.add('sc-startwatch', 'start the shoutcast watcher', 'sc-startwatch')
+
+def handle_scstopwatch(bot, ievent):
+    scwatcher.stop = True
+    cfg.set('scwatch', 0)
+    ievent.reply('watcher stopped')
+    
+cmnds.add('sc-stopwatch', handle_scstopwatch, 'OPER')
+examples.add('sc-stopwatch', 'stop the shoutcast watcher', 'sc-stopwatch')
--- gozerbot-0.99.1.orig/build/lib/gplugs/remind.py
+++ gozerbot-0.99.1/build/lib/gplugs/remind.py
@@ -0,0 +1,130 @@
+# plugs/remind.py
+#
+#
+
+""" remind people .. say txt when somebody gets active """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.utils.generic import convertpickle
+from gozerbot.generic import getwho, lockdec
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.callbacks import callbacks, jcallbacks
+from gozerbot.datadir import datadir
+from gozerbot.persist.pdol import Pdol
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import time, os, thread
+
+plughelp.add('remind', 'check if user says something if so do /msg')
+
+## UPGRADE PART
+
+def upgrade():
+    try:
+        convertpickle(datadir + os.sep + 'remind', datadir + os.sep + 'plugs' + \
+os.sep + 'remind' + os.sep + 'remind')
+    except:
+        pass
+
+## END UPGRADE PART
+
+remindlock = thread.allocate_lock()
+rlocked = lockdec(remindlock)
+
+class Remind(Pdol):
+
+    """ remind object """
+
+    def __init__(self, name):
+        Pdol.__init__(self, name)
+
+    @rlocked
+    def add(self, who, data):
+        """ add a remind txt """
+        self[who] = data
+        self.save()
+
+    def wouldremind(self, userhost):
+        """ check if there is a remind for userhost """
+        reminds = self[userhost]
+        if reminds == None or reminds == []:
+            return 0
+        return 1
+
+    @rlocked
+    def remind(self, bot, userhost):
+        """ send a user all registered reminds """
+        reminds = self[userhost]
+        if not reminds:
+            return
+        for i in reminds:
+            ttime = None
+            try:
+                (tonick, fromnick, txt, ttime) = i
+            except ValueError:
+                (tonick, fromnick, txt) = i
+            txtformat = '[%s] %s wants to remind you of: %s'
+            if ttime:
+                timestr = time.ctime(ttime)
+            else:
+                timestr = None
+            if bot.jabber:
+                bot.saynocb(userhost, txtformat % (timestr, fromnick, txt), \
+fromm=tonick, groupchat=False)
+                bot.saynocb(fromnick, '[%s] reminded %s of: %s' % (timestr, \
+tonick, txt))
+            else:
+                bot.say(tonick, txtformat % (timestr, fromnick, txt), \
+fromm=tonick, speed=1)
+                bot.say(fromnick, '[%s] reminded %s of:  %s' % (timestr, \
+tonick, txt), speed=1)
+        del self[userhost]
+        self.save()
+
+remind = Remind(datadir + os.sep + 'plugs' + os.sep + 'remind' + os.sep + \
+'remind')
+if not remind.data:
+    remind = Remind(datadir + os.sep + 'plugs' + os.sep + 'remind' + os.sep + \
+'remind')
+
+def preremind(bot, ievent):
+    """ remind precondition """
+    return remind.wouldremind(ievent.userhost)
+
+def remindcb(bot, ievent):
+    """ remind callbacks """
+    remind.remind(bot, ievent.userhost)
+
+# monitor privmsg and joins
+callbacks.add('PRIVMSG', remindcb, preremind, threaded=True)
+callbacks.add('JOIN', remindcb, preremind, threaded=True)
+jcallbacks.add('Message', remindcb, preremind, threaded=True)
+
+def handle_remind(bot, ievent):
+    """ remind <nick> <txt> .. add a remind """
+    try:
+        who = ievent.args[0]
+        txt = ' '.join(ievent.args[1:])
+    except IndexError:
+        ievent.missing('<nick> <txt>')
+        return
+    if not txt:
+        ievent.missing('<nick> <txt>')
+        return
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("can't find userhost for %s" % who)
+        return
+    else:
+        if ievent.jabber:
+            remind.add(userhost, (who, ievent.userhost, txt, time.time()))
+        else:
+            remind.add(userhost, (who, ievent.nick, txt, time.time()))
+        ievent.reply("remind for %s added" % who)
+
+cmnds.add('remind', handle_remind, 'USER', allowqueue=False)
+examples.add('remind', 'remind <nick> <txt>', 'remind dunker check the bot !')
+tests.add('remind exec blaet')
--- gozerbot-0.99.1.orig/build/lib/gplugs/search.py
+++ gozerbot-0.99.1/build/lib/gplugs/search.py
@@ -0,0 +1,51 @@
+# plugs/search.py
+#
+#
+
+from gozerbot.generic import handle_exception
+from gozerbot.commands import cmnds
+from gozerbot.plugins import plugins
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.plughelp import plughelp
+from gozerbot.examples import examples
+from gozerbot.tests import tests
+
+import Queue
+
+plughelp.add('search', 'search all plugins that provide a search() function')
+
+def handle_search(bot, ievent):
+    """ search all plugins that provide a search() function """
+    result = {}
+    queue = Queue.Queue()
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        ievent.missing('<what>')
+        return
+    threads = []
+    plugs = dict(plugins.plugs)
+    for name, plug in plugs.iteritems():
+        try:
+            searchfunc = getattr(plug, 'search')
+            if searchfunc:
+                threadid = start_new_thread(searchfunc, (what, queue))
+                threads.append(threadid)
+        except AttributeError:
+            pass
+        except Exception, ex:
+            handle_exception()
+    for i in threads:
+        i.join()
+    queue.put(None)
+    result = []
+    while 1:
+        res = queue.get_nowait()
+        if not res:
+            break
+        result.append(res)
+    ievent.reply('search results for %s => ' % what, result, dot=True)
+
+cmnds.add('search', handle_search, ['USER', 'CLOUD', 'WEB'])
+examples.add('search', 'search all bot data for <item>', 'search gozer')
+tests.add('search', 'search gozerbot')
--- gozerbot-0.99.1.orig/build/lib/gplugs/buzz.py
+++ gozerbot-0.99.1/build/lib/gplugs/buzz.py
@@ -0,0 +1,61 @@
+# gozerplugs/buzz.py
+#
+#
+
+__author__ = 'unknown'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+plughelp.add('buzz', 'create a buzz word')
+
+from random import randint
+
+verb = ["implement","utilize","integrate","streamline","optimize",
+	"evolve","transform","embrace","enable","orchestrate","leverage",
+	"reinvent","aggregate","architect","enhance","incentivize","morph",
+	"empower","envisioneer","monetize","harness","facilitate","seize",
+	"disintermediate","synergize","strategize","deploy","brand","grow",
+	"brand","grow","target","syndicate","synthesize","deliver","mesh",
+	"incubate","engage","maximize","benchmark","expedite","reintermediate", 
+	"expedite","reintermediate","whiteboard","visualize","repurpose",
+	"innovate","scale","unleash","drive","extend","engineer",
+	"revolutionize","generate","exploit","transition","e-enable","iterate",
+	"cultivate","matrix","productize","redefine","recontextualize"]
+
+adj = ["clicks-and-mortar","value-added","vertical","proactive",
+	"robust","revolutionary","scalable","leading-edge","innovative",
+	"intuitive","strategic","e-business","mission-critical","sticky",
+	"one-to-one","24/7","end-to-end","global","B2B","B2C","granular",
+	"frictionless","virtual","viral","dynamic","24/365","best-of-breed",
+	"killer","magnetic","bleeding-edge","web-enabled","interactive",
+	"dot-com","sexy","back-end","real-time","efficient","front-end",
+	"distributed","seamless","extensible","turn-key","world-class",
+	"open-source","cross-platform","cross-media","synergistic",
+	"bricks-and-clicks","out-of-the-box","enterprise","integrated",
+	"impactful","wireless","transparent","next-generation","cutting-edge",
+	"user-centric","visionary","customized","ubiquitous","plug-and-play",
+	"collaborative","compelling","holistic","rich"]
+
+noun = ["synergies","web-readiness","paradigms","markets","partnerships",
+	"infrastructures","platforms", "initiatives","channels","eyeballs",
+	"communities","ROI","solutions","e-tailers","e-services","action-items",
+	"portals","niches","technologies","content","vortals","supply-chains",
+	"convergence","relationships", "architectures","interfaces","e-markets",
+	"e-commerce","systems","bandwidth","infomediaries","models","mindshare",
+	"deliverables","users","schemas","networks","applications","metrics",
+	"e-business","functionalities","experiences","web services",
+	"methodologies"]
+
+def rarr(arr):
+   return randint(0,len(arr)-1)
+
+def handle_buzz(bot, ievent):
+   ievent.reply("%s %s %s" % (verb[rarr(verb)],adj[rarr(adj)],noun[rarr(noun)]))
+
+
+cmnds.add('buzz', handle_buzz, 'USER')
+examples.add('buzz', 'generate buzz', 'buzz')
+tests.add('buzz')
\ No newline at end of file
--- gozerbot-0.99.1.orig/build/lib/gplugs/translate.py
+++ gozerbot-0.99.1/build/lib/gplugs/translate.py
@@ -0,0 +1,171 @@
+# Description: freetranslation.com parser
+# Author: Wijnand 'tehmaze' Modderman - http://tehmaze.com
+# License: BSD
+# License: For non-commercial use only: http://www.freetranslation.com/terms.htm
+
+import httplib
+import re
+import types
+import urllib
+import urlparse
+from gozerbot.commands import cmnds
+from gozerbot.config import config
+from gozerbot.examples import examples
+from gozerbot.generic import geturl, posturl, waitforqueue
+from gozerbot.plughelp import plughelp
+# compatibility check (since r1701)
+try:
+    from gozerbot.textutils import html_unescape
+except ImportError:
+    import htmllib
+
+    def html_unescape(s):
+        p = htmllib.HTMLParser(None)
+        p.save_bgn()
+        p.feed(s)
+        return p.save_end()
+
+plughelp.add('translate', 'translate between languages')
+
+class TranslateLanguageException(Exception):
+    pass
+
+class TranslateLoginException(Exception):
+    pass
+
+class Translate:
+    
+    lang = ['English/Spanish', 'English/French', 'English/German', 'English/Italian', 'English/Dutch', 'English/Portuguese', 'English/Russian', 'English/Norwegian', 'English/SimplifiedChinese', 'English/TraditionalChinese', 'English/Japanese', 'Spanish/English', 'French/English', 'German/English', 'Italian/English', 'Dutch/English', 'Portuguese/English', 'Russian/English', 'Japanese/English']
+    re_username = re.compile('<input type="hidden" name="username" value="([^"]+)" />', re.I | re.M)
+    re_password = re.compile('<input type="hidden" name="password" value="([^"]+)" />', re.I | re.M)
+    
+    def translate(self, lang_from, lang_to, text):
+        # fix case stuff
+        lang_from = lang_from.title().replace('chinese', 'Chinese')
+        lang_to   = lang_to.title().replace('chinese', 'Chinese')
+        if lang_from == 'Chinese':
+            lang_from = 'SimplifiedChinese'
+        if lang_to == 'Chinese':
+            lang_to = 'SimplifiedChinese'
+        lang = '%s/%s' % (lang_from, lang_to)
+        if not lang in self.lang:
+            raise TranslateLanguageException('no such language combination')
+        else:
+            # oh, this is not needed, ah well, in case we'll ever need it .. ;-)
+            #credentials = self.fetch_credentials()
+            #if not credentials:
+            #    raise TranslateLoginException('Could not fetch username and password')
+            #return self.translate_web(credentials, lang, text)
+            return self.translate_web({}, lang, text)
+
+    def fetch_credentials(self):
+        """On the front page, a username and password are generated and have a limited validity."""
+        html = geturl('http://www.freetranslation.com')
+        test_username = self.re_username.search(html)
+        test_password = self.re_password.search(html)
+        credentials = {}
+        if test_username and test_password:
+            credentials['username'] = test_username.group(1)
+            credentials['password'] = test_password.group(1)
+        return credentials
+
+    def translate_web(self, postdata, lang, text):
+        # defaults
+        postdata.update({'language': lang, 'sequence': 'core', 'mode': 'html',
+            'template': 'results_en-us.htm', 'charset': 'UTF-8', 'a': 'a',
+            'e': 'e', 'i': 'i', 'o': 'o', 'u': 'u', 'misc': 'misc', 
+            'Submit': 'FREE Translation'})
+        # text
+        postdata.update({'srctext': text})
+        # pick correct server
+        server = 'ets.freetranslation.com'
+        if 'chinese' in lang.lower() or 'russian' in lang.lower():
+            server = 'ets6.freetranslation.com'
+        elif 'japanese' in lang.lower():
+            server = 'tets9.freetranslation.com'
+        result = posturl('http://%s/' % server, {}, postdata)
+        for line in result.read().splitlines():
+            # <textarea name="dsttext" cols="40" rows="6">ff test or works this</textarea><br />
+            if 'name="dsttext"' in line:
+                return line.split('>')[1].split('</textarea')[0]
+        return None
+
+translate = Translate()
+
+def handle_translate(bot, ievent):
+    if ievent.inqueue:
+        text = ' '.join(waitforqueue(ievent.inqueue, 5))
+    elif len(ievent.args) < 3:
+        ievent.missing('<from language> <to language> <text>')
+        return
+    else:
+        text = ' '.join(ievent.args[2:])
+    try:
+        result = translate.translate(ievent.args[0], ievent.args[1], text)
+        if result:
+            ievent.reply(html_unescape(result))
+        else:
+            ievent.reply('translation failed (no result)')
+    except TranslateLanguageException, e:
+        ievent.reply(str(e))
+
+cmnds.add('translate', handle_translate, 'USER')
+examples.add('translate', 'translate between languages', 'translate English Dutch how do you do')
+
+def handle_translate_langs(bot, ievent):
+    langs = []
+    for lang in translate.lang:
+        lang = lang.split('/')
+        for l in lang:
+            if not l in langs:
+                langs.append(l)
+    langs.sort()
+    ievent.reply('available languages: %s' % ', '.join(langs))
+
+cmnds.add('translate-lang', handle_translate_langs, 'USER')
+
+trmap = {
+    'de': 'German',
+    'en': 'English',
+    'es': 'Spanish',
+    'fr': 'French',
+    'it': 'Italian',
+    'ja': 'Japanese',
+    'jp': 'Japanese',
+    'nl': 'Dutch',
+    'no': 'Norwegian',
+    'pt': 'Portuguese',
+    'ru': 'Russian',
+    'cn': 'SimplifiedChinese'
+    }
+re_tr = re.compile('^(\S\S)[>\s](\S\S)')
+
+def handle_tr(bot, ievent):
+    if not re_tr.match(ievent.txt.strip()):
+        return ievent.missing('<from lang>to lang> <text>')
+    else:
+        if ievent.inqueue:
+            text = ' '.join(waitforqueue(ievent.inqueue, 5))
+        elif '>' in ievent.args[0]:
+            text = ' '.join(ievent.args[1:])
+        else:
+            text = ' '.join(ievent.args[2:])
+        test_tr = re_tr.search(ievent.args[0])
+        if not test_tr or not trmap.has_key(test_tr.group(1).lower()) or \
+             not trmap.has_key(test_tr.group(2).lower()):
+            langs = trmap.keys()
+            langs.sort()
+            return ievent.reply('invalid language combination, available languages are: %s' % ', '.join(langs))
+        lang1 = trmap[test_tr.group(1).lower()]
+        lang2 = trmap[test_tr.group(2).lower()]
+        try:
+            result = translate.translate(lang1, lang2, text)
+            if result:
+                ievent.reply(html_unescape(result))
+            else:
+                ievent.reply('translation failed (no result)')
+        except TranslateLanguageException, e:
+            ievent.reply(str(e))
+
+cmnds.add('tr', handle_tr, 'USER')
+examples.add('tr', 'translate between two languages', 'tr nl>en het is mooi weer vandaag')
--- gozerbot-0.99.1.orig/build/lib/gplugs/snarf.py
+++ gozerbot-0.99.1/build/lib/gplugs/snarf.py
@@ -0,0 +1,263 @@
+# gozerplugs/plugs/snarf.py
+# 
+#
+
+__author__ = "Wijnand 'tehmaze' Modderman - http://tehmaze.com"
+__license__ = 'BSD'
+__gendoclast__ = ['snarf-disable', ]
+__depend__ = ['url', ]
+
+from gozerbot.callbacks import callbacks, jcallbacks
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliases
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.generic import decode_html_entities, get_encoding, geturl, \
+geturl2, rlog, handle_exception
+from gozerbot.persist.persist import Persist
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.plugins import plugins
+import urllib
+import urllib2
+import urlparse
+import copy
+import re
+import socket
+
+plughelp.add('snarf', 'the snarf plugin gets the title of the web page of \
+the provided url or the last url in the log')
+
+cfg           = Persist('snarf', {})
+pcfg          = PersistConfig()
+pcfg.define('allow', ['text/plain', 'text/html', 'application/xml'])
+re_html_title = re.compile(u'<title>(.*?)</title>', re.I | re.M | re.S)
+re_url_match  = re.compile(u'((?:http|https)://\S+)')
+re_html_valid = {
+    'result':   re.compile('(Failed validation, \
+\d+ errors?|Passed validation)', re.I | re.M),
+    'modified': re.compile('<th>Modified:</th>\
+<td colspan="2">([^<]+)</td>', re.I | re.M),
+    'server':   re.compile('<th>Server:</th>\
+<td colspan="2">([^<]+)</td>', re.I | re.M),
+    'size':     re.compile('<th>Size:</th><td colspan="2">\
+([^<]+)</td>', re.I | re.M),
+    'content':  re.compile('<th>Content-Type:</th><td colspan="2">\
+([^<]+)</td>', re.I | re.M),
+    'encoding': re.compile('<td>([^<]+)</td><td><select name="charset" \
+id="charset">', re.I | re.M),
+    'doctype':  re.compile('<td>([^<]+)</td><td><select id="doctype" \
+name="doctype">', re.I | re.M)
+    }
+urlvalidate   = 'http://validator.w3.org/check?charset=%%28\
+detect+automatically%%29&doctype=Inline&verbose=1&%s'
+
+class SnarfException(Exception):
+    pass
+
+def geturl_title(url):
+    """ fetch title of url """
+    try:
+        result = geturl2(url)
+    except urllib2.HTTPError, ex:
+        rlog(10, 'snarf', str(ex))
+        return False
+    except urllib2.URLError, ex:
+        rlog(10, 'snarf', str(ex))
+        return False
+    except IOError, ex:
+        try:
+            errno = ex[0]
+        except IndexError:
+            handle_exception()
+            return
+        return False
+    if not result:
+        return False
+    test_title = re_html_title.search(result)
+    if test_title:
+        # try to find an encoding and standardize it to utf-8
+        encoding = get_encoding(result)
+        title = test_title.group(1).decode(encoding, 'replace').replace('\n', ' ')
+        title = title.strip()
+        return decode_html_entities(title)
+    return False
+
+def geturl_validate(url):
+    """ validate url """
+    url = urlvalidate % urllib.urlencode({'uri': url})
+    try:
+        result = geturl(url)
+    except IOError, ex:
+        try:
+            errno = ex[0]
+        except IndexError:
+            handle_exception()
+            return
+        return False
+    if not result:
+        return False
+    results = {}
+    for key in re_html_valid.keys():
+        results[key] = re_html_valid[key].search(result)
+        if results[key]:
+            results[key] = results[key].group(1)
+        else:
+            results[key] = '(unknown)'
+    return results
+
+def valid_url(url):
+    """ check if url is valid """
+    if not re_url_match.match(url):
+        return False
+    parts = urlparse.urlparse(url)
+    # do a HEAD request to get the content-type
+    request = urllib2.Request(url)
+    request.get_method = lambda: "HEAD"
+    content = urllib2.urlopen(request)
+    if content.headers['content-type']:
+        type = content.headers['content-type'].split(';', 1)[0].strip()
+        if type not in pcfg.get('allow'):
+            raise SnarfException, "Content-Type %s is not allowed" % type
+    cleanurl = '%s://%s' % (parts[0], parts[1])
+    if parts[2]:
+        cleanurl = '%s%s' % (cleanurl, parts[2])
+    if parts[3]:
+        cleanurl = '%s;%s' % (cleanurl, parts[3])
+    if parts[4]:
+        cleanurl = '%s?%s' % (cleanurl, parts[4])
+    return cleanurl
+
+def handle_snarf(bot, ievent, direct=True):
+    """ snarf provided url or last url in log """
+    url = None
+
+    if ievent.rest:
+        url = ievent.rest
+    else:
+	if plugins['url']:
+	    url = plugins['url'].cache.fetch(bot, ievent)
+
+    if not url:
+        ievent.missing('<url>')
+        return
+
+    try:
+        url = valid_url(url)
+    except KeyError:
+        ievent.reply("can't detect content type")
+        return
+    except SnarfException, e:
+        if direct:
+            ievent.reply('unable to snarf: %s' % str(e))
+        return
+    except urllib2.HTTPError, e:
+        ievent.reply('unable to snarf: %s' % str(e))
+        return
+    except urllib2.URLError, ex:
+        ievent.reply('unable to snarf: %s' % str(ex))
+        return False
+    if not url:
+        ievent.reply('invalid url')
+        return
+    try:
+        title = geturl_title(url)
+    except socket.timeout:
+        ievent.reply('%s socket timeout' % url)
+        return
+    except urllib2.HTTPError, e:
+        ievent.reply('error: %s' % e)
+        return
+    if title:
+        host = urlparse.urlparse(url)[1]
+        if len(host) > 20:
+            host = host[0:20] + '...'
+        ievent.reply('%s: %s' % (host, title))
+    else:
+        ievent.reply('no title found at %s' % urlparse.urlparse(url)[1])
+
+cmnds.add('snarf', handle_snarf, 'USER')
+examples.add('snarf', 'fetch the title from an URL', \
+'snarf http://gozerbot.org')
+aliases.data['@'] = 'snarf'
+aliases.data['title'] = 'snarf'
+
+def handle_snarf_enable(bot, ievent):
+    """ enable snarfing in channel """
+    if not cfg.data.has_key(bot.name):
+        cfg.data[bot.name] = {}
+    cfg.data[bot.name][ievent.printto] = True
+    cfg.save()
+    ievent.reply('ok')
+
+cmnds.add('snarf-enable', handle_snarf_enable, 'OPER')
+examples.add('snarf-enable', 'enable snarfing in the channel', 'snarf-enable')
+aliases.data['snarf-on'] = 'snarf-enable'
+
+def handle_snarf_disable(bot, ievent):
+    """ disable snarfing in channel """
+    if not cfg.data.has_key(bot.name):
+        ievent.reply('ok')
+        return
+    cfg.data[bot.name][ievent.printto] = False
+    cfg.save()
+    ievent.reply('ok')
+
+cmnds.add('snarf-disable', handle_snarf_disable, 'OPER')
+examples.add('snarf-disable', 'disable snarfing in the channel', \
+'snarf-disable')
+aliases.data['snarf-off'] = 'snarf-disable'
+
+def handle_snarf_list(bot, ievent):
+    """ show channels in which snarfing is enabled """
+    snarfs = []
+    names  = cfg.data.keys()
+    names.sort()
+    for name in names:
+        targets = cfg.data[name].keys()
+        targets.sort()
+        snarfs.append('%s: %s' % (name, ' '.join(targets)))
+    if not snarfs:
+        ievent.reply('none')
+    else:
+        ievent.reply('snarfers enable on: %s' % ', '.join(snarfs))
+
+cmnds.add('snarf-list', handle_snarf_list, 'OPER')
+examples.add('snarf-list', 'show in which channels snarfing is enabled', \
+'snarf-list')
+
+def handle_validate(bot, ievent):
+    """ validate provided url or last url in log """
+    url = None
+
+    if ievent.rest:
+        url = ievent.rest
+    else:
+	if plugins['url']:
+	    url = plugins['url'].cache.fetch(bot, ievent)
+
+    if not url:
+        ievent.missing('<url>')
+        return
+
+    try:
+        url = valid_url(url)
+    except urllib2.HTTPError, e:
+        ievent.reply('error: %s' % e)
+        return
+    if not url:
+        ievent.reply('invalid or bad URL')
+        return
+    result = geturl_validate(url)
+    if result:
+        host = urlparse.urlparse(url)[1]
+        if len(host) > 20:
+            host = host[0:20] + '...'
+        ievent.reply('%s: %s | modified: %s | server: %s | size: %s | \
+content-type: %s | encoding: %s | doctype: %s' % \
+            tuple([host] + [result[x] for x in ['result', 'modified', \
+'server', 'size', 'content', 'encoding', 'doctype']]))
+
+cmnds.add('validate', handle_validate, 'USER')
+examples.add('validate', 'validate an URL', 'validate http://gozerbot.org')
+aliases.data['valid'] = 'validate'
+
--- gozerbot-0.99.1.orig/build/lib/gplugs/hexjoin.py
+++ gozerbot-0.99.1/build/lib/gplugs/hexjoin.py
@@ -0,0 +1,69 @@
+# plugs/hexonjoin.py
+#
+#
+
+from gozerbot.callbacks import callbacks
+from gozerbot.persist.persistconfig import PersistConfig
+from gozerbot.aliases import aliasset
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.tests import tests
+
+import struct, socket
+
+plughelp.add('hexjoin', 'show ip and hostname from user joining a channel')
+
+cfg = PersistConfig()
+cfg.define('channels', [])
+
+def hexjoin(bot, ievent):
+    what = ievent.user
+    ip = None
+    try:
+        ipint = int(what, 16)
+        ipint = socket.ntohl(ipint)
+        packed = struct.pack('l', ipint)
+        ip = socket.inet_ntoa(str(packed))
+    except Exception, ex:
+        return
+    try:
+        hostname = socket.gethostbyaddr(ip)[0]
+    except:
+        if ip:
+            bot.say(ievent.channel, '%s is on %s' % (ievent.nick, ip))
+            return
+    bot.say(ievent.channel, '%s is on %s' % (ievent.nick, hostname))
+
+def prehexjoin(bot , ievent):
+    if not len(ievent.user) == 8:
+        return 0
+    try:
+        int(ievent.user, 16)
+    except ValueError:
+        return 0
+    if (bot.name, ievent.channel) in cfg.get('channels'):
+        return 1
+
+callbacks.add('JOIN', hexjoin, prehexjoin)
+
+def handle_hexjoinenable(bot, ievent):
+    cfg.append('channels', (bot.name, ievent.channel))
+    ievent.reply('%s channel added' % ievent.channel)
+
+cmnds.add('hexjoin-enable', handle_hexjoinenable, 'OPER')
+examples.add('hexjoin-enable', 'enable hexjoin in the channel the command is \
+given in', 'hexjoin-enable')
+tests.add('hexjoin-enable', 'channel added')
+
+def handle_hexjoindisable(bot, ievent):
+    try:
+        cfg.remove('channels', (bot.name, ievent.channel))
+        ievent.reply('%s channel removed' % ievent.channel)
+    except ValueError:
+        ievent.reply('%s channel is not in channels list' % ievent.channel)
+
+cmnds.add('hexjoin-disable', handle_hexjoindisable, 'OPER')
+examples.add('hexjoin-disable', 'disable hexjoin in the channel this command \
+is given in', 'hexjoin-disable')
+tests.add('hexjoin-disable', 'channel')
--- gozerbot-0.99.1.orig/build/lib/gplugs/relay.py
+++ gozerbot-0.99.1/build/lib/gplugs/relay.py
@@ -0,0 +1,421 @@
+# plugs/relay.py
+#
+#
+
+"""
+ the bot can relay between different bots both IRC and Jabber ones.
+ relay uses the following format.
+
+ <botname> <channel> <botname> <channel>
+
+ <------ from -----> <------- to ------>
+"""
+
+__copyright__ = 'this file is in the public domain'
+__gendoclast__ = ['relay-del', ]
+
+from gozerbot.utils.generic import convertpickle, jsonstring
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.callbacks import callbacks, jcallbacks
+from gozerbot.fleet import fleet
+from gozerbot.irc.monitor import saymonitor
+from gozerbot.xmpp.monitor import xmppmonitor
+from gozerbot.datadir import datadir
+from gozerbot.persist.pdol import Pdol
+from gozerbot.plughelp import plughelp
+from gozerbot.ignore import shouldignore
+from gozerbot.generic import rlog
+from gozerbot.threads.thr import start_new_thread
+from gozerbot.tests import tests
+
+from simplejson import loads
+
+import time, os
+
+plughelp.add('relay', 'relay between fleet bots or channels')
+
+## UPGRADE PART
+
+def upgrade():
+    convertpickle(datadir + os.sep + 'old' + os.sep + 'relay', \
+datadir + os.sep + 'plugs' + os.sep + 'relay' + os.sep + 'relay')
+
+class Relay(Pdol):
+
+    """ relay is implemented as a pickled dict of lists """
+
+    def check(self, botname, channel, txt, fromm=None):
+        """ check if we relay on (botname, channel) .. if so do output """
+        channel = channel
+        mainbot = fleet.byname(botname)
+        if not mainbot:
+            rlog(10, 'relay', "can't find %s bot in fleet" % botname)
+            return
+        marker2 = '<%s>' % (mainbot.channels.getnick(channel) or mainbot.nick)
+
+        if marker2 in txt:
+            return
+
+        indexstring = jsonstring((botname, channel))
+        index = loads(indexstring)
+
+        if self.data.has_key(indexstring):
+
+            for i in self.data[indexstring]:
+
+                if i != index:
+                    bot = fleet.byname(i[0])
+                    chan = i[1]
+
+                    if bot:
+
+                        if bot.jabber:
+                             marker = '<%s>' % bot.channels.getnick(chan)
+                        else:
+                             marker = '<%s>' % bot.nick
+
+                        if marker in txt: 
+                            return
+
+                        if not bot.stopped:
+                            time.sleep(1)
+                            bot.outputnolog(i[1], txt, 'msg', fromm=fromm)
+
+    def wouldrelay(self, botname, channel):
+
+        """ check if (botname, channel) would relay """
+
+        return self.data.has_key(jsonstring((botname, channel)))
+
+    def channels(self, botname):
+
+        """ show channels that are relayed on bot """
+
+        result = []
+
+        for i in self.data.keys():
+
+            if i[0] == botname:
+                result.append(i[1])
+
+        return result
+
+def init():
+    """ called after reload """
+    saymonitor.start()
+    xmppmonitor.start()
+    saymonitor.add('relay', saycb, prerelaysay, True)
+    xmppmonitor.add('relay', jabbersaycb, jabberprerelaysay, True)
+    return 1
+    
+relay = Relay(datadir + os.sep + 'plugs' + os.sep + 'relay' + os.sep + 'relay')
+if not relay.data:
+    upgrade()
+    relay = Relay(datadir + os.sep + 'plugs' + os.sep + 'relay' + os.sep + 'relay')
+
+jabberjoined = {}
+
+def size():
+
+    """ return number of relays """
+
+    return len(relay.data)
+
+def prerelay(bot, ievent):
+
+    """ precondition """
+
+    if not ievent.txt:
+        return 0
+
+    if shouldignore(ievent.userhost):
+        return 0
+
+    go = relay.wouldrelay(bot.name, ievent.channel)
+
+    if go:
+        ievent.isrelay = True
+
+    return go
+
+def cbrelayquit(bot, ievent):
+
+    """ relay quit callback """
+
+    time.sleep(1)
+    nick = ievent.nick
+
+    if nick in bot.splitted:
+        return
+
+    try:
+
+        for i in bot.userchannels[nick]:
+
+            if i in bot.state['joinedchannels']:
+                relay.check(bot.name, i, "%s (%s) quit %s - %s" % \
+(ievent.nick, ievent.userhost, bot.server, ievent.txt))
+
+    except KeyError:
+        rlog(10, 'relay', 'missing %s in userchannels' % nick)
+
+callbacks.add('QUIT', cbrelayquit, nr=0, threaded=True)
+
+def cbrelaykick(bot, ievent):
+
+    """ relay kick callback """
+
+    relay.check(bot.name, ievent.channel, "%s kicked %s from %s (%s) - %s" % \
+(ievent.nick, ievent.arguments[1], ievent.channel, bot.server, ievent.txt))
+
+callbacks.add('KICK', cbrelaykick, prerelay, threaded=True)
+
+def cbrelaynick(bot, ievent):
+
+    """ relay nick callback """
+
+    nick = ievent.nick
+
+    try:
+
+        for i in bot.userchannels[nick]:
+
+            if i in bot.state['joinedchannels']:
+                relay.check(bot.name, i, "%s is now known as %s" % \
+(ievent.nick, ievent.txt))
+
+    except KeyError:
+        rlog(10, 'relay', 'missing %s in userchannels' % nick)
+
+callbacks.add('NICK', cbrelaynick, threaded=True)
+
+def cbrelaytopic(bot, ievent):
+
+    """ relay topic callback """
+
+    relay.check(bot.name, ievent.channel, "%s changed topic to %s" % (ievent.nick, ievent.txt))
+
+callbacks.add('TOPIC', cbrelaytopic, prerelay, threaded=True)
+
+def cbrelaymode(bot, ievent):
+
+    """ callback for MODE events """
+
+    relay.check(bot.name, ievent.channel, "mode change on %s by %s \
+(%s): %s" % (bot.server, ievent.nick, ievent.userhost, ievent.postfix))
+
+callbacks.add('MODE', cbrelaymode, prerelay, threaded=True)
+
+def cbrelaypriv(bot, ievent):
+
+    """ PRIVMSG relay callback """
+
+    t = ievent.origtxt or ievent.txt
+    t = t.strip()
+
+    if not t:
+        return
+
+    if t[0] == '\001' and t.find('ACTION') != -1:
+        result = "<%s> *** %s" % (ievent.nick, t[8:-1])
+    else:
+        result = "<%s> %s" % (ievent.nick, t)
+
+    relay.check(bot.name, ievent.channel, result, fromm=ievent.userhost)
+
+callbacks.add('PRIVMSG', cbrelaypriv, prerelay, threaded=True)
+
+def cbMessage(bot, msg):
+
+    """ jabber relay message callback """
+
+    t = msg.origtxt or msg.txt
+    t = t.strip()
+
+    if not t:
+        return
+
+    if msg.usercmnd and not msg.groupchat:
+        return
+
+    if bot.google:
+        result = "<%s> %s" % (msg.userhost, t)
+    else:
+        result = "<%s> %s" % (msg.nick, t)
+
+    relay.check(bot.name, msg.channel, result, fromm=msg.userhost)
+
+jcallbacks.add('Message', cbMessage, prerelay, threaded=True)
+
+def cbPresence(bot, msg):
+
+    """ jabber relay presence callback """
+
+    result = None
+    got = False
+
+    if msg.type == 'unavailable':
+        result = "%s (%s) left %s" % (msg.nick, msg.userhost, msg.channel)
+
+        try:
+            jabberjoined[msg.channel].remove(msg.nick)
+        except (ValueError, KeyError):
+            pass
+
+    elif msg.joined:
+
+        try:
+
+            if msg.nick in jabberjoined[msg.channel]:
+                got = True
+            else:
+                got = False
+
+        except KeyError:
+            got = False
+
+        if not got:
+
+            if not jabberjoined.has_key(msg.channel):
+                jabberjoined[msg.channel] = []
+
+            jabberjoined[msg.channel].append(msg.nick)
+
+            if bot.timejoined.has_key(msg.channel):
+
+                if time.time() - bot.timejoined[msg.channel] > 10:
+                    result = "%s (%s) joined %s" % (msg.nick, msg.userhost, msg.channel)
+
+    if result:
+        relay.check(bot.name, msg.channel, result)
+
+jcallbacks.add('Presence', cbPresence, prerelay, threaded=True)
+
+def cbrelayjoin(bot, ievent):
+
+    """ JOIN relay callback """
+
+    if ievent.nick in bot.splitted:
+        return
+
+    relay.check(bot.name, ievent.channel, "%s (%s) joined %s on %s" % \
+(ievent.nick, ievent.userhost, ievent.channel, bot.server))
+
+callbacks.add('JOIN', cbrelayjoin, prerelay, nr=0, threaded=True)
+
+def cbrelaypart(bot, ievent):
+
+    """ PART relay callback """
+
+    relay.check(bot.name, ievent.channel, "%s left %s on %s" % \
+(ievent.nick, ievent.channel, bot.name))
+
+callbacks.add('PART', cbrelaypart, prerelay, threaded=True)
+
+def prerelaysay(botname, printto, txt, who, how, fromm):
+
+    """ precondition on bot.say callbacks """
+
+    return relay.wouldrelay(botname, printto)
+
+def saycb(botname, printto, txt, who, how, fromm):
+
+    """ callback for bots output """
+
+    relay.check(botname, printto, "<bot> %s" % txt, fromm=fromm)
+
+def jabberprerelaysay(bot, jmsg):
+
+    """ precondition on bot.say callbacks """
+
+    if jmsg:
+        return relay.wouldrelay(bot.name, jmsg.to.split('/')[0])
+
+def jabbersaycb(bot, jmsg):
+
+    """ callback for bots output """
+
+    if jmsg.botoutput and not jmsg.groupchat:
+        return
+
+    t = jmsg.txt or jmsg.origtxt
+
+    if not t:
+        return
+
+    try:
+        chan = jmsg.to.split('/')[0]
+        relay.check(bot.name, chan, "<bot> %s" % t, fromm=bot.name)
+
+    except AttributeError:
+        handle_exception()
+        return
+        
+def handle_relaylist(bot, ievent):
+
+    """ realy-list .. list all relays """
+
+    result = []
+
+    for item, value in relay.data.iteritems():
+        tempstr = ""
+
+        for relayto in value:
+            tempstr += "[%s,%s] .. " % (relayto[0], relayto[1])
+
+        tempstr = tempstr[:-4]
+        result.append("%s => %s" % (item, tempstr))
+
+    if result:
+        ievent.reply(result, dot=' || ')
+    else:
+        ievent.reply('no relays')
+
+cmnds.add('relay-list', handle_relaylist, 'OPER')
+examples.add('relay-list', 'list the relays', 'relay-list')
+tests.add('relay-list')
+
+def handle_relayadd(bot, ievent):
+
+    """ relay-add <botname> <channel> <botname> <channel> .. add a relay """
+
+    try:
+        (botnamefrom, channelfrom, botnameto, channelto) = ievent.args
+    except ValueError:
+        ievent.missing('<botnamefrom> <channelfrom> <botnameto> <channelto>')
+        return
+    relay[jsonstring([botnamefrom, channelfrom])] = [botnameto, channelto]
+    relay.save()
+    ievent.reply('relay added')
+
+cmnds.add('relay-add', handle_relayadd, 'OPER')
+examples.add('relay-add', 'relay-add <botname> <channel> <botname> \
+<channel> .. add bot/channel to relay', 'relay-add main #dunkbots test \
+#dunkbots')
+tests.add('relay-add default #dunkbots irc #dunkbots')
+
+def handle_relaydel(bot, ievent):
+    """ relay-del <botname> <channel> <botname> <channel> .. delete a relay """
+    try:
+        (botnamefrom, channelfrom, botnameto, channelto) = ievent.args
+    except ValueError:
+        ievent.missing('<botnamefrom> <channelfrom> <botnameto> <channelto>')
+        return
+    try:
+        relay[jsonstring([botnamefrom, channelfrom])].remove([botnameto, \
+channelto])
+    except (KeyError, ValueError, AttributeError):
+        ievent.reply("there is no %s %s - %s %s relay" % \
+(botnamefrom, channelfrom, botnameto, channelto))
+        return
+    if len(relay[jsonstring([botnamefrom, channelfrom])]) == 0:
+        del relay[jsonstring([botnamefrom, channelfrom])]
+    relay.save()
+    ievent.reply('relay deleted')
+
+cmnds.add('relay-del', handle_relaydel, 'OPER')
+examples.add('relay-del', 'relay-del <botname> <channel> <botname> \
+<channel> .. delete bot/channel from relay', 'relay-del main #dunkbots \
+test #dunkbots')
+tests.add('relay-del default #dunkbots irc #dunkbots')
--- gozerbot-0.99.1.orig/build/lib/gplugs/alchemy/infoitem.py
+++ gozerbot-0.99.1/build/lib/gplugs/alchemy/infoitem.py
@@ -0,0 +1,356 @@
+# plugs/infoitem.py
+#
+#
+
+""" information items .. keyword/description pairs """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.tests import tests
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.redispatcher import rebefore, reafter
+from gozerbot.ignore import shouldignore
+from gozerbot.datadir import datadir
+from gozerbot.persist.persist import Persist
+from gozerbot.generic import lockdec, cchar, rlog, handle_exception
+from gozerbot.aliases import aliases
+from gozerbot.plughelp import plughelp
+from gozerbot.callbacks import callbacks
+from gozerbot.users import users
+from gozerbot.config import config
+from gozerbot.database.alchemy import Base, create_all, query, Session, dblocked
+from datetime import datetime
+from time import localtime
+from sqlalchemy import Column, String, Integer, Text, DateTime, ForeignKey, Sequence
+import sqlalchemy as sa
+
+class InfoItems(Base):
+    __tablename__ = 'infoitems'
+    __table_args__ = {'useexisting': True}
+    indx = Column('indx', Integer, primary_key=True)
+    item = Column('item', String(255), nullable=False)
+    description = Column('description', Text, nullable=False)
+    userhost = Column('userhost', String(255), ForeignKey('userhosts.userhost'), nullable=False)
+    time = Column('time', DateTime, nullable=False)
+
+    def __init__(self, item, description, userhost, ttime=None):
+        self.time = ttime and ttime or datetime.now()
+        self.item = item.lower()
+        self.description = description
+        self.userhost = userhost
+
+## BEGIN UPGRADE PART
+
+def upgrade():
+    rlog(10, 'infoitem', 'upgrading')
+    teller = 0
+    dbdir = datadir + os.sep + 'db' + os.sep + 'infoitem.db'
+    if os.path.exists(dbdir):
+        try:
+            from gozerbot.database.db import Db
+            db = Db(dbtype='sqlite')
+            db.connect('db/infoitem.db')
+            result = db.execute(""" SELECT * FROM infoitems """)
+            if result:
+                for i in result:
+                    info.add(*i[1:])
+                    teller += 1
+        except Exception, ex:
+            handle_exception()
+    else:
+        oldfile = datadir + os.sep + 'old' + os.sep + 'infoitems'
+        try:
+            from gozerbot.utils.generic import dosed
+            from gozerbot.compat.persist import Persist
+            oldinfo = Persist(oldfile)
+            assert(oldinfo)
+            if not oldinfo.data:
+                return
+            for item, descrlist in oldinfo.data.iteritems():
+                for descr in descrlist:
+                    try:
+                        info.add(item, descr, 'none', 0)
+                    except Exception, ex:
+                        handle_exception()
+                    teller += 1
+        except IOError, ex:
+            if "No such file" in str(ex):
+                rlog(10, 'infoitem', 'nothing to upgrade')
+        except Exception, ex:
+            rlog(10, 'infoitem', "can't upgrade: %s" % str(ex))
+            return
+    rlog(10, 'infoitem', 'upgraded %s infoitems' % str(teller))
+    return teller
+
+import thread, os, time
+
+plughelp.add('infoitem', 'also known as factoids .. info can be retrieved \
+by keyword or searched')
+
+infolock = thread.allocate_lock()
+
+# create lock descriptor
+locked = lockdec(infolock)
+
+class InfoitemsDb(object):
+
+    """ information items """
+
+    @dblocked
+    def add(self, item, description, userhost, ttime, channel="", name=""):
+        """ add an item """
+        item = item.lower()
+        result = 0
+        try:
+            #Session.begin()
+            newitem = InfoItems(item, description, userhost, datetime.fromtimestamp(ttime))
+            Session.add(newitem)
+            #Session.commit()
+            #Session.close()
+            result = 1
+        except Exception, ex:
+            rlog(10, 'infoitem', "can't add item: %s" % str(ex))
+            raise ex
+        return result
+
+    def get(self, item):
+        """ get infoitems """
+        item = item.lower()
+        result = [r.description for r in query(InfoItems).filter_by(item=item)]
+        return result
+
+    @dblocked
+    def delete(self, indexnr):
+        """ delete item with indexnr  """
+        item = Session.query(InfoItems).filter_by(indx=indexnr).first()
+        try:
+            #Session.begin()
+            Session.delete(item)
+            #Session.commit()
+            #Session.close()
+            result = 1
+        except Exception, ex:
+            rlog(10, 'infoitem', "can't delete item %s: %s" % (str(indexnr), str(ex)))
+            raise ex
+        return result
+
+    @dblocked
+    def deltxt(self, item, txt):
+        """ delete item with matching txt """
+        items = Session.query(InfoItems).filter(InfoItems.item==item
+                        ).filter(InfoItems.description.like('%%%s%%' % txt)).all()
+        result = 0
+        try:
+            #Session.begin()
+            for n, i in enumerate(items):
+                Session.delete(i)
+                result = n + 1
+            #Session.commit()
+            #Session.close()
+        except Exception, ex:
+            rlog(10, 'infoitem', "can't delete items like %s: %s" % (str(txt), str(ex)))
+            raise ex
+        return result
+
+    def size(self):
+        """ return number of items """
+        count = query(sa.func.count(InfoItems.indx)).first()[0]
+        return count
+
+    def searchitem(self, search):
+        """ search items """
+        result = query(InfoItems).filter(InfoItems.item.like('%%%s%%' % search)).all()
+        return result
+
+    def searchdescr(self, search):
+        """ search descriptions """
+        result = query(InfoItems).filter(InfoItems.description.like('%%%s%%' % search)).all()
+        return result
+
+
+info = InfoitemsDb()
+create_all('infoitem')
+assert(info)
+
+def size():
+    """ return number of infoitems """
+    return info.size()
+
+def search(what, queue):
+    rlog(10, 'infoitem', 'searched for %s' % what)
+    result = info.searchitem(what)   
+    if not result:
+        return
+    res = []
+    for i in result:
+        queue.put_nowait(i.description)
+    result = info.searchdescr(what)   
+    if not result:
+        return
+    for i in result:
+        queue.put_nowait("[%s] %s" % (i.item, i.description))
+
+def infopre(bot, ievent):
+    """ see if info callback needs to be called """
+    cc = cchar(bot, ievent)
+    if ievent.origtxt and  ievent.origtxt[0] in cc and not ievent.usercmnd \
+and ievent.txt:
+        return 1
+
+def infocb(bot, ievent):
+    """ implement a !infoitem callback """
+    if not shouldignore(ievent.userhost):
+        if 'handle_question' in bot.state['allowed'] or users.allowed(ievent.userhost, 'USER'):
+             data = info.get(ievent.txt)
+             if data:
+                ievent.reply('%s is ' % ievent.txt, data , dot=True)
+
+callbacks.add('PRIVMSG', infocb, infopre)
+
+def handle_infoupgrade(bot, ievent):
+    if info.size():
+         if '-f' in ievent.optionset:
+             pass
+         else:
+             ievent.reply('there are already infoitems in the main database .. not upgrading')
+             ievent.reply('use the -f option to force an upgrade')
+             return
+    ievent.reply('upgrading infoitems')
+    nritems = upgrade()
+    ievent.reply('%s items upgraded' % nritems)
+
+cmnds.add('info-upgrade', handle_infoupgrade, 'OPER', options={'-f': ''})
+
+def handle_infosize(bot, ievent):
+    """ info-size .. show number of information items """
+    ievent.reply("we have %s infoitems" % info.size())
+
+cmnds.add('info-size', handle_infosize, ['USER', 'WEB', 'CLOUD'])
+examples.add('info-size', 'show number of infoitems', 'info-size')
+tests.add('info-size', 'we have (\d+) infoitems')
+
+def handle_addinfoitem(bot, ievent):
+    """ <keyword> = <description> .. add information item """
+    try:
+        (what, description) = ievent.groups
+    except ValueError:
+        ievent.reply('i need <item> <description>')
+        return
+    if len(description) < 3:
+        ievent.reply('i need at least 3 chars for the description')
+        return
+    what = what.strip()
+    ret = info.add(what, description, ievent.userhost, time.time())
+    if ret:
+        ievent.reply('item added')
+    else:
+        ievent.reply('unable to add item')
+
+rebefore.add(10, '^(.+?)\s+=\s+(.+)$', handle_addinfoitem, ['USER', \
+'INFOADD'], allowqueue=False)
+examples.add('=', 'add description to item', 'dunk = top')
+tests.add('gozerbot = top bot', 'item added')
+
+def handle_question(bot, ievent):
+    """ <keyword>? .. ask for information item description """
+    try:
+        what = ievent.groups[0]
+    except TypeError:
+        what = ievent.rest
+    except IndexError:
+        ievent.reply('i need a argument')
+        return
+    what = what.strip().lower()
+    infoitems = info.get(what)
+    if infoitems:
+        ievent.reply("%s is " % what, infoitems, dot=True)
+    else:
+        ievent.reply('nothing known about %s' % what)
+
+reafter.add(10, '^(.+)\?$', handle_question, ['USER', 'WEB', 'JCOLL', \
+'CLOUD'], allowqueue=True)
+reafter.add(10, '^\?(.+)$', handle_question, ['USER', 'WEB', 'JCOLL', \
+'CLOUD'], allowqueue=True)
+cmnds.add('?', handle_question, ['USER', 'INFOADD'], allowqueue=False)
+examples.add('?', 'show infoitems of <what>', '1) test? 2) ?test')
+tests.add('gozerbot?', 'top bot')
+tests.add('?gozerbot', 'top bot')
+
+def handle_forget(bot, ievent):
+    """ forget <keyword> <txttomatch> .. remove information item where \
+        description matches txt given """
+    if len(ievent.args) > 1:
+        what = ' '.join(ievent.args[:-1])
+        txt = ievent.args[-1]
+    else:
+        ievent.missing('<item> <txttomatch> (min 3 chars)')
+        return
+    if len(txt) < 3:
+        ievent.reply('i need txt with at least 3 characters')
+        return
+    what = what.strip().lower()
+    try:
+        nrtimes = info.deltxt(what, txt)
+    except KeyError:
+        ievent.reply('no records matching %s found' % what)
+        return
+    if nrtimes > 1:
+        ievent.reply('%d items deleted' % nrtimes)
+    elif nrtimes:
+        ievent.reply('item deleted')
+    else:
+        ievent.reply('delete %s of %s failed' % (txt, what))
+
+cmnds.add('info-forget', handle_forget, ['FORGET', 'OPER'])
+examples.add('info-forget', 'forget <item> containing <txt>', 'info-forget \
+dunk bla')
+aliases.data['forget'] = 'info-forget'
+tests.add('gozerbot2 = top bot').add('info-forget gozerbot2 top', 'item deleted')
+
+def handle_searchdescr(bot, ievent):
+    """ info-sd <txttosearchfor> .. search information items descriptions """
+    if not ievent.rest:
+        ievent.missing('<txt>')
+        return
+    else:
+        what = ievent.rest
+    what = what.strip().lower()
+    result = info.searchdescr(what)
+    if result: 
+        res = []
+        for i in result:
+            res.append("[%s] %s" % (i.item, i.description))
+        ievent.reply("the following matches %s: " % what, res, dot=True)
+    else:
+        ievent.reply('none found')
+
+cmnds.add('info-sd', handle_searchdescr, ['USER', 'WEB', 'CLOUD'])
+examples.add('info-sd', 'info-sd <txt> ..  search description of \
+infoitems', 'info-sd http')
+aliases.data['sd'] = 'info-sd'
+aliases.data['sl'] = 'info-sd'
+tests.add('gozerbot = top bot').add('info-sd top', 'top bot')
+
+def handle_searchitem(bot, ievent):
+    """ info-si <txt> .. search information keywords """
+    if not ievent.rest:
+        ievent.missing('<txt>')
+        return
+    else:
+        what = ievent.rest
+    what = what.strip().lower()
+    result = info.searchitem(what)
+    if result:
+        res = []
+        for i in result:
+            res.append("[%s] %s" % (i.item, i.description))
+        ievent.reply("the following matches %s: " % what, res, dot=True)
+    else:
+        ievent.reply('none found')
+
+cmnds.add('info-si', handle_searchitem, ['USER', 'WEB', 'CLOUD'])
+examples.add('info-si', 'info-si <txt> ..  search the infoitems keys', \
+'info-si test')
+aliases.data['si'] = 'info-si'
+tests.add('gozerbot = top bot').add('info-si gozer', 'gozerbot')
--- gozerbot-0.99.1.orig/build/lib/gplugs/alchemy/karma.py
+++ gozerbot-0.99.1/build/lib/gplugs/alchemy/karma.py
@@ -0,0 +1,699 @@
+# plugs/karma.py
+#
+#
+
+""" karma plugin """
+
+__copyright__ = 'this file is in the public domain'
+__depending__ = ['fans', 'quote']
+
+from gozerbot.tests import tests
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.redispatcher import rebefore
+from gozerbot.datadir import datadir
+from gozerbot.generic import handle_exception, rlog, lockdec
+from gozerbot.utils.statdict import Statdict
+from gozerbot.aliases import aliases
+from gozerbot.plughelp import plughelp
+from gozerbot.config import config
+import thread, pickle, time, os
+
+from gozerbot.database.alchemy import Base, create_all, engine, query, Session, dblocked
+from datetime import datetime
+from time import localtime
+from sqlalchemy import Column, String, Integer, Text, DateTime, ForeignKey, Sequence
+import sqlalchemy as sa
+
+class Karma(Base):
+    __tablename__ = 'karma'
+    __table_args__ = {'useexisting': True}
+    item = Column('item', String(255), primary_key=True)
+    value = Column('value', Integer, nullable=False)
+
+    def __init__(self, item, value):
+        self.item = item
+        self.value = value
+
+class WhyKarma(Base):
+    __tablename__ = 'whykarma'
+    __table_args__ = {'useexisting': True}
+    item = Column('item', String(255), nullable=False)
+    updown = Column('updown', String(10), nullable=False)
+    why = Column('why', Text, nullable=False)
+    __mapper_args__ = {'primary_key':[item,updown,why]}
+
+    def __init__(self, item, updown, why):
+        self.item = item
+        self.updown = updown
+        self.why = why
+
+class WhoKarma(Base):
+    __tablename__ = 'whokarma'
+    __table_args__ = {'useexisting': True}
+    item = Column('item', String(255), nullable=False)
+    nick = Column('nick', String(255), nullable=False)
+    updown = Column('updown', String(10), nullable=False)
+    __mapper_args__ = {'primary_key': [item, nick, updown]}
+
+    def __init__(self, item, nick, updown):
+        self.item = item
+        self.nick = nick
+        self.updown = updown
+
+## UPGRADE PART
+
+def upgrade():
+    teller = 0
+    oldfile = datadir + os.sep + 'old'
+    dbdir = datadir + os.sep + 'db' + os.sep + 'karma.db'
+    if os.path.exists(dbdir):
+        try:
+            from gozerbot.database.db import Db
+            db = Db(dbtype='sqlite')
+            db.connect('db/karma.db')
+            result = db.execute(""" SELECT * FROM karma """)
+            if result:
+                for i in result:
+                    karma.add(i[0], i[1])
+                    teller += 1
+            result = db.execute(""" SELECT * FROM whokarma """)
+            if result:
+                for i in result:
+                    if i[2] == 'up':
+                        karma.setwhoup(i[0], i[1])
+                    else:
+                        karma.setwhodown(i[0], i[1])
+            result = db.execute(""" SELECT * FROM whykarma """)
+            if result:
+                for i in result:
+                    karma.addwhy(*i)
+        except Exception, ex:
+            handle_exception()
+        return teller
+
+    try:
+        from gozerbot.utils.generic import dosed
+        from gozerbot.database.db import Db
+        from gozerbot.compat.karma import Karma
+
+        oldkarma = Karma(oldfile) 
+
+        if not oldkarma:
+            return
+
+        k = oldkarma
+        got = []
+
+        rlog(10, 'karma', 'upgrading karma items')
+        for i,j in k.karma.iteritems():
+            if i in got:
+                continue
+            else:
+                got.append(i)
+                try:
+                    karma.add(i,j)
+                    teller += 1
+                except sa.exc.IntegrityError, ex:
+                    #if 'not unique' in str(ex):
+                    #    continue
+                    raise
+
+        rlog(10, 'karma', 'upgrading reasonup')
+        for i,j in k.reasonup.iteritems():
+            for z in j:
+                karma.addwhy(i, 'up', z)
+
+        rlog(10, 'karma', 'upgrading reasondown')
+        for i,j in k.reasondown.iteritems():
+            for z in j:
+                karma.addwhy(i, 'down', z)
+
+        rlog(10, 'karma', 'upgrading whodown')
+        for i,j in k.whodown.iteritems():
+            for z in j:
+                karma.setwhodown(i, z)
+
+        rlog(10, 'karma', 'upgrading whoup')
+        for i,j in k.whoup.iteritems():
+            for z in j:
+                karma.setwhoup(i, z)
+
+    except Exception, ex:
+        handle_exception()
+        rlog(10, 'karma', 'failed to upgrade: %s' % str(ex))
+        return
+    rlog(10, 'karma', 'upgraded %s karma items' % str(teller))
+
+# END UPGRADE PART
+
+plughelp.add('karma', 'maintain karma of items .. use ++ to raise karma by 1 \
+or use -- to lower by 1 .. reason might be given after a "#"')
+
+class KarmaDb(object):
+
+    """ karma object """
+
+    def save(self):
+        pass
+
+    def size(self):
+        """ return number of items """
+        
+        count = query(sa.func.count(Karma.item)).first()[0]
+        return count
+
+    @dblocked
+    def add(self, item, value):
+        item = item.lower()
+        if Session.query(Karma).filter(Karma.item==item).count():
+            rlog(10, 'karma', '%s item is already in database' % item)
+            return
+        #Session.begin()
+        k = Karma(item=item, value=value)
+        Session.add(k)
+        #Session.commit()
+        #Session.close()
+        return 1
+
+    def get(self, item):
+        """ get karma of item """
+        item = item.lower()
+        karma = query(Karma).filter(Karma.item==item).first()
+        if karma:
+            return karma.value
+
+    @dblocked
+    def delete(self, item):
+        """ delete karma item """
+        item = item.lower()
+        whokarma = Session.query(WhoKarma).filter(WhoKarma.item==item).all()
+        whykarma = Session.query(WhyKarma).filter(WhyKarma.item==item).all()
+        #Session.begin()
+        for w in whokarma + whykarma:
+		Session.delete(w)
+        karma = Session.query(Karma).filter(Karma.item==item).first()
+        if karma:
+            Session.delete(karma)
+        #Session.commit()
+        #Session.close()
+        return 1
+
+    @dblocked
+    def addwhy(self, item, updown, reason):
+        """ add why of karma up/down """
+        #Session.begin()
+        item = item.lower()
+        whykarma = WhyKarma(item, updown, reason)
+        Session.add(whykarma)
+        #Session.commit()
+        #Session.close()
+
+    @dblocked
+    def upitem(self, item, reason=None):
+        """ up a karma item with/without reason """
+        item = item.lower()
+        karma = Session.query(Karma).filter(Karma.item==item).first()
+        #Session.begin()
+        if not karma:
+            karma = Karma(item, 0)
+            Session.add(karma)
+        karma.value = karma.value + 1
+        if reason:
+            whykarma = WhyKarma(item, 'up', reason.strip())
+            Session.add(whykarma)
+        #Session.commit()
+        #Session.close()
+
+    @dblocked
+    def down(self, item, reason=None):
+        """ lower a karma item with/without reason """
+        item = item.lower()
+        karma = Session.query(Karma).filter(Karma.item==item).first()
+        #Session.begin()
+        if not karma:
+            karma = Karma(item, 0)
+            Session.add(karma)
+        karma.value = karma.value - 1
+        if reason:
+            whykarma = WhyKarma(item, 'down', reason.strip())
+            Session.add(whykarma)
+        #Session.commit()
+        #Session.close()  
+
+    def whykarmaup(self, item):
+        """ get why of karma ups """
+        item = item.lower()
+        karma = query(WhyKarma).filter(WhyKarma.item==item).filter(WhyKarma.updown=='up')
+        if karma:
+            return [k.why for k in karma]
+
+    def whykarmadown(self, item):
+        """ get why of karma downs """
+        item = item.lower()
+        karma = query(WhyKarma).filter(WhyKarma.item==item).filter(WhyKarma.updown=='down')
+        if karma:
+            return [k.why for k in karma]
+
+    @dblocked
+    def setwhoup(self, item, nick):
+        """ set who upped a karma item """
+        #Session.begin()
+        item = item.lower()
+        nick = nick.lower()
+        wk = WhoKarma(item, nick, 'up')
+        Session.add(wk)
+        #Session.commit()
+        #Session.close()
+
+    @dblocked
+    def setwhodown(self, item, nick):
+        """ set who lowered a karma item """
+        #Session.begin()
+        item = item.lower()
+        nick = nick.lower()
+        wk = WhoKarma(item, nick, 'down')
+        Session.add(wk)
+        #Session.commit()
+        #Session.close()
+
+    def getwhoup(self, item):
+        """ get list of who upped a karma item """
+        item = item.lower()
+        karma = query(WhoKarma).filter(WhoKarma.item==item).filter(WhoKarma.updown=='up').all()
+        if karma:
+            return [k.nick for k in karma]
+
+    def getwhodown(self, item):
+        """ get list of who downed a karma item """
+        item = item.lower()
+        karma = query(WhoKarma).filter(WhoKarma.item==item).filter(WhoKarma.updown=='down').all()
+        if karma:
+            return [k.nick for k in karma]
+
+    def search(self, item):
+        """ search for matching karma item """
+        item = item.lower()
+        karma = query(Karma).filter(Karma.item.like('%%%s%%' % item))
+        if karma:
+            return karma
+
+    def good(self, limit=10):
+        """ show top 10 of karma items """
+        statdict = Statdict()
+        karma = query(Karma).all()
+        if not karma:
+            return []
+        for i in karma:
+            if i.item.startswith('quote '):
+                continue
+            statdict.upitem(i.item, i.value)
+        return statdict.top(limit=limit)
+
+    def bad(self, limit=10):
+        """ show lowest 10 of negative karma items """
+        statdict = Statdict()
+        karma = query(Karma).all()
+        if not karma:
+            return []
+        for i in karma:
+            if i.item.startswith('quote '):
+                continue
+            statdict.upitem(i.item, i.value)
+        return statdict.down(limit=limit)
+
+    def quotegood(self, limit=10):
+        """ show top 10 of karma items """
+        statdict = Statdict()
+        karma = query(Karma).all()
+        if not karma:
+            return []
+        for i in karma:
+            if not i.item.startswith('quote '):
+                continue
+            statdict.upitem(i.item, i.value)
+        return statdict.top(limit=limit)
+
+    def quotebad(self, limit=10):
+        """ show lowest 10 of negative karma items """
+        statdict = Statdict()
+        karma = query(Karma).all()
+        if not karma:
+            return []
+        for i in karma:
+            if not i.item.startswith('quote '):
+                continue
+            statdict.upitem(i.item, i.value)
+        return statdict.down(limit=limit)
+
+    def whatup(self, nick):
+        """ show what items are upped by nick """
+        nick = nick.lower()
+        statdict = Statdict()
+        whokarma = query(WhoKarma).filter(WhoKarma.nick==nick).filter(WhoKarma.updown=='up')
+        if not whokarma:
+            return []
+        for i in whokarma:
+            statdict.upitem(i.item)
+        return statdict.top()
+
+    def whatdown(self, nick):
+        """ show what items are upped by nick """
+        nick = nick.lower()
+        statdict = Statdict()
+        whokarma = query(WhoKarma).filter(WhoKarma.nick==nick).filter(WhoKarma.updown=='down')
+        if not whokarma:
+            return []
+        for i in whokarma:
+            statdict.upitem(i.item)
+        return statdict.top()
+
+karma = KarmaDb()
+create_all('karma')
+assert(karma)
+
+ratelimited = []
+limiterlock = thread.allocate_lock()
+limlock = lockdec(limiterlock)
+nolimiter = False
+
+def size():
+    """ return number of kamra items """
+    return karma.size()
+
+def search(what, queue):
+    rlog(10, 'karma', 'searched for %s' % what)
+    result = karma.search(what)
+    for i in result:
+        queue.put_nowait("%s has karma %s" % (i.item, i.value))
+
+@limlock
+def ratelimit(bot, ievent):
+    """ karma rate limiter """
+    if nolimiter:
+        return 1
+    waittime = 30
+    limit = 2
+    try:
+        name = ievent.userhost
+        # Create a state for this user and his/her karma-state if necessary
+        if not bot.state.has_key(name):
+            bot.state[name] = {}
+        if not bot.state[name].has_key('karma'):
+            bot.state[name]['karma'] = {'count': 0, 'time': time.time() } 
+        # If the waittime has elapsed, reset the counter
+        if time.time() > (bot.state[name]['karma']['time'] + waittime):
+            bot.state[name]['karma']['count'] = 0 
+        # Update counter
+        bot.state[name]['karma']['count'] += 1
+        # If counter is too high, limit :)
+        if bot.state[name]['karma']['count'] > limit:
+            if name in ratelimited:
+                return 0
+            ievent.reply("karma limit reached, you'll have to wait %s \
+seconds" % int((bot.state[name]['karma']['time'] + waittime) - time.time()))
+            ratelimited.append(name)
+            return 0
+        # Update time
+        bot.state[name]['karma']['time'] = time.time()
+        # Ratelimiting passed :)
+        try:
+            ratelimited.remove(name)
+        except ValueError:
+            pass
+        return 1
+    except Exception, ex:
+        handle_exception(ievent)
+
+def handle_karmaget(bot, ievent):
+    """ karma-get <item> .. show karma of item """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    else:
+        item = ievent.rest
+    result = karma.get(item)
+    if result:
+        ievent.reply("%s has karma %s" % (item, str(result)))
+    else:
+        ievent.reply("%s has no karma yet" % item)
+
+cmnds.add('karma-get', handle_karmaget, ['USER', 'WEB', 'ANONKARMA', 'CLOUD'])
+examples.add('karma-get', 'karma-get <item> .. show karma of <item>', \
+'karma-get dunker')
+aliases.data['karma'] = 'karma-get'
+
+def nolimit():
+    global nolimiter
+    nolimiter = True
+
+def dolimit():
+    global nolimiter
+    nolimiter = False
+
+tests.start(nolimit).add('gozerbot++').add('karma-get gozerbot', 'gozerbot has karma (\d+)').end(dolimit)
+
+def handle_karmadel(bot, ievent):
+    """ karma-del <item> .. delete karma item """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    item = ievent.rest
+    result = karma.delete(item)
+    if result:
+        ievent.reply("%s deleted" % item)
+    else:
+        ievent.reply("can't delete %s" % item)
+
+cmnds.add('karma-del', handle_karmadel, ['OPER'])
+examples.add('karma-del', 'karma-del <item> .. delete karma item', \
+'karma-del dunker')
+tests.add('boozer--').add('karma-del boozer', 'boozer deleted')
+
+def handle_karmaup(bot, ievent):
+    """ <item>++ ['#' <reason>] .. increase karma of item with optional \
+        reason """
+    if not ratelimit(bot, ievent):
+        return
+    (item, reason) = ievent.groups
+    item = item.strip().lower()
+    if not item:
+        return
+    karma.upitem(item, reason=reason)
+    karma.setwhoup(item, ievent.nick)
+    ievent.reply('karma of '+ item + ' is now ' + str(karma.get(item)))
+
+rebefore.add(8, '^(.+)\+\+\s+#(.*)$', handle_karmaup, ['USER', 'KARMA', \
+'ANONKARMA'],  allowqueue=False)
+examples.add('++', "<item>++ ['#' <reason>] .. higher karma of item with 1 \
+(use optional reason)", '1) gozerbot++ 2) gozerbot++ # top bot')
+tests.add('gozerbot++', 'karma of gozerbot is now (\d+)')
+tests.add('gozerbot++ # top bot', 'karma of gozerbot is now (\d+)')
+
+def handle_karmaup2(bot, ievent):
+    """ increase karma without reason """
+    ievent.groups += [None, ]
+    handle_karmaup(bot, ievent)
+
+rebefore.add(9, '^(.+)\+\+$', handle_karmaup2, ['USER', 'ANONKARMA'], \
+allowqueue=False)
+
+def handle_karmadown(bot, ievent):
+    """ <item>-- ['#' <reason> .. decrease karma item with reason """
+    if not ratelimit(bot, ievent):
+        return
+    (item, reason) = ievent.groups
+    item = item.strip().lower()
+    if not item:
+        return
+    karma.down(item, reason=reason)
+    karma.setwhodown(item, ievent.nick)
+    ievent.reply('karma of ' + item + ' is now ' + str(karma.get(item)))
+
+rebefore.add(8, '^(.+)\-\-\s+#(.*)$', handle_karmadown, ['USER', 'KARMA', \
+'ANONKARMA'], allowqueue=False)
+examples.add('--', "<item>-- ['#' <reason>] .. lower karma of item with 1 \
+(use optional reason)", '1) gozerbot-- 2) gozerbot-- # bad bot')
+tests.add('miep--', 'karma of miep is now (-\d+)')
+tests.add('miep-- # top bot', 'karma of miep is now (-\d+)')
+
+def handle_karmadown2(bot, ievent):
+    """ decrease karma item without reason """
+    ievent.groups += [None, ]
+    handle_karmadown(bot, ievent)
+
+rebefore.add(9, '^(.+)\-\-$', handle_karmadown2, ['USER', 'KARMA', \
+'ANONKARMA'], allowqueue=False)
+
+def handle_karmawhyup(bot, ievent):
+    """ karma-whyup <item> .. show why karma of item has been increased """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    item = ievent.rest
+    result = karma.whykarmaup(item)
+    if result:
+        ievent.reply('whykarmaup of %s: ' % item, result, dot=True)
+    else:
+        ievent.reply('%s has no reason for karmaup yet' % item)
+
+cmnds.add('karma-whyup', handle_karmawhyup, ['USER', 'WEB', \
+'ANONKARMA'])
+examples.add('karma-whyup', 'karma-whyup <item> .. show the reason why \
+karma of <item> was raised', 'karma-whyup gozerbot')
+aliases.data['wku'] = 'karma-whyup'
+tests.add('gozerbot++ # top bot').add('karma-whyup gozerbot', 'top bot')
+
+def handle_whykarmadown(bot, ievent):
+    """ karma-whydown <item> .. show why karma of item has been decreased """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    item = ievent.rest
+    result = karma.whykarmadown(item)
+    if result:
+        ievent.reply('whykarmadown of %s: ' % item, result, dot=True)
+    else:
+        ievent.reply('%s has no reason for karmadown yet' % item)
+
+cmnds.add('karma-whydown', handle_whykarmadown, ['USER', 'WEB', \
+'ANONKARMA'])
+examples.add('karma-whydown', 'karma-whydown <item> .. show the reason why \
+karma of <item> was lowered', 'karma-whydown gozerbot')
+aliases.data['wkd'] = 'karma-whydown'
+tests.add('miep-- # kut bot').add('karma-whydown miep', 'kut bot')
+
+def handle_karmagood(bot, ievent):
+    """ karma-good .. show top 10 karma items """
+    result = karma.good(limit=10)
+    if result:
+        res = []
+        for i in result:
+            if i[1] > 0:
+                res.append("%s=%s" % (i[0], i[1]))
+        ievent.reply('goodness: ', res, dot=True)
+    else:
+        ievent.reply('karma void')
+
+cmnds.add('karma-good', handle_karmagood, ['USER', 'WEB', 'ANONKARMA', 'CLOUD'])
+examples.add('karma-good', 'show top 10 karma', 'karma-good')
+aliases.data['good'] = 'karma-good'
+tests.add('gozerbot++').add('karma-good', 'gozerbot')
+
+def handle_karmabad(bot, ievent):
+    """ karma-bad .. show 10 most negative karma items """
+    result = karma.bad(limit=10)
+    if result:
+        res = []
+        for i in result:
+            if i[1] < 0:
+                res.append("%s=%s" % (i[0], i[1]))
+        ievent.reply('badness: ', res, dot=True)
+    else:
+        ievent.reply('karma void')
+
+cmnds.add('karma-bad', handle_karmabad, ['USER', 'WEB', 'ANONKARMA', 'CLOUD'])
+examples.add('karma-bad', 'show lowest top 10 karma', 'karma-bad')
+aliases.data['bad'] = 'karma-bad'
+tests.add('miep--').add('karma-bad', 'miep')
+
+def handle_whokarmaup(bot, ievent):
+    """ karma-whoup <item> .. show who increased a karma item """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    item = ievent.rest
+    result = karma.getwhoup(item)
+    if result:
+        ievent.reply("whokarmaup of %s: " % item, result, dot=True)
+    else:
+        ievent.reply('no whokarmaup data available for %s' % item)
+
+cmnds.add('karma-whoup', handle_whokarmaup, ['USER', 'WEB', \
+'ANONKARMA', 'CLOUD'])
+examples.add('karma-whoup', 'karma-whoup <item> .. show who raised the \
+karma of <item>', 'karma-whoup gozerbot')
+tests.add('gozerbot++').add('karma-whoup gozerbot', '{{ me }}')
+
+def handle_whokarmadown(bot, ievent):
+    """ karma-whodown <item> .. show who decreased a karma item """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    item = ievent.rest
+    result = karma.getwhodown(item)
+    if result:
+        ievent.reply("whokarmadown of %s: " % item, result, dot=True)
+    else:
+        ievent.reply('no whokarmadown data available for %s' % item)
+
+cmnds.add('karma-whodown', handle_whokarmadown, ['USER', 'WEB', \
+'ANONKARMA', 'CLOUD'])
+examples.add('karma-whodown', 'karma-whodown <item> .. show who lowered \
+the karma of <item>', 'karma-whodown gozerbot')
+tests.add('miep--').add('karma-whodown miep', '{{ me }}')
+
+def handle_karmasearch(bot, ievent):
+    """ karma-search <txt> .. search for karma items """
+    what = ievent.rest
+    if not what:
+        ievent.missing('<txt>')
+        return
+    result = karma.search(what)
+    if result:
+        res = []
+        for i in result:
+            res.append("%s (%s)" % (i.item, i.value))
+        ievent.reply("karma items matching %s: " % what, res, dot=True)
+    else:
+        ievent.reply('no karma items matching %s found' % what)
+
+cmnds.add('karma-search', handle_karmasearch, ['USER', 'WEB', \
+'ANONKARMA', 'CLOUD'])
+examples.add('karma-search', 'karma-search <txt> .. search karma' , \
+'karma-search gozerbot')
+tests.add('gozerbot++').add('karma-search gozer', 'gozerbot')
+
+def handle_karmawhatup(bot, ievent):
+    """ show what karma items have been upped by nick """
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+    result = karma.whatup(nick)
+    if result:
+        res = []
+        for i in result:
+            res.append("%s (%s)" % i)
+        ievent.reply("karma items upped by %s: " % nick, res, dot=True)
+    else:
+        ievent.reply('no karma items upped by %s' % nick)
+
+cmnds.add('karma-whatup', handle_karmawhatup, ['USER', 'WEB', \
+'ANONKARMA', 'CLOUD'])
+examples.add('karma-whatup', 'karma-whatup <nick> .. show what karma items \
+<nick> has upped' , 'karma-whatup dunker')
+tests.add('gozerbot++').add('karma-whatup {{ me }}', 'gozerbot')
+
+def handle_karmawhatdown(bot, ievent):
+    """ show what karma items have been lowered by nick """
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+    result = karma.whatdown(nick)
+    if result:
+        res = []
+        for i in result:
+            res.append("%s (%s)" % i)
+        ievent.reply("karma items downed by %s: " % nick, res, dot=True)
+    else:
+        ievent.reply('no karma items downed by %s' % nick)
+
+cmnds.add('karma-whatdown', handle_karmawhatdown, ['USER', 'WEB', \
+'ANONKARMA', 'CLOUD'])
+examples.add('karma-whatdown', 'karma-whatdown <nick> .. show what karma \
+items <nick> has downed' , 'karma-whatdown dunker')
+tests.add('miep--').add('karma-whatdown {{ me }}', 'miep')
--- gozerbot-0.99.1.orig/build/lib/gplugs/alchemy/__init__.py
+++ gozerbot-0.99.1/build/lib/gplugs/alchemy/__init__.py
@@ -0,0 +1,25 @@
+# gozerbot basic plugins
+#
+#
+
+""" register all .py files """
+
+__copyright__ = 'this file is in the public domain'
+
+import os
+
+(f, tail) = os.path.split(__file__)
+__all__ = []
+
+for i in os.listdir(f):
+    if i.endswith('.py'):
+        __all__.append(i[:-3])
+    elif os.path.isdir(f + os.sep + i) and not i.startswith('.'):
+        __all__.append(i)
+
+try:
+    __all__.remove('__init__')
+except:
+    pass
+
+__plugs__ = __all__
--- gozerbot-0.99.1.orig/build/lib/gplugs/alchemy/todo.py
+++ gozerbot-0.99.1/build/lib/gplugs/alchemy/todo.py
@@ -0,0 +1,690 @@
+# plugs/todo.py
+#
+#
+
+""" manage todo lists .. by user or by channel .. a time/data string can 
+ be provided to set time on a todo item.
+"""
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import strtotime, striptime, getwho, today, lockdec, \
+handle_exception, rlog
+from gozerbot.tests import tests
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.users import users
+from gozerbot.datadir import datadir
+from gozerbot.persist.persist import PlugPersist
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliases
+from gozerbot.config import config
+from gozerplugs.alarm import alarms
+import time, thread, os
+
+from datetime import datetime, timedelta
+from time import localtime
+
+try:
+    from gozerbot.database.alchemy import Base, create_all, byname, query, Session, dblocked
+    from sqlalchemy import Column, String, Integer, Text, DateTime, ForeignKey, Sequence
+    import sqlalchemy as sa
+
+    class Todo(Base):
+        __tablename__ = 'todo'
+        __table_args__ = {'useexisting': True}
+        indx = Column('indx', Integer, primary_key=True)
+        name = Column('name', String(255), nullable=False)
+        time = Column('time', DateTime)
+        duration = Column('duration', Integer)
+        warnsec = Column('warnsec', Integer)
+        descr = Column('descr', Text, nullable=False)
+        priority = Column('priority', Integer)
+
+        def __init__(self, name, time, duration, warnsec, descr, priority):
+            self.name = name
+            self.time = time
+            self.duration = duration
+            self.warnsec = warnsec
+            self.descr = descr
+            self.priority = priority
+
+except:
+    def trans(func, *args, **kwargs):
+        def transaction(*args, **kwargs):
+            func(*args, **kwargs)
+        return transaction
+
+if config['GAE']:
+    from google.appengine.ext import db
+
+    class GAETodo(db.Expando):
+
+       indx = db.IntegerProperty()
+       name = db.StringProperty(required=True)
+       time = db.DateProperty()
+       duration = db.IntegerProperty()
+       warnsec = db.IntegerProperty()
+       descr = db.StringProperty(required=True)
+       priority = db.IntegerProperty()
+
+
+## UPGRADE PART
+
+def upgrade():
+    rlog(10, 'todo', 'upgrading')
+    teller = 0
+    oldfile = datadir + os.sep + 'old' + os.sep + 'todo'
+    dbdir = datadir + os.sep + 'db' + os.sep + 'todo.db' 
+    if os.path.exists(dbdir):
+        try:
+            from gozerbot.database.db import Db
+            db = Db(dbtype='sqlite')
+            db.connect('db/todo.db')
+            result = db.execute(""" SELECT * FROM todo """)
+            if result:
+                for i in result:
+                    todo.add(i[1], i[5],*i[2:4])
+                    teller += 1
+        except Exception, ex:  
+            handle_exception() 
+        return teller
+    try:
+        from gozerbot.utils.generic import dosed
+        from gozerbot.compat.persist import Persist
+        from gozerbot.compat.todo import Todoitem
+        dosed(oldfile, 's/cgozerbot\.compat/cgozerplugs/')
+        oldpersist = Persist(oldfile) 
+        if not oldpersist or not oldpersist.data:
+            return
+        for name, itemlist in oldpersist.data.iteritems():
+            for item in itemlist:
+                if item.duration == None:
+                    duration = 0
+                else:
+                    duration = item.duration
+                if item.priority == None:
+                    priority = 0
+                else:
+                    priority = item.priority
+                todo.add(name, item.descr, item.time, duration, item.warnsec, priority)
+                teller += 1  
+    except IOError, ex:
+        if 'No such file' in str(ex):
+            rlog(10, 'todo', 'nothing to upgrade')
+    except Exception, ex:
+        rlog(10, 'todo', "can't upgrade .. reason: %s" % str(ex))
+        handle_exception()
+    else:
+        rlog(10, 'todo', "upgraded %s items" % teller)
+
+## END UPGRADE PART
+
+plughelp.add('todo', 'todo lists')
+
+todolock = thread.allocate_lock()
+locked = lockdec(todolock)
+
+class TodoDb(object):
+
+    """ database todo interface """
+
+    @dblocked
+    def reset(self, name): 
+        #Session.begin()
+        item = Session.query(Todo).filter(Todo.name==name.lower()).first()
+        Session.delete(item)
+        #Session.commit()
+        #Session.close()
+        return 1
+
+    def size(self):
+        """ return number of todo's """
+        count = Session.query(sa.func.count(Todo.indx)).first()[0]
+        return count 
+        
+    def get(self, name):
+        """ get todo list of <name> """
+        name = name.lower()
+        print name
+        prio = Todo.priority.desc()
+        print prio
+        result = Session.query(Todo).filter(Todo.name==name).order_by(prio).all()
+        return result
+
+    def getid(self, idnr):
+        """ get todo data of <idnr> """
+        result = Session.query(Todo).filter(Todo.indx==idnr).first()
+        return result
+
+    def setprio(self, who, todonr, prio):
+        """ set priority of todonr """
+        #Session.begin()
+        item = Session.query(Todo).filter(Todo.indx==todonr).first()
+        if item:
+            item.priority = prio
+            #Session.commit()
+            #Session.close()
+            return 1
+
+    def getprio(self, todonr):
+        """ get priority of todonr """
+        result =  Session.query(Todo).filter(Todo.indx==todonr).first()
+        if result:
+            return result.priority
+
+    def getwarnsec(self, todonr):
+        """ get priority of todonr """
+        result = Session.query(Todo).filter(Todo.indx==todonr).first()
+        return result
+
+    def settime(self, who, todonr, ttime):
+        """ set time of todonr """
+        item = Session.query(Todo).filter(Todo.indx==todonr).first()
+        if item:
+            #Session.begin()
+            item.time = datetime.fromtimestamp(ttime)
+            #Session.commit()
+            Session.refresh(item)
+            #Session.close()
+            return 1
+
+    def add(self, name, txt, ttime=0, duration=0, warnsec=0, priority=0, alarmnr=None):
+        """ add a todo """
+        name = name.lower()
+        txt = txt.strip()
+        #Session.begin()
+        if not ttime:
+            if config['dbtype'] == 'mysql':
+                todo = Todo(name, 0, duration, warnsec, txt, priority)
+            else:
+                todo = Todo(name, datetime.min, duration, warnsec, txt, priority)
+            Session.add(todo)
+        else:
+            todo = Todo(name, datetime.fromtimestamp(ttime), duration, warnsec, txt, priority)
+            Session.add(todo)
+        #Session.commit()
+        #idnr = todo.indx
+        #Session.close()
+        #return idnr
+
+    def delete(self, name, indexnr):
+        """ delete todo item """
+        name = name.lower()
+        try:
+            warnsec = self.getwarnsec(indexnr)[0][0]
+            if warnsec:
+                alarmnr = 0 - warnsec
+                if alarmnr > 0:
+                    alarms.delete(alarmnr)
+        except (IndexError, TypeError):
+            pass
+        item = Session.query(Todo).filter(Todo.name==name and Todo.indx==indexnr).first()
+        if item:
+            #Session.begin()
+            Session.delete(item)
+            #Session.close()
+            return 1
+
+    def toolate(self, name):
+        """ show if there are any time related todoos that are too late """
+        items = Session.query(Todo).filter(Todo.name==name.lower()).filter(Todo.time<datetime.now()).all()
+        return items
+
+    def withintime(self, name, time1, time2):
+        """ show todo list within time frame """
+        name = name.lower()
+        items = Session.query(Todo).filter(Todo.name==name.lower()).filter(Todo.time>datetime.fromtimestamp(time1)).filter(Todo.time<datetime.fromtimestamp(time2)).all()
+        return items
+
+    def timetodo(self, name):
+        name = name.lower()
+        if 'mysql' in config['dbtype']:
+            items = Session.query(Todo).filter(Todo.name==name.lower()).filter(Todo.time>0).all()
+        else:
+            items = Session.query(Todo).filter(Todo.name==name.lower()).filter(Todo.time>datetime.min).all()
+        return items
+
+todo = TodoDb()
+create_all('todo')
+
+assert(todo)
+
+def size():
+    """ return number of todo entries """
+    return todo.size()
+
+def handle_todoupgrade(bot, ievent):
+    if todo.size():
+         if '-f' in ievent.optionset:
+             pass
+         else:
+             ievent.reply('there are already todo items in the main database .. not upgrading')
+             ievent.reply('use the -f option to force an upgrade')
+             return
+    ievent.reply('upgrading todo')
+    nritems = upgrade()
+    ievent.reply('%s items upgraded' % nritems)
+
+cmnds.add('todo-upgrade', handle_todoupgrade, 'OPER', options={'-f': ''})
+
+def handle_todo(bot, ievent):
+    """ todo [<item>] .. show todo's or set todo item .. a time/date can be \
+given"""
+    if len(ievent.args) > 0:
+        handle_todo2(bot, ievent)
+        return
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    try:
+        todoos = todo.get(name)
+    except KeyError:
+        ievent.reply('i dont have todo info for %s' % user.name)
+        return
+    saytodo(bot, ievent, todoos)
+
+def handle_todo2(bot, ievent):
+    """ set todo item """
+    if not ievent.rest:
+        ievent.missing("<what>")
+        return
+    else:
+        what = ievent.rest
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    ttime = strtotime(what)
+    nr = 0
+    if not ttime == None:
+        ievent.reply('time detected ' + time.ctime(ttime))
+        nr = todo.add(name, what, ttime)
+        what = "#%s %s" % (nr, striptime(what))
+        alarmnr = alarms.add(bot.name, ievent.nick, ttime, what)
+    else:
+        nr = todo.add(name, what)
+    ievent.reply('todo item %s added' % nr)
+
+cmnds.add('todo', handle_todo, 'USER')
+examples.add('todo', 'todo [<item>] .. show todo items or add a todo item', \
+'1) todo 2) todo program the bot 3) todo 22:00 sleep')
+tests.add('todo program the bot').add('todo', 'program the bot')
+
+def handle_tododone(bot, ievent):
+    """ todo-done <listofnrs> .. remove todo items """
+    if len(ievent.args) == 0:
+        ievent.missing('<list of nrs>')
+        return
+    try:
+        nrs = []
+        for i in ievent.args:
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    nrdone = 0
+    failed = []
+    for i in nrs:
+        try:
+            todo.delete(name, i)
+            nrdone += 1
+        except Exception, ex:
+            failed.append(str(i))
+            handle_exception()
+    if failed:
+        ievent.reply('failed to delete %s' % ' .. '.join(failed))
+    if nrdone == 1:
+        ievent.reply('%s item deleted' % nrdone)
+    elif nrdone == 0:
+        ievent.reply('no items deleted')
+    else:
+        ievent.reply('%s items deleted' % nrdone)
+
+cmnds.add('todo-done', handle_tododone, 'USER')
+examples.add('todo-done', 'todo-done <listofnrs> .. remove items from \
+todo list', '1) todo-done 1 2) todo-done 3 5 8')
+aliases.data['done'] = 'todo-done'
+tests.add('todo program the bot', 'todo item (\d+) added').add('todo-done %s', '(\d+) item deleted')
+
+def handle_chantodo(bot, ievent):
+    """ todo-chan [<item>] .. show channel todo's or set todo item for \
+channel"""
+    if ievent.rest:
+        handle_chantodo2(bot, ievent)
+        return
+    todoos = todo.get(ievent.channel)
+    saytodo(bot, ievent, todoos)
+
+def handle_chantodo2(bot, ievent):
+    """ set todo item for channel"""
+    what = ievent.rest
+    ttime = strtotime(what)
+    nr = 0
+    if not ttime  == None:
+        ievent.reply('time detected ' + time.ctime(ttime))
+        what = striptime(what)
+        nr = todo.add(ievent.channel, what, ttime)
+        result = '#%s (%s) %s' % (nr, ievent.nick, what)
+        alarmnr = alarms.add(bot.name, ievent.channel, ttime, result)
+    else:
+        result = '(%s) ' % ievent.nick + what
+        nr = todo.add(ievent.channel, result, 0)
+    ievent.reply('todo item %s added' % nr)
+
+cmnds.add('todo-chan', handle_chantodo, 'USER')
+examples.add('todo-chan', 'todo-chan [<item>] .. add channel todo', \
+'todo-chan fix bla')
+aliases.data['chantodo'] = 'todo-chan'
+tests.add('todo-chan program the bot', 'todo item (\d+) added').add('todo-chan', 'program the bot')
+
+def handle_todochandone(bot, ievent):
+    """ todo-chandone <listofnrs> .. remove channel todo item """
+    if not ievent.rest:
+        ievent.missing('<list of nrs>')
+        return
+    data = ievent.rest.split()
+    try:
+        nrs = []
+        for i in data:
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    nrdone = 0
+    failed = []
+    for i in nrs:
+        try:
+            if todo.delete(ievent.channel, i):
+                nrdone += 1
+        except Excpetion, ex:
+            failed.append(i)
+            handle_exception()
+    if failed:
+        ievent.reply('failed to delete %s' % ' .. '.join(failed))
+    if nrdone == 1:
+        ievent.reply('%s item deleted' % nrdone)
+    elif nrdone == 0:
+        ievent.reply('no items deleted')
+    else:
+        ievent.reply('%s items deleted' % nrdone)
+
+cmnds.add('todo-chandone', handle_todochandone, 'USER')
+examples.add('todo-chandone', 'todo-chandone <listofnrs> .. remove item \
+from channel todo list', 'todo-chandone 2')
+aliases.data['chandone'] = 'todo-chandone'
+tests.add('todo-chan program the bot', 'todo item (\d+) added').add('todo-chandone %s', '(\d+) item deleted')
+
+def handle_settodo(bot, ievent):
+    """ todo-set <name> <txt> .. add a todo to another user's todo list"""
+    try:
+        who = ievent.args[0]
+        what = ' '.join(ievent.args[1:])
+    except IndexError:
+        ievent.missing('<nick> <what>')
+        return
+    if not what:
+        ievent.missing('<nick> <what>')
+        return
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("can't find userhost for %s" % who)
+        return
+    whouser = users.getname(userhost)
+    if not whouser:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    if not users.permitted(userhost, name, 'todo'):
+        ievent.reply("%s doesn't permit todo sharing for %s " % \
+(who, name))
+        return
+    what = "%s: %s" % (ievent.nick, what)
+    ttime = strtotime(what)
+    nr = 0
+    if not ttime  == None:
+        ievent.reply('time detected ' + time.ctime(ttime))
+        what = striptime(what)
+        nr = todo.add(whouser, what, ttime)
+        what = "#%s %s" % (nr, what)
+        alarmnr = alarms.add(bot.name, who, ttime, what)
+    else:
+        nr = todo.add(whouser, what, 0)
+    ievent.reply('todo item %s added' % nr)
+
+cmnds.add('todo-set', handle_settodo, 'USER')
+examples.add('todo-set', 'todo-set <nick> <txt> .. set todo item of \
+<nick>', 'todo-set dunker bot proggen')
+tests.add('user-addpermit owner todo').add('todo-set {{ me }} program the bot', 'todo item (\d+) added')
+
+def handle_gettodo(bot, ievent):
+    """ todo-get <nick> .. get todo of another user """
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("can't find userhost for %s" % who)
+        return
+    whouser = users.getname(userhost)
+    if not whouser:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    if not users.permitted(userhost, name, 'todo'):
+        ievent.reply("%s doesn't permit todo sharing for %s " % (who, name))
+        return
+    todoos = todo.get(whouser)
+    saytodo(bot, ievent, todoos)
+
+cmnds.add('todo-get', handle_gettodo, ['USER', 'WEB'])
+examples.add('todo-get', 'todo-get <nick> .. get the todo list of \
+<nick>', 'todo-get dunker')
+tests.add('todo program the bot').add('todo-get {{ me }}', 'program the bot')
+
+def handle_todotime(bot, ievent):
+    """ todo-time .. show time related todoos """
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    todoos = todo.timetodo(name)
+    saytodo(bot, ievent, todoos)
+
+cmnds.add('todo-time', handle_todotime, 'USER')
+examples.add('todo-time', 'todo-time .. show todo items with time fields', \
+'todo-time')
+aliases.data['tt'] = 'todo-time'
+tests.add('todo 11-11-2011 test', 'time detected').add('todo-time', 'test')
+
+def handle_todoweek(bot, ievent):
+    """ todo-week .. show time related todo items for this week """
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    todoos = todo.withintime(name, today(), today()+7*24*60*60)
+    saytodo(bot, ievent, todoos)
+
+cmnds.add('todo-week', handle_todoweek, 'USER')
+examples.add('todo-week', 'todo-week .. todo items for this week', 'todo-week')
+tests.add('tomorrow test the bot').add('todo-week', 'test the bot')
+
+def handle_today(bot, ievent):
+    """ todo-today .. show time related todo items for today """
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    todoos = todo.withintime(name, today(), today()+24*60*60)
+    saytodo(bot, ievent, todoos)
+
+cmnds.add('todo-today', handle_today, 'USER')
+examples.add('todo-today', 'todo-today .. todo items for today', 'todo-today')
+aliases.data['today'] = 'todo-today'
+tests.add('todo test the bot').add('todo-today', 'test the bot')
+
+def handle_tomorrow(bot, ievent):
+    """ todo-tomorrow .. show time related todo items for tomorrow """
+    username = byname(ievent.userhost)
+    if not username:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    if ievent.rest:
+        what = ievent.rest
+        ttime = strtotime(what)
+        if ttime != None:
+            if ttime < today() or ttime > today() + 24*60*60:
+                ievent.reply("%s is not tomorrow" % \
+time.ctime(ttime + 24*60*60))
+                return
+            ttime += 24*60*60
+            ievent.reply('time detected ' + time.ctime(ttime))
+            what = striptime(what)
+        else:
+            ttime = today() + 42*60*60
+        todo.add(username, what, ttime)   
+        ievent.reply('todo added')    
+        return
+    todoos = todo.withintime(username, today()+24*60*60, today()+2*24*60*60)
+    saytodo(bot, ievent, todoos)
+
+cmnds.add('todo-tomorrow', handle_tomorrow, 'USER')
+examples.add('todo-tomorrow', 'todo-tomorrow .. todo items for tomorrow', \
+'todo-tomorrow')
+aliases.data['tomorrow'] = 'todo-tomorrow'
+tests.add('todo-tomorrow test the bot').add('todo-time', 'test the bot')
+
+def handle_setpriority(bot, ievent):
+    """ todo-setprio [<channel|name>] <itemnr> <prio> .. show priority \
+        on todo item """
+    try:
+        (who, itemnr, prio) = ievent.args
+    except ValueError:
+        try:
+            (itemnr, prio) = ievent.args
+            who = users.getname(ievent.userhost)
+        except ValueError:
+            ievent.missing('[<channe|namel>] <itemnr> <priority>')
+            return
+    if not who:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    try:
+        itemnr = int(itemnr)
+        prio = int(prio)
+    except ValueError:
+        ievent.missing('[<channel|name>] <itemnr> <priority>')
+        return
+    who = who.lower()
+    todo.setprio(who, itemnr, prio)
+    ievent.reply('priority set')
+
+cmnds.add('todo-setprio', handle_setpriority, 'USER')
+examples.add('todo-setprio', 'todo-setprio [<channel|name>] <itemnr> <prio> \
+.. set todo priority', '1) todo-setprio #dunkbots 2 5 2) todo-setprio owner \
+3 10 3) todo-setprio 2 10')
+aliases.data['setprio'] = 'todo-setprio'
+tests.add('todo test the bot', 'todo item (\d+) added').add('todo-setprio %s 10', 'priority set')
+
+def handle_todosettime(bot, ievent):
+    """ todo-settime [<channel|name>] <itemnr> <timestring> .. set time \
+        on todo item """
+    ttime = strtotime(ievent.rest)
+    if ttime == None:
+        ievent.reply("can't detect time")
+        return   
+    txt = striptime(ievent.rest)
+    try:
+        (who, itemnr) = txt.split()
+    except ValueError:
+        try:
+            (itemnr, ) = txt.split()
+            who = users.getname(ievent.userhost)
+        except ValueError:
+            ievent.missing('[<channel|name>] <itemnr> <timestring>')
+            return
+    if not who:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    try:
+        itemnr = int(itemnr)
+    except ValueError:
+        ievent.missing('[<channel|name>] <itemnr> <timestring>')
+        return
+    who = who.lower()
+    if not todo.settime(who, itemnr, ttime):
+        ievent.reply('no todo %s found for %s' % (itemnr, who))
+        return
+    ievent.reply('time of todo %s set to %s' % (itemnr, time.ctime(ttime)))
+
+cmnds.add('todo-settime', handle_todosettime, 'USER')
+examples.add('todo-settime', 'todo-settime [<channel|name>] <itemnr> \
+<timestring> .. set todo time', '1) todo-settime #dunkbots 2 13:00 2) \
+todo-settime owner 3 2-2-2010 3) todo-settime 2 22:00')
+tests.add('todo test the bot', 'todo item (\d+) added').add('todo-settime %s 11:00', 'time of todo %s set')
+
+def handle_getpriority(bot, ievent):
+    """ todo-getprio <[channel|name]> <itemnr> .. get priority of todo \
+        item """
+    try:
+        (who, itemnr) = ievent.args
+    except ValueError:
+        try:
+            itemnr = ievent.args[0]
+            who = users.getname(ievent.userhost)
+        except IndexError:
+            ievent.missing('[<channel|name>] <itemnr>')
+            return
+    if not who:
+        ievent.reply("can't find username for %s" % ievent.userhost)
+        return
+    try:
+        itemnr = int(itemnr)
+    except ValueError:
+        ievent.missing('[<channel|name>] <itemnr>')
+        return
+    who = who.lower()
+    prio = todo.getprio(itemnr)
+    ievent.reply('priority is %s' % prio)
+
+cmnds.add('todo-getprio', handle_getpriority, 'USER')
+examples.add('todo-getprio', 'todo-getprio [<channel|name>] <itemnr> .. get \
+todo priority', '1) todo-getprio #dunkbots 5 2) todo-getprio 3')
+aliases.data['prio'] = 'todo-getprio'
+tests.add('todo test the bot', 'todo item (\d+) added').add('todo-getprio %s', 'priority is 0')
+
+def saytodo(bot, ievent, todoos):
+    """ output todo items of <name> """
+    result = []
+    now = datetime.now()
+    if not todoos:
+        ievent.reply('nothing todo ;]')
+        return
+    for i in todoos:
+        res = ""
+        res += "%s) " % i.indx
+        if i.priority:
+            res += "[%s] " % i.priority
+        if i.time and not i.time == i.time.min:
+            if i.time < now:
+                res += 'TOO LATE: '
+            res += "%s %s " % (i.time.ctime(), i.descr)
+        else:
+            res += "%s " % i.descr
+        result.append(res.strip())
+    if result:
+        ievent.reply("todolist of %s: " % ievent.nick, result, nritems=True)
--- gozerbot-0.99.1.orig/build/lib/gplugs/alchemy/quote.py
+++ gozerbot-0.99.1/build/lib/gplugs/alchemy/quote.py
@@ -0,0 +1,452 @@
+# plugs/quote.py
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+__depend__ = ['karma', ]
+__depending__ = ['grab', ]
+
+from gozerbot.tests import tests
+from gozerbot.persist.persist import Persist
+from gozerbot.utils.nextid import nextid
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.datadir import datadir
+from gozerbot.generic import lockdec, rlog, handle_exception
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliases
+from gozerbot.config import config
+from gplugs.alchemy.karma import karma
+import random, re, time, thread, os, types
+
+from gozerbot.database.alchemy import Base, create_all, query, Session, dblocked
+from datetime import datetime
+from time import localtime   
+from sqlalchemy import Column, String, Integer, Text, DateTime, ForeignKey, Sequence
+import sqlalchemy as sa
+
+class Quotes(Base):
+    __tablename__ = 'quotes'
+    __table_args__ = {'useexisting': True }
+    #indx = Column('indx', Integer, Sequence('quotes_indx_seq'), primary_key=True)
+    indx = Column('indx', Integer, primary_key=True)
+    quote = Column('quote', Text, nullable=False)
+    userhost = Column('userhost', String(255), ForeignKey('userhosts.userhost'), nullable=False)
+    createtime = Column('createtime', DateTime, nullable=False)
+    nick = Column('nick', String(255), nullable=False)
+
+    def __init__(self, quote, userhost, createtime, nick):
+        self.quote = quote
+        self.userhost = userhost
+        self.createtime = createtime
+        self.nick = nick
+
+## UPGRADE PART
+
+def upgrade():
+    rlog(10, 'quote', 'upgrading')
+    teller = 0
+    oldfile = datadir + os.sep + 'old' + os.sep + 'quotes'
+    dbdir = datadir + os.sep + 'db' + os.sep + 'quote.db'
+    if os.path.exists(dbdir):
+        try:
+            from gozerbot.database.db import Db
+            db = Db(dbtype='sqlite')
+            db.connect('db/quote.db')
+            result = db.execute(""" SELECT * FROM quotes """)
+            if result:
+                for i in result:
+                    try:
+                        quotes.add(i[4], i[2], i[1], i[3])
+                    except:
+                        quotes.add(i[3], i[2], i[1], i[4])
+                    teller += 1
+        except Exception, ex:
+            handle_exception()
+        return teller
+    try:
+        from gozerbot.utils.generic import dosed   
+        from gozerbot.compat.persist import Persist
+        from gozerbot.compat.todo import Todoitem
+        oldpersist = Persist(oldfile) 
+        if not oldpersist or not oldpersist.data:
+            return
+        for item in oldpersist.data:
+            quotes.add(item.nick, item.userhost, item.txt, item.time)
+            teller += 1
+    except IOError, ex:
+        if "No such file" in str(ex):
+            rlog(10, 'quote', 'nothing to upgrade')
+    except Exception, ex:
+        rlog(10, 'quote', "can't upgrade .. reason: %s" % str(ex))
+        handle_exception()
+    else:
+        rlog(10, 'quote', "upgraded %s items" % teller)
+
+# END UPGRADE PART
+
+plughelp.add('quote', 'manage quotes')
+
+class QuotesDb(object):
+
+    """ quotes db interface """
+
+    def size(self):
+        """ return number of items """
+        count = query(sa.func.count(Quotes.indx)).first()[0]
+        return count
+
+    @dblocked
+    def add(self, nick, userhost, q, ttime=None):
+        """ add a quote """
+        #Session.begin()
+        if ttime:
+            try:
+                ttime = float(ttime)
+            except TypeError:
+                pass
+            t = datetime.fromtimestamp(ttime)
+        else: 
+            t = datetime.now()
+        quote = Quotes(q, userhost, t, nick)
+        Session.add(quote)
+        #Session.flush()
+        #idnr = quote.indx
+        return quote
+
+    @dblocked
+    def delete(self, quotenr):
+        #Session.begin()
+        quote = Session.query(Quotes).filter(Quotes.indx==quotenr).first()
+        if quote:
+             Session.delete(quote)
+             #Session.commit()
+             #Session.close()
+             return 1
+
+    def random(self):
+        """ get random quote """
+        result = query(Quotes.indx).all()
+        indices = []
+        if not result:
+            return 
+        for i in result:
+            if i[0]: indices.append(i[0])
+        if indices:
+            idnr = random.choice(indices)
+            return self.idquote(str(idnr))
+
+    def idquote(self, quotenr):
+        """ get quote by id """
+        quotenr = str(quotenr)
+        quote = query(Quotes).filter(Quotes.indx==quotenr).first()
+        if quote:
+            return quote
+
+    def whoquote(self, quotenr):
+        """ get who quoted the quote """
+        quotenr = str(quotenr)
+        quote = query(Quotes).filter(Quotes.indx==quotenr).first()
+        if quote:
+            return quote
+
+    def last(self, nr=1):
+        """ get last quote """ 
+        result = query(Quotes).order_by(Quotes.indx.desc()).limit(nr)
+        if result:
+            return result
+
+    def search(self, what):
+        """ search quotes """
+        result = query(Quotes).filter(Quotes.quote.like('%%%s%%' % what)).all()
+        if result:
+            return result
+
+    def searchlast(self, what, nr):
+        """ search quotes """
+        result = query(Quotes).filter(Quotes.quote.like('%%%s%%' % what)).order_by(Quotes.indx.desc()).limit(nr)
+        if result:
+            return result
+
+quotes = QuotesDb()
+assert(quotes)
+
+def init():
+    create_all('quote')
+
+
+def size():
+    """ return number of quotes """
+    return quotes.size()
+
+def search(what, queue):
+    """ search the quotes """
+    rlog(10, 'quote', 'searched for %s' % what)
+    result = quotes.search(what)
+    if result:
+        for i in result:
+            queue.put_nowait("#%s %s" % (i.indx, i.quote))
+
+def handle_quoteupgrade(bot, ievent):
+    if quotes.size():
+         if '-f' in ievent.optionset:
+             pass
+         else:   
+             ievent.reply('there are already quote items in the main database .. not upgrading')
+             ievent.reply('use the -f option to force an upgrade')
+             return
+    ievent.reply('upgrading quotes')
+    nritems = upgrade()
+    ievent.reply('%s items upgraded' % nritems)
+
+cmnds.add('quote-upgrade', handle_quoteupgrade, 'OPER', options={'-f': ''})
+
+def handle_quoteadd(bot, ievent):
+    """ quote-add <txt> .. add a quote """
+    if not ievent.rest:
+        ievent.missing("<quote>")
+        return
+    idnr = quotes.add(ievent.nick, ievent.userhost, ievent.rest)
+    ievent.reply('quote %s added' % idnr)
+
+cmnds.add('quote-add', handle_quoteadd, ['USER', 'QUOTEADD'], allowqueue=False, threaded=True)
+examples.add('quote-add', 'quote-add <txt> .. add quote', 'quote-add mekker')
+aliases.data['aq'] = 'quote-add'
+tests.add('quote-add mekker','quote (\d+) added')
+
+def handle_quotewho(bot, ievent):
+    """ quote-who <nr> .. show who added a quote """
+    try:
+        quotenr = int(ievent.args[0])
+    except IndexError:
+        ievent.missing("<nr>")
+        return
+    except ValueError:
+        ievent.reply("argument must be an integer")
+        return
+    result = quotes.whoquote(quotenr)
+    if not result:
+        ievent.reply('no who quote data available')
+        return
+    if result.createtime:
+        if type(result.createtime) == types.LongType:
+            ievent.reply('quote #%s was made by %s on %s' % (quotenr, \
+result.nick, datetime.fromtimestamp(result.createtime).ctime()))
+        else:
+            ievent.reply('quote #%s was made by %s on %s' % (quotenr, \
+result.nick, result.createtime.ctime()))
+    else:
+        ievent.reply('quote #%s was made by %s' % (quotenr, result.nick))
+
+cmnds.add('quote-who', handle_quotewho, ['USER', 'WEB', 'CLOUD', 'ANONQUOTE'])
+examples.add('quote-who', 'quote-who <nr> .. show who quote <nr>', \
+'quote-who 1')
+aliases.data['wq'] = 'quote-who'
+tests.add('quote-who 1', 'quote #(\d+) was made by (\S+)')
+
+def handle_quotedel(bot, ievent):
+    """ quote-del <nr> .. delete quote by id """
+    try:
+        quotenr = int(ievent.args[0])
+    except IndexError:
+        ievent.missing('<nr>')
+        return
+    except ValueError:
+        ievent.reply('argument needs to be an integer')
+        return
+    if quotes.delete(quotenr):
+        ievent.reply('quote %s deleted' % quotenr)
+    else:
+        ievent.reply("can't delete quote with nr %s" % quotenr)
+
+cmnds.add('quote-del', handle_quotedel, ['QUOTEDEL', 'OPER', 'QUOTE'])
+examples.add('quote-del', 'quote-del <nr> .. delete quote', 'quote-del 2')
+aliases.data['dq'] = 'quote-del'
+tests.add('quote-add mekker', 'quote (\d+)').add('quote-del %s', 'quote %s deleted')
+
+def handle_quotelast(bot, ievent):
+    """ quote-last .. show last quote """
+    search = ""
+    try:
+        (nr, search) = ievent.args
+        nr = int(nr)  
+    except ValueError:
+        try:
+            nr = ievent.args[0]
+            nr = int(nr)
+        except (IndexError, ValueError):
+            nr = 1
+            try:
+                search = ievent.args[0]
+            except IndexError:
+                search = ""
+    if nr < 1 or nr > 4:
+        ievent.reply('nr needs to be between 1 and 4')
+        return
+    search = re.sub('^d', '', search)
+    if search:
+        quotelist = quotes.searchlast(search, nr)
+    else:
+        quotelist = quotes.last(nr)
+    if quotelist != None:
+        for quote in quotelist:
+            try:
+                qkarma = karma.get('quote %s' % quote.indx)
+                if qkarma:
+                    ievent.reply('#%s (%s) %s' % (quote.indx, qkarma, quote.quote))
+                else:
+                    ievent.reply('#%s %s' % (quote.indx, quote.quote))
+            except AttributeError:
+                    ievent.reply('#%s %s' % (quote.indx, quote.quote))
+    else:
+        ievent.reply("can't fetch quote")
+
+cmnds.add('quote-last', handle_quotelast, ['USER', 'WEB', 'ANONQUOTE', 'CLOUD'])
+examples.add('quote-last', 'show last quote', 'quote-last')
+aliases.data['lq'] = 'quote-last'
+tests.add('quote-last', '#(\d+)')
+
+def handle_quote2(bot, ievent):
+    """ quote-2 .. show 2 random quotes """
+    quote = quotes.random()
+    if quote:
+        qkarma = karma.get('quote %s' % quote.indx)
+        if qkarma:
+            ievent.reply('#%s (%s) %s' % (quote.indx, qkarma, quote.quote))
+        else:
+            ievent.reply('#%s %s' % (quote.indx, quote.quote))
+    else:
+        ievent.reply('no quotes yet')
+        return
+    quote = quotes.random()
+    if quote:
+        qkarma = karma.get('quote %s' % quote.indx)
+        if qkarma:
+            ievent.reply('#%s (%s) %s' % (quote.indx, qkarma, quote.quote))
+        else:
+            ievent.reply('#%s %s' % (quote.indx, quote.quote))
+
+cmnds.add('quote-2', handle_quote2, ['USER', 'WEB', 'ANONQUOTE', 'CLOUD'])
+examples.add('quote-2', 'quote-2 .. show 2 random quotes', 'quote-2')
+aliases.data['2q'] = 'quote-2'
+tests.add('quote-2', '#(\d+)')
+aliases.data['3q'] = "quote && quote && quote"
+
+def handle_quoteid(bot, ievent):
+    """ quote-id <nr> .. show quote by id """
+    try:
+        quotenr = int(ievent.args[0])
+    except IndexError:
+        ievent.missing('<nr>')
+        return
+    except ValueError:
+        ievent.reply('argument must be an integer')
+        return
+    quote = quotes.idquote(quotenr)
+    if quote:
+        qkarma = karma.get('quote %s' % quote.indx)
+        if qkarma:
+            ievent.reply('#%s (%s) %s' % (quote.indx, qkarma, quote.quote))
+        else:
+            ievent.reply('#%s %s' % (quote.indx, quote.quote))
+    else:
+        ievent.reply("can't fetch quote with id %s" % quotenr)
+
+cmnds.add('quote-id', handle_quoteid, ['USER', 'WEB', 'ANONQUOTE', 'CLOUD'])
+examples.add('quote-id', 'quote-id <nr> .. get quote <nr>', 'quote-id 2')
+aliases.data['iq'] = 'quote-id'
+tests.add('quote-id 1', '#(\d+)')
+
+def handle_quote(bot, ievent):
+    """ quote .. show random quote """
+    quote = quotes.random()
+    if quote:
+        qkarma = karma.get('quote %s' % quote.indx)
+        if qkarma:
+            ievent.reply('#%s (%s) %s' % (quote.indx, qkarma, quote.quote))
+        else:
+            ievent.reply('#%s %s' % (quote.indx, quote.quote))
+    else:
+        ievent.reply('no quotes yet')
+
+cmnds.add('quote', handle_quote, ['USER', 'WEB', 'ANONQUOTE', 'CLOUD'])
+examples.add('quote', 'show random quote', 'quote')
+aliases.data['q'] = 'quote'
+tests.add('quote', '#(\d+)')
+
+def handle_quotesearch(bot, ievent):
+    """ quote-search <txt> .. search quotes """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    else:
+        what = ievent.rest
+        nrtimes = 3
+    result = quotes.search(what)
+    if result:
+        if ievent.queues:
+            res = []
+            for quote in result:
+                res.append('#%s %s' % (quote.indx, quote.quote))
+            ievent.reply(res)
+            return            
+        if nrtimes > len(result):
+            nrtimes = len(result)
+        randquotes = random.sample(result, nrtimes)
+        for quote in randquotes:
+            qkarma = karma.get('quote %s' % quote.indx)
+            if qkarma:
+                ievent.reply('#%s (%s) %s' % (quote.indx, qkarma, quote.quote))
+            else:
+                ievent.reply("#%s %s" % (quote.indx, quote.quote))
+    else:
+        ievent.reply('no quotes found with %s' % what)
+
+cmnds.add('quote-search', handle_quotesearch, ['USER', 'WEB', \
+'ANONQUOTE', 'CLOUD'])
+examples.add('quote-search', 'quote-search <txt> .. search quotes for <txt>'\
+, 'quote-search bla')
+aliases.data['sq'] = 'quote-search'
+tests.add('quote-add gozerbot is tof').add('quote-search gozerbot', 'tof')
+
+def handle_quotescount(bot, ievent):
+    """ quote-count .. show number of quotes """
+    ievent.reply('quotes count is %s' % quotes.size())
+
+cmnds.add('quote-count', handle_quotescount, ['USER', 'WEB', \
+'ANONQUOTE', 'CLOUD'])
+examples.add('quote-count', 'count nr of quotes', 'quote-count')
+aliases.data['cq'] = 'quote-count'
+tests.add('quote-count', 'quotes count is (\d+)')
+
+def handle_quotegood(bot, ievent):
+    """ show top ten positive karma """
+    result = karma.quotegood(limit=10)
+    if result:
+        resultstr = ""
+        for i in result:
+            if i[1] > 0:
+                resultstr += "%s: %s " % (i[0], i[1])
+        ievent.reply('quote goodness: %s' % resultstr)
+    else:
+        ievent.reply('quote karma void')
+
+cmnds.add('quote-good', handle_quotegood, ['USER', 'WEB', 'ANONQUOTE', 'CLOUD'])
+examples.add('quote-good', 'show top 10 quote karma', 'quote-good')
+tests.add('quote 1++').add('quote-good', 'quote goodness')
+
+def handle_quotebad(bot, ievent):
+    """ show top ten negative karma """
+    result = karma.quotebad(limit=10)
+    if result:
+        resultstr = ""
+        for i in result:
+            if i[1] < 0:
+                resultstr += "%s: %s " % (i[0], i[1])
+        ievent.reply('quote badness: %s' % resultstr)
+    else:
+        ievent.reply('quote karma void')
+
+cmnds.add('quote-bad', handle_quotebad, ['USER', 'WEB', 'ANONQUOTE', 'CLOUD'])
+examples.add('quote-bad', 'show lowest 10 quote karma', 'quote-bad')
+tests.add('quote 2--').add('quote-bad', 'quote badness')
--- gozerbot-0.99.1.orig/build/lib/gplugs/alchemy/lists.py
+++ gozerbot-0.99.1/build/lib/gplugs/alchemy/lists.py
@@ -0,0 +1,406 @@
+# dbplugs/lists.py
+#
+#
+#
+
+""" lists per global/channel/user """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.tests import tests
+from gozerbot.generic import handle_exception
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.users import users
+from gozerbot.config import config
+
+from gozerbot.database.alchemy import Base, create_all, query, Session, dblocked
+from datetime import datetime, timedelta
+from time import localtime
+from sqlalchemy import Column, String, Integer, Text, DateTime, ForeignKey, Sequence
+import sqlalchemy as sa
+
+class Lists(Base):
+    __tablename__ = 'list'
+    __table_args__ = {'useexisting': True}
+    indx = Column('indx', Integer, primary_key=True)
+    username = Column('username', String(255), nullable=False)
+    listname = Column('listname', String(255), nullable=False)
+    item = Column('item', Text, nullable=False)
+
+    def __init__(self, username, listname, item):
+        self.username = username
+        self.listname = listname
+        self.item = item
+
+plughelp.add('lists', 'maintain lists')
+
+create_all('lists')
+
+def size():
+    """ return number of lists """
+    def size(self):
+        """ return number of todo's """
+        count = query(sa.func.count(Lists.indx)).count()
+        return count 
+
+def getlists(username):
+    """ get all lists of user """
+    lists = query(Lists).filter(Lists.username==username)
+    if lists:
+        return lists
+
+def getlist(username, listname):
+    """ get list of user """
+    lists = query(Lists).filter(Lists.username==username).filter(Lists.listname==listname)
+    if lists:
+        return lists
+
+@dblocked
+def addtolist(username, listname, item):
+    """ add item to list """
+    list = Lists(username, listname, item)
+    #Session.begin()
+    Session.add(list)
+    #Session.commit()
+    #idnr = list.indx
+    #Session.close()
+    #return idnr
+
+@dblocked
+def delfromlist(username, indx):
+    """ delete item from list """
+    item = Session.query(Lists).filter(Lists.username==username).filter(Lists.indx==indx).first()
+    if item:
+        #Session.begin()
+        Session.delete(item)
+        #Session.commit()
+        #Session.close()
+        return 1
+
+def mergelist(username, listname, l):
+    """ merge 2 lists """
+    teller = 0
+    for i in l:
+        addtolist(username, listname, i)
+        teller += 1
+    return teller
+
+def handle_listsglobal(bot, ievent):
+    """ lists <listname> [',' <item>] .. global lists"""
+    if not ievent.rest:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    try:
+        listname, item = ievent.rest.split(',', 1)
+    except ValueError:
+        l = getlist('all', ievent.rest)
+        if not l:
+            ievent.reply('no %s list available' % ievent.rest)
+            return
+        result = []
+        for i in l:
+            result.append("%s) %s" % (i.indx, i.item))
+        ievent.reply(result)
+        return
+    listname = listname.strip().lower()
+    item = item.strip()
+    if not listname or not item:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    result = 0
+    try:
+        result = addtolist('all', listname, item)
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if result:
+        ievent.reply('%s (%s) added to %s list' % (item, result, listname))
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('lists-global', handle_listsglobal, 'USER')
+examples.add('lists-global', "lists-global <listname> [',' <item>] .. show \
+content of list or add item to list", '1) lists-global bla 2) lists-global \
+bla, mekker')
+tests.add('lists-global test, mekker', 'added to test list').add('lists-global test', 'mekker')
+
+def handle_listsglobaldel(bot, ievent):
+    """ list-globaldel <listname> ',' <listofnrs> .. remove items with \
+indexnr from list """
+    if not ievent.rest:
+        ievent.missing('<listofnrs>')
+        return
+    try:
+        nrs = []
+        for i in ievent.rest.split():
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    nrs.sort()
+    failed = []
+    itemsdeleted = 0
+    try:
+        for i in nrs:
+            result = delfromlist('all', i)
+            if not result:
+                failed.append(str(i))
+            else:
+                itemsdeleted += 1
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if failed:
+        ievent.reply('failed to delete %s' % ' '.join(failed))
+    ievent.reply('%s item(s) removed' % itemsdeleted)
+
+cmnds.add('lists-globaldel', handle_listsglobaldel, 'USER')
+examples.add('lists-globaldel', "lists-globaldel <listname> ',' <listofnrs> \
+.. remove items with indexnr from list", '1) lists-globaldel 1 2) \
+lists-globaldel 0 3 6')
+tests.add('lists-global test, mekker', '(\d+)\) added to test list').add('lists-globaldel %s', '1 item\(s\) removed')
+
+def handle_listsglobalshow(bot, ievent):
+    """ show avaiable global lists """
+    l = getlists('all')
+    if not l:
+        ievent.reply('no lists available')
+        return
+    else:
+        result = []
+        for i in l:
+            if not i.listname in result:
+                result.append(i.listname)
+        if result:
+            ievent.reply(result, dot=True)
+
+cmnds.add('lists-globalshow', handle_listsglobalshow, 'USER')
+examples.add('lists-globalshow', 'show available global lists' , \
+'lists-globalshow')
+tests.add('lists-global test, mekker', 'added to test list').add('lists-globalshow', 'test')
+
+def handle_listschan(bot, ievent):
+    """ lists-chan <listname> [',' <item>] .. global lists"""
+    if not ievent.rest:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    try:
+        listname, item = ievent.rest.split(',', 1)
+    except ValueError:
+        l = getlist(ievent.channel, ievent.rest)
+        if not l:
+            ievent.reply('no %s list available' % ievent.rest)
+            return
+        result = []
+        for i in l:
+            result.append("%s) %s" % (i.indx, i.item))
+        ievent.reply(result)
+        return
+    listname = listname.strip().lower()
+    item = item.strip()
+    if not listname or not item:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    result = 0
+    try:
+        result = addtolist(ievent.channel, listname, item)
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if result:
+        ievent.reply('%s (%s) added to %s list' % (item, result, listname))
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('lists-chan', handle_listschan, 'USER')
+examples.add('lists-chan', "lists-chan <listname> [',' <item>] .. show \
+content of list or add item to list", '1) lists-chan bla 2) lists-chan \
+bla, mekker')
+tests.add('lists-chan test, mekker', 'added to test list').add('lists-chan test', 'mekker')
+
+def handle_listschandel(bot, ievent):
+    """ lists-chandel <listname> ',' <listofnrs> .. remove items with \
+indexnr from list """
+    if not ievent.rest:
+        ievent.missing('<listofnrs>')
+        return
+    try:
+        nrs = []
+        for i in ievent.rest.split():
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    nrs.sort()
+    failed = []
+    itemsdeleted = 0
+    try:
+        for i in nrs:
+            result = delfromlist(ievent.channel, i)
+            if not result:
+                failed.append(str(i))
+            else:
+                itemsdeleted += 1
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if failed:
+        ievent.reply('failed to remove %s' % ' '.join(failed))
+    ievent.reply('%s item(s) removed' % itemsdeleted)
+
+cmnds.add('lists-chandel', handle_listschandel, 'USER')
+examples.add('lists-chandel', "lists-chandel <listname> ',' <listofnrs> \
+.. remove items with indexnr from list", '1) lists-chandel 1 2) \
+lists-chandel 0 3 6')
+tests.add('lists-chan test, mekker', '(\d+)\) added to test list').add('lists-chandel %s', '1 item\(s\) removed')
+
+def handle_listschanshow(bot, ievent):
+    """ show avaiable lists """
+    l = getlists(ievent.channel)
+    if not l:
+        ievent.reply('no lists available')
+        return
+    else:
+        result = []
+        for i in l:
+            if not i.listname in result:
+                result.append(i.listname)
+        if result:
+            ievent.reply(result, dot=True)
+
+cmnds.add('lists-chanshow', handle_listschanshow, 'USER')
+examples.add('lists-chanshow', 'show available channel lists' , \
+'lists-chanshow')
+tests.add('lists-chan test, mekker').add('lists-chanshow', 'test')
+
+def handle_lists(bot, ievent):
+    """ lists <listname> [',' <item>] .. global lists"""
+    if not ievent.rest:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    username = users.getname(ievent.userhost)
+    try:
+        listname, item = ievent.rest.split(',', 1)
+    except ValueError:
+        l = getlist(username, ievent.rest)
+        if not l:
+            ievent.reply('no %s list available' % ievent.rest)
+            return
+        result = []
+        for i in l:
+            result.append("%s) %s" % (i.indx, i.item))
+        ievent.reply(result)
+        return
+    listname = listname.strip().lower()
+    item = item.strip()
+    if not listname or not item:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    result = 0
+    try:
+        result = addtolist(username, listname, item)
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if result:
+        ievent.reply('%s (%s) added to %s list' % (item, result, listname))
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('lists', handle_lists, 'USER')
+examples.add('lists', "lists <listname> [',' <item>] .. show content of list \
+or add item to list", '1) lists bla 2) lists bla, mekker')
+tests.add('lists test, mekker').add('lists test', 'mekker')
+
+def handle_listsdel(bot, ievent):
+    """ lists-del <listname> ',' <listofnrs> .. remove items with indexnr \
+from list """
+    if not ievent.rest:
+        ievent.missing('<listofnrs>')
+        return
+    try:
+        nrs = []
+        for i in ievent.rest.split():
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    username = users.getname(ievent.userhost)
+    nrs.sort()
+    failed = []
+    itemsdeleted = 0
+    try:
+        for i in nrs:
+            result = delfromlist(username, i)
+            if not result:
+                failed.append(str(i))
+            else:
+                itemsdeleted += 1
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if failed:
+        ievent.reply('failed to delete %s' % ' '.join(failed))
+    ievent.reply('%s item(s) removed' % itemsdeleted)
+
+cmnds.add('lists-del', handle_listsdel, 'USER')
+examples.add('lists-del', "lists-del <listname> ',' <listofnrs> \
+.. remove items with indexnr from list", '1) lists-del 1 2) \
+lists-del 0 3 6')
+tests.add('lists test, mekker', '(\d+)\) added to test list').add('lists-del %s', '1 item\(s\) removed')
+
+def handle_listshow(bot, ievent):
+    """ show avaiable lists """
+    username = users.getname(ievent.userhost)
+    l = getlists(username)
+    if not l:
+        ievent.reply('no lists available')
+        return
+    else:
+        result = []
+        for i in l:
+            if not i.listname in result:
+                result.append(i.listname)
+        if result:
+            ievent.reply(result, dot=True)
+
+cmnds.add('lists-show', handle_listshow, 'USER')
+examples.add('lists-show', 'show available channel lists' , 'lists-show')
+tests.add('lists-chan test, mekker').add('lists-show', 'test')
+
+def handle_listsmerge(bot, ievent):
+    """ merge 2 lists """
+    try:
+        (fromlist, tolist) = ievent.args
+    except ValueError:
+        ievent.missing('<fromlist> <tolist>')
+        return
+    username = users.getname(ievent.userhost)
+    res = getlist(username, fromlist)
+    if not res: 
+        ievent.reply('no %s list available or empty' % fromlist)
+        return
+    l = []
+    for i in res:
+        l.append(i.item)
+    result = 0
+    try:
+        result = mergelist(username, tolist, l)
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    ievent.reply('%s items merged' % result)
+
+cmnds.add('lists-merge', handle_listsmerge, 'USER')
+examples.add('lists-merge', 'lists-merge <fromlist> <tolist> .. merge 2 \
+lists', 'lists-merge mekker miep')
+tests.add('lists miep, mekker2').add('lists-merge test miep', '(\d+) items merged')
--- gozerbot-0.99.1.orig/build/lib/gplugs/alchemy/birthday.py
+++ gozerbot-0.99.1/build/lib/gplugs/alchemy/birthday.py
@@ -0,0 +1,215 @@
+# dbplugs/birthday.py
+#
+#
+
+""" manage birthdays """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import getdaymonth, strtotime, elapsedstring, getwho, \
+bdmonths, handle_exception
+from gozerbot.tests import tests
+from gozerbot.users import users
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliases
+from gozerbot.config import config
+import time, re
+
+from gozerbot.database.alchemy import Base, create_all, startmaindb, query, dblocked
+from datetime import datetime
+from time import localtime
+from sqlalchemy import Column, String, Integer, Text, DateTime, ForeignKey, Sequence
+import sqlalchemy as sa
+
+class Birthday(Base):
+    __tablename__ = 'birthday'
+    __table_args__ = {'useexisting': True}
+    name = Column('name', String(255), primary_key=True)
+    birthday = Column('birthday', String(255), nullable=False)
+
+    def __init__(self, name, birthday):
+        self.name = name
+        self.birthday = birthday
+
+startmaindb()
+create_all('birthday')
+
+plughelp.add('birthday', 'manage birthday data')
+
+@dblocked
+def handle_bdset(bot, ievent):
+    """ bd-set <date> .. set birthday """
+    try:
+        what = ievent.args[0]
+        if not re.search('\d*\d-\d*\d-\d\d\d\d', what):
+            ievent.reply('i need a date in the format day-month-year')
+            return
+    except IndexError:
+        ievent.missing('<date>')
+        return
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find a user for %s" % ievent.userhost)
+        return
+    bd = query(Birthday).filter(Birthday.name==name).first()
+    #Session.begin()
+    if not bd:
+        bd = Birthday(name, what)
+        Session.add(bd)
+    else:
+        bd.birthday = what
+    #Session.commit()
+    #Session.close()
+    ievent.reply('birthday set')
+
+cmnds.add('bd-set', handle_bdset, 'USER')
+examples.add('bd-set', 'bd-set <date> .. set birthday', 'bd-set 3-11-1967')
+aliases.data['setbd'] = 'bd-set'
+aliases.data['setjarig'] = 'bd-set'
+tests.add('bd-set 3-11-1967', 'birthday set')
+
+@dblocked
+def handle_bddel(bot, ievent):
+    """ bd-del .. delete birthday """
+    name = users.getname(ievent.userhost)
+    result = 0
+    bd = Session.query(Birthday).filter(Birthday.name==name).first()
+    if not bd:
+        ievent.reply('no birthday known for %s (%s)' % (ievent.nick, name))
+    else:
+        #Session.begin()
+        Session.delete(bd)
+        #Session.commit()
+        #Session.close()
+        ievent.reply('birthday removed')
+
+cmnds.add('bd-del', handle_bddel, 'USER')
+examples.add('bd-del', 'delete birthday data', 'bd-del')
+aliases.data['delbd'] = 'bd-del'
+aliases.data['deljarig'] = 'bd-del'
+tests.add('bd-del', 'birthday removed')
+
+def handle_bd(bot, ievent):
+    """ bd [<nr|user>] .. show birthday of month or user """
+    if not ievent.rest:    
+        handle_checkbd(bot, ievent)
+        return
+    try:
+        int(ievent.args[0])
+        handle_checkbd2(bot, ievent)
+        return
+    except (IndexError, ValueError):
+        who = ievent.args[0]
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("don't know userhost of %s" % who)
+        return
+    name = users.getname(userhost)
+    if not name:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    bd = query(Birthday).filter(Birthday.name==name).first()
+    if bd:
+        ievent.reply('birthday of %s is %s' % (who, bd.birthday))
+    else:
+        ievent.reply('no birthday know for %s' % name)
+
+cmnds.add('bd', handle_bd, ['USER', 'WEB'])
+examples.add('bd', 'bd [<nr|user>] .. show birthdays for this month or \
+show birthday of <nick>', '1) bd 2) bd dunker')
+aliases.data['jarig'] = 'bd'
+tests.add('bd-set 3-11-1967').add('bd 11', 'birthdays in Nov')
+
+def handle_checkbd(bot, ievent):
+    """ bd-check .. check birthdays for current month """
+    (nowday, nowmonth) = getdaymonth(time.time())
+    mstr = ""
+    result = []
+    bds = query(Birthday).all()
+    if not bds:
+        ievent.reply('no birthdays this month')
+        return
+    for i in bds:
+        btime = strtotime(i.birthday)
+        if btime == None:
+            continue
+        (day, month) = getdaymonth(btime)
+        if month == nowmonth:
+            result.append((int(day), i.name, i.birthday))
+            if day == nowday and month == nowmonth:
+                ievent.reply("it's %s's birthday today!" % i.name)
+    result.sort(lambda x, y: cmp(x[0], y[0]))
+    for i in result:
+        mstr += "%s: %s " % (i[1], i[2])
+    if mstr:
+        mstr = "birthdays this month = " + mstr
+        ievent.reply(mstr)
+    else:
+        ievent.reply('no birthdays this month')
+
+def handle_checkbd2(bot, ievent):
+    """ bd-check <nr> .. show birthdays in month (by number) """
+    try:
+        monthnr = int(ievent.args[0])
+        if monthnr < 1 or monthnr > 12:
+            ievent.reply("number must be between 1 and 12")
+            return
+    except (IndexError, ValueError):
+        ievent.missing('<monthnr>')
+        return
+    mstr = ""
+    result = []
+    bds = query(Birthday).all()
+    if not bds:
+        ievent.reply('no birthdays known')
+        return
+    for i in bds:
+        btime = strtotime(i.birthday)
+        if btime == None:
+            continue
+        (day, month) = getdaymonth(btime)
+        if month == bdmonths[monthnr]:
+            result.append((int(day), i.name, i.birthday))
+    result.sort(lambda x, y: cmp(x[0], y[0]))
+    for i in result:
+        mstr += "%s: %s " % (i[1], i[2])
+    if mstr:
+        mstr = "birthdays in %s = " % bdmonths[monthnr] + mstr
+        ievent.reply(mstr)
+    else:
+        ievent.reply('no birthdays found for %s' % bdmonths[monthnr])
+
+def handle_age(bot, ievent):
+    """ age <nick> .. show age of user """
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("don't know userhost of %s" % who)
+        return
+    name = users.getname(userhost)
+    if not name:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    bd = query(Birthday).filter(Birthday.name==name).first()
+    try:
+        birthday = bd.birthday
+    except (TypeError, AttributeError):
+        ievent.reply("can't find birthday data for %s" % who)
+        return
+    btime = strtotime(birthday)
+    if btime == None:
+        ievent.reply("can't make a date out of %s" % birthday)
+        return
+    age = int(time.time()) - int(btime)
+    ievent.reply("age of %s is %s" % (who, elapsedstring(age, ywd=True)))
+
+cmnds.add('age', handle_age, ['USER', 'WEB'])
+examples.add('age', 'age <nick> .. show how old <nick> is', 'age dunker')
+aliases.data['oud'] = 'age'
+tests.add('bd-set 3-11-1967').add('age {{ me }}', 'age of {{ me }} is')
--- gozerbot-0.99.1.orig/build/lib/gplugs/olddb/user.py
+++ gozerbot-0.99.1/build/lib/gplugs/olddb/user.py
@@ -0,0 +1,908 @@
+# dbplugs/user.py
+#
+#
+
+""" users related commands """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import getwho, stripident
+from gozerbot.users import users
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.aliases import aliases, aliasdel
+from gozerbot.plughelp import plughelp
+
+plughelp.add('user', 'manage users')
+
+def handle_whoami(bot, ievent):
+    """ user-whoami .. get your username """
+    ievent.reply('%s' % users.getname(ievent.userhost))
+
+cmnds.add('user-whoami', handle_whoami, 'USER')
+examples.add('user-whoami', 'get your username', 'user-whoami')
+aliases.data['whoami'] = 'user-whoami'
+
+def handle_meet(bot, ievent):
+    """ user-meet <nick> .. introduce a new user to the bot """
+    try:
+        nick = ievent.args[0].lower()
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+    if users.exist(nick):
+        ievent.reply('there is already a user with username %s' % nick)
+        return
+    userhost = getwho(bot, nick)
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % nick)
+        return
+    username = users.getname(userhost)
+    if username:
+        ievent.reply('we already have a user with userhost %s (%s)' % \
+(userhost, username))
+        return
+    result = 0
+    try:
+        result = users.add(nick.lower(), [userhost, ], ['USER', ])
+    except Exception, ex:
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if result:
+        ievent.reply('%s added to user database' % nick)
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('user-meet', handle_meet, ['OPER', 'MEET'])
+examples.add('user-meet', 'user-meet <nick> .. introduce <nick> to the \
+bot', 'user-meet dunker')
+aliases.data['meet'] = 'user-meet'
+
+def handle_adduser(bot, ievent):
+    """ user-aadd <name> <userhost> .. introduce a new user to the bot """
+    try:
+        (name, userhost) = ievent.args
+    except ValueError:
+        ievent.missing('<name> <userhost>')
+        return
+    username = users.getname(userhost)
+    if username:
+        ievent.reply('we already have a user with userhost %s (%s)' % \
+(userhost, username))
+        return
+    result = 0
+    try:
+        result = users.add(name.lower(), [userhost, ], ['USER', ])
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('%s added to user database' % name)
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('user-add', handle_adduser, 'OPER')
+examples.add('user-add', 'user-add <name> <userhost> .. add <name> with \
+<userhost> to the bot', 'user-add dunker bart@localhost')
+
+def handle_merge(bot, ievent):
+    """ user-merge <name> <nick> .. merge the userhost into a already \
+        existing user """
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <nick>')
+        return  
+    name, nick = ievent.args
+    name = name.lower()
+    if users.gotperm(name, 'OPER') and not users.allowed(ievent.userhost, \
+'OPER'):
+        ievent.reply("only OPER perm can merge with OPER user")
+        return
+    if name == 'owner' and not bot.ownercheck(ievent, "can merge with owner \
+user"):
+         return 
+    if not users.exist(name):
+        ievent.reply("we have no user %s" % name)
+        return
+    userhost = getwho(bot, nick)
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % nick)
+        return
+    username = users.getname(userhost)
+    if username:
+        ievent.reply('we already have a user with userhost %s (%s)' % \
+(userhost, username))
+        return
+    result = 0
+    try:
+        result = users.merge(name, userhost)
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('%s merged' % nick)
+    else:
+        ievent.reply('merge failed')
+
+cmnds.add('user-merge', handle_merge, ['OPER', 'MEET'])
+examples.add('user-merge', 'user-merge <name> <nick> .. merge record with \
+<name> with userhost from <nick>', 'merge bart dunker')
+aliases.data['merge'] = 'user-merge'
+
+def handle_delete(bot, ievent):
+    """ user-del <name> .. remove user """
+    if len(ievent.args) == 0:
+        ievent.missing('<name>')
+        return
+    name = ievent.args[0].lower()
+    if name == 'owner':
+        ievent.reply("can't delete owner")
+        return
+    result = 0
+    try:
+        result = users.delete(name)
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('%s deleted' % name)
+    else:
+        ievent.reply('delete of %s failed' % name)
+
+cmnds.add('user-del', handle_delete, 'OPER')
+examples.add('user-del', 'user-del <name> .. delete user with <username>' , \
+'user-del dunker')
+aliases.data['delete'] = 'user-del'
+
+def handle_userscan(bot, ievent):
+    """ user-scan <txt> .. scan for user """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<txt>')
+        return
+    name = name.lower()
+    names = users.names()
+    result = []
+    for i in names:
+        if i.find(name) != -1:
+            result.append(i)
+    if result:
+        ievent.reply("users matching %s: " % name, result, dot=True)
+    else:
+        ievent.reply('no users matched')
+        return
+
+cmnds.add('user-scan', handle_userscan, 'OPER')
+examples.add('user-scan', 'user-scan <txt> .. search database for matching \
+usernames', 'user-scan dunk')
+aliases.data['us'] = 'user-scan'
+
+def handle_names(bot, ievent):
+    """ user-names .. show registered users """
+    ievent.reply("usernames: ", users.names(), dot=True)
+
+cmnds.add('user-names', handle_names, 'OPER')
+examples.add('user-names', 'show names of registered users', 'user-names')
+aliases.data['names'] = 'user-names'
+
+def handle_name(bot, ievent):
+    """ user-name .. show name of user giving the command """
+    ievent.reply('your name is %s' % users.getname(ievent.userhost))
+
+cmnds.add('user-name', handle_name, 'USER')
+examples.add('user-name', 'show name of user giving the commands', \
+'user-name')
+aliases.data['name'] = 'user-name'
+
+def handle_getname(bot, ievent):
+    """ user-getname <nick> .. fetch name of nick """
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing("<nick>")
+        return
+    userhost = getwho(bot, nick)
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % nick)
+        return
+    name = users.getname(userhost)
+    if not name:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    ievent.reply(name)
+
+cmnds.add('user-getname', handle_getname, 'USER')
+examples.add('user-getname', 'user-getname <nick> .. get the name of \
+<nick>', 'user-getname dunker')
+aliases.data['gn'] = 'user-getname'
+aliases.data['getname'] = 'user-getname'
+
+def handle_addperm(bot, ievent):
+    """ user-addperm <name> <perm> .. add permission """
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <perm>')
+        return
+    name, perm = ievent.args
+    perm = perm.upper()
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    result = 0
+    if users.gotperm(name, perm):
+        ievent.reply('%s already has permission %s' % (name, perm))
+        return         
+    try:
+        result = users.db.execute(""" INSERT INTO perms(name, perm) \
+values(%s,%s) """, (name, perm))
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('%s perm added' % perm)
+    else:
+        ievent.reply('perm add failed')
+
+cmnds.add('user-addperm', handle_addperm, 'OPER')
+examples.add('user-addperm', 'user-addperm <name> <perm> .. add permissions \
+to user <name>', 'user-addperm dunker rss')
+aliases.data['setperms'] = 'user-addperm'
+aliases.data['addperms'] = 'user-addperm'
+
+def handle_getperms(bot, ievent):
+    """ user-getperms <name> .. get permissions of name"""
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    perms = users.db.execute(""" SELECT perm FROM perms WHERE \
+name = %s """, name)
+    if perms:
+        permlist = []
+        for i in perms:
+            permlist.append(i[0])
+        ievent.reply("permissions of %s: " % name, permlist, dot=True)
+    else:
+        ievent.reply('%s has no permissions set' % name)
+
+cmnds.add('user-getperms', handle_getperms, 'OPER')
+examples.add('user-getperms', 'user-getperms <name> .. get permissions of \
+<name>', 'user-getperms dunker')
+aliases.data['getperms'] = 'user-getperms'
+
+def handle_perms(bot, ievent):
+    """ user-perms .. get permission of the user given the command """
+    if ievent.rest:
+        ievent.reply("use getperms to get the permissions of somebody else")
+        return
+    name = users.getname(ievent.userhost)
+    if not name:
+         ievent.reply("can't find username for %s" % ievent.userhost)
+         return
+    perms = users.db.execute(""" SELECT perm FROM perms WHERE \
+name = %s """, name)
+    if perms:
+        permlist = []
+        for i in perms:
+            permlist.append(i[0])
+        ievent.reply("you have permissions: ", permlist, dot=True)
+
+cmnds.add('user-perms', handle_perms, 'USER')
+examples.add('user-perms', 'get permissions', 'user-perms')
+aliases.data['perms'] = 'user-perms'
+
+def handle_delperm(bot, ievent):
+    """ user-delperm <name> <perm> .. delete permission of name """
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <perm>')
+        return
+    name, perm = ievent.args
+    perm = perm.upper()
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    result = 0
+    try:
+        result = users.db.execute(""" DELETE FROM perms WHERE name = %s AND \
+perm = %s """, (name, perm))
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('%s perm removed' % perm)
+    else:
+        ievent.reply("%s has no %s permission" % (name, perm))
+        return
+
+cmnds.add('user-delperm', handle_delperm, 'OPER')
+examples.add('user-delperms', 'delete from user <name> permission <perm>', \
+'user-delperms dunker rss')
+
+def handle_addstatus(bot, ievent):
+    """ user-addstatus <name> <status> .. add status of name """
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <status>')
+        return
+    name, status = ievent.args
+    status = status.upper()
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    result = 0
+    if users.gotstatus(name, status):
+        ievent.reply('%s already has status %s' % (name, status))
+        return
+    try:
+        result = users.db.execute(""" INSERT INTO statuses(name, status) \
+values(%s,%s) """, (name, status))
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('%s status added' % status)
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('user-addstatus', handle_addstatus, 'OPER')
+examples.add('user-addstatus', 'user-addstatus <name> <status>', \
+'user-addstatus dunker #dunkbots')
+aliases.data['setstatus'] = 'user-addstatus'
+aliases.data['addstatus'] = 'user-addstatus'
+
+def handle_getstatus(bot, ievent):
+    """ user-getstatus <name> .. get status of name """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    status = users.db.execute(""" SELECT status FROM statuses WHERE \
+name = %s """, name)
+    if status:
+        statuslist = []
+        for i in status:
+            statuslist.append(i[0])
+        ievent.reply("status of %s: " % name, statuslist, dot=True)
+    else:
+        ievent.reply('%s has no status set' % name)
+
+cmnds.add('user-getstatus', handle_getstatus, 'OPER')
+examples.add('user-getstatus', 'user-getstatus <name> .. get status of \
+<name>', 'user-getstatus dunker')
+aliases.data['getstatus'] = 'user-getstatus'
+
+def handle_status(bot, ievent):
+    """ user-status .. get status of user given the command """
+    name = users.getname(ievent.userhost)
+    status = users.db.execute(""" SELECT status FROM statuses WHERE \
+name = %s """, name)
+    if status:
+        statuslist = []
+        for i in status:
+            statuslist.append(i[0])
+        ievent.reply("you have status: ", statuslist, dot=True)
+    else:
+        ievent.reply('you have no status set')
+
+cmnds.add('user-status', handle_status, 'USER')
+examples.add('user-status', 'get status', 'user-status')
+aliases.data['status'] = 'user-status'
+
+def handle_delstatus(bot, ievent):
+    """ user-delstatus <name> <status> .. delete status of name """
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <status>')
+        return
+    name, status = ievent.args
+    status = status.upper()
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    result = 0
+    try:
+        result = users.db.execute(""" DELETE FROM statuses WHERE \
+name = %s AND status = %s """, (name, status))
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('%s status deleted' % status)
+    else:
+        ievent.reply("%s has no %s status" % (name, status))
+        return
+
+cmnds.add('user-delstatus', handle_delstatus, 'OPER')
+examples.add('user-delstatus', 'user-delstatus <name> <status>', \
+'user-delstatus dunker #dunkbots')
+aliases.data['delstatus'] = 'user-delstatus'
+
+def handle_adduserhost(bot, ievent):
+    """ user-adduserhost <name> <userhost> .. add to userhosts of name """ 
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <userhost>')
+        return
+    name, userhost = ievent.args
+    userhost = stripident(userhost)
+    name = name.lower()
+    if name == 'owner' and not bot.ownercheck(ievent, 'can adduserhost to \
+owner'):
+        return
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    if users.gotuserhost(name, userhost):
+        ievent.reply('%s already has userhost %s' % (name, userhost))
+        return
+    result = 0
+    try:
+        result = users.db.execute(""" INSERT INTO userhosts(name, \
+userhost) values(%s, %s) """, (name, userhost))
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('userhost added')
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('user-adduserhost', handle_adduserhost, 'OPER')
+examples.add('user-adduserhost', 'user-adduserhost <name> <userhost>', \
+'user-adduserhost dunker bart@%.a2000.nl')
+aliases.data['adduserhost'] = 'user-adduserhost'
+aliases.data['adduserhosts'] = 'user-adduserhost'
+
+def handle_deluserhost(bot, ievent):
+    """ user-deluserhost <name> <userhost> .. remove from userhosts of name """
+    if len(ievent.args) != 2:
+        ievent.missing('<name> <userhost>')
+        return
+    name, userhost = ievent.args
+    userhost = stripident(userhost)
+    name = name.lower()
+    if name == 'owner'  and not bot.ownercheck(ievent, 'can delete userhosts \
+from owner'):
+        return 
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    result = 0
+    try:
+        result = users.db.execute(""" DELETE FROM userhosts WHERE \
+name = %s AND userhost = %s """, (name, userhost))
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('userhost removed')
+    else:
+        ievent.reply("%s has no %s in userhost list" % (name, \
+userhost))
+        return  
+
+cmnds.add('user-deluserhost', handle_deluserhost, 'OPER')
+examples.add('user-deluserhost', 'user-deluserhost <name> <userhost> .. \
+delete from usershosts of <name> userhost <userhost>','user-deluserhost \
+dunker bart1@bla.a2000.nl')
+aliases.data['deluserhost'] = 'user-deluserhost'
+aliases.data['deluserhosts'] = 'user-deluserhost'
+
+def handle_getuserhosts(bot, ievent):
+    """ user-getuserhosts <name> .. get userhosts of name """
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    who = who.lower()
+    userhosts = users.db.execute(""" SELECT userhost FROM userhosts \
+WHERE name = %s """, who)
+    if userhosts:
+        userhostlist = []
+        for i in userhosts:
+            userhostlist.append(i[0])
+        ievent.reply("userhosts of %s: " % who, userhostlist, dot=True)
+    else:
+        ievent.reply("can't find user %s" % who)
+
+cmnds.add('user-getuserhosts', handle_getuserhosts, 'OPER')
+examples.add('user-getuserhosts', 'user-getuserhosts <name> .. get \
+userhosts of <name>', 'getuserhosts dunker')
+aliases.data['getuserhosts'] = 'user-getuserhosts'
+
+def handle_userhosts(bot, ievent):
+    """ user-userhosts .. get userhosts of user giving the command """
+    name = users.getname(ievent.userhost)
+    userhosts = users.db.execute(""" SELECT userhost FROM userhosts \
+WHERE name = %s """, name)
+    if userhosts:
+        userhostlist = []
+        for i in userhosts:
+            userhostlist.append(i[0])
+        ievent.reply("you have userhosts: ", userhostlist, dot=True)
+
+cmnds.add('user-userhosts', handle_userhosts, 'USER')
+examples.add('user-userhosts', 'get userhosts', 'user-userhosts')
+aliases.data['userhosts'] = 'user-userhosts'
+
+def handle_getemail(bot, ievent):
+    """ user-getemail <name> .. get email of name """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    email = users.db.execute(""" SELECT email FROM email \
+WHERE name = %s """, name)
+    if email:
+        ievent.reply(email[0][0])
+    else:
+        ievent.reply('no email set')
+
+cmnds.add('user-getemail', handle_getemail, 'USER')
+examples.add('user-getemail', 'user-getemail <name> .. get email from user \
+<name>', 'user-getemail dunker')
+aliases.data['getemail'] = 'user-getemail'
+
+def handle_setemail(bot, ievent):
+    """ user-setemail <name> .. set email of name """
+    try:
+        name, email = ievent.args
+    except ValueError:
+        ievent.missing('<name> <email>')
+        return
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    users.setemail(name, email)
+    ievent.reply('email set')
+
+cmnds.add('user-setemail', handle_setemail, 'OPER')
+examples.add('user-setemail', 'user-setemail <name> <email>.. set email of \
+user <name>', 'user-setemail dunker bart@gozerbot.org')
+aliases.data['setemail'] = 'user-setemail'
+
+def handle_email(bot, ievent):
+    """ user-email .. show email of user giving the command """
+    if len(ievent.args) != 0:
+        ievent.reply('use getemail to get the email address of an user .. \
+email shows your own mail address')
+        return
+    name = users.getname(ievent.userhost)
+    email = users.db.execute(""" SELECT email FROM email \
+WHERE name = %s """, name)
+    if email:
+        ievent.reply(email[0][0])
+    else:
+        ievent.reply('no email set')
+
+cmnds.add('user-email', handle_email, 'USER')
+examples.add('user-email', 'get email', 'user-email')
+aliases.data['email'] = 'user-email'
+
+def handle_delemail(bot, ievent):
+    """ user-delemail .. reset email of user giving the command """
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find user for %s" % ievent.userhost)
+        return
+    result = 0
+    try:
+        result = users.db.execute(""" DELETE FROM email WHERE \
+name = %s """, name)
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('email removed')
+    else:
+        ievent.reply('delete failed')
+
+cmnds.add('user-delemail', handle_delemail, 'OPER')
+examples.add('user-delemail', 'reset email', 'user-delemail')
+aliases.data['delemail'] = 'user-delemail'
+
+def handle_addpermit(bot, ievent):
+    """ user-addpermit <name> <permit> .. add permit to permit list \
+        of <name> """
+    try:
+        who, what = ievent.args
+    except ValueError:
+        ievent.missing("<name> <permit>")
+        return
+    if not users.exist(who):
+        ievent.reply("can't find username of %s" % who)
+        return
+    name = users.getname(ievent.userhost)
+    if users.gotpermit(name, (who, what)):
+        ievent.reply('%s is already allowed to do %s' % (who, what))
+        return
+    result = 0
+    try:
+        result = users.db.execute(""" INSERT INTO permits(name, \
+permit) values(%s,%s) """, (name, "%s %s" % (who, what)))
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('permit added')
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('user-addpermit', handle_addpermit, 'USER')
+examples.add('user-addpermit', 'user-addpermit <nick> <what> .. permit \
+nick access to <what> .. use setperms to add permissions', \
+'user-addpermit dunker todo')
+aliasdel('allow')
+
+def handle_permit(bot, ievent):
+    """ user-permit .. get permit list of user giving the command """
+    if ievent.rest:
+        ievent.reply("use the allow command to allow somebody something .. \
+use getname <nick> to get the username of somebody .. this command shows \
+what permits you have")
+        return
+    name = users.getname(ievent.userhost)
+    if not name:
+        ievent.reply("can't find user for %s" % ievent.userhost)
+        return
+    permit = users.db.execute(""" SELECT permit FROM permits \
+WHERE name = %s """, name)
+    if permit:
+        permitlist = []
+        for i in permit:
+            permitlist.append(i[0])
+        ievent.reply("you permit the following: ", permitlist, dot=True)
+    else:
+        ievent.reply("you don't have any permits")
+
+cmnds.add('user-permit', handle_permit, 'USER')
+examples.add('user-permit', 'show permit of user giving the command', \
+'user-permit')
+aliases.data['permit'] = 'user-permit'
+
+def handle_userdelpermit(bot, ievent):
+    """ user-delpermit <name> <permit> .. remove (name, permit) from permit 
+        list """
+    try:
+        who, what = ievent.args
+    except ValueError:
+        ievent.missing("<name> <what>")
+        return
+    if not users.exist(who):
+        ievent.reply("can't find registered name of %s" % who)
+        return
+    name = users.getname(ievent.userhost)
+    if not users.gotpermit(name, (who, what)):
+        ievent.reply('%s is already not allowed to do %s' % (who, what))
+        return
+    result = 0
+    try:
+        result = users.db.execute(""" DELETE FROM permits WHERE \
+name = %s AND permit = %s """, (name, "%s %s" % (who, what)))
+    except Exception, ex:
+        ievent.reply("ERROR: %s" % str(ex))
+        return
+    if result:
+        ievent.reply('%s denied' % what)
+    else:
+        ievent.reply('delete failed')
+
+cmnds.add('user-delpermit', handle_userdelpermit, 'USER')
+examples.add('user-delpermit', 'user-delpermit <name> <permit>', \
+'user-delpermit dunker todo')
+aliasdel('deny')
+
+def handle_check(bot, ievent):
+    """ user-check <nick> .. get user data of <nick> """
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+    userhost = getwho(bot, nick)
+    if not userhost:
+        ievent.reply("can't find userhost of %s" % nick)
+        return
+    name = users.getname(userhost)
+    if not name:
+        ievent.reply("can't find user")
+        return
+    userhosts = users.db.execute(""" SELECT userhost FROM userhosts \
+WHERE name = %s """, name)
+    perms = users.db.execute(""" SELECT perm FROM perms \
+WHERE name = %s """, name)
+    email = users.db.execute(""" SELECT email FROM email \
+WHERE name = %s """, name)
+    permits = users.db.execute(""" SELECT permit FROM permits \
+WHERE name = %s """, name)
+    status = users.db.execute(""" SELECT status FROM statuses \
+WHERE name = %s """, name)
+    jarig = users.db.execute(""" SELECT birthday FROM birthday \
+WHERE name = %s """, name)
+    ievent.reply('userrecord of %s = userhosts: %s perms: %s email: %s \
+permits: %s status: %s birthday: %s' % (name, str(userhosts), str(perms), \
+str(email), str(permits), str(status),str(jarig)))
+
+cmnds.add('user-check', handle_check, 'OPER')
+examples.add('user-check', 'user-check <nick>', 'user-check dunker')
+aliases.data['check'] = 'user-check'
+
+def handle_show(bot, ievent):
+    """ user-show <name> .. get data of <name> """
+    try:
+        name = ievent.args[0]
+    except IndexError:
+        ievent.missing('<name>')
+        return
+    name = name.lower()
+    if not users.exist(name):
+        ievent.reply("can't find user %s" % name)
+        return
+    userhosts = users.db.execute(""" SELECT userhost FROM userhosts \
+WHERE name = %s """, name)
+    perms = users.db.execute(""" SELECT perm FROM perms \
+WHERE name = %s """, name)
+    email = users.db.execute(""" SELECT email FROM email \
+WHERE name = %s """, name)
+    permits = users.db.execute(""" SELECT permit FROM permits \
+WHERE name = %s """, name)
+    status = users.db.execute(""" SELECT status FROM statuses \
+WHERE name = %s """, name)
+    jarig = users.db.execute(""" SELECT birthday FROM birthday \
+WHERE name = %s """, name)
+    ievent.reply('userrecord of %s = userhosts: %s perms: %s email: %s \
+permits: %s status: %s birthday: %s' % (name, str(userhosts), str(perms), \
+str(email), str(permits), str(status),str(jarig)))
+
+cmnds.add('user-show', handle_show, 'OPER')
+examples.add('user-show', 'user-show <name> .. show data of <name>', \
+'user-show dunker')
+
+def handle_match(bot, ievent):
+    """ user-match <userhost> .. get data of <userhost> """
+    try:
+        userhost = ievent.args[0]
+    except IndexError:
+        ievent.missing('<userhost>')
+        return
+    name = users.getname(userhost)
+    if not name:
+        ievent.reply("can't find user with userhost %s" % userhost)
+        return
+    userhosts = users.db.execute(""" SELECT userhost FROM userhosts \
+WHERE name = %s """, name)
+    perms = users.db.execute(""" SELECT perm FROM perms \
+WHERE name = %s """, name)
+    email = users.db.execute(""" SELECT email FROM email \
+WHERE name = %s """, name)
+    permits = users.db.execute(""" SELECT permit FROM permits \
+WHERE name = %s """, name)
+    status = users.db.execute(""" SELECT status FROM statuses \
+WHERE name = %s """, name)
+    jarig = users.db.execute(""" SELECT birthday FROM birthday \
+WHERE name = %s """, name)
+    ievent.reply('userrecord of %s = userhosts: %s perms: %s email: %s \
+permits: %s status: %s birthday: %s' % (name, str(userhosts), str(perms), \
+str(email), str(permits), str(status),str(jarig)))
+
+cmnds.add('user-match', handle_match, ['USER', 'OPER'])
+examples.add('user-match', 'user-match <userhost>', 'user-match test@test')
+aliases.data['match'] = 'user-match'
+
+def handle_getuserstatus(bot, ievent):
+    """ user-allstatus <status> .. list users with status <status> """
+    try:
+        status = ievent.args[0].upper()
+    except IndexError:
+        ievent.missing('<status>')
+        return
+    result = []
+    userslist = users.db.execute(""" SELECT DISTINCT name FROM statuses \
+WHERE status = %s """, status)
+    if not userslist:
+        ievent.reply("no users with %s status found" % status)
+        return
+    for i in userslist:
+        result.append(i[0])
+    if result:
+        ievent.reply("users with %s status: " % status, result, dot=True)
+    else:
+        ievent.reply("no users with %s status found" % status)
+
+cmnds.add('user-allstatus', handle_getuserstatus, 'OPER')
+examples.add('user-allstatus', 'user-allstatus <status> .. get all users \
+with <status> status', 'user-allstatus #dunkbots')
+
+def handle_getuserperm(bot, ievent):
+    """ user-allperm <perm> .. list users with permission <perm> """
+    try:
+        perm = ievent.args[0].upper()
+    except IndexError:
+        ievent.missing('<perm>')
+        return
+    result = []
+    permusers = users.db.execute(""" SELECT DISTINCT name FROM perms \
+WHERE perm = %s """, perm)
+    if not permusers:
+        ievent.reply("no users with %s permission found" % perm)
+        return
+    for i in permusers:
+        result.append(i[0])
+    if result:
+        ievent.reply('users with %s permission: ' % perm, result, dot=True)
+    else:
+        ievent.reply("no users with %s permission found" % perm)
+
+cmnds.add('user-allperm', handle_getuserperm, 'OPER')
+examples.add('user-allperm', 'user-allperm <perm> .. get users with \
+<perm> permission', 'user-allperm rss')
+
+def handle_usersearch(bot, ievent):
+    """ search for user matching given userhost """
+    try:
+        what = ievent.args[0]
+    except IndexError:
+        ievent.missing('<what>')
+        return
+    result = users.db.execute(""" SELECT name, userhost FROM userhosts \
+WHERE userhost LIKE %s """, '%%%s%%' % what)
+    if result:
+        res = []
+        for i in result:
+            res.append("(%s) %s" % (i[0], i[1]))
+        ievent.reply('users matching %s: ' % what, res, dot=True)
+    else:
+        ievent.reply('no userhost matching %s found' % what)
+
+cmnds.add('user-search', handle_usersearch, 'OPER')
+examples.add('user-search', 'search users userhosts', 'user-search gozerbot')
+
+def handle_addpermall(bot, ievent):
+    """ user-addpermall <perm> .. add permission to all users """
+    try:
+        perm = ievent.args[0].upper()
+    except IndexError:
+        ievent.missing('<perm>')
+        return
+    if perm == 'OPER':
+        ievent.reply("can't add OPER permissions to all")
+        return
+    users.addpermall(perm)
+    ievent.reply('%s perm added' % perm)
+
+cmnds.add('user-addpermall', handle_addpermall, 'OPER')
+examples.add('user-addpermall', 'user-addpermall <perm> .. add <permission> \
+to all users', 'addpermsall USER')
+
+def handle_delpermall(bot, ievent):
+    """ user-delpermall <perm> .. delete permission from all users """
+    try:
+        perm = ievent.args[0].upper()
+    except IndexError:
+        ievent.missing('<perm>')
+        return
+    if perm == 'OPER':
+        ievent.reply("can't delete OPER permissions from all")
+        return
+    users.delpermall(perm)
+    ievent.reply('%s perm deleted' % perm)
+
+cmnds.add('user-delpermall', handle_delpermall, 'OPER')
+examples.add('user-delpermall', 'user-delpermall <perm> .. delete \
+<permission> from all users', 'delpermsall BLA')
--- gozerbot-0.99.1.orig/build/lib/gplugs/olddb/infoitem.py
+++ gozerbot-0.99.1/build/lib/gplugs/olddb/infoitem.py
@@ -0,0 +1,306 @@
+# plugs/infoitem.py
+#
+#
+
+""" information items .. keyword/description pairs """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.redispatcher import rebefore, reafter
+from gozerbot.datadir import datadir
+from gozerbot.persist.persist import Persist
+from gozerbot.generic import lockdec, cchar
+from gozerbot.aliases import aliases
+from gozerbot.plughelp import plughelp
+from gozerbot.callbacks import callbacks
+from gozerbot.users import users
+from gozerbot.config import config
+if not config['nodb']:
+    from gozerbot.database.db import db
+import thread, os, time
+
+plughelp.add('infoitem', 'also known as factoids .. info can be retrieved \
+by keyword or searched')
+
+infolock = thread.allocate_lock()
+
+# create lock descriptor
+locked = lockdec(infolock)
+
+class Infoitems(Persist):
+
+    """ information items """
+
+    @locked
+    def add(self, item, issue, userhost=None, ttime=None):
+        """ add an item """
+        item = item.lower()
+        if self.data.has_key(item):
+            if not issue in self.data[item]:
+                self.data[item].append(issue)
+        else:
+            self.data[item] = [issue]
+        self.save()
+
+    @locked
+    def addnosave(self, item, issue, userhost=None, ttime=None):
+        """ add item but don't save """
+        item = item.lower()
+        if self.data.has_key(item):
+            self.data[item].append(issue)
+        else:
+            self.data[item] = [issue]
+
+    @locked
+    def deltxt(self, item, txt):
+        """ delete todo item with txt in it """
+        got = 0
+        if not self.data.has_key(item):
+            return got
+        for i in range(len(self.data[item])-1, -1, -1):
+            if txt in self.data[item][i]:
+                del self.data[item][i]
+                got += 1
+                break
+        if got:
+            self.save()
+        return got
+
+    @locked
+    def delete(self, item, itemnr):
+        """ delete item with nr from list """
+        try:
+            del self.data[item.lower()][int(itemnr)]
+            self.save()
+            return 1
+        except IndexError:
+            return 0
+        except ValueError:
+            return 0
+        except KeyError:
+            return 0
+
+    def get(self, item):
+        """ get description of item """
+        if self.data.has_key(item):
+            return self.data[item]
+
+    def size(self):
+        """ return number of items """
+        return len(self.data)
+
+    def searchdescr(self, txt):
+        result = []
+        for i, j in self.data.iteritems():
+            for z in j:
+                if txt in z:
+                    result.append((i, z))
+        return result
+
+    def searchitem(self, txt):
+        result = []
+        for i, j in self.data.iteritems():
+            if txt in i:
+                result.append((i, j))
+        return result
+
+class InfoitemsDb(object):
+
+    """ information items """
+ 
+    def add(self, item, description, userhost, ttime):
+        """ add an item """
+        item = item.lower()
+        result = db.execute(""" INSERT INTO infoitems(item, description, \
+userhost, time) VALUES(%s, %s, %s, %s) """, (item, description, \
+userhost, ttime))
+        return result
+
+    def get(self, item):
+        """ get infoitems """
+        item = item.lower()
+        result = db.execute(""" SELECT description FROM \
+infoitems WHERE item = %s """, item)
+        res = []
+        if result:
+            for i in result:
+                res.append(i[0])
+        return res
+
+    def delete(self, indexnr):
+        """ delete item with indexnr  """
+        result = db.execute(""" DELETE FROM infoitems WHERE indx = %s """, \
+indexnr)
+        return result
+
+    def deltxt(self, item, txt):
+        """ delete item with matching txt """
+        result = db.execute(""" DELETE FROM infoitems WHERE item = %s AND \
+description LIKE %s """, (item, '%%%s%%' % txt))
+        return result
+
+    def size(self):
+        """ return number of items """
+        result = db.execute(""" SELECT COUNT(*) FROM infoitems """)
+        return result[0][0]
+
+    def searchitem(self, search):
+        """ search items """
+        result = db.execute(""" SELECT item, description \
+FROM infoitems WHERE item LIKE %s """, '%%%s%%' % search)
+        return result
+
+    def searchdescr(self, search):
+        """ search descriptions """
+        result = db.execute(""" SELECT item, description \
+FROM infoitems WHERE description LIKE %s """, '%%%s%%' % search)
+        return result
+
+if not config['nodb']:
+    info = InfoitemsDb()
+else:
+    info = Infoitems(datadir + os.sep + 'infoitems')
+    if not info.data:
+        info.data = {}
+assert(info)
+
+def size():
+    """ return number of infoitems """
+    return info.size()
+
+def infopre(bot, ievent):
+    """ see if info callback needs to be called """
+    cc = cchar(bot, ievent)
+    if ievent.origtxt and cc == ievent.origtxt[0] and not ievent.usercmnd \
+and ievent.txt:
+        return 1
+
+def infocb(bot, ievent):
+    """ implement a !infoitem callback """
+    if users.allowed(ievent.userhost, 'USER'):
+        data = info.get(ievent.txt)
+        if data:
+            ievent.reply('%s is: ' % ievent.txt, data , dot=True)
+
+callbacks.add('PRIVMSG', infocb, infopre)
+
+def handle_infosize(bot, ievent):
+    """ info-size .. show number of information items """
+    ievent.reply("we have %s infoitems" % info.size())
+
+cmnds.add('info-size', handle_infosize, ['USER', 'WEB', 'ANON'])
+examples.add('info-size', 'show number of infoitems', 'info-size')
+
+def handle_addinfoitem(bot, ievent):
+    """ <keyword> = <description> .. add information item """
+    try:
+        (what, description) = ievent.groups
+    except ValueError:
+        ievent.reply('i need <item> <description>')
+        return
+    if len(description) < 3:
+        ievent.reply('i need at least 3 chars for the description')
+        return
+    what = what.strip()
+    info.add(what, description, ievent.userhost, time.time())
+    ievent.reply('item added')
+
+rebefore.add(10, '^(.+?)\s+=\s+(.+)$', handle_addinfoitem, ['USER', \
+'INFOADD'], allowqueue=False)
+examples.add('=', 'add description to item', 'dunk = top')
+
+def handle_question(bot, ievent):
+    """ <keyword>? .. ask for information item description """
+    try:
+        what = ievent.groups[0]
+    except IndexError:
+        ievent.reply('i need a argument')
+        return
+    what = what.strip().lower()
+    infoitems = info.get(what)
+    if infoitems:
+        ievent.reply("%s is: " % what, infoitems, dot=True)
+    else:
+        ievent.reply('nothing known about %s' % what)
+        return
+
+reafter.add(10, '^(.+)\?$', handle_question, ['USER', 'WEB', 'JCOLL', \
+'ANON'], allowqueue=True)
+reafter.add(10, '^\?(.+)$', handle_question, ['USER', 'WEB', 'JCOLL', \
+'ANON'], allowqueue=True)
+examples.add('?', 'show infoitems of <what>', '1) test? 2) ?test')
+
+def handle_forget(bot, ievent):
+    """ forget <keyword> <txttomatch> .. remove information item where \
+        description matches txt given """
+    if len(ievent.args) > 1:
+        what = ' '.join(ievent.args[:-1])
+        txt = ievent.args[-1]
+    else:
+        ievent.missing('<item> <txttomatch> (min 3 chars)')
+        return
+    if len(txt) < 3:
+        ievent.reply('i need txt with at least 3 characters')
+        return
+    what = what.strip().lower()
+    try:
+        nrtimes = info.deltxt(what, txt)
+    except KeyError:
+        ievent.reply('no records matching %s found' % what)
+        return
+    if nrtimes:
+        ievent.reply('item deleted')
+    else:
+        ievent.reply('delete %s of %s failed' % (txt, what))
+
+cmnds.add('info-forget', handle_forget, ['FORGET', 'OPER'])
+examples.add('info-forget', 'forget <item> containing <txt>', 'info-forget \
+dunk bla')
+aliases.data['forget'] = 'info-forget'
+
+def handle_searchdescr(bot, ievent):
+    """ info-sd <txttosearchfor> .. search information items descriptions """
+    if not ievent.rest:
+        ievent.missing('<txt>')
+        return
+    else:
+        what = ievent.rest
+    what = what.strip().lower()
+    result = info.searchdescr(what)
+    if result: 
+        res = []
+        for i in result:
+            res.append("[%s] %s" % (i[0], i[1]))
+        ievent.reply("the following matches %s: " % what, res, dot=True)
+    else:
+        ievent.reply('none found')
+
+cmnds.add('info-sd', handle_searchdescr, ['USER', 'WEB', 'ANON'])
+examples.add('info-sd', 'info-sd <txt> ..  search description of \
+infoitems', 'info-sd http')
+aliases.data['sd'] = 'info-sd'
+aliases.data['sl'] = 'info-sd'
+
+def handle_searchitem(bot, ievent):
+    """ info-si <txt> .. search information keywords """
+    if not ievent.rest:
+        ievent.missing('<txt>')
+        return
+    else:
+        what = ievent.rest
+    what = what.strip().lower()
+    result = info.searchitem(what)
+    if result:
+        res = []
+        for i in result:
+            res.append("[%s] %s" % (i[0], i[1]))
+        ievent.reply("the following matches %s: " % what, res, dot=True)
+    else:
+        ievent.reply('none found')
+
+cmnds.add('info-si', handle_searchitem, ['USER', 'WEB', 'ANON'])
+examples.add('info-si', 'info-si <txt> ..  search the infoitems keys', \
+'info-si test')
+aliases.data['si'] = 'info-si'
--- gozerbot-0.99.1.orig/build/lib/gplugs/olddb/karma.py
+++ gozerbot-0.99.1/build/lib/gplugs/olddb/karma.py
@@ -0,0 +1,773 @@
+# plugs/karma.py
+#
+#
+
+""" karma plugin """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.redispatcher import rebefore
+from gozerbot.datadir import datadir
+from gozerbot.generic import handle_exception, rlog, lockdec
+from gozerbot.utils.statdict import Statdict
+from gozerbot.aliases import aliases
+from gozerbot.plughelp import plughelp
+from gozerbot.config import config
+from gplugs.links import links
+if not config['nodb']:
+    from gozerbot.database.db import db
+import thread, pickle, time, os
+
+plughelp.add('karma', 'maintain karma of items .. use ++ to raise karma by 1 \
+or use -- to lower by 1 .. reason might be given after a "#"')
+
+savelist = []
+
+class Karma:
+
+    """ holds karma data """
+
+    def __init__(self, ddir):
+        rlog(0, 'karma', 'reading %s' % datadir + os.sep + 'karma')
+        self.datadir = ddir
+        self.lock = thread.allocate_lock()
+        try:
+            karmafile = open(ddir + os.sep + 'karma', 'r')
+            self.karma = pickle.load(karmafile)
+            karmafile.close()
+        except:
+            self.karma = {}
+        try:
+            reasonupfile = open(ddir + os.sep + 'reasonup', 'r')
+            self.reasonup = pickle.load(reasonupfile)
+            reasonupfile.close()
+        except:
+            self.reasonup = {}
+        try:
+            reasondownfile = open(ddir + os.sep + 'reasondown', 'r')
+            self.reasondown = pickle.load(reasondownfile)
+            reasondownfile.close()
+        except:
+            self.reasondown = {}
+        try:
+            whoupfile = open(ddir + os.sep + 'whoup', 'r')
+            self.whoup = pickle.load(whoupfile)
+            whoupfile.close()
+        except:
+            self.whoup = {}
+        try:
+            whodownfile = open(ddir + os.sep + 'whodown', 'r')
+            self.whodown = pickle.load(whodownfile)
+            whodownfile.close()
+        except:
+            self.whodown = {}
+
+    def size(self):
+        return len(self.karma)
+        
+    def save(self):
+        """ save karma data """
+        try:
+            self.lock.acquire()
+            karmafile = open(self.datadir + os.sep + 'karma', 'w')
+            pickle.dump(self.karma, karmafile)
+            karmafile.close()
+            rlog(1, 'karma', '%s karma saved' % self.datadir)
+            reasonupfile = open(self.datadir + os.sep + 'reasonup', 'w')
+            pickle.dump(self.reasonup, reasonupfile)
+            reasonupfile.close()
+            rlog(1, 'karma', '%s reasonup saved' % self.datadir)
+            reasondownfile = open(self.datadir + os.sep + 'reasondown', 'w')
+            pickle.dump(self.reasondown, reasondownfile)
+            reasondownfile.close()
+            rlog(1, 'karma', '%s reasondown saved' % self.datadir)
+            whoupfile = open(self.datadir + os.sep + 'whoup', 'w')
+            pickle.dump(self.whoup, whoupfile)
+            whoupfile.close()
+            rlog(1, 'karma', '%s whoup saved' % self.datadir)
+            whodownfile = open(self.datadir + os.sep + 'whodown', 'w')
+            pickle.dump(self.whoup, whodownfile)
+            whodownfile.close()
+            rlog(1, 'karma', '%s whodown saved' % self.datadir)
+        finally:
+            self.lock.release()
+
+    def add(self, item, value):
+        """ set karma value of item """
+        self.karma[item.lower()] = value
+
+    def delete(self, item):
+        """ delete karma item """
+        item = item.lower()
+        try:
+            del self.karma[item]
+            return 1
+        except KeyError:
+            return 0
+
+    def get(self, item):
+        """ get karma of item """
+        item = item.lower()
+        if self.karma.has_key(item):
+            return self.karma[item]
+        else:
+            return None
+
+    def addwhy(self, item, updown, reason):
+        """ add why of karma up/down """
+        item = item.lower()
+        if not self.karma.has_key(item):
+            return 0
+        reason = reason.strip()
+        if updown == 'up':
+            if self.reasonup.has_key(item):
+                self.reasonup[item].append(reason)
+            else:
+                self.reasonup[item] = [reason]
+        elif updown == 'down':
+            if self.reasondown.has_key(item):
+                self.reasondown[item].append(reason)
+            else:
+                self.reasondown[item] = [reason]
+            
+    def upitem(self, item, reason=None):
+        """ up a karma item with/without reason """
+        item = item.lower()
+        if self.karma.has_key(item):
+            self.karma[item] += 1
+        else:
+            self.karma[item] = 1
+        if reason:
+            reason = reason.strip()
+            if self.reasonup.has_key(item):
+                self.reasonup[item].append(reason)
+            else:
+                self.reasonup[item] = [reason]
+
+    def down(self, item, reason=None):
+        """ lower a karma item with/without reason """
+        item = item.lower()
+        if self.karma.has_key(item):
+            self.karma[item] -= 1
+        else:
+            self.karma[item] = -1
+        if reason:
+            reason = reason.strip()
+            if self.reasondown.has_key(item):
+                self.reasondown[item].append(reason)
+            else:
+                self.reasondown[item] = [reason]
+
+    def whykarmaup(self, item):
+        """ get why of karma ups """
+        item = item.lower()
+        if self.reasonup.has_key(item):
+            return self.reasonup[item]
+
+    def whykarmadown(self, item):
+        """ get why of karma downs """
+        item = item.lower()
+        if self.reasondown.has_key(item):
+            return self.reasondown[item]
+
+    def setwhoup(self, item, nick):
+        """ set who upped a karma item """
+        item = item.lower()
+        if self.whoup.has_key(item):
+            self.whoup[item].append(nick)
+        else:
+            self.whoup[item] = [nick]
+
+    def setwhodown(self, item, nick):
+        """ set who lowered a karma item """
+        item = item.lower()
+        if self.whodown.has_key(item):
+            self.whodown[item].append(nick)
+        else:
+            self.whodown[item] = [nick]
+
+    def getwhoup(self, item):
+        """ get list of who upped a karma item """
+        item = item.lower()
+        try:
+            return self.whoup[item]
+        except KeyError:
+            return None
+
+    def getwhodown(self, item):
+        """ get list of who downed a karma item """
+        item = item.lower()
+        try:
+            return self.whodown[item]
+        except KeyError:
+            return None
+
+    def good(self, limit=10):
+        """ show top 10 of karma items """
+        statdict = Statdict()
+        for i in self.karma.keys():
+            if i.startswith('quote '):
+                continue
+            statdict.upitem(i, value=self.karma[i])
+        return statdict.top(limit=limit)
+
+    def bad(self, limit=10):
+        """ show lowest 10 of negative karma items """
+        statdict = Statdict()
+        for i in self.karma.keys():
+            if i.startswith('quote '):
+                continue
+            statdict.upitem(i, value=self.karma[i])
+        return statdict.down(limit=limit)
+
+    def quotegood(self, limit=10):
+        """ show top 10 of karma items """
+        statdict = Statdict()
+        for i in self.karma.keys():
+            if not i.startswith('quote '):
+                continue
+            statdict.upitem(i, value=self.karma[i])
+        return statdict.top(limit=limit)
+
+    def quotebad(self, limit=10):
+        """ show lowest 10 of negative karma items """
+        statdict = Statdict()
+        for i in self.karma.keys():
+            if not i.startswith('quote '):
+                continue
+            statdict.upitem(i, value=self.karma[i])
+        return statdict.down(limit=limit)
+
+    def search(self, item):
+        """ search karma items """
+        result = []
+        item = item.lower()
+        for i, j in self.karma.iteritems():
+            if item in i:
+                result.append((i, j))
+        return result
+
+    def whatup(self, nick):
+        """ show what items where upped by nick """
+        nick = nick.lower()
+        statdict = Statdict()
+        for i, j in self.whoup.iteritems():
+            for z in j:
+                if nick == z:
+                    statdict.upitem(i)
+        return statdict.top()
+
+    def whatdown(self, nick):
+        """ show what items where lowered by nick """
+        nick = nick.lower()
+        statdict = Statdict()
+        for i, j in self.whodown.iteritems():
+            for z in j:
+                if nick == z:
+                    statdict.upitem(i)
+        return statdict.top()
+
+class KarmaDb(object):
+
+    """ karma object """
+
+    from gozerbot.database.db import db
+
+    def save(self):
+        pass
+
+    def size(self):
+        """ return number of karma items """
+        nritems = db.execute(""" SELECT COUNT(*) FROM karma """)
+        return nritems[0][0]
+
+    def get(self, item):
+        """ get karma of item """
+        item = item.lower()
+        value = db.execute(""" SELECT value FROM karma WHERE item = %s """, item)
+        if value: return value[0][0]
+        else: return 0
+
+    def delete(self, item):
+        """ delete karma item """
+        item = item.lower()
+        value = db.execute(""" DELETE FROM karma WHERE item = %s """, item)
+        return value
+
+    def addwhy(self, item, updown, reason):
+        """ add why of karma up/down """
+        item = item.lower()
+        result = db.execute(""" INSERT INTO whykarma(item, updown, why) VALUES (%s, %s, %s) """, (item, updown, reason))
+        return result
+            
+    def upitem(self, item, reason=None):
+        """ up a karma item with/without reason """
+        item = item.lower()
+        value = db.execute(""" SELECT value FROM karma WHERE item = %s """, item)
+        try: val = value[0][0]
+        except (TypeError, IndexError):
+            result = db.execute(""" INSERT INTO karma(item, value) VALUES (%s, 1) """, item)
+            if reason: self.addwhy(item, 'up', reason.strip())
+            return result
+        val += 1
+        result = db.execute(""" UPDATE karma SET value = %s WHERE item = %s """, (val, item))
+        if reason: self.addwhy(item, 'up', reason.strip())
+        return result
+
+    def down(self, item, reason=None):
+        """ lower a karma item with/without reason """
+        item = item.lower()
+        value = db.execute(""" SELECT value FROM karma WHERE item = %s """, item)
+        try: val = value[0][0]
+        except (TypeError, IndexError):
+            result = db.execute(""" INSERT INTO karma(item, value) VALUES (%s, -1) """, item)
+            if reason: self.addwhy(item, 'down', reason.strip())
+            return result
+        val -= 1
+        result = db.execute(""" UPDATE karma SET value = %s WHERE item = %s """, (val, item))
+        if reason: self.addwhy(item, 'down', reason.strip())
+        return result
+
+    def whykarmaup(self, item):
+        """ get why of karma ups """
+        item = item.lower()
+        result = db.execute(""" SELECT why FROM whykarma WHERE item = %s AND updown = 'up' """, item)
+        res = []
+        if result:
+             for i in result: res.append(i[0])
+        return res
+
+    def whykarmadown(self, item):
+        """ get why of karma downs """
+        item = item.lower()
+        result = db.execute(""" SELECT why FROM whykarma WHERE item = %s AND updown = 'down' """, item)
+        res = []
+        if result:
+             for i in result: res.append(i[0])
+        return res
+
+    def setwhoup(self, item, nick):
+        """ set who upped a karma item """
+        item = item.lower()
+        nick = nick.lower()
+        result = db.execute(""" INSERT INTO whokarma(item, nick, updown) VALUES(%s, %s, %s) """, (item, nick, 'up'))
+        return result
+ 
+    def setwhodown(self, item, nick):
+        """ set who lowered a karma item """
+        item = item.lower()
+        nick = nick.lower()
+        result = db.execute(""" INSERT INTO whokarma(item, nick, updown) VALUES(%s, %s, %s) """, (item, nick, 'down'))
+        return result
+
+    def getwhoup(self, item):
+        """ get list of who upped a karma item """
+        item = item.lower()
+        result = db.execute(""" SELECT nick FROM whokarma WHERE item = %s AND updown = 'up' """, item)
+        res = []
+        if result:
+             for i in result: res.append(i[0])
+        return res
+
+    def getwhodown(self, item):
+        """ get list of who downed a karma item """
+        item = item.lower()
+        result = db.execute(""" SELECT nick FROM whokarma WHERE item = %s AND updown = 'down' """, item)
+        res = []
+        if result:
+             for i in result: res.append(i[0])
+        return res
+
+    def search(self, item):
+        """ search for matching karma item """
+        item = item.lower()
+        result = db.execute(""" SELECT item,value FROM karma WHERE item LIKE %s """, '%%%s%%' % item)
+        res = []
+        if result:
+             for i in result: res.append(i)
+        return res
+
+    def good(self, limit=10):
+        """ show top 10 of karma items """
+        statdict = Statdict()
+        result = db.execute(""" SELECT item, value FROM karma """)
+        if not result: return []
+        for i in result:
+            if i[0].startswith('quote '): continue
+            statdict.upitem(i[0], value=i[1])
+        return statdict.top(limit=limit)
+
+    def bad(self, limit=10):
+        """ show lowest 10 of negative karma items """
+        statdict = Statdict()
+        result = db.execute(""" SELECT item, value FROM karma """)
+        if not result: return []
+        for i in result:
+            if i[0].startswith('quote '): continue
+            statdict.upitem(i[0], value=i[1])
+        return statdict.down(limit=limit)
+
+    def quotegood(self, limit=10):
+        """ show top 10 of karma items """
+        statdict = Statdict()
+        result = db.execute(""" SELECT item, value FROM karma """)
+        if not result: return []
+        for i in result:
+            if not i[0].startswith('quote '): continue
+            statdict.upitem(i[0], value=i[1])
+        return statdict.top(limit=limit)
+
+    def quotebad(self, limit=10):
+        """ show lowest 10 of negative karma items """
+        statdict = Statdict()
+        result = db.execute(""" SELECT item, value FROM karma """)
+        if not result: return []
+        for i in result:
+            if not i[0].startswith('quote '): continue
+            statdict.upitem(i[0], value=i[1])
+        return statdict.down(limit=limit)
+
+    def whatup(self, nick):
+        """ show what items are upped by nick """
+        nick = nick.lower()
+        statdict = Statdict()
+        result = db.execute(""" SELECT item FROM whokarma WHERE nick = %s AND updown = 'up' """, nick)
+        if not result: return []
+        for i in result: statdict.upitem(i[0])
+        return statdict.top()
+
+    def whatdown(self, nick):
+        """ show what items are lowered by nick """
+        nick = nick.lower()
+        statdict = Statdict()
+        result = db.execute(""" SELECT item FROM whokarma WHERE nick = %s AND updown = 'down' """, nick)
+        if not result:
+            return []
+        for i in result:
+            statdict.upitem(i[0])
+        return statdict.top()
+
+if not config['nodb']:
+    karma = KarmaDb()
+else:
+    karma = Karma(datadir)
+assert(karma)
+
+savelist.append(karma)
+
+ratelimited = []
+limiterlock = thread.allocate_lock()
+limlock = lockdec(limiterlock)
+
+def size():
+    """ return number of kamra items """
+    return karma.size()
+
+@limlock
+def ratelimit(bot, ievent):
+    """ karma rate limiter """
+    waittime = 30
+    limit = 2
+    try:
+        name = ievent.userhost
+        # Create a state for this user and his/her karma-state if necessary
+        if not bot.state.has_key(name):
+            bot.state[name] = {}
+        if not bot.state[name].has_key('karma'):
+            bot.state[name]['karma'] = {'count': 0, 'time': time.time() } 
+        # If the waittime has elapsed, reset the counter
+        if time.time() > (bot.state[name]['karma']['time'] + waittime):
+            bot.state[name]['karma']['count'] = 0 
+        # Update counter
+        bot.state[name]['karma']['count'] += 1
+        # If counter is too high, limit :)
+        if bot.state[name]['karma']['count'] > limit:
+            if name in ratelimited:
+                return 0
+            ievent.reply("karma limit reached, you'll have to wait %s \
+seconds" % int((bot.state[name]['karma']['time'] + waittime) - time.time()))
+            ratelimited.append(name)
+            return 0
+        # Update time
+        bot.state[name]['karma']['time'] = time.time()
+        # Ratelimiting passed :)
+        try:
+            ratelimited.remove(name)
+        except ValueError:
+            pass
+        return 1
+    except Exception, ex:
+        handle_exception(ievent)
+
+def handle_karmaget(bot, ievent):
+    """ karma-get <item> .. show karma of item """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    else:
+        item = ievent.rest
+    result = karma.get(item)
+    linklist = links[item]
+    linkresult = ""
+    total = 0
+    if linklist:
+        for i in linklist:
+            linkkarma = karma.get(i)
+            if linkkarma:
+                total += linkkarma
+                linkresult += "%s (%s) " % (i, linkkarma)
+    if result:
+        if linkresult:
+            total += result
+            ievent.reply("%s has karma %s .. %s .. total is %s" % (item, \
+str(result), linkresult, total))
+        else:
+            ievent.reply("%s has karma %s" % (item, str(result)))
+    else:
+        ievent.reply("%s has no karma yet" % item)
+
+cmnds.add('karma-get', handle_karmaget, ['USER', 'WEB', 'ANON', 'ANONKARMA'])
+examples.add('karma-get', 'karma-get <item> .. show karma of <item>', \
+'karma-get dunker')
+aliases.data['karma'] = 'karma-get'
+
+def handle_karmadel(bot, ievent):
+    """ karma-del <item> .. delete karma item """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    item = ievent.rest
+    result = karma.delete(item)
+    if result:
+        ievent.reply("%s deleted" % item)
+    else:
+        ievent.reply("can't delete %s" % item)
+
+cmnds.add('karma-del', handle_karmadel, ['OPER'])
+examples.add('karma-del', 'karma-del <item> .. delete karma item', \
+'karma-del dunker')
+
+def handle_karmaup(bot, ievent):
+    """ <item>++ ['#' <reason>] .. increase karma of item with optional \
+        reason """
+    if not ratelimit(bot, ievent):
+        return
+    (item, reason) = ievent.groups
+    item = item.strip().lower()
+    karma.upitem(item, reason=reason)
+    karma.setwhoup(item, ievent.nick)
+    ievent.reply('karma of '+ item + ' is now ' + str(karma.get(item)))
+
+rebefore.add(8, '^(.+)\+\+\s+#(.*)$', handle_karmaup, ['USER', 'KARMA', \
+'ANONKARMA'],  allowqueue=False)
+examples.add('++', "<item>++ ['#' <reason>] .. higher karma of item with 1 \
+(use optional reason)", '1) gozerbot++ 2) gozerbot++ # top bot')
+
+def handle_karmaup2(bot, ievent):
+    """ increase karma without reason """
+    ievent.groups += [None, ]
+    handle_karmaup(bot, ievent)
+
+rebefore.add(9, '^(.+)\+\+$', handle_karmaup2, ['USER', 'ANON', \
+'ANONKARMA'], allowqueue=False)
+
+def handle_karmadown(bot, ievent):
+    """ <item>-- ['#' <reason> .. decrease karma item with reason """
+    if not ratelimit(bot, ievent):
+        return
+    (item, reason) = ievent.groups
+    item = item.strip().lower()
+    karma.down(item, reason=reason)
+    karma.setwhodown(item, ievent.nick)
+    ievent.reply('karma of ' + item + ' is now ' + str(karma.get(item)))
+
+rebefore.add(8, '^(.+)\-\-\s+#(.*)$', handle_karmadown, ['USER', 'KARMA', \
+'ANONKARMA'], allowqueue=False)
+examples.add('--', "<item>-- ['#' <reason>] .. lower karma of item with 1 \
+(use optional reason)", '1) gozerbot-- 2) gozerbot-- # bad bot')
+
+def handle_karmadown2(bot, ievent):
+    """ decrease karma item without reason """
+    ievent.groups += [None, ]
+    handle_karmadown(bot, ievent)
+
+rebefore.add(9, '^(.+)\-\-$', handle_karmadown2, ['USER', 'KARMA', \
+'ANONKARMA'], allowqueue=False)
+
+def handle_karmawhyup(bot, ievent):
+    """ karma-whyup <item> .. show why karma of item has been increased """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    item = ievent.rest
+    result = karma.whykarmaup(item)
+    if result:
+        ievent.reply('whykarmaup of %s: ' % item, result, dot=True)
+    else:
+        ievent.reply('%s has no reason for karmaup yet' % item)
+
+cmnds.add('karma-whyup', handle_karmawhyup, ['USER', 'WEB', 'ANON', \
+'ANONKARMA'])
+examples.add('karma-whyup', 'karma-whyup <item> .. show the reason why \
+karma of <item> was raised', 'karma-whyup gozerbot')
+aliases.data['wku'] = 'karma-whyup'
+
+def handle_whykarmadown(bot, ievent):
+    """ karma-whydown <item> .. show why karma of item has been decreased """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    item = ievent.rest
+    result = karma.whykarmadown(item)
+    if result:
+        ievent.reply('whykarmadown of %s: ' % item, result, dot=True)
+    else:
+        ievent.reply('%s has no reason for karmadown yet' % item)
+
+cmnds.add('karma-whydown', handle_whykarmadown, ['USER', 'WEB', 'ANON', \
+'ANONKARMA'])
+examples.add('karma-whydown', 'karma-whydown <item> .. show the reason why \
+karma of <item> was lowered', 'karma-whydown gozerbot')
+aliases.data['wkd'] = 'karma-whydown'
+
+def handle_karmagood(bot, ievent):
+    """ karma-good .. show top 10 karma items """
+    result = karma.good(limit=10)
+    if result:
+        res = []
+        for i in result:
+            if i[1] > 0:
+                res.append("%s=%s" % (i[0], i[1]))
+        ievent.reply('goodness: ', res, dot=True)
+    else:
+        ievent.reply('karma void')
+
+cmnds.add('karma-good', handle_karmagood, ['USER', 'WEB', 'ANON', 'ANONKARMA'])
+examples.add('karma-good', 'show top 10 karma', 'karma-good')
+aliases.data['good'] = 'karma-good'
+
+def handle_karmabad(bot, ievent):
+    """ karma-bad .. show 10 most negative karma items """
+    result = karma.bad(limit=10)
+    if result:
+        res = []
+        for i in result:
+            if i[1] < 0:
+                res.append("%s=%s" % (i[0], i[1]))
+        ievent.reply('badness: ', res, dot=True)
+    else:
+        ievent.reply('karma void')
+
+cmnds.add('karma-bad', handle_karmabad, ['USER', 'WEB', 'ANON', 'ANONKARMA'])
+examples.add('karma-bad', 'show lowest top 10 karma', 'karma-bad')
+aliases.data['bad'] = 'karma-bad'
+
+def handle_whokarmaup(bot, ievent):
+    """ karma-whoup <item> .. show who increased a karma item """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    item = ievent.rest
+    result = karma.getwhoup(item)
+    statdict = Statdict()
+    if result:
+        for i in result:
+            statdict.upitem(i)
+        res = []
+        for i in statdict.top():
+            res.append("%s=%s" % i)
+        ievent.reply("whokarmaup of %s: " % item, res, dot=True)
+    else:
+        ievent.reply('no whokarmaup data available for %s' % item)
+
+cmnds.add('karma-whoup', handle_whokarmaup, ['USER', 'WEB', 'ANON', \
+'ANONKARMA'])
+examples.add('karma-whoup', 'karma-whoup <item> .. show who raised the \
+karma of <item>', 'karma-whoup gozerbot')
+
+def handle_whokarmadown(bot, ievent):
+    """ karma-whodown <item> .. show who decreased a karma item """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    item = ievent.rest
+    result = karma.getwhodown(item)
+    statdict = Statdict()
+    if result:
+        for i in result:
+            statdict.upitem(i)
+        res = []
+        for i in statdict.top():
+            res.append("%s=%s" % i)
+        ievent.reply("whokarmadown of %s: " % item, res, dot=True)
+    else:
+        ievent.reply('no whokarmadown data available for %s' % item)
+
+cmnds.add('karma-whodown', handle_whokarmadown, ['USER', 'WEB', 'ANON', \
+'ANONKARMA'])
+examples.add('karma-whodown', 'karma-whodown <item> .. show who lowered \
+the karma of <item>', 'karma-whodown gozerbot')
+
+def handle_karmasearch(bot, ievent):
+    """ karma-search <txt> .. search for karma items """
+    what = ievent.rest
+    if not what:
+        ievent.missing('<txt>')
+        return
+    result = karma.search(what)
+    if result:
+        res = []
+        for i in result:
+            res.append("%s (%s)" % (i[0], i[1]))
+        ievent.reply("karma items matching %s: " % what, res, dot=True)
+    else:
+        ievent.reply('no karma items matching %s found' % what)
+
+cmnds.add('karma-search', handle_karmasearch, ['USER', 'WEB', 'ANON', \
+'ANONKARMA'])
+examples.add('karma-search', 'karma-search <txt> .. search karma' , \
+'karma-search gozerbot')
+
+def handle_karmawhatup(bot, ievent):
+    """ show what karma items have been upped by nick """
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+    result = karma.whatup(nick)
+    if result:
+        res = []
+        for i in result:
+            res.append("%s (%s)" % i)
+        ievent.reply("karma items upped by %s: " % nick, res, dot=True)
+    else:
+        ievent.reply('no karma items upped by %s' % nick)
+
+cmnds.add('karma-whatup', handle_karmawhatup, ['USER', 'WEB', 'ANON', \
+'ANONKARMA'])
+examples.add('karma-whatup', 'karma-whatup <nick> .. show what karma items \
+<nick> has upped' , 'karma-whatup dunker')
+
+def handle_karmawhatdown(bot, ievent):
+    """ show what karma items have been lowered by nick """
+    try:
+        nick = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+    result = karma.whatdown(nick)
+    if result:
+        res = []
+        for i in result:
+            res.append("%s (%s)" % i)
+        ievent.reply("karma items downed by %s: " % nick, res, dot=True)
+    else:
+        ievent.reply('no karma items downed by %s' % nick)
+
+cmnds.add('karma-whatdown', handle_karmawhatdown, ['USER', 'WEB', 'ANON', \
+'ANONKARMA'])
+examples.add('karma-whatdown', 'karma-whatdown <nick> .. show what karma \
+items <nick> has downed' , 'karma-whatdown dunker')
--- gozerbot-0.99.1.orig/build/lib/gplugs/olddb/__init__.py
+++ gozerbot-0.99.1/build/lib/gplugs/olddb/__init__.py
@@ -0,0 +1,25 @@
+# gozerbot basic plugins
+#
+#
+
+""" register all .py files """
+
+__copyright__ = 'this file is in the public domain'
+
+import os
+
+(f, tail) = os.path.split(__file__)
+__all__ = []
+
+for i in os.listdir(f):
+    if i.endswith('.py'):
+        __all__.append(i[:-3])
+    elif os.path.isdir(f + os.sep + i) and not i.startswith('.'):
+        __all__.append(i)
+
+try:
+    __all__.remove('__init__')
+except:
+    pass
+
+__plugs__ = __all__
--- gozerbot-0.99.1.orig/build/lib/gplugs/olddb/todo.py
+++ gozerbot-0.99.1/build/lib/gplugs/olddb/todo.py
@@ -0,0 +1,708 @@
+# plugs/todo.py
+#
+#
+
+""" provide todo related commands """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import strtotime, striptime, getwho, today, lockdec
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.users import users
+from gozerbot.datadir import datadir
+from gozerbot.persist.persist import Persist
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliases
+from gozerbot.config import config
+from gplugs.alarm import alarms
+import time, thread, os
+
+plughelp.add('todo', 'manage todo lists .. by user or by channel .. a \
+time/data string can be provided.')
+
+todolock = thread.allocate_lock()
+locked = lockdec(todolock)
+
+class Todoitem:
+
+    """ a todo item """
+
+    def __init__(self, name, descr, ttime=None, duration=None, warnsec=None, \
+priority=None, num=0):
+        self.name = name
+        self.time = ttime
+        self.duration = duration
+        self.warnsec = warnsec
+        self.descr = descr
+        self.priority = priority
+        self.num = num
+
+    def __str__(self):
+        return "name: %s num: %d time: %s duration: %s warnsec: %s \
+description: %s priority: %s" % (self.name, self.num, \
+time.ctime(self.time), self.duration, self.warnsec, self.descr, self.priority)
+
+class Todolist:
+
+    """ a dict faking list of todo items .. index is number """
+
+    def __init__(self):
+        self.max = 0
+        self.data = {}
+
+    def __len__(self):
+        return len(self.data)
+
+    def __getitem__(self, num):
+        return self.data[num]
+
+    def __delitem__(self, num):
+        del self.data[num]
+
+    def __iter__(self):
+        tmplist = self.data.values()
+        tmplist.sort(lambda x, y: cmp(x.priority, y.priority), reverse=True)
+        return tmplist.__iter__()
+
+    def append(self, item):
+        """ add todo item """
+        self.max += 1
+        item.num = self.max
+        self.data[self.max] = item
+
+    def __str__(self):
+        return str(self.data)
+
+
+class Todo(Persist):
+
+    """ Todoos """
+
+    @locked
+    def __init__(self, filename):
+        Persist.__init__(self, filename)
+        if not self.data:
+            return
+        for key in self.data.keys():
+            todoos = self.data[key]
+            for (k, v) in todoos.data.items():
+                v.num = k
+            newd = Todolist()
+            for i in todoos:
+                newd.append(i)
+            self.data[key] = newd
+
+    def size(self):
+        """ return number of todo entries """
+        return len(self.data)
+
+    def get(self, name):
+        """ get todoos of <name> """
+        if self.data.has_key(name):
+            return self.data[name]
+
+    @locked
+    def add(self, name, txt, ttime, warnsec=0):
+        """ add a todo """
+        name = name.lower()
+        if not self.data.has_key(name):
+            self.data[name] = Todolist()
+        self.data[name].append(Todoitem(name, txt.strip(), ttime, \
+warnsec=0-warnsec))
+        self.save()
+        return len(self.data[name])
+
+    @locked
+    def addnosave(self, name, txt, ttime):
+        """ add but don't save """
+        name = name.lower()
+        if not self.data.has_key(name):
+            self.data[name] = Todolist()
+        self.data[name].append(Todoitem(name, txt, ttime))
+
+
+    @locked
+    def reset(self, name):
+        name = name.lower()
+        if self.data.has_key(name):
+           self.data[name] = Todolist()
+        self.save()
+
+    @locked
+    def delete(self, name, nr):
+        """ delete todo item """
+        if not self.data.has_key(name):
+            return 0
+        todoos = self.data[name]
+        try:
+            if todoos[nr].warnsec:
+                alarmnr = 0 - todoos[nr].warnsec
+                if alarmnr > 0:
+                    alarms.delete(alarmnr)
+            del todoos[nr]
+        except KeyError:
+            return 0
+        self.save()
+        return 1
+
+    def toolate(self, name):
+        """ show if there are any time related todoos that are too late """
+        now = time.time()
+        teller = 0
+        for i in self.data[name]:
+            if i.time < now:
+                teller += 1
+        return teller
+
+    def timetodo(self, name):
+        """ show todoos with time field set """
+        result = []
+        if not self.data.has_key(name):
+            return result
+        for i in self.data[name]:
+            if i.time:
+                result.append(i)
+        return result
+
+    def withintime(self, name, time1, time2):
+        """ show todoos within time frame """
+        result = []
+        if not self.data.has_key(name):
+            return result
+        for i in self.data[name]:
+            if i.time >= time1 and i.time < time2:
+                result.append(i)
+        return result
+
+    @locked
+    def setprio(self, who, itemnr, prio):
+        """ set priority of todo item """
+        try:
+            todoitems = self.get(who)
+            todoitems[itemnr].priority = prio
+            self.save()
+            return 1
+        except (KeyError, TypeError):
+            pass
+
+    def settime(self, who, itemnr, ttime):
+        """ set time of todo item """
+        try:
+            todoitems = self.get(who)
+            todoitems[itemnr].time = ttime
+            self.save()
+            return 1
+        except (KeyError, TypeError):
+            pass
+
+class TodoDb(object):
+
+    """ database todo interface """
+
+    def reset(self, name): 
+        result = db.execute(""" DELETE FROM todo WHERE name == %s """, name)
+        return result
+
+    def size(self):
+        """ return number of todo's """
+        result = db.execute(""" SELECT COUNT(*) FROM todo """)
+        return result[0][0]
+        
+    def get(self, name):
+        """ get todo list of <name> """
+        name = name.lower()
+        result = db.execute(""" SELECT * FROM todo WHERE name = %s ORDER BY \
+priority DESC, indx ASC """, name)
+        res = []
+        if result:
+            for i in result:
+                args = [i[1],i[5], i[2], i[3], i[4], i[6], i[0]]
+                res.append(Todoitem(*args))
+        return res
+
+    def getid(self, idnr):
+        """ get todo data of <idnr> """
+        result = db.execute(""" SELECT * FROM todo WHERE indx = %s """, idnr)
+        res = []
+        if result:
+            for i in result:
+                args = [i[1],i[5], i[2], i[3], i[4], i[6], i[0]]
+                res.append(Todoitem(*args))
+        return res
+        return result
+
+    def setprio(self, who, todonr, prio):
+        """ set priority of todonr """
+        result = db.execute(""" UPDATE todo SET priority = %s WHERE indx \
+= %s """, (prio, todonr))
+        return result
+
+    def getprio(self, who, todonr):
+        """ get priority of todonr """
+        result = db.execute(""" SELECT name, priority FROM todo WHERE \
+indx = %s """, todonr)
+        return result
+
+    def getwarnsec(self, todonr):
+        """ get priority of todonr """
+        result = db.execute(""" SELECT warnsec FROM todo WHERE \
+indx = %s """, todonr)
+        return result
+
+    def settime(self, who, todonr, ttime):
+        """ set time of todonr """
+        result = db.execute(""" UPDATE todo SET time = %s WHERE indx \
+= %s """, (ttime, todonr))
+        return result
+
+    def add(self, name, txt, ttime, alarmnr=None):
+        """ add a todo """
+        name = name.lower()
+        txt = txt.strip()
+        if ttime:
+            if not alarmnr:
+                result = db.execute(""" INSERT INTO todo(name, time, \
+descr) VALUES (%s, %s, %s) """, (name, ttime, txt))
+            else:
+                result = db.execute(""" INSERT INTO todo(name, time, \
+descr, warnsec) VALUES (%s, %s, %s, %s) """, (name, ttime, txt, 0-alarmnr))
+
+        else:
+            result = db.execute(""" INSERT INTO todo(name, descr) \
+VALUES (%s, %s) """, (name, txt))
+        return result
+
+    def delete(self, name, indexnr):
+        """ delete todo item """
+        name = name.lower()
+        try:
+            warnsec = self.getwarnsec(indexnr)[0][0]
+            if warnsec:
+                alarmnr = 0 - warnsec
+                if alarmnr > 0:
+                    alarms.delete(alarmnr)
+        except (IndexError, TypeError):
+            pass
+        result = db.execute(""" DELETE FROM todo WHERE name = %s AND \
+indx = %s """, (name, indexnr))
+        return result
+
+    def toolate(self, name):
+        """ show if there are any time related todoos that are too late """
+        name = name.lower()
+        now = time.time()
+        result = db.execute(""" SELECT * FROM todo WHERE name = %s AND \
+time < %s """, (name, now))
+        res = []
+        if result:
+            for i in result:
+                args = [i[1],i[5], i[2], i[3], i[4], i[6], i[0]]
+                res.append(Todoitem(*args))
+        return res
+
+    def withintime(self, name, time1, time2):
+        """ show todo list within time frame """
+        name = name.lower()
+        result = db.execute(""" SELECT * FROM todo WHERE name = %s AND \
+time > %s AND time < %s """, (name, time1, time2))
+        res = []
+        if result:
+            for i in result:
+                args = [i[1],i[5], i[2], i[3], i[4], i[6], i[0]]
+                res.append(Todoitem(*args))
+        return res
+
+    def timetodo(self, name):
+        name = name.lower()
+        now = time.time()
+        result = db.execute(""" SELECT * FROM todo WHERE time AND name = %s \
+""", name)
+        res = []
+        if result:
+            for i in result:
+                args = [i[1],i[5], i[2], i[3], i[4], i[6], i[0]]
+                res.append(Todoitem(*args))
+        return res
+
+    def reset(self, name):
+        """ reset todo items of user with <name> """
+        name = name.lower()
+        result = db.execute(""" DELETE FROM todo WHERE name = %s """, (name, ))
+        return result
+
+if not config['nodb']:
+    from gozerbot.database.db import db
+    todo = TodoDb()
+else:
+    todo = Todo(datadir + os.sep + 'todo')
+    if not todo.data:
+        todo.data = {}
+
+def size():
+    """ return number of todo entries """
+    return todo.size()
+
+def handle_todo(bot, ievent):
+    """ todo [<item>] .. show todo's or set todo item .. a time/date can be \
+given"""
+    if len(ievent.args) > 0:
+        handle_todo2(bot, ievent)
+        return
+    name = users.getname(ievent.userhost)
+    try:
+        todoos = todo.get(name)
+    except KeyError:
+        ievent.reply('i dont have todo info for %s' % user.name)
+        return
+    saytodo(bot, ievent, todoos)
+
+def handle_todo2(bot, ievent):
+    """ set todo item """
+    if not ievent.rest:
+        ievent.missing("<what>")
+        return
+    else:
+        what = ievent.rest
+    name = users.getname(ievent.userhost)
+    ttime = strtotime(what)
+    nr = 0
+    if not ttime  == None:
+        ievent.reply('time detected ' + time.ctime(ttime))
+        what = striptime(what)
+        alarmnr = alarms.add(bot.name, ievent.nick, ttime, what)
+        nr = todo.add(name, what, ttime, alarmnr)
+    else:
+        nr = todo.add(name, what, None)
+    ievent.reply('todo item %s added' % nr)
+
+cmnds.add('todo', handle_todo, 'USER')
+examples.add('todo', 'todo [<item>] .. show todo items or add a todo item', \
+'1) todo 2) todo program the bot 3) todo 22:00 sleep')
+
+def handle_tododone(bot, ievent):
+    """ todo-done <listofnrs> .. remove todo items """
+    if len(ievent.args) == 0:
+        ievent.missing('<list of nrs>')
+        return
+    try:
+        nrs = []
+        for i in ievent.args:
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    name = users.getname(ievent.userhost)
+    nrdone = 0
+    for i in nrs:
+        nrdone += todo.delete(name, i)
+    if nrdone == 1:
+        ievent.reply('%s item deleted' % nrdone)
+    elif nrdone == 0:
+        ievent.reply('no items deleted')
+    else:
+        ievent.reply('%s items deleted' % nrdone)
+
+cmnds.add('todo-done', handle_tododone, 'USER')
+examples.add('todo-done', 'todo-done <listofnrs> .. remove items from \
+todo list', '1) todo-done 1 2) todo-done 3 5 8')
+aliases.data['done'] = 'todo-done'
+
+def handle_chantodo(bot, ievent):
+    """ todo-chan [<item>] .. show channel todo's or set todo item for \
+channel"""
+    if ievent.rest:
+        handle_chantodo2(bot, ievent)
+        return
+    todoos = todo.get(ievent.channel)
+    saytodo(bot, ievent, todoos)
+
+def handle_chantodo2(bot, ievent):
+    """ set todo item for channel"""
+    what = ievent.rest
+    ttime = strtotime(what)
+    nr = 0
+    if not ttime  == None:
+        ievent.reply('time detected ' + time.ctime(ttime))
+        result = '(%s) ' % ievent.nick + striptime(what)
+        alarmnr = alarms.add(bot.name, ievent.channel, ttime, result)
+        nr = todo.add(ievent.channel, result, ttime, alarmnr)
+    else:
+        result = '(%s) ' % ievent.nick + what
+        nr = todo.add(ievent.channel, result, None)
+    ievent.reply('todo item %s added' % nr)
+
+cmnds.add('todo-chan', handle_chantodo, 'USER')
+examples.add('todo-chan', 'todo-chan [<item>] .. add channel todo', \
+'todo-chan fix bla')
+aliases.data['chantodo'] = 'todo-chan'
+
+def handle_todochandone(bot, ievent):
+    """ todo-chandone <listofnrs> .. remove channel todo item """
+    if not ievent.rest:
+        ievent.missing('<list of nrs>')
+        return
+    data = ievent.rest.split()
+    try:
+        nrs = []
+        for i in data:
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    nrdone = 0
+    for i in nrs:
+        nrdone += todo.delete(ievent.channel, i)
+    if nrdone == 1:
+        ievent.reply('%s item deleted' % nrdone)
+    elif nrdone == 0:
+        ievent.reply('no items deleted')
+    else:
+        ievent.reply('%s items deleted' % nrdone)
+
+cmnds.add('todo-chandone', handle_todochandone, 'USER')
+examples.add('todo-chandone', 'todo-chandone <listofnrs> .. remove item \
+from channel todo list', 'todo-chandone 2')
+aliases.data['chandone'] = 'todo-chandone'
+
+def handle_settodo(bot, ievent):
+    """ todo-set <name> <txt> .. add a todo to another user's todo list"""
+    try:
+        who = ievent.args[0]
+        what = ' '.join(ievent.args[1:])
+    except IndexError:
+        ievent.missing('<nick> <what>')
+        return
+    if not what:
+        ievent.missing('<nick> <what>')
+        return
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("can't find userhost for %s" % who)
+        return
+    whouser = users.getname(userhost)
+    if not whouser:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    name = users.getname(ievent.userhost)
+    if not users.permitted(userhost, name, 'todo'):
+        ievent.reply("%s doesn't permit todo sharing for %s " % \
+(who, name))
+        return
+    what = "%s: %s" % (ievent.nick, what)
+    ttime = strtotime(what)
+    nr = 0
+    if not ttime  == None:
+        ievent.reply('time detected ' + time.ctime(ttime))
+        what = striptime(what)
+        alarmnr = alarms.add(bot.name, who, ttime, what)
+        nr = todo.add(whouser, what, ttime, alarmnr)
+    else:
+        nr = todo.add(whouser, what, None)
+    ievent.reply('todo item %s added' % nr)
+
+cmnds.add('todo-set', handle_settodo, 'USER')
+examples.add('todo-set', 'todo-set <nick> <txt> .. set todo item of \
+<nick>', 'todo-set dunker bot proggen')
+
+def handle_gettodo(bot, ievent):
+    """ todo-get <nick> .. get todo of another user """
+    try:
+        who = ievent.args[0]
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("can't find userhost for %s" % who)
+        return
+    whouser = users.getname(userhost)
+    if not whouser:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    name = users.getname(ievent.userhost)
+    if not users.permitted(userhost, name, 'todo'):
+        ievent.reply("%s doesn't permit todo sharing for %s " % (who, name))
+        return
+    todoos = todo.get(whouser)
+    saytodo(bot, ievent, todoos)
+
+cmnds.add('todo-get', handle_gettodo, ['USER', 'WEB'])
+examples.add('todo-get', 'todo-get <nick> .. get the todo list of \
+<nick>', 'todo-get dunker')
+
+def handle_todotime(bot, ievent):
+    """ todo-time .. show time related todoos """
+    name = users.getname(ievent.userhost)
+    todoos = todo.timetodo(name)
+    saytodo(bot, ievent, todoos)
+
+cmnds.add('todo-time', handle_todotime, 'USER')
+examples.add('todo-time', 'todo-time .. show todo items with time fields', \
+'todo-time')
+aliases.data['tt'] = 'todo-time'
+
+def handle_todoweek(bot, ievent):
+    """ todo-week .. show time related todo items for this week """
+    name = users.getname(ievent.userhost)
+    todoos = todo.withintime(name, today(), today()+7*24*60*60)
+    saytodo(bot, ievent, todoos)
+
+cmnds.add('todo-week', handle_todoweek, 'USER')
+examples.add('todo-week', 'todo-week .. todo items for this week', 'todo-week')
+
+def handle_today(bot, ievent):
+    """ todo-today .. show time related todo items for today """
+    name = users.getname(ievent.userhost)
+    todoos = todo.withintime(name, today(), today()+24*60*60)
+    saytodo(bot, ievent, todoos)
+
+cmnds.add('todo-today', handle_today, 'USER')
+examples.add('todo-today', 'todo-today .. todo items for today', 'todo-today')
+aliases.data['today'] = 'todo-today'
+
+def handle_tomorrow(bot, ievent):
+    """ todo-tomorrow .. show time related todo items for tomorrow """
+    username = users.getname(ievent.userhost)
+    if ievent.rest:
+        what = ievent.rest
+        ttime = strtotime(what)
+        if ttime != None:
+            if ttime < today() or ttime > today() + 24*60*60:
+                ievent.reply("%s is not tomorrow" % \
+time.ctime(ttime + 24*60*60))
+                return
+            ttime += 24*60*60
+            ievent.reply('time detected ' + time.ctime(ttime))
+            what = striptime(what)
+        else:
+            ttime = today() + 42*60*60
+        todo.add(username, what, ttime)   
+        ievent.reply('todo added')    
+        return
+    todoos = todo.withintime(username, today()+24*60*60, today()+2*24*60*60)
+    saytodo(bot, ievent, todoos)
+
+cmnds.add('todo-tomorrow', handle_tomorrow, 'USER')
+examples.add('todo-tomorrow', 'todo-tomorrow .. todo items for tomorrow', \
+'todo-tomorrow')
+aliases.data['tomorrow'] = 'todo-tomorrow'
+
+def handle_setpriority(bot, ievent):
+    """ todo-setprio [<channel|name>] <itemnr> <prio> .. show priority \
+        on todo item """
+    try:
+        (who, itemnr, prio) = ievent.args
+    except ValueError:
+        try:
+            (itemnr, prio) = ievent.args
+            who = users.getname(ievent.userhost)
+        except ValueError:
+            ievent.missing('[<channe|namel>] <itemnr> <priority>')
+            return
+    try:
+        itemnr = int(itemnr)
+        prio = int(prio)
+    except ValueError:
+        ievent.missing('[<channel|name>] <itemnr> <priority>')
+        return
+    who = who.lower()
+    if not todo.setprio(who, itemnr, prio):
+        ievent.reply('no todo %s found for %s' % (itemnr, who))
+        return
+    ievent.reply('priority set')
+
+cmnds.add('todo-setprio', handle_setpriority, 'USER')
+examples.add('todo-setprio', 'todo-setprio [<channel|name>] <itemnr> <prio> \
+.. set todo priority', '1) todo-setprio #dunkbots 2 5 2) todo-setprio owner \
+3 10 3) todo-setprio 2 10')
+aliases.data['setprio'] = 'todo-setprio'
+
+def handle_todosettime(bot, ievent):
+    """ todo-settime [<channel|name>] <itemnr> <timestring> .. set time \
+        on todo item """
+    ttime = strtotime(ievent.txt)
+    if ttime == None:
+        ievent.reply("can't detect time")
+        return   
+    txt = striptime(ievent.txt)
+    try:
+        (who, itemnr) = txt.split()
+    except ValueError:
+        try:
+            (itemnr, ) = txt.split()
+            who = users.getname(ievent.userhost)
+        except ValueError:
+            ievent.missing('[<channe|namel>] <itemnr> <timestring>')
+            return
+    try:
+        itemnr = int(itemnr)
+    except ValueError:
+        ievent.missing('[<channel|name>] <itemnr> <timestring>')
+        return
+    who = who.lower()
+    if not todo.settime(who, itemnr, ttime):
+        ievent.reply('no todo %s found for %s' % (itemnr, who))
+        return
+    ievent.reply('time of todo %s set to %s' % (itemnr, time.ctime(ttime)))
+
+cmnds.add('todo-settime', handle_todosettime, 'USER')
+examples.add('todo-settime', 'todo-settime [<channel|name>] <itemnr> \
+<timestring> .. set todo time', '1) todo-settime #dunkbots 2 13:00 2) \
+todo-settime owner 3 2-2-2010 3) todo-settime 2 22:00')
+
+def handle_getpriority(bot, ievent):
+    """ todo-getprio <[channel|name]> <itemnr> .. get priority of todo \
+        item """
+    try:
+        (who, itemnr) = ievent.args
+    except ValueError:
+        try:
+            itemnr = ievent.args[0]
+            who = users.getname(ievent.userhost)
+        except IndexError:
+            ievent.missing('[<channel|name>] <itemnr>')
+            return
+    try:
+        itemnr = int(itemnr)
+    except ValueError:
+        ievent.missing('[<channel|name>] <itemnr>')
+        return
+    who = who.lower()
+    todoitems = todo.get(who)
+    if not todoitems:
+        ievent.reply('no todoitems known for %s' % who)
+        return
+    try:
+        prio = todoitems[itemnr].priority
+    except (IndexError, KeyError):
+        ievent.reply('no todo item %s known for %s' % (itemnr, who))
+        return
+    ievent.reply('priority is %s' % prio)
+
+cmnds.add('todo-getprio', handle_getpriority, 'USER')
+examples.add('todo-getprio', 'todo-getprio [<channel|name>] <itemnr> .. get \
+todo priority', '1) todo-getprio #dunkbots 5 2) todo-getprio 3')
+aliases.data['prio'] = 'todo-getprio'
+
+def saytodo(bot, ievent, todoos):
+    """ output todo items of <name> """
+    result = []
+    now = time.time()
+    if not todoos:
+        ievent.reply('nothing todo ;]')
+        return
+    for i in todoos:
+        res = ""
+        res += "%s) " % i.num
+        if i.time:
+            if i.time < now:
+                res += 'TOO LATE: '
+            res += "%s %s " % (i.time, i.descr)
+        else:
+            res += "%s " % i.descr
+        if i.priority:
+            res += "[%+d] " % i.priority
+        result.append(res.strip())
+    if result:
+        ievent.reply("todolist of %s: " % ievent.nick, result, nritems=True)
--- gozerbot-0.99.1.orig/build/lib/gplugs/olddb/quote.py
+++ gozerbot-0.99.1/build/lib/gplugs/olddb/quote.py
@@ -0,0 +1,463 @@
+# plugs/quote.py
+#
+#
+
+""" quotes plugin """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.persist.persist import Persist
+from gozerbot.utils.nextid import nextid
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.datadir import datadir
+from gozerbot.generic import lockdec, rlog
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliases
+from gozerbot.config import config
+if not config['nodb']:
+    from gozerbot.database.db import db
+from gplugs.olddb.karma import karma
+import random, re, time, thread, os
+
+plughelp.add('quote', 'manage quotes')
+
+class Quoteitem(object):
+
+    """ object representing a quote """
+
+    def __init__(self, idnr, txt, nick=None, userhost=None, ttime=None):
+        self.id = idnr
+        self.txt = txt
+        self.nick = nick
+        self.userhost = userhost
+        self.time = ttime
+
+quoteslock = thread.allocate_lock()
+locked = lockdec(quoteslock)
+
+class Quotes(Persist):
+
+    """ list of quotes """
+
+    @locked
+    def __init__(self, fname):
+        Persist.__init__(self, fname)
+        if not self.data:
+            self.data = []
+
+    def size(self):
+        """ return nr of quotes """
+        return len(self.data)
+
+    @locked
+    def add(self, nick, userhost, quote):
+        """ add a quote """
+        id = nextid.next('quotes')
+        item = Quoteitem(id, quote, nick, userhost, \
+time.time())
+        self.data.append(item)
+        self.save()
+        return id
+
+    @locked
+    def addnosave(self, nick, userhost, quote, ttime):
+        """ add quote but don't call save """
+        id = nextid.next('quotes')
+        item = Quoteitem(nextid.next('quotes'), quote, nick, userhost, ttime)
+        self.data.append(item)
+        return id
+
+    @locked
+    def delete(self, quotenr):
+        """ delete quote with id == nr """
+        for i in range(len(self.data)):
+            if self.data[i].id == quotenr:
+                del self.data[i]
+                self.save()
+                return 1
+
+    def random(self):
+        """ get random quote """
+        if not self.data:
+            return None
+        quotenr = random.randint(0, len(self.data)-1)
+        return self.data[quotenr]
+
+    def idquote(self, quotenr):
+        """ get quote by id """
+        for i in self.data:
+            if i.id == quotenr:
+                return i
+
+    def whoquote(self, quotenr):
+        """ get who quoted the quote """
+        for i in self.data:
+            if i.id == quotenr:
+                return (i.nick, i.time)
+
+    def last(self, nr=1):
+        """ get last quote """
+        return self.data[len(self.data)-nr:]
+
+    def search(self, what):
+        """ search quotes """
+        if not self.data:
+            return []
+        result = []
+        andre = re.compile('and', re.I)
+        ands = re.split(andre, what)
+        got = 0
+        for i in self.data:
+            for item in ands:
+                if i.txt.find(item.strip()) == -1:
+                    got = 0
+                    break  
+                got = 1
+            if got:                  
+                result.append(i)
+        return result
+
+    def searchlast(self, what, nr=1):
+        """ search quotes backwards limit to 1"""
+        if not self.data:
+            return []
+        result = []
+        andre = re.compile('and', re.I)
+        ands = re.split(andre, what)
+        got = 0
+        for i in self.data[::-1]:
+            for item in ands:
+                if i.txt.find(item.strip()) == -1:
+                    got = 0
+                    break  
+                got = 1
+            if got:                  
+                result.append(i)
+                got = 0
+        return result
+
+class QuotesDb(object):
+
+    """ quotes db interface """
+
+    def size(self):
+        """ return nr of quotes """
+        result = db.execute(""" SELECT COUNT(*) FROM quotes """)
+        return result[0][0]
+
+    def add(self, nick, userhost, quote):
+        """ add a quote """
+        result = db.execute(""" INSERT INTO quotes(quote, userhost, \
+createtime, nick) VALUES (%s, %s, %s, %s) """, (quote, userhost, \
+time.time(), nick))
+        return result
+
+    def delete(self, quotenr):
+        """ delete quote with id == nr """
+        result = db.execute(""" DELETE FROM quotes WHERE indx = %s """, \
+(quotenr, ))
+        return result
+
+    def random(self):
+        """ get random quote """
+        result = db.execute(""" SELECT indx FROM quotes """)
+        indices = []
+        if not result:
+            return None
+        for i in result:
+            indices.append(i[0])
+        if indices:
+            idnr = random.choice(indices)
+            return self.idquote(idnr)
+
+    def idquote(self, quotenr):
+        """ get quote by id """
+        if quotenr == 0:
+            return None
+        result = db.execute(""" SELECT indx, quote FROM quotes WHERE \
+indx = %s """, quotenr)
+        if result:
+            return Quoteitem(*result[0])
+
+    def whoquote(self, quotenr):
+        """ get who quoted the quote """
+        result = db.execute(""" SELECT nick, createtime FROM quotes WHERE \
+indx = %s """, (quotenr, ))
+        if result:
+            return result[0]
+
+    def last(self, nr=1):
+        """ get last quote """
+        result = db.execute(""" SELECT indx, quote FROM quotes ORDER BY \
+indx DESC LIMIT %s """, (nr, ))
+        res = []
+        if result:
+            for i in result:
+                res.append(Quoteitem(*i))
+        return res
+
+    def search(self, what):
+        """ search quotes """
+        result = db.execute(""" SELECT indx, quote FROM quotes WHERE \
+quote LIKE %s """, '%%%s%%' % what)
+        res = []
+        if result:
+            for i in result:
+                res.append(Quoteitem(*i))
+        return res
+
+    def searchlast(self, what, nr):
+        """ search quotes """
+        result = db.execute(""" SELECT indx, quote FROM quotes WHERE \
+quote LIKE %s ORDER BY indx DESC LIMIT %s """, ('%%%s%%' % what, nr))
+        res = []
+        if result:
+            for i in result:
+                res.append(Quoteitem(*i))
+        return res
+
+if not config['nodb']:
+    quotes = QuotesDb()
+else:
+    quotes = Quotes(datadir + os.sep + 'quotes')
+assert(quotes)
+
+def size():
+    """ return number of quotes """
+    return quotes.size()
+
+def search(what, queue):
+    """ search the quotes """
+    rlog(10, 'quote', 'searched for %s' % what)
+    result = quotes.search(what)
+    for i in result:
+        queue.put_nowait("#%s %s" % (i.id, i.txt))
+
+def handle_quoteadd(bot, ievent):
+    """ quote-add <txt> .. add a quote """
+    if not ievent.rest:
+        ievent.missing("<quote>")
+        return
+    idnr = quotes.add(ievent.nick, ievent.userhost, ievent.rest)
+    ievent.reply('quote %s added' % idnr)
+
+cmnds.add('quote-add', handle_quoteadd, ['USER', 'QUOTEADD'], allowqueue=False)
+examples.add('quote-add', 'quote-add <txt> .. add quote', 'quote-add mekker')
+aliases.data['aq'] = 'quote-add'
+
+def handle_quotewho(bot, ievent):
+    """ quote-who <nr> .. show who added a quote """
+    try:
+        quotenr = int(ievent.args[0])
+    except IndexError:
+        ievent.missing("<nr>")
+        return
+    except ValueError:
+        ievent.reply("argument must be an integer")
+        return
+    result = quotes.whoquote(quotenr)
+    if not result or not result[0] or not result[1]:
+        ievent.reply('no who quote data available')
+        return
+    print result
+    ievent.reply('quote #%s was made by %s on %s' % (quotenr, result[0], result[1]))
+
+cmnds.add('quote-who', handle_quotewho, ['USER', 'WEB', 'ANON', 'ANONQUOTE'])
+examples.add('quote-who', 'quote-who <nr> .. show who quote <nr>', \
+'quote-who 1')
+aliases.data['wq'] = 'quote-who'
+
+def handle_quotedel(bot, ievent):
+    """ quote-del <nr> .. delete quote by id """
+    try:
+        quotenr = int(ievent.args[0])
+    except IndexError:
+        ievent.missing('<nr>')
+        return
+    except ValueError:
+        ievent.reply('argument needs to be an integer')
+        return
+    if quotes.delete(quotenr):
+        ievent.reply('quote deleted')
+    else:
+        ievent.reply("can't delete quote with nr %s" % quotenr)
+
+cmnds.add('quote-del', handle_quotedel, ['QUOTEDEL', 'OPER', 'QUOTE'])
+examples.add('quote-del', 'quote-del <nr> .. delete quote', 'quote-del 2')
+aliases.data['dq'] = 'quote-del'
+
+def handle_quotelast(bot, ievent):
+    """ quote-last .. show last quote """
+    search = ""
+    try:
+        (nr, search) = ievent.args
+        nr = int(nr)  
+    except ValueError:
+        try:
+            nr = ievent.args[0]
+            nr = int(nr)
+        except (IndexError, ValueError):
+            nr = 1
+            try:
+                search = ievent.args[0]
+            except IndexError:
+                search = ""
+    if nr < 1 or nr > 4:
+        ievent.reply('nr needs to be between 1 and 4')
+        return
+    search = re.sub('^d', '', search)
+    if search:
+        quotelist = quotes.searchlast(search, nr)
+    else:
+        quotelist = quotes.last(nr)
+    if quotelist != None:
+        for quote in quotelist:
+            qkarma = karma.get('quote %s' % quote.id)
+            if qkarma:
+                ievent.reply('#%s (%s) %s' % (quote.id, qkarma, quote.txt))
+            else:
+                ievent.reply('#%s %s' % (quote.id, quote.txt))
+    else:
+        ievent.reply("can't fetch quote")
+
+cmnds.add('quote-last', handle_quotelast, ['USER', 'WEB', 'ANON', 'ANONQUOTE'])
+examples.add('quote-last', 'show last quote', 'quote-last')
+aliases.data['lq'] = 'quote-last'
+
+def handle_quote2(bot, ievent):
+    """ quote-2 .. show 2 random quotes """
+    quote = quotes.random()
+    if quote != None:
+        qkarma = karma.get('quote %s' % quote.id)
+        if qkarma:
+            ievent.reply('#%s (%s) %s' % (quote.id, qkarma, quote.txt))
+        else:
+            ievent.reply('#%s %s' % (quote.id, quote.txt))
+    else:
+        ievent.reply('no quotes yet')
+        return
+    quote = quotes.random()
+    if quote != None:
+        qkarma = karma.get('quote %s' % quote.id)
+        if qkarma:
+            ievent.reply('#%s (%s) %s' % (quote.id, qkarma, quote.txt))
+        else:
+            ievent.reply('#%s %s' % (quote.id, quote.txt))
+
+cmnds.add('quote-2', handle_quote2, ['USER', 'WEB', 'ANON', 'ANONQUOTE'])
+examples.add('quote-2', 'quote-2 .. show 2 random quotes', 'quote-2')
+aliases.data['2q'] = 'quote-2'
+
+def handle_quoteid(bot, ievent):
+    """ quote-id <nr> .. show quote by id """
+    try:
+        quotenr = int(ievent.args[0])
+    except IndexError:
+        ievent.missing('<nr>')
+        return
+    except ValueError:
+        ievent.reply('argument must be an integer')
+        return
+    quote = quotes.idquote(quotenr)
+    if quote != None:
+        qkarma = karma.get('quote %s' % quote.id)
+        if qkarma:
+            ievent.reply('#%s (%s) %s' % (quote.id, qkarma, quote.txt))
+        else:
+            ievent.reply('#%s %s' % (quote.id, quote.txt))
+    else:
+        ievent.reply("can't fetch quote with id %s" % quotenr)
+
+cmnds.add('quote-id', handle_quoteid, ['USER', 'WEB', 'ANON', 'ANONQUOTE'])
+examples.add('quote-id', 'quote-id <nr> .. get quote <nr>', 'quote-id 2')
+aliases.data['iq'] = 'quote-id'
+
+def handle_quote(bot, ievent):
+    """ quote .. show random quote """
+    quote = quotes.random()
+    if quote != None:
+        qkarma = karma.get('quote %s' % quote.id)
+        if qkarma:
+            ievent.reply('#%s (%s) %s' % (quote.id, qkarma, quote.txt))
+        else:
+            ievent.reply('#%s %s' % (quote.id, quote.txt))
+    else:
+        ievent.reply('no quotes yet')
+
+cmnds.add('quote', handle_quote, ['USER', 'WEB', 'ANON', 'ANONQUOTE'])
+examples.add('quote', 'show random quote', 'quote')
+aliases.data['q'] = 'quote'
+
+def handle_quotesearch(bot, ievent):
+    """ quote-search <txt> .. search quotes """
+    if not ievent.rest:
+        ievent.missing('<item>')
+        return
+    else:
+        what = ievent.rest
+        nrtimes = 3
+    result = quotes.search(what)
+    if result:
+        if ievent.queues:
+            res = []
+            for quote in result:
+                res.append('#%s %s' % (quote.id, quote.txt))
+            ievent.reply(res)
+            return            
+        if nrtimes > len(result):
+            nrtimes = len(result)
+        randquotes = random.sample(result, nrtimes)
+        for quote in randquotes:
+            qkarma = karma.get('quote %s' % quote.id)
+            if qkarma:
+                ievent.reply('#%s (%s) %s' % (quote.id, qkarma, quote.txt))
+            else:
+                ievent.reply("#%s %s" % (quote.id, quote.txt))
+    else:
+        ievent.reply('no quotes found with %s' % what)
+
+cmnds.add('quote-search', handle_quotesearch, ['USER', 'WEB', 'ANON', \
+'ANONQUOTE'])
+examples.add('quote-search', 'quote-search <txt> .. search quotes for <txt>'\
+, 'quote-search bla')
+aliases.data['sq'] = 'quote-search'
+
+def handle_quotescount(bot, ievent):
+    """ quote-count .. show number of quotes """
+    ievent.reply('quotes count is %s' % quotes.size())
+
+cmnds.add('quote-count', handle_quotescount, ['USER', 'WEB', 'ANON', \
+'ANONQUOTE'])
+examples.add('quote-count', 'count nr of quotes', 'quote-count')
+aliases.data['cq'] = 'quote-count'
+
+def handle_quotegood(bot, ievent):
+    """ show top ten positive karma """
+    result = karma.quotegood(limit=10)
+    if result:
+        resultstr = ""
+        for i in result:
+            if i[1] > 0:
+                resultstr += "%s: %s " % (i[0], i[1])
+        ievent.reply('quote goodness: %s' % resultstr)
+    else:
+        ievent.reply('quote karma void')
+
+cmnds.add('quote-good', handle_quotegood, ['USER', 'WEB', 'ANON', 'ANONQUOTE'])
+examples.add('quote-good', 'show top 10 quote karma', 'quote-good')
+
+def handle_quotebad(bot, ievent):
+    """ show top ten negative karma """
+    result = karma.quotebad(limit=10)
+    if result:
+        resultstr = ""
+        for i in result:
+            if i[1] < 0:
+                resultstr += "%s: %s " % (i[0], i[1])
+        ievent.reply('quote badness: %s' % resultstr)
+    else:
+        ievent.reply('quote karma void')
+
+cmnds.add('quote-bad', handle_quotebad, ['USER', 'WEB', 'ANON', 'ANONQUOTE'])
+examples.add('quote-bad', 'show lowest 10 quote karma', 'quote-bad')
--- gozerbot-0.99.1.orig/build/lib/gplugs/olddb/lists.py
+++ gozerbot-0.99.1/build/lib/gplugs/olddb/lists.py
@@ -0,0 +1,359 @@
+# dbplugs/lists.py
+#
+#
+#
+
+""" lists per global/channel/user """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import handle_exception
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.users import users
+from gozerbot.database.db import db
+
+plughelp.add('lists', 'maintain lists')
+
+def size():
+    """ return number of lists """
+    result = db.execute(""" SELECT COUNT(*) FROM list """)
+    return result[0][0]
+
+def getlists(username):
+    """ get all lists of user """
+    result = db.execute(""" SELECT * FROM list WHERE username = %s """, \
+username)
+    return result
+
+def getlist(username, listname):
+    """ get list of user """
+    result = db.execute(""" SELECT * FROM list WHERE username = %s AND \
+listname = %s """, (username, listname))
+    return result
+
+def addtolist(username, listname, item):
+    """ add item to list """
+    result = db.execute(""" INSERT INTO list(username, listname, item) \
+VALUES(%s, %s, %s) """, (username, listname, item))
+    return result
+
+def delfromlist(username, indx):
+    """ delete item from list """
+    result = db.execute(""" DELETE FROM list WHERE username = %s AND indx = %s \
+""", (username, indx))
+    return result
+
+def mergelist(username, listname, l):
+    """ merge 2 lists """
+    for i in l:
+        addtolist(username, listname, i)
+
+def handle_listsglobal(bot, ievent):
+    """ lists <listname> [',' <item>] .. global lists"""
+    if not ievent.rest:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    try:
+        listname, item = ievent.rest.split(',', 1)
+    except ValueError:
+        l = getlist('all', ievent.rest)
+        if not l:
+            ievent.reply('no %s list available' % ievent.rest)
+            return
+        result = []
+        for i in l:
+            result.append("%s) %s" % (i[0], i[3]))
+        ievent.reply(result)
+        return
+    listname = listname.strip().lower()
+    item = item.strip()
+    if not listname or not item:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    result = 0
+    try:
+        result = addtolist('all', listname, item)
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if result:
+        ievent.reply('%s added to %s list' % (item, listname))
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('lists-global', handle_listsglobal, 'USER')
+examples.add('lists-global', "lists-global <listname> [',' <item>] .. show \
+content of list or add item to list", '1) lists-global bla 2) lists-global \
+bla, mekker')
+
+def handle_listsglobaldel(bot, ievent):
+    """ list-globaldel <listname> ',' <listofnrs> .. remove items with \
+indexnr from list """
+    if not ievent.rest:
+        ievent.missing('<listofnrs>')
+        return
+    try:
+        nrs = []
+        for i in ievent.rest.split():
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    nrs.sort()
+    failed = []
+    itemsdeleted = 0
+    try:
+        for i in nrs:
+            result = delfromlist('all', i)
+            if not result:
+                failed.append(i)
+            else:
+                itemsdeleted += 1
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if failed:
+        ievent.reply('failed to delete %s' % ' '.join(failed))
+    ievent.reply('%s item(s) removed' % itemsdeleted)
+
+cmnds.add('lists-globaldel', handle_listsglobaldel, 'USER')
+examples.add('lists-globaldel', "lists-globaldel <listname> ',' <listofnrs> \
+.. remove items with indexnr from list", '1) lists-globaldel mekker , 1 2) \
+lists-globaldel mekker , 0 3 6')
+
+def handle_listsglobalshow(bot, ievent):
+    """ show avaiable global lists """
+    l = getlists('all')
+    if not l:
+        ievent.reply('no lists available')
+        return
+    else:
+        result = []
+        for i in l:
+            if not i[2] in result:
+                result.append(i[2])
+        if result:
+            ievent.reply(result, dot=True)
+
+cmnds.add('lists-globalshow', handle_listsglobalshow, 'USER')
+examples.add('lists-globalshow', 'show available global lists' , \
+'lists-globalshow')
+
+def handle_listschan(bot, ievent):
+    """ lists-chan <listname> [',' <item>] .. global lists"""
+    if not ievent.rest:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    try:
+        listname, item = ievent.rest.split(',', 1)
+    except ValueError:
+        l = getlist(ievent.channel, ievent.rest)
+        if not l:
+            ievent.reply('no %s list available' % ievent.rest)
+            return
+        result = []
+        for i in l:
+            result.append("%s) %s" % (i[0], i[3]))
+        ievent.reply(result)
+        return
+    listname = listname.strip().lower()
+    item = item.strip()
+    if not listname or not item:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    ok = 0
+    try:
+        ok = addtolist(ievent.channel, listname, item)
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if ok:
+        ievent.reply('%s added to %s list' % (item, listname))
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('lists-chan', handle_listschan, 'USER')
+examples.add('lists-chan', "lists-chan <listname> [',' <item>] .. show \
+content of list or add item to list", '1) lists-chan bla 2) lists-chan \
+bla, mekker')
+
+def handle_listschandel(bot, ievent):
+    """ lists-chandel <listname> ',' <listofnrs> .. remove items with \
+indexnr from list """
+    if not ievent.rest:
+        ievent.missing('<listofnrs>')
+        return
+    try:
+        nrs = []
+        for i in ievent.rest.split():
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    nrs.sort()
+    failed = []
+    itemsdeleted = 0
+    try:
+        for i in nrs:
+            result = delfromlist(ievent.channel, i)
+            if not result:
+                failed.append(i)
+            else:
+                itemsdeleted += 1
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if failed:
+        ievent.reply('failed to remove %s' % ' '.join(failed))
+    ievent.reply('%s item(s) removed' % itemsdeleted)
+
+cmnds.add('lists-chandel', handle_listschandel, 'USER')
+examples.add('lists-chandel', "lists-chandel <listname> ',' <listofnrs> \
+.. remove items with indexnr from list", '1) lists-chandel mekker , 1 2) \
+lists-chandel mekker , 0 3 6')
+
+def handle_listschanshow(bot, ievent):
+    """ show avaiable lists """
+    l = getlists(ievent.channel)
+    if not l:
+        ievent.reply('no lists available')
+        return
+    else:
+        result = []
+        for i in l:
+            if not i[2] in result:
+                result.append(i[2])
+        if result:
+            ievent.reply(result, dot=True)
+
+cmnds.add('lists-chanshow', handle_listschanshow, 'USER')
+examples.add('lists-chanshow', 'show available channel lists' , \
+'lists-chanshow')
+
+def handle_lists(bot, ievent):
+    """ lists <listname> [',' <item>] .. global lists"""
+    if not ievent.rest:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    username = users.getname(ievent.userhost)
+    try:
+        listname, item = ievent.rest.split(',', 1)
+    except ValueError:
+        l = getlist(username, ievent.rest)
+        if not l:
+            ievent.reply('no %s list available' % ievent.rest)
+            return
+        result = []
+        for i in l:
+            result.append("%s) %s" % (i[0], i[3]))
+        ievent.reply(result)
+        return
+    listname = listname.strip().lower()
+    item = item.strip()
+    if not listname or not item:
+        ievent.missing("<listname> [',' <item>]")
+        return
+    ok = 0
+    try:
+        ok = addtolist(username, listname, item)
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if ok:
+        ievent.reply('%s added to %s list' % (item, listname))
+    else:
+        ievent.reply('add failed')
+
+cmnds.add('lists', handle_lists, 'USER')
+examples.add('lists', "lists <listname> [',' <item>] .. show content of list \
+or add item to list", '1) lists bla 2) lists bla, mekker')
+
+def handle_listsdel(bot, ievent):
+    """ lists-del <listname> ',' <listofnrs> .. remove items with indexnr \
+from list """
+    if not ievent.rest:
+        ievent.missing('<listofnrs>')
+        return
+    try:
+        nrs = []
+        for i in ievent.rest.split():
+            nrs.append(int(i))
+    except ValueError:
+        ievent.reply('%s is not an integer' % i)
+        return
+    username = users.getname(ievent.userhost)
+    nrs.sort()
+    failed = []
+    itemsdeleted = 0
+    try:
+        for i in nrs:
+            result = delfromlist(username, i)
+            if not result:
+                failed.append(i)
+            else:
+                itemsdeleted += 1
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    if failed:
+        ievent.reply('failed to delete %s' % ' '.join(failed))
+    ievent.reply('%s item(s) removed' % itemsdeleted)
+
+cmnds.add('lists-del', handle_listsdel, 'USER')
+examples.add('lists-del', "lists-del <listname> ',' <listofnrs> \
+.. remove items with indexnr from list", '1) lists-del mekker , 1 2) \
+lists-del mekker , 0 3 6')
+
+def handle_listshow(bot, ievent):
+    """ show avaiable lists """
+    username = users.getname(ievent.userhost)
+    l = getlists(username)
+    if not l:
+        ievent.reply('no lists available')
+        return
+    else:
+        result = []
+        for i in l:
+            if not i[2] in result:
+                result.append(i[2])
+        if result:
+            ievent.reply(result, dot=True)
+
+cmnds.add('lists-show', handle_listshow, 'USER')
+examples.add('lists-show', 'show available channel lists' , 'lists-show')
+
+def handle_listsmerge(bot, ievent):
+    """ merge 2 lists """
+    try:
+        (fromlist, tolist) = ievent.args
+    except ValueError:
+        ievent.missing('<fromlist> <tolist>')
+        return
+    username = users.getname(ievent.userhost)
+    res = getlist(username, fromlist)
+    if not res: 
+        ievent.reply('no %s list available or empty' % fromlist)
+        return
+    l = []
+    for i in res:
+        l.append(i[3])
+    result = 0
+    try:
+        result = mergelist(username, tolist, l)
+    except Exception, ex:
+        handle_exception()
+        ievent.reply('ERROR: %s' % str(ex))
+        return
+    ievent.reply('%s items merged' % result)
+
+cmnds.add('lists-merge', handle_listsmerge, 'USER')
+examples.add('lists-merge', 'lists-merge <fromlist> <tolist> .. merge 2 \
+lists', 'lists-merge mekker miep')
--- gozerbot-0.99.1.orig/build/lib/gplugs/olddb/birthday.py
+++ gozerbot-0.99.1/build/lib/gplugs/olddb/birthday.py
@@ -0,0 +1,190 @@
+# dbplugs/birthday.py
+#
+#
+
+""" manage birthdays """
+
+__copyright__ = 'this file is in the public domain'
+
+from gozerbot.generic import getdaymonth, strtotime, elapsedstring, getwho, bdmonths, handle_exception
+from gozerbot.users import users
+from gozerbot.commands import cmnds
+from gozerbot.examples import examples
+from gozerbot.plughelp import plughelp
+from gozerbot.aliases import aliases
+from gozerbot.database.db import db
+import time, re
+
+plughelp.add('birthday', 'manage birthday data')
+
+def handle_bdset(bot, ievent):
+    """ bd-set <date> .. set birthday """
+    try:
+        what = ievent.args[0]
+        if not re.search('\d*\d-\d*\d-\d\d\d\d', what):
+            ievent.reply('i need a date in the format day-month-year')
+            return
+    except IndexError:
+        ievent.missing('<date>')
+        return
+    name = users.getname(ievent.userhost)
+    try:
+        db.execute(""" INSERT INTO birthday (name, birthday) \
+VALUES(%s, %s) """ , (name, what))
+    except:
+        try:
+            db.execute(""" UPDATE birthday SET birthday = %s \
+WHERE name = %s """,  (what, name))
+        except Exception, ex:
+            handle_exception()
+            ievent.reply('ERROR: %s' % str(ex))
+            return
+    ievent.reply('birthday set')
+
+cmnds.add('bd-set', handle_bdset, 'USER')
+examples.add('bd-set', 'bd-set <date> .. set birthday', 'bd-set 3-11-1967')
+aliases.data['setbd'] = 'bd-set'
+aliases.data['setjarig'] = 'bd-set'
+
+def handle_bddel(bot, ievent):
+    """ bd-del .. delete birthday """
+    name = users.getname(ievent.userhost)
+    result = 0
+    try:
+        result = db.execute(""" DELETE FROM birthday WHERE name = %s """, name)
+    except Exception, ex:
+        handle_exception()
+    if result:
+        ievent.reply('birthday removed')
+    else:
+        ievent.reply('no birthday known for %s' % ievent.nick)
+
+cmnds.add('bd-del', handle_bddel, 'USER')
+examples.add('bd-del', 'delete birthday data', 'bd-del')
+aliases.data['delbd'] = 'bd-del'
+aliases.data['deljarig'] = 'bd-del'
+
+def handle_bd(bot, ievent):
+    """ bd [<nr|user>] .. show birthday of month or user """
+    if not ievent.rest:    
+        handle_checkbd(bot, ievent)
+        return
+    try:
+        int(ievent.args[0])
+        handle_checkbd2(bot, ievent)
+        return
+    except (IndexError, ValueError):
+        who = ievent.args[0].lower()
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("don't know userhost of %s" % who)
+        return
+    name = users.getname(userhost)
+    if not name:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    result = db.execute(""" SELECT birthday FROM birthday WHERE \
+name = %s """, name)
+    try:
+        birthday = result[0][0]
+    except TypeError:
+        ievent.reply("i don't have birthday data for %s" % who)
+        return
+    ievent.reply('birthday of %s is %s' % (who, birthday))
+
+cmnds.add('bd', handle_bd, ['USER', 'WEB'])
+examples.add('bd', 'bd [<nr|user>] .. show birthdays for this month or \
+show birthday of <nick>', '1) bd 2) bd dunker')
+aliases.data['jarig'] = 'bd'
+
+def handle_checkbd(bot, ievent):
+    """ bd-check .. check birthdays for current month """
+    (nowday, nowmonth) = getdaymonth(time.time())
+    mstr = ""
+    result = []
+    bds = db.execute(""" SELECT * FROM birthday """)
+    if not bds:
+        ievent.reply('no birthdays this month')
+        return
+    for i in bds:
+        btime = strtotime(i[1])
+        if btime == None:
+            continue
+        (day, month) = getdaymonth(btime)
+        if month == nowmonth:
+            result.append((int(day), i[0], i[1]))
+            if day == nowday and month == nowmonth:
+                ievent.reply("it's %s's birthday today!" % i[0])
+    result.sort(lambda x, y: cmp(x[0], y[0]))
+    for i in result:
+        mstr += "%s: %s " % (i[1], i[2])
+    if mstr:
+        mstr = "birthdays this month = " + mstr
+        ievent.reply(mstr)
+    else:
+        ievent.reply('no birthdays this month')
+
+def handle_checkbd2(bot, ievent):
+    """ bd-check <nr> .. show birthdays in month (by number) """
+    try:
+        monthnr = int(ievent.args[0])
+        if monthnr < 1 or monthnr > 12:
+            ievent.reply("number must be between 1 and 12")
+            return
+    except (IndexError, ValueError):
+        ievent.missing('<monthnr>')
+        return
+    mstr = ""
+    result = []
+    bds = db.execute(""" SELECT * FROM birthday """)
+    if not bds:
+        ievent.reply('no birthdays known')
+        return
+    for i in bds:
+        btime = strtotime(i[1])
+        if btime == None:
+            continue
+        (day, month) = getdaymonth(btime)
+        if month == bdmonths[monthnr]:
+            result.append((int(day), i[0], i[1]))
+    result.sort(lambda x, y: cmp(x[0], y[0]))
+    for i in result:
+        mstr += "%s: %s " % (i[1], i[2])
+    if mstr:
+        mstr = "birthdays in %s = " % bdmonths[monthnr] + mstr
+        ievent.reply(mstr)
+    else:
+        ievent.reply('no birthdays found for %s' % bdmonths[monthnr])
+
+def handle_age(bot, ievent):
+    """ age <nick> .. show age of user """
+    try:
+        who = ievent.args[0].lower()
+    except IndexError:
+        ievent.missing('<nick>')
+        return
+    userhost = getwho(bot, who)
+    if not userhost:
+        ievent.reply("don't know userhost of %s" % who)
+        return
+    name = users.getname(userhost)
+    if not name:
+        ievent.reply("can't find user for %s" % userhost)
+        return
+    birthday = db.execute(""" SELECT birthday FROM birthday WHERE name \
+= %s """, name)
+    try:
+        birthday = birthday[0][0]
+    except TypeError:
+        ievent.reply("can't find birthday data for %s" % who)
+        return
+    btime = strtotime(birthday)
+    if btime == None:
+        ievent.reply("can't make a date out of %s" % birthday)
+        return
+    age = int(time.time()) - int(btime)
+    ievent.reply("age of %s is %s" % (who, elapsedstring(age, ywd=True)))
+
+cmnds.add('age', handle_age, ['USER', 'WEB'])
+examples.add('age', 'age <nick> .. show how old <nick> is', 'age dunker')
+aliases.data['oud'] = 'age'
--- gozerbot-0.99.1.orig/build/scripts-2.5/gozerbot-stop
+++ gozerbot-0.99.1/build/scripts-2.5/gozerbot-stop
@@ -0,0 +1,18 @@
+#!/bin/sh
+if [ $1 ]
+then
+  DATADIR=$1
+else
+  DATADIR="$HOME/.gozerbot"
+fi
+if [ -e $DATADIR ]
+then
+  cd $DATADIR
+else
+  echo "no $DATADIR directory found"
+  exit 1
+fi
+if [ -e gozerbot.pid ]
+then kill -s TERM `cat gozerbot.pid`
+else echo "no pid file in $DATADIR directory"
+fi
--- gozerbot-0.99.1.orig/build/scripts-2.5/gozerbot-start
+++ gozerbot-0.99.1/build/scripts-2.5/gozerbot-start
@@ -0,0 +1,23 @@
+#!/bin/sh
+if [ $1 ]
+then
+  DATADIR=$1
+else
+  DATADIR="$HOME/.gozerbot"
+fi
+if [ -e $DATADIR ]
+then
+  cd $DATADIR
+else
+  mkdir -p $DATADIR
+  cd $DATADIR
+fi
+if [ -e gozerdata/mainconfig ]
+then
+   gozerbot >> gozerbot.log 2>&1 &
+else
+   gozerbot-init
+   echo "A default config file $DATADIR/gozerdata/mainconfig has been created."
+   echo "irc and jabber bot example files are installed in $DATADIR/gozerdata/fleet."
+   echo "Please edit those files and then run this script again to start gozerbot."
+fi
--- gozerbot-0.99.1.orig/build/scripts-2.5/gozerbot-init
+++ gozerbot-0.99.1/build/scripts-2.5/gozerbot-init
@@ -0,0 +1,24 @@
+#!/usr/bin/python2.5
+#
+#
+
+import sys, os
+sys.path.insert(0, os.getcwd())
+
+try:
+    from gozerbot.datadir import datadir, makedirs
+    makedirs()
+    from gozerbot.config import config, Config, mainconfigtxt, fleetbotconfigtxt
+    config.write_init(mainconfigtxt)
+    cfg = Config(datadir + os.sep + 'fleet' + os.sep + 'default', 'config', inittxt=fleetbotconfigtxt)
+    cfg.save()
+    cfg = Config(datadir + os.sep + 'fleet' + os.sep + 'jabber', 'config', inittxt=fleetbotconfigtxt)
+    cfg['name'] = "xmpp"
+    cfg['type'] = "xmpp"
+    cfg['enable']= 0
+    cfg.save()
+except Exception, ex:
+    print ex
+    os._exit(1)
+
+os._exit(0)
--- gozerbot-0.99.1.orig/build/scripts-2.5/gozerbot-udp
+++ gozerbot-0.99.1/build/scripts-2.5/gozerbot-udp
@@ -0,0 +1,450 @@
+#!/usr/bin/python2.5
+#
+#
+
+__copyright__ = 'this file is in the public domain'
+
+import socket, sys, os
+
+sys.path.insert(0, os.getcwd())
+sys.path.insert(0, os.getcwd() + os.sep + 'gozernest')
+
+from gozerbot.eggs import loadeggs
+loadeggs(os.getcwd(), log=False)
+loadeggs(os.getcwd() + os.sep + 'gozernest', log=False)
+
+import gozerbot
+from gozerbot.config import Config
+from gozerbot.datadir import datadir
+
+from optparse import OptionParser
+
+parser = OptionParser(usage='usage: %prog [options]', version='%prog' + gozerbot.__version__)
+
+parser.add_option('-p', '--printto', type='string', default=False, dest='printto',
+                  metavar='PATH', 
+                  help="channel/user to print to")
+parser.add_option('-c', '--config', type='string', default="udp-send", dest='configname',
+                  help="Specify a config file")
+parser.add_option('-s', '--save', action='store_true', default=False, dest='saveconfig',
+                  help="save to config file")
+
+opts, args = parser.parse_args()
+opts.args = args
+
+cfg = Config(ddir='.', filename=opts.configname)
+cfg.reload()
+cfg['host'] = cfg['host'] or 'localhost'
+cfg['port'] = cfg['port'] or 5500
+cfg['passwd'] = cfg['passwd'] or 'mekker'
+cfg['printto'] = cfg['printto'] or '#dunkbots'
+cfg['seed'] = cfg['seed'] or "blablablablablaz"
+cfg['length'] = cfg['length'] or 16
+cfg['ipv6'] = cfg['ipv6'] or 0
+if opts.saveconfig:
+    cfg.save()
+
+assert(cfg)
+
+"""
+A pure python (slow) implementation of rijndael with a decent interface
+
+To include -
+
+from rijndael import rijndael
+
+To do a key setup -
+
+r = rijndael(key, block_size = 16)
+
+key must be a string of length 16, 24, or 32
+blocksize must be 16, 24, or 32. Default is 16
+
+To use -
+
+ciphertext = r.encrypt(plaintext)
+plaintext = r.decrypt(ciphertext)
+
+If any strings are of the wrong length a ValueError is thrown
+"""
+
+# ported from the Java reference code by Bram Cohen, April 2001
+# this code is public domain, unless someone makes 
+# an intellectual property claim against the reference 
+# code, in which case it can be made public domain by 
+# deleting all the comments and renaming all the variables
+
+import copy
+import string
+
+shifts = [[[0, 0], [1, 3], [2, 2], [3, 1]],
+          [[0, 0], [1, 5], [2, 4], [3, 3]],
+          [[0, 0], [1, 7], [3, 5], [4, 4]]]
+
+# [keysize][block_size]
+num_rounds = {16: {16: 10, 24: 12, 32: 14}, 24: {16: 12, 24: 12, 32: 14}, 32: {16: 14, 24: 14, 32: 14}}
+
+A = [[1, 1, 1, 1, 1, 0, 0, 0],
+     [0, 1, 1, 1, 1, 1, 0, 0],
+     [0, 0, 1, 1, 1, 1, 1, 0],
+     [0, 0, 0, 1, 1, 1, 1, 1],
+     [1, 0, 0, 0, 1, 1, 1, 1],
+     [1, 1, 0, 0, 0, 1, 1, 1],
+     [1, 1, 1, 0, 0, 0, 1, 1],
+     [1, 1, 1, 1, 0, 0, 0, 1]]
+
+# produce log and alog tables, needed for multiplying in the
+# field GF(2^m) (generator = 3)
+alog = [1]
+for i in xrange(255):
+    j = (alog[-1] << 1) ^ alog[-1]
+    if j & 0x100 != 0:
+        j ^= 0x11B
+    alog.append(j)
+
+log = [0] * 256
+for i in xrange(1, 255):
+    log[alog[i]] = i
+
+# multiply two elements of GF(2^m)
+def mul(a, b):
+    if a == 0 or b == 0:
+        return 0
+    return alog[(log[a & 0xFF] + log[b & 0xFF]) % 255]
+
+# substitution box based on F^{-1}(x)
+box = [[0] * 8 for i in xrange(256)]
+box[1][7] = 1
+for i in xrange(2, 256):
+    j = alog[255 - log[i]]
+    for t in xrange(8):
+        box[i][t] = (j >> (7 - t)) & 0x01
+
+B = [0, 1, 1, 0, 0, 0, 1, 1]
+
+# affine transform:  box[i] <- B + A*box[i]
+cox = [[0] * 8 for i in xrange(256)]
+for i in xrange(256):
+    for t in xrange(8):
+        cox[i][t] = B[t]
+        for j in xrange(8):
+            cox[i][t] ^= A[t][j] * box[i][j]
+
+# S-boxes and inverse S-boxes
+S =  [0] * 256
+Si = [0] * 256
+for i in xrange(256):
+    S[i] = cox[i][0] << 7
+    for t in xrange(1, 8):
+        S[i] ^= cox[i][t] << (7-t)
+    Si[S[i] & 0xFF] = i
+
+# T-boxes
+G = [[2, 1, 1, 3],
+    [3, 2, 1, 1],
+    [1, 3, 2, 1],
+    [1, 1, 3, 2]]
+
+AA = [[0] * 8 for i in xrange(4)]
+
+for i in xrange(4):
+    for j in xrange(4):
+        AA[i][j] = G[i][j]
+        AA[i][i+4] = 1
+
+for i in xrange(4):
+    pivot = AA[i][i]
+    if pivot == 0:
+        t = i + 1
+        while AA[t][i] == 0 and t < 4:
+            t += 1
+            assert t != 4, 'G matrix must be invertible'
+            for j in xrange(8):
+                AA[i][j], AA[t][j] = AA[t][j], AA[i][j]
+            pivot = AA[i][i]
+    for j in xrange(8):
+        if AA[i][j] != 0:
+            AA[i][j] = alog[(255 + log[AA[i][j] & 0xFF] - log[pivot & 0xFF]) % 255]
+    for t in xrange(4):
+        if i != t:
+            for j in xrange(i+1, 8):
+                AA[t][j] ^= mul(AA[i][j], AA[t][i])
+            AA[t][i] = 0
+
+iG = [[0] * 4 for i in xrange(4)]
+
+for i in xrange(4):
+    for j in xrange(4):
+        iG[i][j] = AA[i][j + 4]
+
+def mul4(a, bs):
+    if a == 0:
+        return 0
+    r = 0
+    for b in bs:
+        r <<= 8
+        if b != 0:
+            r = r | mul(a, b)
+    return r
+
+T1 = []
+T2 = []
+T3 = []
+T4 = []
+T5 = []
+T6 = []
+T7 = []
+T8 = []
+U1 = []
+U2 = []
+U3 = []
+U4 = []
+
+for t in xrange(256):
+    s = S[t]
+    T1.append(mul4(s, G[0]))
+    T2.append(mul4(s, G[1]))
+    T3.append(mul4(s, G[2]))
+    T4.append(mul4(s, G[3]))
+
+    s = Si[t]
+    T5.append(mul4(s, iG[0]))
+    T6.append(mul4(s, iG[1]))
+    T7.append(mul4(s, iG[2]))
+    T8.append(mul4(s, iG[3]))
+
+    U1.append(mul4(t, iG[0]))
+    U2.append(mul4(t, iG[1]))
+    U3.append(mul4(t, iG[2]))
+    U4.append(mul4(t, iG[3]))
+
+# round constants
+rcon = [1]
+r = 1
+for t in xrange(1, 30):
+    r = mul(2, r)
+    rcon.append(r)
+
+del A
+del AA
+del pivot
+del B
+del G
+del box
+del log
+del alog
+del i
+del j
+del r
+del s
+del t
+del mul
+del mul4
+del cox
+del iG
+
+class rijndael:
+    def __init__(self, key, block_size = 16):
+        if block_size != 16 and block_size != 24 and block_size != 32:
+            raise ValueError('Invalid block size: ' + str(block_size))
+        if len(key) != 16 and len(key) != 24 and len(key) != 32:
+            raise ValueError('Invalid key size: ' + str(len(key)))
+        self.block_size = block_size
+
+        ROUNDS = num_rounds[len(key)][block_size]
+        BC = block_size / 4
+        # encryption round keys
+        Ke = [[0] * BC for i in xrange(ROUNDS + 1)]
+        # decryption round keys
+        Kd = [[0] * BC for i in xrange(ROUNDS + 1)]
+        ROUND_KEY_COUNT = (ROUNDS + 1) * BC
+        KC = len(key) / 4
+
+        # copy user material bytes into temporary ints
+        tk = []
+        for i in xrange(0, KC):
+            tk.append((ord(key[i * 4]) << 24) | (ord(key[i * 4 + 1]) << 16) |
+                (ord(key[i * 4 + 2]) << 8) | ord(key[i * 4 + 3]))
+
+        # copy values into round key arrays
+        t = 0
+        j = 0
+        while j < KC and t < ROUND_KEY_COUNT:
+            Ke[t / BC][t % BC] = tk[j]
+            Kd[ROUNDS - (t / BC)][t % BC] = tk[j]
+            j += 1
+            t += 1
+        tt = 0
+        rconpointer = 0
+        while t < ROUND_KEY_COUNT:
+            # extrapolate using phi (the round key evolution function)
+            tt = tk[KC - 1]
+            tk[0] ^= (S[(tt >> 16) & 0xFF] & 0xFF) << 24 ^  \
+                     (S[(tt >>  8) & 0xFF] & 0xFF) << 16 ^  \
+                     (S[ tt        & 0xFF] & 0xFF) <<  8 ^  \
+                     (S[(tt >> 24) & 0xFF] & 0xFF)       ^  \
+                     (rcon[rconpointer]    & 0xFF) << 24
+            rconpointer += 1
+            if KC != 8:
+                for i in xrange(1, KC):
+                    tk[i] ^= tk[i-1]
+            else:
+                for i in xrange(1, KC / 2):
+                    tk[i] ^= tk[i-1]
+                tt = tk[KC / 2 - 1]
+                tk[KC / 2] ^= (S[ tt        & 0xFF] & 0xFF)       ^ \
+                              (S[(tt >>  8) & 0xFF] & 0xFF) <<  8 ^ \
+                              (S[(tt >> 16) & 0xFF] & 0xFF) << 16 ^ \
+                              (S[(tt >> 24) & 0xFF] & 0xFF) << 24
+                for i in xrange(KC / 2 + 1, KC):
+                    tk[i] ^= tk[i-1]
+            # copy values into round key arrays
+            j = 0
+            while j < KC and t < ROUND_KEY_COUNT:
+                Ke[t / BC][t % BC] = tk[j]
+                Kd[ROUNDS - (t / BC)][t % BC] = tk[j]
+                j += 1
+                t += 1
+        # inverse MixColumn where needed
+        for r in xrange(1, ROUNDS):
+            for j in xrange(BC):
+                tt = Kd[r][j]
+                Kd[r][j] = U1[(tt >> 24) & 0xFF] ^ \
+                           U2[(tt >> 16) & 0xFF] ^ \
+                           U3[(tt >>  8) & 0xFF] ^ \
+                           U4[ tt        & 0xFF]
+        self.Ke = Ke
+        self.Kd = Kd
+
+    def encrypt(self, plaintext):
+        if len(plaintext) != self.block_size:
+            raise ValueError('wrong block length, expected ' + str(self.block_size) + ' got ' + str(len(plaintext)))
+        Ke = self.Ke
+
+        BC = self.block_size / 4
+        ROUNDS = len(Ke) - 1
+        if BC == 4:
+            SC = 0
+        elif BC == 6:
+            SC = 1
+        else:
+            SC = 2
+        s1 = shifts[SC][1][0]
+        s2 = shifts[SC][2][0]
+        s3 = shifts[SC][3][0]
+        a = [0] * BC
+        # temporary work array
+        t = []
+        # plaintext to ints + key
+        for i in xrange(BC):
+            t.append((ord(plaintext[i * 4    ]) << 24 |
+                      ord(plaintext[i * 4 + 1]) << 16 |
+                      ord(plaintext[i * 4 + 2]) <<  8 |
+                      ord(plaintext[i * 4 + 3])        ) ^ Ke[0][i])
+        # apply round transforms
+        for r in xrange(1, ROUNDS):
+            for i in xrange(BC):
+                a[i] = (T1[(t[ i           ] >> 24) & 0xFF] ^
+                        T2[(t[(i + s1) % BC] >> 16) & 0xFF] ^
+                        T3[(t[(i + s2) % BC] >>  8) & 0xFF] ^
+                        T4[ t[(i + s3) % BC]        & 0xFF]  ) ^ Ke[r][i]
+            t = copy.copy(a)
+        # last round is special
+        result = []
+        for i in xrange(BC):
+            tt = Ke[ROUNDS][i]
+            result.append((S[(t[ i           ] >> 24) & 0xFF] ^ (tt >> 24)) & 0xFF)
+            result.append((S[(t[(i + s1) % BC] >> 16) & 0xFF] ^ (tt >> 16)) & 0xFF)
+            result.append((S[(t[(i + s2) % BC] >>  8) & 0xFF] ^ (tt >>  8)) & 0xFF)
+            result.append((S[ t[(i + s3) % BC]        & 0xFF] ^  tt       ) & 0xFF)
+        return string.join(map(chr, result), '')
+
+    def decrypt(self, ciphertext):
+        if len(ciphertext) != self.block_size:
+            raise ValueError('wrong block length, expected ' + str(self.block_size) + ' got ' + str(len(ciphertext)))
+        Kd = self.Kd
+
+        BC = self.block_size / 4
+        ROUNDS = len(Kd) - 1
+        if BC == 4:
+            SC = 0
+        elif BC == 6:
+            SC = 1
+        else:
+            SC = 2
+        s1 = shifts[SC][1][1]
+        s2 = shifts[SC][2][1]
+        s3 = shifts[SC][3][1]
+        a = [0] * BC
+        # temporary work array
+        t = [0] * BC
+        # ciphertext to ints + key
+        for i in xrange(BC):
+            t[i] = (ord(ciphertext[i * 4    ]) << 24 |
+                    ord(ciphertext[i * 4 + 1]) << 16 |
+                    ord(ciphertext[i * 4 + 2]) <<  8 |
+                    ord(ciphertext[i * 4 + 3])        ) ^ Kd[0][i]
+        # apply round transforms
+        for r in xrange(1, ROUNDS):
+            for i in xrange(BC):
+                a[i] = (T5[(t[ i           ] >> 24) & 0xFF] ^
+                        T6[(t[(i + s1) % BC] >> 16) & 0xFF] ^
+                        T7[(t[(i + s2) % BC] >>  8) & 0xFF] ^
+                        T8[ t[(i + s3) % BC]        & 0xFF]  ) ^ Kd[r][i]
+            t = copy.copy(a)
+        # last round is special
+        result = []
+        for i in xrange(BC):
+            tt = Kd[ROUNDS][i]
+            result.append((Si[(t[ i           ] >> 24) & 0xFF] ^ (tt >> 24)) & 0xFF)
+            result.append((Si[(t[(i + s1) % BC] >> 16) & 0xFF] ^ (tt >> 16)) & 0xFF)
+            result.append((Si[(t[(i + s2) % BC] >>  8) & 0xFF] ^ (tt >>  8)) & 0xFF)
+            result.append((Si[ t[(i + s3) % BC]        & 0xFF] ^  tt       ) & 0xFF)
+        return string.join(map(chr, result), '')
+
+def encrypt(key, block):
+    return rijndael(key, len(block)).encrypt(block)
+
+def decrypt(key, block):
+    return rijndael(key, len(block)).decrypt(block)
+
+def test():
+    def t(kl, bl):
+        b = 'b' * bl
+        r = rijndael('a' * kl, bl)
+        assert r.decrypt(r.encrypt(b)) == b
+    t(16, 16)
+    t(16, 24)
+    t(16, 32)
+    t(24, 16)
+    t(24, 24)
+    t(24, 32)
+    t(32, 16)
+    t(32, 24)
+    t(32, 32)
+
+if cfg['seed']:
+    crypt = rijndael(cfg['seed'])
+
+def out(what):
+    z = '%s %s %s' % (cfg['passwd'], opts.printto or cfg['printto'], what.strip())
+    while len(z) % 16:
+        z += "\0"        
+    if cfg['seed']:
+        data = ""
+        for i in range((len(z)/16)):
+            data += crypt.encrypt(z[i*16:i*16+16])
+    else:
+        data = z
+    if cfg['ipv6']:
+        sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
+    else:
+        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    sock.sendto(data, (cfg['host'], cfg['port']))
+
+while 1:
+    a = sys.stdin.readline()
+    if a:
+        out(a)
+    else:
+        os._exit(0)
--- gozerbot-0.99.1.orig/build/scripts-2.5/gozerbot
+++ gozerbot-0.99.1/build/scripts-2.5/gozerbot
@@ -0,0 +1,292 @@
+#!/usr/bin/python2.5
+#
+#
+
+""" start the bot from standalone directory """
+
+__copyright__ = 'this file is in the public domain'
+
+import warnings
+warnings.simplefilter("ignore")
+
+import traceback, sys, os, socket
+
+def handle_exception():
+    """ schow exception traceback as a oneliner' """
+    exctype, excvalue, tb = sys.exc_info()
+    trace = traceback.extract_tb(tb)
+    result = ""
+    for i in trace:  
+        fname = i[0] 
+        linenr = i[1]
+        func = i[2]
+        result += "%s:%s %s | " % (fname, linenr, func)
+    #del trace
+    print "%s%s: %s" % (result, exctype, excvalue)
+
+import time
+
+try:
+    try:
+        if os.getuid() == 0:
+            print "don't run the bot as root"
+            os._exit(1)
+    except AttributeError:
+        pass
+
+    # check to see if python version is 2.5 or higer
+    vi = sys.version_info
+    if vi[0] < 2 or (vi[0] == 2 and vi[1] < 5):
+        print "i need at least python version >= 2.5"
+        os._exit(1)
+
+    sys.path.insert(0, os.getcwd())
+
+    import gozerbot.utils.log
+    gozerbot.utils.log.rlog(10, 'GOZERBOT', 'STARTING VERSION %s' % gozerbot.__version__)
+
+    from gozerbot.eggs import loadeggs
+    loadeggs(os.getcwd(), log=False)
+    loadeggs(os.getcwd() + os.sep + 'gozernest', log=False)
+
+    # command line option parsing
+    from optparse import OptionParser
+    parser = OptionParser(usage='usage: %prog [options]', version='%prog ' + gozerbot.__version__)
+    parser.add_option('', '-r', type='string', default=False, dest='doresume', 
+                  metavar='PATH', 
+                  help="resume the bot from the folder specified")
+    parser.add_option('-t', '--type', type='string', default=False,
+dest='type', 
+                  help="set type of the bot (irc/jabber)")
+    parser.add_option('-o', '--owner', type='string', default=False,
+dest='owner', 
+                  help="owner of the bot")
+    parser.add_option('-s', '--server', type='string', default=False,
+dest='server', 
+                  help="server to connect to (irc)")
+    parser.add_option('', '--host', type='string', default=False,
+dest='host', 
+                  help="server to connect to (jabber)")
+    parser.add_option('-c', '--channel', type='string', default=False,
+dest='channel', 
+                  help="channel to join")
+    parser.add_option('-l', '--loglevel', type='string', default=False,
+dest='loglevel', 
+                  help="loglevel of the bot .. the lower the more it logs")
+    parser.add_option('-e', '--encoding', type='string', default=False,
+dest='encoding', 
+                  help="set default encoding of the bot")
+    parser.add_option('-p', '--pass', type='string', default=False,
+dest='password', 
+                  help="set password used to connect to the server")
+    parser.add_option('-u', '--user', type='string', default=False,
+dest='user', 
+                  help="set user used to connect to the server")
+    parser.add_option('-n', '--name', type='string', default=False,
+dest='name', 
+                  help="bot's name")
+    parser.add_option('-b', '--bork', action='store_true', default=False,
+dest='bork', 
+                  help="bork (exit) on exception")
+    parser.add_option('', '--port', type='string', default=False,
+dest='port', 
+                  help="set port of server to connect to")
+    parser.add_option('-x', '--ssl', action='store_true', default=False,
+dest='ssl', 
+                  help="use ssl")
+    parser.add_option('-y', '--nossl', action='store_true', default=False,
+dest='nossl', 
+                  help="don't use ssl")
+
+    opts, args = parser.parse_args()
+    opts.args = args
+
+    # sys path manipulation .. add eggs and gozerplugs/myplugs dirs
+    pdir1 = os.getcwd() + os.sep + 'gplugs'
+    pdir2 = os.getcwd() + os.sep + 'myplugs'
+    # gozerplugs dir
+    if os.path.isdir(pdir1):
+        sys.path.insert(0, pdir1)
+    # myplugs dir
+    if os.path.isdir(pdir2):
+        sys.path.insert(0, pdir2)
+
+    # set default settings
+    reload(sys)
+    if opts.encoding:
+        sys.setdefaultencoding(opts.encoding)
+    else:
+        sys.setdefaultencoding('utf-8')
+    sys.setcheckinterval(50)
+    socket.setdefaulttimeout(30)
+
+    # write options to config file
+    from gozerbot.utils.log import enable_logging, rlog
+    from gozerbot.datadir import makedirs, datadir
+    import gozerbot.utils.exception
+
+    if opts.bork:
+        rlog(10, 'gozerbot', 'BORK ON EXCEPTION enabled')
+        gozerbot.utils.exception.borkonexception = True
+
+    makedirs()
+    from gozerbot.config import config, mainconfigtxt, Config, fleetbotconfigtxt
+    config.write_init(mainconfigtxt)
+    if opts.owner and opts.owner not in config['owner']:
+        config['owner'].append(opts.owner)
+        config.save()
+
+    if opts.loglevel:
+        try:
+            config['loglevel'] = int(opts.loglevel)
+            config.save()
+        except:
+            print "loglevel needs to be an integer .. the lower the more the bot logs"
+    #config.load()
+    if config['loglist']:
+        enable_logging(config['loglevel'], config['loglist'])
+    else:
+        enable_logging(config['loglevel'])
+    if not config['owner']:
+        print "owner is not set in %s" % os.getcwd() + os.sep + config.cfile
+        sys.stdout.flush()
+        os._exit(1)
+    if not os.path.isfile(datadir + os.sep + 'VERSION'):
+        f = open(datadir + os.sep + 'VERSION', 'w')
+        f.write(gozerbot.__version__)
+        f.close()
+    else:
+        version = open(datadir + os.sep + 'VERSION', 'r').read().strip()
+        if version != gozerbot.__version__:
+             rlog(0, 'GOZERBOT', 'datadir version %s differs from bot version %s' % (version, config['version']))
+
+    # initialize the database
+    if config.get('db_driver') == "olddb":
+        from gozerbot.database.db import init_tables
+        init_tables()
+        rlog(10, 'gozerbot', 'olddb mode enabled')
+        
+    else:
+        rlog(10, 'gozerbot', 'alchemy mode enabled')
+        try:
+            from gozerbot.database.alchemy import startmaindb
+            startmaindb()
+        except ImportError: rlog(100, 'gozerbot', 'sqlalchemy is not installed on your system. try installing it or use db_driver="olddb"') ; os._exit(1)
+
+    rlog(5, 'gozerbot', 'default encoding is %s' % sys.getdefaultencoding())
+    rlog(10, 'gozerbot', 'loglevel is %s' % config['loglevel'])
+
+    # basic bot imports
+    from gozerbot.utils.generic import checkpermissions
+    from gozerbot.irc.bot import Bot
+    from gozerbot.fleet import fleet
+    from gozerbot.plugins import plugins
+    from gozerbot.eventhandler import mainhandler
+    from gozerbot.users import users
+    from gozerbot.threads.thr import start_new_thread
+    from gozerbot.partyline import partyline
+    from gozerbot.exit import globalshutdown
+    from gozerbot.periodical import periodical
+    import time, signal, gc, types, asyncore
+
+    # enable garbage collection
+    gc.enable()
+
+    # provide sigterm support
+    def dostop(a, b):
+        """ sig handler """
+        globalshutdown()
+
+    signal.signal(signal.SIGTERM, dostop)
+
+    # set umask of gozerdata dir
+    umask = config['umask']
+    if not umask:
+        checkpermissions('gozerdata', 0700)
+    else:
+        checkpermissions('gozerdata', umask)
+
+    # write pid to pidfile
+    k = open('gozerbot.pid','w')
+    k.write(str(os.getpid()))
+    k.close()
+
+    # start periodical loop
+    periodical.start()
+
+    # register plugins
+    start_new_thread(plugins.regplugins, ())
+    
+    # cfg for the default bot
+    if opts.name:
+        botcfg = Config(datadir + os.sep + 'fleet' + os.sep + opts.name, inittxt=fleetbotconfigtxt)
+    else:
+        botcfg = Config(datadir + os.sep + 'fleet' + os.sep + 'default', inittxt=fleetbotconfigtxt)
+    
+    if not botcfg.has_key('owner'):
+        botcfg['owner'] = []
+    if opts.type:
+        botcfg['type'] = opts.type
+    if opts.host:
+        botcfg['host'] = opts.host
+    if opts.password:
+        botcfg['password'] = opts.password
+    if opts.server:
+        botcfg['server'] = opts.server
+    if opts.user:
+        botcfg['user'] = opts.user
+    if opts.port:
+        try:
+            botcfg['port'] = int(opts.port)
+        except ValueError:
+           rlog(100, 'gozerbot', 'port needs to be an integer')
+           os._exit(1)
+    if opts.ssl:
+        botcfg['ssl'] = 1
+    elif opts.nossl:
+        botcfg['ssl'] = 0
+    if opts.owner:
+        if opts.owner not in botcfg['owner']:
+            botcfg['owner'].append(opts.owner)
+    botcfg.save()
+    # create the bot on the fleet
+    bot = fleet.makebot(opts.name or 'default', botcfg)
+    if not bot:
+        rlog(100, 'GOZERBOT', "can't create bot")
+        os._exit(1)
+
+    if opts.channel and not opts.channel in bot.state['joinedchannels']:
+        bot.state['joinedchannels'].append(opts.channel)
+        bot.state.save()
+
+    # resume the bot or start the fleet
+    if opts.doresume and os.path.isfile(opts.doresume):
+        fleet.resume(opts.doresume)
+        fleet.startok.wait()
+        partyline.resume(opts.doresume)
+        os.unlink(opts.doresume) # bye
+    else:
+        if not opts.name:
+            fleet.start()
+        else:
+            fleet.addbot(bot)
+            start_new_thread(bot.connectwithjoin, ())
+
+except Exception, ex:
+        handle_exception()
+        time.sleep(2)
+        os._exit(1)
+
+# basic loop
+while 1:
+    try:
+        #asyncore.poll(timeout=0.1)
+        time.sleep(0.1)
+        mainhandler.handle_one()
+    except KeyboardInterrupt:
+        globalshutdown()
+        os._exit(0)
+    except Exception, ex:
+        handle_exception()
+        globalshutdown()
+        os._exit(1)