zmb 0.2.1 → 0.3.0

data/plugins/dns.rb

@@ -6,16 +6,12 @@ class DNS
   
   def commands
     {
-      'dns' => :dns,
+      'dns' => lambda { |e, host| Resolv.new.getaddress(host) },
       'rdns' => :rdns,
       'whois' => [:whois, 1, { :help => 'perform a whois on a domain' }],
     }
   end
   
-  def dns(e, host)
-    Resolv.new.getaddress(host)
-  end
-  
   def rdns(e, ip)
     begin
       Resolv.new.getname(ip)

data/plugins/gcalc.rb

@@ -12,10 +12,7 @@ class GCalc
   end
   
   def calc(e, search)
-    http = Net::HTTP.new('www.google.com', 80)
-    resp, body = http.start do |h|
-        h.get("/search?q=#{URI.escape(search, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}")
-    end
+    resp, body = 'http://www.google.com/search'.get({ :q => URI.escape(search, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")) })
     
     if resp.code == '200' then
       if body.include?('<img src=/images/calc_img.gif width=40 height=30 alt="">')

data/plugins/idle.rb

@@ -4,14 +4,15 @@ class Idle
   end
   
   def event(sender, e)
-    if e.message? and e.respond_to?('channel') then
+    if e.message? and not 
+      e.message.include?('idle') and e.respond_to?('channel') then
       @channels[e.channel] = Time.now if not e.message.include?('idle')
     end
   end
   
   def commands
     {
-      'idle' => [:idle, 1, { :help => 'How long has this channel been idle?'}],
+      'idle' => [:idle, 1, { :help => 'How long has this channel been idle?' }],
     }
   end
   
@@ -20,20 +21,8 @@ class Idle
     
     if not @channels.has_key?(channel) then
       "I have not seen any messages in #{channel}"
-    else
-      diff = Time.now - @channels[channel]
-      
-      if diff < 60 then
-        msg = "#{Integer(diff)} seconds ago"
-      elsif diff < 3600 then
-        msg = "#{Integer(diff/60)} minutes ago"
-      elsif diff < 86400 then
-        msg = "about #{Integer(diff/3600)} hours ago"
-      else
-        msg = "#{Integer(diff/86400)} days ago"
-      end
-      
-      "Last message in #{channel} was #{msg}"
+    else      
+      "Last message in #{channel} was #{@channels[channel].since_words}"
     end
   end
 end

data/plugins/irc.rb

@@ -62,7 +62,7 @@ class Event
 end
 
 class IrcConnection
-  attr_accessor :host, :port, :channels, :nick, :name, :realname, :password, :throttle
+  attr_accessor :delegate, :host, :port, :channels, :nick, :name, :realname, :password, :throttle
   
   def initialize(sender, s={})
     @delegate = sender
@@ -85,7 +85,7 @@ class IrcConnection
     @throttle = 10
     @throttle = s['throttle'] if s.has_key?('throttle')
     
-    sender.timer_add(Timer.new(self, :connect, 0.1, false)) if sender.running?
+    @delegate.timer_add(Timer.new(self, :connect, 0.1, false)) if sender.running?
   end
   
   def socket=(value)
@@ -121,16 +121,51 @@ class IrcConnection
   
   def commands
     {
-      'join' => [:join_command, 1, { :permission => 'admin' }],
-      'part' => [:part_command, 1, { :permission => 'admin' }],
-      'cycle' => [:cycle_command, 1, { :permission => 'admin' }],
-      'topic' => [:topic_command, 2, { :permission => 'admin' }],
-      'kick' => [:kick_command, 2, { :permission => 'admin' }],
-      'channels' => [:channels_command, 1, { :permission => 'admin' }],
-      'raw' => [:raw_command, 1, { :permission => 'admin' }],
-      'nick' => [:nick_command, 1, { :permission => 'admin' }],
-      'tell' => [:tell_command, 2, { :permission => 'admin' }],
-      'reconnect' => [:reconnect_command, 1, { :permission => 'admin' }],
+      'join' => [:join_command, 1, {
+        :permission => 'admin',
+        :help => 'Join a channel',
+        :usage => 'channel',
+        :example => '#zmb' }],
+      'part' => [:part_command, 1, {
+        :permission => 'admin',
+        :help => 'Leave a channel',
+        :usage => 'channel',
+        :example => '#zmb' }],
+      'cycle' => [:cycle_command, 1, {
+        :permission => 'admin',
+        :help => 'Part and rejoin a channel',
+        :usage => 'channel',
+        :example => '#zmb' }],
+      'topic' => [:topic_command, 2, {
+        :permission => 'admin',
+        :help => 'Set the topic in a channel',
+        :usage => 'channel topic',
+        :example => '#zmb' }],
+      'kick' => [:kick_command, 2, {
+        :permission => 'admin',
+        :help => 'Kick a user from a channel',
+        :usage => 'channel user',
+        :example => '#zmb zynox' }],
+      'channels' => [:channels_command, 1, {
+        :permission => 'admin',
+        :help => 'List all the channels this bot is in.' }],
+      'raw' => [:raw_command, 1, {
+        :permission => 'admin',
+        :help => 'Send raw IRC commands',
+        :usage => 'command',
+        :example => 'PRIVMSG #zmb :Hello world!' }],
+      'nick' => [:nick_command, 1, {
+        :permission => 'admin',
+        :help => 'Change the bot\'s nick',
+        :usage => 'new-nick',
+        :example => 'zmb' }],
+      'tell' => [:tell_command, 2, {
+        :permission => 'admin',
+        :usage => 'location message',
+        :example => '#zmb Hello World!' }],
+      'reconnect' => [:reconnect_command, 1, {
+        :permission => 'admin',
+        :help => 'Reconnect to the irc server' }],
     }
   end
   
@@ -140,8 +175,8 @@ class IrcConnection
   end
   
   def nick=(value)
-    @nick = value
     write "NICK #{@nick}"
+    @nick = value
   end
   
   def connected?
@@ -160,7 +195,7 @@ class IrcConnection
   
   def disconnected(sender, socket)
     @socket = nil
-    sender.timer_add(Timer.new(self, :connect, @throttle))
+    @delegate.timer_add(Timer.new(self, :connect, @throttle))
   end
   
   def perform
@@ -170,29 +205,16 @@ class IrcConnection
   end
   
   def write(line)
-    @socket.write line + "\r\n" if @socket
+    begin
+      @socket.write line + "\r\n" if @socket
+    rescue
+      disconnected(self, nil)
+    end  
   end
   
   def message(recipient, msg)
-    if msg.size >= (total = 510 - (recipient.size + 10)) then
-      words = msg.split(' ')
-      line = words.shift
-      length = line.size
-      
-      words.each do |word|
-        if (length += (word.size + 1)) >= total then
-          write "PRIVMSG #{recipient} :#{line}"
-          sleep 0.1
-          line = word
-          length = word.size
-        else
-          line += " #{word}"
-        end
-      end
-      
-      write "PRIVMSG #{recipient} :#{line}" if line.size > 0
-    else
-      write "PRIVMSG #{recipient} :#{msg}"
+    msg.truncate_words(500-recipient.size).each do |m|
+      write "PRIVMSG #{recipient} :#{m}"
     end
   end
   
@@ -221,10 +243,7 @@ class IrcConnection
         when '001' then
           sleep 0.1
           @channels.each{ |channel| write "JOIN #{channel}" }
-        when 'nick' then tmp, @nick = e.args.split(' :', 2)
-        when '433' then
-          @nick="#{@nick}_"
-          write "NICK #{@nick}"
+        when '433' then nick = "#{@nick}_"
       end
       
       @delegate.event(self, e)

data/plugins/quote.rb

@@ -38,7 +38,7 @@ class Quote
       'quote-del' => [:del_command, 1, { 
         :help => 'Delete a quote by id',
         :example => '7'}],
-      'quote-count' =>[:count_command, 0, {
+      'quote-count' =>[lambda { |e| "#{count} quotes" }, 0, {
         :help => 'Show amount of quotes' }],
       'quote-last' => [:last_command, 0, { :help => 'Show the last quote' }],
       'quote-search' => [:search_command, 1, {
@@ -77,10 +77,6 @@ class Quote
     end
   end
   
-  def count_command(e)
-    "#{count} quotes"
-  end
-  
   def last_command(e)
     return "no quotes" if count < 1
     quote_command(e, @quotes.keys.sort.reverse[0])

data/plugins/random.rb

@@ -1,32 +1,18 @@
 class Random
   def initialize(sender, settings); end
   
-  def split_seperators(data)
-    if data.class == Array then
-      data
-    elsif data.include?("\n") then
-      data.split("\n").map{ |arg| arg.strip }
-    elsif data.include?(',') then
-      data.split(',').map{ |arg| arg.strip }
-    elsif data.include?(' ') then
-      data.split(' ')
-    else
-      data
-    end
-  end
-  
   def commands
     {
       'random' => :random,
       'yesno' => [:yesno, 0],
       'headstails' => [:coinflip, 0],
       'coinflip' => [:coinflip, 0],
-      'dice' => [:dice, 0],
+      'dice' => [lambda { |e| "#{rand(6) + 1}" }, 0],
     }
   end
   
   def random(e, args)
-    items = split_seperators(args)
+    items = args.split_seperators
     "#{items[rand(items.size)]}"
   end
   
@@ -37,10 +23,6 @@ class Random
   def coinflip(e)
     random(e, ['heads', 'tails'])
   end
-  
-  def dice(e)
-    "#{rand(6) + 1}"
-  end
 end
 
 Plugin.define do

data/plugins/relay.rb

@@ -28,11 +28,15 @@ class Relay
       'relays' => [:relays_command, 0, {
         :help => 'Show all relays' }],
       'relay-add' => [:add_command, 2, {
+        :permission => 'admin',
         :help => 'Add a relay',
-        :permission => 'admin' }],
+        :usage => 'instance:channel instance:channel',
+        :example => 'efnet:#zmb efnet:#zmb2' }],
       'relay-del' => [:del_command, 1, {
+        :permission => 'admin'
         :help => 'Delete a relay',
-        :permission => 'admin' }],
+        :usage => 'instance:channel'
+        :example => 'efnet:#zmb' }],
     }
   end
   
@@ -68,7 +72,7 @@ class Relay
 end
 
 Plugin.define do
-  name "relay"
-  description "This plugin allows you to relay messages from one channel/server to another."
+  name 'relay'
+  description 'This plugin allows you to relay messages from one channel/server to another.'
   object Relay
 end

data/plugins/security.rb

@@ -69,11 +69,11 @@ class Security
         :example => '.... . .-.. .-.. --- / .-- --- .-. .-.. -..' }],
       
       'rot13' => :rot13,
