mod_spox 0.2.0 → 0.3.0

data/data/mod_spox/extras/Pinger.rb

@@ -2,7 +2,7 @@ class Pinger < ModSpox::Plugin
 
     def initialize(pipeline)
         super(pipeline)
-        Models::Signature.find_or_create(:signature => 'ping', :plugin => name, :method => 'ping')
+        add_sig(:sig => 'ping', :method => :ping)
     end
     
     def ping(message, params)

data/data/mod_spox/extras/Quotes.rb

@@ -6,14 +6,10 @@ class Quotes < ModSpox::Plugin
         super
         Quote.create_table unless Quote.table_exists?
         group = Group.find_or_create(:name => 'quote')
-        Signature.find_or_create(:signature => 'quote ?(.+)?', :plugin => name, :method => 'quote',
-            :description => 'Display random quote, random quote containing search term, or quote with given ID').params = [:term]
-        Signature.find_or_create(:signature => 'addquote (.+)', :plugin => name, :method => 'addquote',
-            :description => 'Add a new quote').params = [:quote]
-        Signature.find_or_create(:signature => 'searchquote (.+)', :plugin => name, :method => 'searchquote',
-            :description => 'Return IDs of quotes matching term').params = [:term]
-        Signature.find_or_create(:signature => 'delquote (\d+)', :plugin => name, :method => 'delquote', :group_id => group.pk,
-            :description => 'Delete quote with given ID').params = [:id]
+        add_sig(:sig => 'quote ?(.+)?', :method => :quote, :desc => 'Display random quote, random quote containing search term, or quote with given ID', :params => [:term])
+        add_sig(:sig => 'addquote (.+)', :method => :addquote, :desc => 'Add a new quote', :params => [:quote])
+        add_sig(:sig => 'searchquote (.+)', :method => :searchquote, :desc => 'Return IDs of quotes matching term', :params => [:term])
+        add_sig(:sig => 'delquote (\d+)', :method => :delquote, :group => group, :desc => 'Delete quote with given ID', :params => [:id])
     end
     
     def quote(message, params)
@@ -48,7 +44,7 @@ class Quotes < ModSpox::Plugin
     
     def searchquote(message, params)
         result = Quote.filter(:quote => Regexp.new(params[:term], Regexp::IGNORECASE))
-        if(result.size > 0)
+        if(result.count > 0)
             ids = result.map(:id)
             ids.sort!
             ids = ids.slice(0, 20)
@@ -60,7 +56,7 @@ class Quotes < ModSpox::Plugin
     
     def delquote(message, params)
         result = Quote.filter(:id => params[:id].to_i)
-        if(result.size < 1)
+        if(result.count < 1)
             reply message.replyto, "\2Error:\2 Failed to find quote with ID: #{params[:id]}"
         else
             result.destroy
@@ -76,6 +72,8 @@ class Quotes < ModSpox::Plugin
             foreign_key :nick_id, :table => :nicks
             foreign_key :channel_id, :table => :channels
         end
+        many_to_one :nick, :class => ModSpox::Models::Nick
+        many_to_one :channel, :class => ModSpox::Models::Channel
     end
     
 end

data/data/mod_spox/extras/RegexTracker.rb

@@ -137,10 +137,8 @@ class RegexTracker < ModSpox::Plugin
             foreign_key :channel_id, :table => :channels, :null => false
             index [:regex, :channel_id], :unique => true
         end
-        
-        def channel
-            Channel[channel_id]
-        end
+
+        many_to_one :channel, :class => ModSpox::Models::Channel
         
         def channel=(chan)
             raise Exceptions::InvalidType.new('Channel model was expected') unless chan.is_a?(Models::Channel)

data/data/mod_spox/extras/Roulette.rb

@@ -4,12 +4,12 @@ class Roulette < ModSpox::Plugin
 
     def initialize(pipeline)
         super(pipeline)
-        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')
+        add_sig(:sig => 'roulette', :method => :roulette, :req => 'public')
+        add_sig(:sig => 'suicide', :method => :suicide, :req => 'public')
+        add_sig(:sig => 'shoot (\S+)', :method => :shoot, :req => 'public', :params => [:nick])
+        add_sig(:sig => 'roulette topten', :method => :topten, :req => 'public')
+        add_sig(:sig => 'roulette stats ?(\S+)?', :method => :stats, :req => 'public', :params => [:nick])
+        add_sig(:sig => 'roulette chambers', :method => :chambers, :req => 'public')
         Game.create_table unless Game.table_exists?
         Info.create_table unless Info.table_exists?
         @banner = nil
