mod_spox 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,41 @@
+0.0.4 Release (Alpha status)
+    * Signatures now encoded when stored
+    * SQLite lockup fixed on new version of sequel
+    * Timer messages now have IDs
+    * Removed blocks from sequel usage to remove dependency on ParseTree
+        * This was done to enable jruby support
+        * mod_spox will currently load into jruby but is not currently working
+    * Added experimental memcache support (very buggy)
+    * New plugins:
+        * ChatLogger - Logs chatting to database. Provides a seen and lastspoke trigger
+        * Topten - Provides stats on user's chatting
+    * The bot as well as plugins have all been updated to work with Sequel 2.0 (removed deprecated)
+    * Processing pool has been reworked. 
+        * Currently testing to see how memory is consumed. 
+        * New version will play nicely with jruby thread pools
+    * Various small fixes and updates
+
+0.0.3 Release (Alpha status)
+    * New features available from the following new plugins:
+        * AOLSpeak
+        * AutoKick
+        * AutoRejoin
+        * Confess
+        * EightBall
+        * LolSpeak
+        * PhpCli
+        * PhpFuncLookup
+        * Quotes
+        * Talk
+        * Translate
+        * Weather
+        * Help
+    * Added private/public/both specification for signatures
+    * Added smart thread creation/deletion for Pool
+    * Modified Rakefile to build gem without need for unused libraries
+    * Added support for action privmsgs 
+    * Various fixes of small bugs
+
 0.0.2 Release (Alpha status)
     * New features available from the following new plugins:
         * Karma

data/INSTALL

@@ -4,6 +4,9 @@ gem install --include-dependencies mod_spox
 
 Requirements include:
     * sequel
+        * database driver
+    * Ruby >= 1.8.4
+    
+Optional:
     * fastthread
-    * termios
-    * Ruby >= 1.8.4
+    * termios

data/bin/mod_spox

@@ -15,11 +15,12 @@
 begin
     require 'fastthread'
 rescue Object => boom
-    puts "WARNING: fastthread gem was not found"
+    # ignore if not found #
 end
 
-$BOTVERSION='0.0.2'
+$BOTVERSION='0.0.4'
 $VERBOSITY = 0
+$MOD_SPOX_PATH = nil
 
 begin
     require 'mod_spox/Loader'
@@ -33,7 +34,8 @@ opts = GetoptLong.new(
     ['--config', '-c', GetoptLong::NO_ARGUMENT],
     ['--debug', '-d', GetoptLong::OPTIONAL_ARGUMENT],
     ['--version', '-v', GetoptLong::NO_ARGUMENT],
-    ['--help', '-h', GetoptLong::NO_ARGUMENT]
+    ['--help', '-h', GetoptLong::NO_ARGUMENT],
+    ['--path', '-p', GetoptLong::REQUIRED_ARGUMENT]
 )
 verbose = 0
 opts.each do |opt, arg|
@@ -58,6 +60,8 @@ opts.each do |opt, arg|
             wizard = ConfigurationWizard.new
             wizard.run
             exit
+        when '--path'
+            $MOD_SPOX_PATH = arg
     end
 end
 

data/data/mod_spox/extras/Confess.rb

@@ -46,7 +46,7 @@ class Confess < ModSpox::Plugin
                 reg = true
             end
         else
-            ids = Confession.map(:id)
+            ids = Confession.select(:id).map(:id)
             c = Confession[ids[rand(ids.size - 1)].to_i]
         end
         if(c)
@@ -74,11 +74,11 @@ class Confess < ModSpox::Plugin
         end
         if(c)
             if(params[:score] == '++')
-                c.set(:positive => c.positive.to_i + 1)
+                c.update_with_params(:positive => c.positive.to_i + 1)
             else
-                c.set(:negative => c.negative.to_i + 1)
+                c.update_with_params(:negative => c.negative.to_i + 1)
             end