-      'sha1' => [:sha1, 1, { :help => 'Create a sha1 hash of some text' }],
-      'sha256' => [:sha256, 1, { :help => 'Create a sha256 hash of some text' }],
-      'md5' => [:md5, 1, { :help => 'Create a md5 hash of some text' }],
-      'base64' => [:base64, 1, { :help => '' }],
-      'decode64' => [:decode64, 1, { :help => '' }],
+      'sha1' => [lambda { |e, data| Digest::SHA1.hexdigest(data) }, 1, { :help => 'Create a sha1 hash of some text' }],
+      'sha256' => [lambda { |e, data| Digest::SHA256.hexdigest(data) }, 1, { :help => 'Create a sha256 hash of some text' }],
+      'md5' => [lambda { |e, data| Digest::MD5.hexdigest(data) }, 1, { :help => 'Create a md5 hash of some text' }],
+      'base64' => [lambda { |e, data| Base64.b64encode(data) }, 1, { :help => '' }],
+      'decode64' => [lambda { |e, data| Base64.decode64(data) }, 1, { :help => '' }],
     }
   end
   
@@ -88,26 +88,6 @@ class Security
   def rot13(e, data)
     data.tr('A-Ma-mN-Zn-z', 'N-Zn-zA-Ma-m')
   end