@@ -20,7 +20,7 @@ class Roulette < ModSpox::Plugin
     # Display chamber statistics
     def chambers(m, p)
         total = Game.all.size
-        result = Game.group(:chamber).select(:chamber, :COUNT[:chamber] => :total).reverse_order(:total)
+        result = Game.group(:chamber).select(:chamber, 'COUNT(chamber) as total'.lit).reverse_order(:total)
         if(result)
             output = []
             result.each do |res|
@@ -75,8 +75,8 @@ 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).reverse_order!(:wins).limit!(10)
-        ids = ds.map(:nick_id)
+        res = ds.select(:nick_id, 'COUNT(win) as wins'.lit).where(:channel_id => message.target.pk, :win => true).group(:nick_id).reverse_order(:wins).limit(10)
+        ids = res.map(:nick_id)
         top = []
         ids.each do |id|
             nick = Nick[id]
@@ -126,7 +126,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).filter('channel_id = ?', channel.pk).filter('win = ?', true).size
+        Info.left_outer_join(:games, :id => :game_id).filter('nick_id = ?', nick.pk).filter('channel_id = ?', channel.pk).filter('win = ?', true).count
     end
 
     # nick:: ModSpox::Models::Nick
@@ -140,7 +140,7 @@ 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).filter('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).count
     end
 
     # nick:: ModSpox::Models::Nick
@@ -213,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.update_with_params(:shots => info.shots + 1)
-        cur_game.update_with_params(:shots => cur_game.shots - 1)
+        info.update(:shots => info.shots + 1)
+        cur_game.update(:shots => cur_game.shots - 1)
         raise Bullet.new(cur_game) if cur_game.shots < 1
     end
 
@@ -223,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.update_with_params(:win => true) unless info.nick_id == nick.pk
+            info.update(:win => true) unless info.nick_id == nick.pk
         end
     end
 
@@ -236,12 +236,10 @@ class Roulette < ModSpox::Plugin
             foreign_key :channel_id, :null => false, :table => :channels
         end
 
-        before_create do
-            self.stamp = Time.now
-        end
+        many_to_one :channel, :class => ModSpox::Models::Channel
 
-        def channel
-            Models::Channel[channel_id]
+        def before_create
+            self.stamp = Time.now
         end
     end
 
@@ -253,14 +251,9 @@ class Roulette < ModSpox::Plugin
             foreign_key :nick_id, :null => false, :table => :nicks
             foreign_key :game_id, :null => false, :table => :games
         end
-
-        def nick
-            Models::Nick[nick_id]
-        end
-
-        def game
-            Models::Game[game_id]
-        end
+        
+        many_to_one :nick, :class => ModSpox::Models::Nick
+        many_to_one :game, :class => Game
     end
 
     class Bullet < Exception

data/data/mod_spox/extras/RubyCli.rb

@@ -0,0 +1,93 @@
+
+require 'timeout'
+class RubyCli < ModSpox::Plugin
+
+    include Models
+    include Messages::Outgoing
+
+    def initialize(pipeline)
+        super(pipeline)
+        ruby = Group.find_or_create(:name => 'php')
+        admin = Group.filter(:name => 'admin').first
+        add_sig(:sig => 'ruby (on|off)', :method => :set_channel, :group => admin, :desc => 'Add or remove channel from allowing ruby command', :params => [:action])
+        add_sig(:sig => 'ruby (?!on|off)(.+)', :method => :execute_ruby, :group => ruby, :desc => 'Execute ruby code', :params => [:code])
+        add_sig(:sig => 'rubyq (?!on|off)(.+)', :method => :quiet_ruby, :group => ruby, :params => [:code], :desc => 'Execute ruby quietly')
+        @channels = Setting.filter(:name => 'rubycli').first
+        @channels = @channels.nil? ? [] : @channels.value
+    end
+
+    def set_channel(message, params)
+        return unless message.is_public?
+        if(params[:action] == 'on')
+            unless(@channels.include?(message.target.pk))
+                @channels << message.target.pk
+                tmp = Setting.find_or_create(:name => 'rubycli')
+                tmp.value = @channels
+                tmp.save
+            end
+            information message.replyto, 'Ruby command now active'
+        else
+            unless(@channels.include?(message.target.pk))
+                warning message.replyto, 'Ruby command is not currently active in this channel'
+            else
+                @channels.delete(message.target.pk)
+                tmp = Setting.find_or_create(:name => 'rubycli')
+                tmp.value = @channels
+                tmp.save
+                information message.replyto, 'Ruby command is now disabled'
+            end
+        end
+    end
+
+    def quiet_ruby(message, params)
+        execute_ruby(message, params, true)
+    end
+    
+    # we fork into a separate process for more control
+    # over untrusted code
+    def execute_ruby(message, params, shh=false)
+        return unless @channels.include?(message.target.pk)
+        rd, wr = IO.pipe
+        cid = Kernel.fork do
+            rd.close
+            result = nil
+            begin
+                result = lambda{$SAFE=4; eval(params[:code])}.call
+            rescue Object => boom
+                result = boom
+            ensure
+                wr.write [Marshal.dump(result)].pack('m')
+            end
+        end
+        if(cid)
+            Database.reset_connections
+            begin
+                result = nil
+                Timeout::timeout(5) do
+                    wr.close
+                    result = rd.read
+                    rd.close
+                end
+                result = result.size > 0 ? Marshal.load(result.unpack('m')[0]) : ''
+                if(result.is_a?(Exception))
+                    error message.replyto, "Exception generated: #{result.to_s.index(' for ').nil? ? result.to_s : result.to_s.slice(0..result.to_s.index(' for '))}"
+                else
+                    result = result.to_s
+                    reply message.replyto, "#{message.source.nick}: Your result has been truncated. Don't print so much." if result.size > 300
+                    reply message.replyto, "#{shh ? '' : 'Result: '}#{result.slice(0..300)}"
+                end
+            rescue Timeout::Error
+                error message.replyto, 'Execution timeout reached.'
+                Logger.warn("Child process #{cid} to be killed")
+                Process.kill('KILL', cid)
+                Logger.warn("Child process #{cid} has been killed")
+            rescue Object => boom
+                error message.replyto, "Unknown error encountered: #{boom}"
+            ensure
+                Process.wait(cid, Process::WNOHANG)
+                Logger.info("RubyCli process has exited.")
+            end
+        end
+    end
+
+end

data/data/mod_spox/extras/Search.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'open-uri'
 require 'cgi'
 class Search < ModSpox::Plugin
 
@@ -6,7 +7,8 @@ class Search < ModSpox::Plugin
 
     def initialize(pipeline)
         super(pipeline)
-        Models::Signature.find_or_create(:signature => 'search (\d+)? ?(.+)', :plugin => name, :method => 'search', :description => 'Search the internet').params = [:number, :terms]
+        add_sig(:sig => 'search count (.+)', :method => 'search_count', :params => [:terms], :desc => 'Show number of results for given search')
+        add_sig(:sig => 'search (?!count)(\d+)? ?(.+)', :method => 'search', :desc => 'Search the internet', :params => [:number, :terms])
     end
 
     def search(message, params)
@@ -22,14 +24,26 @@ class Search < ModSpox::Plugin
                 title = CGI::unescapeHTML(title)
                 results.push [title, url]
             end
-            output = ["Search results for \2#{params[:terms]}:\2"]
+            output = []
             results.slice(0, limit).each do |title, url|
-                output << "#{title} -> #{Helpers.tinyurl(url)} [#{url.scan(/^http:\/\/.+?\//)[0]}]"
+                output << "#{Helpers.convert_entities(title)} -> #{Helpers.tinyurl(url)} [#{url.scan(/^http:\/\/.+?\//)[0]}]"
             end
+            output = output.empty? ? "No results for: \2#{params[:terms]}\2" :  ["Search results for \2#{params[:terms]}:\2"] + output
             reply message.replyto, output
         rescue Object => boom
             @pipeline << Privmsg.new(message.replyto, "Failed to find any results for: #{params[:terms]} Reason: #{boom}")
             Logger.warn("Error: #{boom}\n#{boom.backtrace.join("\n")}")
         end
     end
+    
+    def search_count(m, params)
+        buf = open("http://www.google.com/search?hl=en&q=#{CGI::escape(params[:terms])}", 'UserAgent' => 'mod_spox IRC bot').read
+        output = ''
+        if(buf =~ /of\s+about.+?([\d,]+)/)
+            output = "There are about \2#{$1}\2 results for the term \2#{params[:terms]}\2"
+        else
+            output = "There are no results found for the term \2#{params[:terms]}\2"
+        end
+        reply m.replyto, output
+    end
 end

data/data/mod_spox/extras/Seen.rb

@@ -0,0 +1,150 @@
+class Seen < ModSpox::Plugin
+    def initialize(pipe)
+        super
+        SeenLog.create_table unless SeenLog.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_privmsg, :Incoming_Notice)
+        @pipeline.hook(self, :log_outpriv, :Outgoing_Privmsg)
+        @pipeline.hook(self, :log_outpriv, :Outgoing_Notice)
+        add_sig(:sig => 'seen (\S+)', :method => :seen, :desc => 'Report last sighting of nick', :params => [:nick])
+    end
+
+    def seen(m, params)
+        nick = Models::Nick.filter(:nick => params[:nick]).first
+        log = SeenLog.filter(:nick_id => nick.pk).first if nick
+        if(nick && log)
+            message = "I last saw #{params[:nick]} on #{log.received} "
+            case log.type
+                when 'join'
+                    message << "joining #{log.channel.name}"
+                when 'part'
+                    message << "parting #{log.channel.name} "
+                    message << "reason: #{log.message}" unless log.message.nil? || log.message.empty?
+                when 'privmsg'
+                    message << "in #{log.channel.name} " unless log.channel.nil?
+                    message << "saying #{log.message}" unless log.action
+                    message << "doing: #{log.message}" if log.action
+                when 'notice'
+                    message << "in #{log.channel.name} " unless log.channel.nil?
+                    message << "sending notice: #{log.message}"
+                when 'kicking'
+                    mes = log.message.dup
+                    k = mes.slice!(0..mes.index('|')-1)
+                    mes.slice!(0)
+                    k = Models::Nick[k.to_i]
+                    message << "kicking #{k.nick} from #{log.channel.name} (Reason: #{mes})"
+                when 'kicked'
+                    mes = log.message.dup
+                    k = mes.slice!(0..mes.index('|')-1)
+                    mes.slice!(0)
+                    k = Models::Nick[k.to_i]
+                    message << "kicked from #{log.channel.name} by #{k.nick} (Reason: #{mes})"
+            end
+            information m.replyto, message
+        else
+            error m.replyto, "Failed to find record of given nick: #{params[:nick]}"
+        end
+    end
+
+    def log_outpriv(message)
+        type = message.instance_of?(Messages::Outgoing::Privmsg) ? 'privmsg' : 'notice'
+        target = message.target.is_a?(Sequel::Model) ? message.target : Helpers.find_model(message.target)
+        target = nil unless target.is_a?(Models::Channel)
+        log = get_log(me.pk)
+        log.action = message.is_action?
+        log.message = message.message
+        log.type = type
+        log.channel = target unless target.nil?
+        log.received = Time.now
+        log.save
+    end
+    
+    def log_privmsg(message)
+        return unless message.source.is_a?(Models::Nick)
+        type = message.instance_of?(Messages::Incoming::Privmsg) ? 'privmsg' : 'notice'
+        target = message.target.is_a?(Sequel::Model) ? message.target : Helpers.find_model(message.target)
+        target = nil unless target.is_a?(Models::Channel)
+        log = get_log(message.source.pk)
+        log.action = message.is_action?
+        log.message = message.message
+        log.type = type
+        log.channel = target unless target.nil?
+        log.received = message.time
+        log.save
+    end
+    
+    def log_join(message)
+        log = get_log(message.nick.pk)
+        log.action = false
+        log.message = nil
+        log.type = 'join'
+        log.channel = message.channel
+        log.received = message.time
+        log.save
+    end
+    
+    def log_part(message)
+        log = get_log(message.nick.pk)
+        log.action = false
+        log.type = 'part'
+        log.message = message.reason
+        log.channel = message.channel
+        log.received = message.time
+        log.save
+    end
+    
+    def log_quit(message)
+        log = get_log(message.nick.pk)
+        log.action = false
+        log.type = 'quit'
+        log.message = message.message
+        log.channel = nil
+        log.received = message.time
+        log.save
+    end
+    
+    def log_kick(message)
+        # log kicker
+        log = get_log(message.kicker.pk)
+        log.action = false
+        log.type = 'kicking'
+        log.channel = message.channel
+        log.received = message.time
+        log.message = "#{message.kickee.pk}|#{message.reason}"
+        log.save
+        # log kickee
+        log = get_log(message.kickee.pk)
+        log.action = false
+        log.type = 'kicked'
+        log.channel = message.channel
+        log.received = message.time
+        log.message = "#{message.kicker.pk}|#{message.reason}"
+        log.save
+    end
+
+    private
+    
+    def get_log(pk)
+        log = SeenLog.filter(:nick_id => pk).first
+        log = SeenLog.new(:nick_id => pk) unless log
+        return log
+    end
+
+    class SeenLog < Sequel::Model
+        set_schema do
+            foreign_key :nick_id, :table => :nicks, :null => false
+            foreign_key :channel_id, :table => :channels
+            varchar :type, :default => 'privmsg'
+            timestamp :received, :null => false
+            boolean :action, :null => false, :default => true
+            text :message
+            primary_key :nick_id
+        end
+        many_to_one :nick, :class => ModSpox::Models::Nick
+        many_to_one :channel, :class => ModSpox::Models::Channel
+    end
+end