-            c.set(:score => ((c.positive.to_f) / (c.positive.to_f + c.negative.to_f)) * 100.0)
+            c.update_with_params(:score => ((c.positive.to_f) / (c.positive.to_f + c.negative.to_f)) * 100.0)
         else
             reply message.replyto, "\2Error:\2 Failed to find confession to score"
         end

data/data/mod_spox/extras/Karma.rb

@@ -21,7 +21,7 @@ class Karma < ModSpox::Plugin
                 thing = thing[1..-2] if thing[0..0] == '(' && thing[-1..1] == ')'
                 adj = adj == '++' ? +1 : -1
                 karma = Datatype::Karma.find_or_create(:thing => thing, :channel_id => message.target.pk)
-                karma.set(:score => karma.score + adj)
+                karma.update_with_params(:score => karma.score + adj)
             end
         end
     end
@@ -42,7 +42,7 @@ class Karma < ModSpox::Plugin
         return unless message.is_public?
         karma = Datatype::Karma.filter(:thing => params[:thing], :channel_id => message.target.pk).first
         if(karma)
-            karma.set(:score => 0)
+            karma.update_with_params(:score => 0)
             @pipeline << Privmsg.new(message.replyto, "Karma for \2#{karma.thing}\2 has been reset")
         else
             @pipeline << Privmsg.new(message.replyto, "\2Error:\2 #{params[:thing]} has no karma")

data/data/mod_spox/extras/Logger.rb