-  
-  def sha1(e, data)
-    Digest::SHA1.hexdigest(data)
-  end
-  
-  def sha256(e, data)
-    Digest::SHA256.hexdigest(data)
-  end
-  
-  def md5(e, data)
-    Digest::MD5.hexdigest(data)
-  end
-  
-  def base64(e, data)
-    Base64.b64encode(data)
-  end
-  
-  def decode64(e, data)
-    Base64.decode64(data)
-  end
 end
 
 Plugin.define do

data/plugins/sed.rb

@@ -0,0 +1,18 @@
+class Sed
+  def initialize(sender, settings)
+    @messages = Hash.new
+  end
+  
+  def event(sender, e)
+    if e.message =~ /^s\/(\S+)\/(\S+)\/$/ then
+      e.reply("#{e.name} meant " + @messages[e.userhost].sub($1, $2))
+    else
+      @messages[e.userhost] = e.message if e.message?
+    end
+  end
+end
+
+Plugin.define do
+  name 'sed'
+  object Sed
+end

data/plugins/url.rb

@@ -5,37 +5,6 @@ require 'cgi'
 class URL
   def initialize(sender, s) ;end
   
-  def to_query_string(h)
-    h.map { |k, v| 
-      if v.instance_of?(Hash)
-        v.map { |sk, sv|
-          "#{k}[#{sk}]=#{sv}"
-        }.join('&')
-      else
-        "#{k}=#{v}"
-      end
-    }.join('&')
-  end
-  
-  def http(host, port=80, path='/', type='get', query_string={})
-    http = Net::HTTP.new(host, port)
-    query_string = to_query_string(query_string) if query_string.class == Hash
-    http.start do |h|
-      case type
-        when 'get' then h.get(path + '?' + query_string)
-        when 'post' then h.post(path, query_string)
-        when 'head' then h.head(path + '?' + query_string)
-      end
-    end
-  end
-  
-  def http_uri(url, type='get')
-    u = URI.parse(url)
-    u.path = '/' if u.path.size == 0
-    u.query = '' if not u.query
-    http(u.host, u.port, u.path, type, u.query)
-  end
-  
   def commands
     {
       'head' => :head,
@@ -50,7 +19,7 @@ class URL
   end
   
   def head(e, url)
-    resp = http_uri(url, 'head')
+    resp = url.http('head')
     
     if resp.code == "301" or resp.code == "302" then
       "#{resp.code} - #{resp['location']}"
@@ -62,33 +31,29 @@ class URL
   end
   
   def get(e, url)
-    resp, body = http_uri(url)
-    body
+    url.get.body
   end
   
   def bitly(e, link)
-    resp, body = http('bit.ly', 80, '/api', 'get', { :url => link })
-    body
+    'http://bit.ly/api'.get({ :url => link }).body
   end
   
   def isgd(e, link)
-    resp, body = http('is.gd', 80, '/api.php', 'get', { :longurl => link })
-    body
+    'http://is.gd/api.php'.get({ :longurl => link }).body
   end
   
   def tinyurl(e, link)
-    resp, body = http('tinyurl.com', 80, '/api-create.php', 'get', { :url => link })
-    body
+    'http://tinyurl.com/api-create.php'.get({ :url => link }).body
   end
   
   def dpaste(e, data)
-    resp, body = http('dpaste.de', 80, '/api/', 'post', { :content => data })
+    resp, body = 'http://dpaste.de/api/'.post({ :content => data })
     body = body[1..-2] if body =~ /^".+"$/ # Remove any quotation marks if there are any
     body
   end
   
   def pastie(data, is_private=false, format='plaintext')
-    resp, body = http('pastie.org', 80, '/pastes', 'post', { :paste => {
+    resp, body = 'http://pastie.org/pastes'.post({ :paste => {
       :body => CGI.escape(data),
       :parser => format,
       :restricted => is_private,