@@ -0,0 +1,167 @@
+class ChatLogger < ModSpox::Plugin
+
+    # This plugin creates a log of conversations the bot sees. It
+    # is important to note that the order in which messages are
+    # added to the database may not be in order. Due to the
+    # async behavior of the pipeline, this plugin may (and most
+    # likely will) receive messages out of order. This will be most
+    # notable with triggers received and responses from the bot
+
+    include Models
+
+    def initialize(pipeline)
+        super
+        PublicLog.create_table unless PublicLog.table_exists?
+        PrivateLog.create_table unless PrivateLog.table_exists?
+        @pipeline.hook(self, :log_privmsg, :Incoming_Privmsg)
+        @pipeline.hook(self, :log_join, :Incoming_Join)
+        @pipeline.hook(self, :log_part, :Incoming_Part)
+        @pipeline.hook(self, :log_quit, :Incoming_Quit)
+        @pipeline.hook(self, :log_kick, :Incoming_Kick)
+        @pipeline.hook(self, :log_mode, :Incoming_Mode)
+        @pipeline.hook(self, :log_privmsg, :Incoming_Notice)
+        @pipeline.hook(self, :log_outpriv, :Outgoing_Privmsg)
+        @pipeline.hook(self, :log_outpriv, :Outgoing_Notice)
+        Signature.find_or_create(:signature => 'seen (\S+)', :plugin => name, :method => 'seen', :description => 'Report last sighting of nick').params = [:nick]
+        Signature.find_or_create(:signature => 'lastspoke (\S+)', :plugin => name, :method => 'spoke', :description => 'Report last time nick spoke').params = [:nick]
+    end
+    
+    def log_outpriv(message)
+        type = message.is_a?(Messages::Outgoing::Privmsg) ? 'privmsg' : 'notice'
+        type = 'action' if message.is_action?
+        target = message.target.is_a?(Sequel::Model) ? message.target : Helpers.find_model(message.target)
+        if(target.is_a?(Models::Channel))
+            PublicLog.new(:message => message.message, :type => type, :sender => me.pk,
+                :channel => target.pk, :received => Time.now).save
+        else
+            PrivateLog.new(:message => message.message, :type => type, :sender => me.pk,
+                :receiver => target.pk, :received => Time.now).save
+        end        
+    end
+    
+    def log_privmsg(message)
+        type = message.is_a?(Messages::Incoming::Privmsg) ? 'privmsg' : 'notice'
+        type = 'action' if message.is_action?
+        if(message.is_public?)
+            PublicLog.new(:message => message.message, :type => type, :sender => message.source.pk,
+                :channel => message.target.pk, :received => message.time).save
+        else
+            PrivateLog.new(:message => message.message, :type => type, :sender => message.source.pk,
+                :receiver => message.target.pk, :received => message.time).save
+        end
+    end
+    
+    def log_join(message)
+        PublicLog.new(:type => 'join', :sender => message.nick.pk, :channel => message.channel.pk, :received => message.time).save
+    end
+    
+    def log_part(message)
+        PublicLog.new(:message => message.reason, :type => 'part', :sender => message.nick.pk,
+            :channel => message.channel.pk, :received => message.time).save
+    end
+    
+    def log_quit(message)
+        PublicLog.new(:message => message.message, :type => 'quit', :sender => message.nick.pk, :received => message.time).save
+    end
+    
+    def log_kick(message)
+        PublicLog.new(:message => "#{message.kickee.pk}|#{message.reason}", :type => 'kick', :sender => message.kicker.pk,
+            :channel => message.channel.pk, :received => message.time).save
+    end
+    
+    # TODO: Fix this
+    def log_mode(message)
+#         if(message.for_channel?)
+#             PublicLog.new(:message => message.mode, :type => 'mode', :sender => message.source.pk,
+#                 :channel => message.channel.pk, :received => message.time).save
+#         else
+#             PrivateLog.new(:message => message.mode, :type => 'mode', :sender => message.source.pk,
+#                 :receiver => message.target.pk, :received => message.time).save
+#         end
+    end
+    
+    def seen(m, p)
+        nick = Helpers.find_model(p[:nick], false)
+        if(nick.is_a?(Models::Nick))
+            record = PublicLog.filter(:sender => nick.pk).order(:received).last
+            record_p = PrivateLog.filter(:sender => nick.pk).order(:received).last
+            record = record_p if !record || (record_p && record && record_p.received > record.received)
+            if(record)
+                if(record.is_a?(PublicLog))
+                    case record.values[:type]
+                        when 'join'
+                            message = "joining #{Channel[record.channel].name}"
+                        when 'part'
+                            message = "parting #{Channel[record.channel].name} with the message: #{record.message}"
+                        when 'privmsg'
+                            message = "in #{Channel[record.channel].name} saying: #{record.message}"
+                        when 'action'
+                            message = "in #{Channel[record.channel].name} saying: * #{p[:nick]} #{record.message}"
+                        when 'notice'
+                            message = "in #{Channel[record.channel].name} saying: #{record.message}"
+                        when 'kick'
+                            if(record.message =~ /^([0-9]+)\|/)
+                                kickee = Nick[$1.to_i]
+                                reason = $2
+                                message = "kicking #{kickee.nick} from #{Channel[record.channel].name} (#{record.message})"
+                            end
+                        end
+                else
+                    message = "saying to me: #{record.message}"
+                end
+                reply m.replyto, "I last saw #{p[:nick]} on #{record.received} #{message}"
+            else
+                reply m.replyto, "\2Error:\2 Failed to find record of #{p[:nick]}"
+            end
+        else
+            reply m.replyto, "\2Error:\2 Failed to find record of #{p[:nick]}"
+        end
+    end
+    
+    def spoke(m, p)
+        nick = Helpers.find_model(p[:nick], false)
+        if(nick.is_a?(Models::Nick))
+            record = PublicLog.filter(:sender => nick.pk).filter("type in ('privmsg', 'action')").order(:received).last
+            record_p = PrivateLog.filter(:sender => nick.pk).order(:received).last
+            record = record_p if !record || (record_p && record && record_p.received > record.received)
+            if(record)
+                if(record.is_a?(PublicLog))
+                    reply m.replyto, "I last saw #{p[:nick]} on #{record.received} saying: #{record.values[:type] == 'action' ? "* #{p[:nick]} #{record.message}" : record.message}"
+                else
+                    reply m.replyto, "I last saw #{p[:nick]} on #{record.received} saying to me: #{record.message}"
+                end
+            else
+                reply m.replyto, "\2Error:\2 Failed to find record of #{p[:nick]}"
+            end
+        else
+            reply m.replyto, "\2Error:\2 Failed to find record of #{p[:nick]}"
+        end        
+    end
+    
+    class PrivateLog < Sequel::Model
+        set_schema do
+            primary_key :id
+            text :message, :null => false
+            text :type, :null => false, :default => 'privmsg'
+            boolean :action, :null => false, :default => false
+            timestamp :received, :null => false
+            foreign_key :sender, :table => :nicks
+            foreign_key :receiver, :table => :nicks
+            index :message, :type => :full_text
+        end
+    end
+    
+    class PublicLog < Sequel::Model
+        set_schema do
+            primary_key :id
+            text :message
+            text :type, :null => false, :default => 'privmsg'
+            boolean :action, :null => false, :default => false
+            timestamp :received, :null => false
+            foreign_key :sender, :table => :nicks
+            foreign_key :channel, :table => :channels
+            index :message, :type => :full_text
+        end
+    end
+
+end

data/data/mod_spox/extras/Quotes.rb

@@ -27,11 +27,11 @@ class Quotes < ModSpox::Plugin
                 reg = true
             end
         else
-            ids = Quote.map(:id)
+            ids = Quote.select(:id).map(:id)
             quote = Quote[ids[rand(ids.size - 1)].to_i]
         end
         if(quote)
-            reply message.replyto, "\2[\2#{quote.pk}\2|\2#{quote.added.year}/#{quote.added.month}/#{quote.added.day}\2]:\2 #{reg ? quote.quote.gsub(/(#{params[:term]})/, "\2\\1\2") : quote.quote}"
+            reply message.replyto, "\2[\2#{quote.pk}\2|\2#{quote.added.year}/#{sprintf('%02d', quote.added.month)}/#{sprintf('%02d', quote.added.day)}\2]:\2 #{reg ? quote.quote.gsub(/(#{params[:term]})/, "\2\\1\2") : quote.quote}"
         else
             reply message.replyto, "\2Error:\2 Failed to find quote"
         end

data/data/mod_spox/extras/Roulette.rb

@@ -4,15 +4,33 @@ class Roulette < ModSpox::Plugin
     
     def initialize(pipeline)
         super(pipeline)
-        Signature.find_or_create(:signature => 'roulette', :plugin => name, :method => 'roulette')
-        Signature.find_or_create(:signature => 'suicide', :plugin => name, :method => 'suicide')
-        Signature.find_or_create(:signature => 'shoot (\S+)', :plugin => name, :method => 'shoot').params = [:nick]
-        Signature.find_or_create(:signature => 'roulette topten', :plugin => name, :method => 'topten')
-        Signature.find_or_create(:signature => 'roulette stats ?(\S+)?', :plugin => name, :method => 'stats').params = [:nick]
+        Signature.find_or_create(:signature => 'roulette', :plugin => name, :method => 'roulette', :requirement => 'public')
+        Signature.find_or_create(:signature => 'suicide', :plugin => name, :method => 'suicide', :requirement => 'public')
+        Signature.find_or_create(:signature => 'shoot (\S+)', :plugin => name, :method => 'shoot', :requirement => 'public').params = [:nick]
+        Signature.find_or_create(:signature => 'roulette topten', :plugin => name, :method => 'topten', :requirement => 'public')
+        Signature.find_or_create(:signature => 'roulette stats ?(\S+)?', :plugin => name, :method => 'stats', :requirement => 'public').params = [:nick]
+        Signature.find_or_create(:signature => 'roulette chambers', :plugin => name, :method => 'chambers', :requirement => 'public')
         Game.create_table unless Game.table_exists?
         Info.create_table unless Info.table_exists?
         @banner = nil
-        @pipeline.hook(:self, :get_banner, :Internal_PluginResponse)
+        @pipeline.hook(self, :get_banner, :Internal_PluginResponse)
+    end
+    
+    # message:: ModSpox::Messages::Incoming::Privmsg
+    # Display chamber statistics
+    def chambers(m, p)
+        total = Game.all.size
+        result = Game.group(:chamber).select(:chamber, :COUNT[:chamber] => :total).reverse_order(:total)
+        if(result)
+            output = []
+            result.each do |res|
+                percent = sprintf('%.2d', ((res[:total].to_f / total.to_f) * 100.0))
+                output << "chamber #{res.chamber}: #{percent}% (#{res[:total]})"
+            end
+            reply m.replyto, "\2Chamber stats:\2 #{output.join(', ')}"
+        else
+            reply m.replyto, "\2Error:\2 No games found"
+        end
     end
     
     # message:: ModSpox::Messages::Internal::PluginResponse
@@ -57,7 +75,7 @@ class Roulette < ModSpox::Plugin
     def topten(message, params)
         return unless message.is_public?
         ds = Database.db[:infos].left_outer_join(:games, :id => :game_id)
-        ds.select!(:nick_id, :COUNT[:win] => :wins).where!(:channel_id => message.target.pk, :win => true).group!(:nick_id).order!(:wins.DESC).limit!(10)
+        ds.select!(:nick_id, :COUNT[:win] => :wins).where!(:channel_id => message.target.pk, :win => true).group!(:nick_id).reverse_order!(:wins).limit!(10)
         Logger.log(ds.sql)
         ids = ds.map(:nick_id)
         top = []
@@ -109,7 +127,7 @@ class Roulette < ModSpox::Plugin
     # channel:: ModSpox::Models::Channel
     # Return number of games nick has won
     def games_won(nick, channel)
-        Info.left_outer_join(:games, :id => :game_id).filter{:nick_id == nick.pk && :channel_id == channel.pk && :win == true}.size
+        Info.left_outer_join(:games, :id => :game_id).filter('nick_id = ?', nick.pk).filter('channel_id = ?', channel.pk).filter('win = ?', true).size
     end
     
     # nick:: ModSpox::Models::Nick
@@ -123,14 +141,14 @@ class Roulette < ModSpox::Plugin
     # channel:: ModSpox::Models::Channel
     # Return number of games nick has played
     def games_total(nick, channel)
-        Info.left_outer_join(:games, :id => :game_id).filter{:nick_id == nick.pk && :channel_id == channel.pk}.exclude(:game_id => game(channel).pk).size
+        Info.left_outer_join(:games, :id => :game_id).filter('nick_id = ?', nick.pk).filter('channel_id = ?', channel.pk).exclude(:game_id => game(channel).pk).size
     end
 
     # nick:: ModSpox::Models::Nick
     # channel:: ModSpox::Models::Channel
     # Return number of shots nick has taken
     def total_shots(nick, channel)
-        v = Info.left_outer_join(:games, :id => :game_id).filter{:nick_id == nick.pk && :channel_id == channel.pk}.exclude(:game_id => game(channel).pk).sum(:infos__shots)
+        v = Info.left_outer_join(:games, :id => :game_id).filter('nick_id = ?', nick.pk).filter('channel_id = ?', channel.pk).exclude(:game_id => game(channel).pk).sum(:infos__shots)
         v = 0 unless v
         return v
     end
@@ -165,8 +183,8 @@ class Roulette < ModSpox::Plugin
     def kill_nick(nick, channel)
         unless(@banner.nil?)
             begin
-                @banner.ban(nick, channel, '*BANG*', true, false)
-            rescue NotOperator => boom
+                @banner.ban(nick, channel, 30, '*BANG*', true, false)
+            rescue Banner::NotOperator => boom
                 reply(channel, "#{nick.nick}: *BANG*")
             rescue Object => boom
                 Logger.log("Error: Roulette ban generated an unexpected error: #{boom}")
@@ -180,7 +198,7 @@ class Roulette < ModSpox::Plugin
     # Return current game
     def game(channel)
         @pipeline << Messages::Internal::PluginRequest.new(self, 'Banner') if @banner.nil?
-        game = Game.filter{:shots > 0 && :channel_id == channel.pk}.first
+        game = Game.filter('shots > ?', 0).filter('channel_id = ?', channel.pk).first
         unless(game)
             chamber = rand(5) + 1
             game = Game.new(:chamber => chamber, :shots => chamber, :channel_id => channel.pk)
@@ -195,8 +213,8 @@ class Roulette < ModSpox::Plugin
     def shot(nick, channel)
         cur_game = game(channel)
         info = Info.find_or_create(:game_id => cur_game.pk, :nick_id => nick.pk)
-        info.set(:shots => info.shots + 1)
-        cur_game.set(:shots => cur_game.shots - 1)
+        info.update_with_params(:shots => info.shots + 1)
+        cur_game.update_with_params(:shots => cur_game.shots - 1)
         raise Bullet.new(cur_game) if cur_game.shots < 1
     end
     
@@ -205,7 +223,7 @@ class Roulette < ModSpox::Plugin
     # Return number of games nick has won
     def game_over(nick, game)
         Info.filter(:game_id => game.pk).each do |info|
-            info.set(:win => true) unless info.nick_id == nick.pk
+            info.update_with_params(:win => true) unless info.nick_id == nick.pk
         end
     end
     

data/data/mod_spox/extras/Topten.rb

@@ -0,0 +1,105 @@
+class Topten < ModSpox::Plugin
+
+    include Models
+
+    def initialize(pipeline)
+        super
+        ChatStat.create_table unless ChatStat.table_exists?
+        Signature.find_or_create(:signature => 'topten', :plugin => name, :method => 'topten',
+            :requirement => 'public', :description => 'Show topten users since midnight')
+        Signature.find_or_create(:signature => 'topten ([0-9]{4}\/[0-9]{2}\/[0-9]{2})', :plugin => name, :method => 'archive',
+            :description => 'Show topten from given date', :requirement => 'public').params = [:date]
+        Signature.find_or_create(:signature => 'stats ?(\S+)?', :plugin => name, :method => 'stats', :description => 'Show stats on nick',
+            :requirement => 'public').params = [:nick]
+        Signature.find_or_create(:signature => 'stats lifetime? (\S+)?', :plugin => name, :method => 'life_stats',
+            :description => 'Show stat totals for given nick', :requirement => 'public').params = [:nick]
+        @pipeline.hook(self, :log_stats, :Incoming_Privmsg)
+    end
+    
+    def topten(m, p)
+        stats = ChatStat.filter(:channel_id => m.target.pk, :daykey => construct_daykey).reverse_order(:bytes).limit(10)
+        if(stats.size > 0)
+            users = []
+            stats.each do |stat|
+                bytes = (stat.bytes > 1023) ? "#{sprintf('%.2f', (stat.bytes / 1024.0))}kb" : "#{stat.bytes}b"
+                users << "#{Nick[stat.nick_id].nick}: #{bytes}"
+            end
+            reply m.replyto, "\2Topten:\2 #{users.join(', ')}"
+        else
+            reply m.replyto, "\2Error:\2 No stats found for this channel."
+        end
+    end
+    
+    def archive(m, p)
+        stats = ChatStat.filter(:channel_id => m.target.pk, :daykey => p[:date]).reverse_order(:bytes).limit(10)
+        if(stats.size > 0)
+            users = []
+            stats.each do |stat|
+                bytes = (stat.bytes > 1023) ? "#{sprintf('%.2f', (stat.bytes / 1024.0))}kb" : "#{stat.bytes}b"
+                users << "#{Nick[stat.nick_id].nick}: #{bytes}"
+            end
+            reply m.replyto, "\2Topten:\2 #{users.join(', ')}"
+        else
+            reply m.replyto, "\2Error:\2 No stats found for date given."
+        end
+    end
+    
+    def stats(m, p)
+        nick = p[:nick] ? Nick.locate(p[:nick], false) : m.source
+        if(nick.is_a?(Nick))
+            stat = ChatStat.filter(:nick_id => nick.pk, :channel_id => m.target.pk, :daykey => construct_daykey).first
+            if(stat)
+                bytes = (stat.bytes > 1023) ? "#{sprintf('%.2f', (stat.bytes / 1024.0))}kb" : "#{stat.bytes}b"
+                reply m.replyto, "#{nick.nick}: #{bytes} logged. #{stat.words} words spoken. #{stat.questions} questions asked."
+            else
+                reply m.replyto, "\2Error:\2 #{nick.nick} has no stats recorded for today"
+            end
+        else
+            reply m.replyto, "\2Error:\2 Failed to find record of nick: #{p[:nick]}"
+        end
+    end
+    
+    def life_stats(m, p)
+        nick = p[:nick] ? Nick.locate(p[:nick], false) : m.source
+        if(nick)
+            result = ChatStat.group(:nick_id).select(:SUM[:bytes] => :tbytes, :SUM[:words] => :twords, :SUM[:questions] => :tquestions).filter(:nick_id => nick.pk).first
+            bytes = (result.tbytes > 1023) ? "#{sprintf('%.2f', (result.tbytes / 1024.0))}kb" : "#{result.tbytes}b"
+            reply m.replyto, "#{nick.nick} (total): #{bytes} logged, #{result.twords} words spoken and #{result.tquestions} questions asked"
+        else
+            reply m.replyto, "\2Error:\2 Failed to find #{p[:nick]}"
+        end
+    end
+    
+    def log_stats(m)
+        return unless m.is_public?
+        key = construct_daykey
+        stat = ChatStat.find_or_create(:nick_id => m.source.pk, :channel_id => m.target.pk, :daykey => key)
+        words = m.message.scan(/([^ ]+ |[^ ]$)/).size
+        bytes = m.message.gsub(/[^a-zA-Z0-9`\~\!@#\$%\^&\*\(\)_\+\[\]\}\{;:'"\/\?\.>,<\\|\-=]/, '').length
+        questions = m.message.scan(/.+?(\? |\?$)/).size
+        stat.words += words
+        stat.bytes += bytes
+        stat.questions += questions
+        stat.save
+    end
+    
+    private
+    
+    def construct_daykey
+        t = Time.now
+        return "#{t.year}/#{sprintf('%02d', t.month)}/#{sprintf('%02d', t.day)}"
+    end
+    
+    class ChatStat < Sequel::Model
+        set_schema do
+            primary_key :id
+            integer :words, :null => false, :default => 0
+            integer :bytes, :null => false, :default => 0
+            integer :questions, :null => false, :default => 0
+            varchar :daykey, :null => false
+            foreign_key :channel_id, :table => :channels
+            foreign_key :nick_id, :table => :nicks
+        end
+    end
+
+end

data/data/mod_spox/plugins/Authenticator.rb

@@ -129,9 +129,9 @@ class Authenticator < ModSpox::Plugin
     def nick_ident(message, params)
         nick = Models::Nick.find_or_create(:nick => params[:nick])
         if(params[:ident] == 'true')
-            nick.auth.set(:services => true)
+            nick.auth.update_with_params(:services => true)
         else
-            nick.auth.set(:services => false)
+            nick.auth.update_with_params(:services => false)
         end
         @pipeline << Messages::Outgoing::Privmsg.new(message.replyto, "Nick #{params[:nick]} has been updated. Services for authentication has been set to #{params[:ident]}")
     end

data/data/mod_spox/plugins/Banner.rb

@@ -179,7 +179,7 @@ class Banner < ModSpox::Plugin
     def ban_remove(message, params)
         record = BanRecord[params[:id].to_i]
         if(record)
-            record.set(:remaining => 0)
+            record.update_with_params(:remaining => 0)
             updater
             reply(message.replyto, 'Okay')
         else
@@ -243,8 +243,8 @@ class Banner < ModSpox::Plugin
             if(message.mode == '-b')
                 update = false
                 BanRecord.filter(:mask => message.target, :channel_id => message.channel.pk).each do |match|
-                    match.set(:remaining => 0)
-                    match.set(:removed => true)
+                    match.update_vaules(:remaining => 0)
+                    match.update_with_params(:removed => true)
                     update = true
                 end
                 updater if update
@@ -297,19 +297,19 @@ class Banner < ModSpox::Plugin
             begin
                 time = @sleep.nil? ? 0 : (Object::Time.now - @sleep).to_i
                 if(time > 0)
-                    BanRecord.filter{:remaining > 0}.update("remaining = remaining - #{time}")
-                    BanMask.filter{:bantime > 0}.update("bantime = bantime - #{time}")
+                    BanRecord.filter('remaining > ?', 0).update("remaining = remaining - #{time}")
+                    BanMask.filter('bantime > ?', 0).update("bantime = bantime - #{time}")
                 end
-                BanRecord.filter{:remaining <= 0 && :removed == false}.each do |record|
+                BanRecord.filter('remaining <= ?', 0).filter('removed = ?', false).each do |record|
                     if(me.is_op?(record.channel))
                         @pipeline << ChannelMode.new(record.channel, '-b', record.mask)
-                        record.set(:removed => true)
+                        record.update_with_params(:removed => true)
                         @pipeline << Invite.new(record.nick, record.channel) if record.invite
                     end
                 end
-                BanMask.filter{:bantime < 1}.destroy
-                next_ban_record = BanRecord.filter{:remaining > 0}.order(:remaining.ASC).first
-                next_mask_record = BanMask.filter{:bantime > 0}.order(:bantime.ASC).first
+                BanMask.filter('bantime < ?', 1).destroy
+                next_ban_record = BanRecord.filter('remaining > ?', 0).order(:remaining).first
+                next_mask_record = BanMask.filter('bantime > ?', 0).order(:bantime).first
                 if(next_ban_record && next_mask_record)
                     time = next_ban_record.bantime < next_mask_record.bantime ? next_ban_record.bantime : next_mask_record.bantime
                 elsif(next_ban_record)

data/data/mod_spox/plugins/Initializer.rb

@@ -33,7 +33,7 @@ class Initializer < ModSpox::Plugin
     private
     
     def populate_servers
-        Models::Server.order(:priority.DESC).each{|s|
+        Models::Server.reverse_order(:priority).each{|s|
             @servers << s
         }
     end

data/data/mod_spox/plugins/Triggers.rb

@@ -38,7 +38,7 @@ include Messages::Outgoing
     end
     
     def add(message, params)
-        Models::Trigger.find_or_create(:trigger => params[:trigger]).set(:active => true)
+        Models::Trigger.find_or_create(:trigger => params[:trigger]).update_with_params(:active => true)
         @pipeline << Privmsg.new(message.replyto, "Trigger #{params[:trigger]} is now active")
         @pipeline << Messages::Internal::TriggersUpdate.new
     end
@@ -58,7 +58,7 @@ include Messages::Outgoing
     def activate(message, params)
         trigger = Models::Trigger[params[:id]]
         if(trigger)
-            trigger.set(:active => true)
+            trigger.update_with_params(:active => true)
             @pipeline << Privmsg.new(message.replyto, "Trigger #{trigger.trigger} has been activated")
             @pipeline << Messages::Internal::TriggersUpdate.new
         else
@@ -69,7 +69,7 @@ include Messages::Outgoing
     def deactivate(message, params)
         trigger = Models::Trigger[params[:id]]
         if(trigger)
-            trigger.set(:active => false)
+            trigger.update_with_params(:active => false)
             @pipeline << Privmsg.new(message.replyto, "Trigger #{trigger.trigger} has been deactivated")
             @pipeline << Messages::Internal::TriggersUpdate.new
         else