zmb 0.1.3 → 0.2.0

data/plugins/system.rb

@@ -1,15 +1,11 @@
 class System
-  def initialize(sender, settings) ;end
-  
-  def to_json(*a)
-    { 'plugin' => 'system' }.to_json(*a)
-  end
+  def initialize(sender, s) ;end
   
   def commands
     require 'zmb/commands'
     {
-      'uptime' => Command.new(self, :uptime, 0, 'Server uptime'),
-      'date' => Command.new(self, :date, 0, 'Display the server date/time'),
+      'uptime' => [:uptime, 0, { :help => 'Server uptime' }],
+      'date' => [:date, 0, { :help => 'Display the server date/time' }],
     }
   end
   

data/plugins/url.rb

@@ -0,0 +1,110 @@
+require 'uri'
+require 'net/http'
+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 commands
+    {
+      'head' => :head,
+      'bitly' => :bitly,
+      'isgd' => :isgd,
+      'tinyurl' => :tinyurl,
+      'dpaste' => :dpaste,
+      'pastie' => :pastie_command,
+      'ppastie' => [:private_pastie_command, 1, { :help => 'Create a private pastie' }],
+    }
+  end
+  
+  def head(e, url)
+    u = URI.parse(url)
+    u.path = '/' if u.path.size == 0
+    u.query = '' if not u.query
+    
+    resp = http(u.host, u.port, u.path, 'head', u.query)
+    if resp.code == "301" or resp.code == "302" then
+      "#{resp.code} - #{resp['location']}"
+    elsif resp.code == "404" then
+      "404 - Page not found"
+    else
+      "#{resp.code}"
+    end
+  end
+  
+  def bitly(e, link)
+    resp, body = http('bit.ly', 80, '/api', 'get', { :url => link })
+    body
+  end
+  
+  def isgd(e, link)
+    resp, body = http('is.gd', 80, '/api.php', 'get', { :longurl => link })
+    body
+  end
+  
+  def tinyurl(e, link)
+    resp, body = http('tinyurl.com', 80, '/api-create.php', 'get', { :url => link })
+    body
+  end
+  
+  def dpaste(e, data)
+    resp, body = http('dpaste.de', 80, '/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 => {
+      :body => CGI.escape(data),
+      :parser => format,
+      :restricted => is_private,
+      :authorization => 'burger'
+    }})
+    
+    puts resp.code
+    
+    if resp.code == '302' then
+      resp['location']
+    else
+      body
+    end
+  end
+  
+  def pastie_command(e, data)
+    pastie(data)
+  end
+  
+  def private_pastie_command(e, data)
+    pastie(data, true)
+  end
+end
+
+Plugin.define do
+  name 'url'
+  description 'URL shortening and paste websites'
+  object URL
+end

data/plugins/usermodes.rb

@@ -0,0 +1,90 @@
+class Usermodes
+  def initialize(sender, s)
+    @usermodes = Hash.new
+    @usermodes = s['usermodes'] if s.has_key?('usermodes')
+  end
+  
+  def settings
+    { 'usermodes' => @usermodes }
+  end
+  
+  def add(instance, channel, username, mode)
+    k = instance + ':' + channel
+    @usermodes[k] = Hash.new if not @usermodes.has_key?(k)
+    @usermodes[k][username] = Array.new if not @usermodes[k].has_key?(username)
+    @usermodes[k][username] << mode
+  end
+  
+  def remove(instance, channel, username=nil, mode=nil)
+    k = instance + ':' + channel
+    @usermodes.delete(k) if @usermodes.has_key?(k) and username == nil
+    
+    if @usermodes.has_key?(k) and @usermodes[k].has_key?(username) then
+      @usermodes[k][username].delete(mode)
+      @usermodes[k].delete(username) if not mode or @usermodes[k][username].empty?
+      @usermodes.delete(k) if @usermodes[k].empty?
+    end
+  end
+  
+  def event(sender, e)
+    if e.command == 'join' and e.respond_to?('user') then
+      if @usermodes.has_key?(k = e.delegate.instance + ':' + e.channel) then
+        if @usermodes[k].has_key?(e.user.username) then
+          @usermodes[k][e.user.username].each{ |mode| e.delegate.write "MODE #{e.channel} +#{mode} #{e.name}" }
+        end
+      end
+    end
+  end
+  
+  def commands
+    {
+      'usermode-add' => [:usermode_add, 4, {
+        :permission => 'admin',
+        :help => 'Apply a usermode to a user when they join a channel',
+        :usage => 'instance channel user mode',
+        :example => 'efnet #zmb zynox o' }],
+      'usermode-del' => [:usermode_del, 4  , {
+        :permission => 'admin',
+        :help => 'Delete a usermode',
+        :usage => 'instance channel user mode',
+        :example => 'efnet #zmb zynox o' }],
+      'usermodes' => [:usermodes, 2    , {
+        :permission => 'admin',
+        :help => 'List all usermodes for a channel',
+        :usage => 'instance channel',
+        :example => 'efnet #zmb' }],
+      'usermodes-ls' => [:usermodes_ls      , {
+        :permission => 'admin',
+        :help => 'List all channels usermodes are applied to' }],
+    }
+  end
+  
+  def usermode_add(e, *args)
+    add(*args)
+    "usermode added"
+  end
+  
+  def usermode_del(e, *args)
+    remove(*args)
+    "usermode deleted"
+  end
+  
+  def usermodes(e, instance, channel)
+    k = instance + ':' + channel
+    if @usermodes.has_key?(k) then
+      @usermodes[k].map{ |k,v| "#{k} +#{v.join('')}" }.join("\n")
+    else
+      'no usermodes found for instance/channel'
+    end
+  end
+  
+  def usermodes_ls(e)
+    @usermodes.keys.map{ |k| k.split(':', 2) }.map{ |i,c| "#{i} - #{c}" }.join("\n")
+  end
+end
+
+Plugin.define do
+  name 'usermodes'
+  description 'Auto opping, voicing users in a channel'
+  object Usermodes
+end

data/plugins/users.rb

@@ -13,7 +13,8 @@ class User
   
   def self.create_settings(data)
     require 'time'
-    user = new(data['username'], data['password'])
+    user = new(data['username'])
+    user.raw_password = data['password']
     user.userhosts = data['userhosts'] if data.has_key?('userhosts')
     user.permissions = data['permissions'] if data.has_key?('permissions')
     user.seen = Time.parse(data['seen']) if data.has_key?('seen') and data['seen']
@@ -33,6 +34,10 @@ class User
     @userhosts += other_user.userhosts
   end
   
+  def raw_password=(new_password)
+    @password = new_password
+  end
+  
   def password=(new_password)
     @password = Digest::SHA1.hexdigest(new_password)
   end
@@ -79,14 +84,14 @@ end
 class Users
   attr_accessor :users
   
-  def initialize(sender, settings={})
+  def initialize(sender, s={})
     @delegate = sender
-    @users = settings['users'].map{ |user| User.create_settings(user) } if settings.has_key?('users')
+    @users = s['users'].map{ |user| User.create_settings(user) } if s.has_key?('users')
     @users = Array.new if not @users
   end
   
-  def to_json(*a)
-    {'users' => @users, 'plugin' => 'users'}.to_json(*a)
+  def settings
+    { 'users' => @users }
   end
   
   def user!(search)
@@ -109,24 +114,54 @@ class Users
   end
   
   def commands
-    require 'zmb/commands'
     {
-      'meet' => Command.new(self, :meet, 1, 'Meet a new user'),
-      'forget' => AuthCommand.new(self, :forget, 0, "Forget about a user"),
-      'permit' => PermCommand.new('admin', self, :permit, 2),
-      'deny' => PermCommand.new('admin', self, :deny, 2),
-      'perms' => AuthCommand.new(self, :perms, 1, 'List all permissions a user has.'),
-      'merge' => PermCommand.new('admin', self, :merge, 2, 'Merge two users together'),
-      'password' => AuthCommand.new(self, :password, 1, 'Set the password for your account'),
-      'login' => Command.new(self, :login, 2, 'Add your current host to the username and password provided.'),
-      'logout' => AuthCommand.new(self, :logout, 0, 'Remove your current host from your account.'),
-      'whoami' => Command.new(self, :whoami, 0, 'Who are you logged in as?'),
-      'userhosts' => AuthCommand.new(self, :userhosts, 0, 'List all the hosts associated with your account'),
-      'adduserhost' => AuthCommand.new(self, :adduserhost, 1, 'Add a host to your account'),
-      'deluserhost' => AuthCommand.new(self, :deluserhost, 1, 'Remove a host to your account'),
-      'names' => Command.new(self, :names, 1, 'List all the users'),
-      'seen' => Command.new(self, :seen, 1, 'When was a user last seen'),
-      'sudo' => PermCommand.new('admin', self, :sudo, 2, 'Execute a command as another user.'),
+      'meet' => [:meet, 1, { :help => 'Meet a user' }],
+      'forget' => [:forget, 0, {
+        :help => 'Forget about a user',
+        :permission => 'authenticated' }],
+      'permit' => [:permit, 2, {
+        :permission => 'admin',
+        :help => 'Add a permission to a user',
+        :usage => '<user> <permission>',
+        :example => 'zynox admin' }],
+      'deny' => [:deny, 2, {
+        :permission => 'admin',
+        :help => 'Remove a permission from a user',
+        :usage => '<user> <permission>',
+        :example => 'zynox admin' }],
+      'perms' => [:perms, 0, {
+        :permission => 'authenticated',
+        :help => 'List all the permissions you have' }],
+      'merge' => [:merge, 2, {
+        :permission => 'admin',
+        :help => 'Merge two users together, give user a the permissions and useragents of b and then delete b',
+        :usage => 'user_a user_b'}],
+      'password' => [:password, 1, {
+        :permission => 'authenticated',
+        :help => 'Set the password for your account',
+        :usage => 'password' }],
+      'login' => [:login, 2, {
+        :help => 'Login to your account, adding your current userhost to your account.',
+        :usage => 'username password' }],
+      'logout' => [:logout, 0, {
+        :permission => 'authenticated',
+        :help => 'Logout from your account, this will remove your current userhost from your account.' }],
+      'whoami' => [:whoami, 0, { :help => 'Who are you logged in as?' }],
+      'userhosts' => [:userhosts, 0, {
+        :help => 'List all the userhosts associated with your account.' }],
+      'adduserhost' => [:adduserhost, 1, { :help => 'Add a userhost to your account.' }],
+      'rmuserhost' => [:rmuserhost, 1, { :help => 'Remove a userhost to your account.' }],
+      'names' => [:names, 1, {
+        :help => 'List all the users',
+        :usage => '<search>' }],
+      'seen' => [:seen, 1, {
+        :help => 'When was a user last seen?',
+        :usage => 'user' }],
+      'sudo' => [:sudo, 2, {
+        :permission => 'admin',
+        :help => 'Execute a command as another user.',
+        :usage => 'user command',
+        :example => 'zynox whoami' }],
     }
   end
   
@@ -168,7 +203,7 @@ class Users
     end
   end
   
-  def perms(e, username=nil)
+  def perms(e)
     e.user.permissions.empty? ? "#{e.user.username} has no permissions" : e.user.permissions.join(', ')
   end
   
@@ -193,19 +228,17 @@ class Users
   def login(e, username, password)
     user = user!(username)
     
-    if e.user.authenticated? then
-      'already logged in'
-    elsif user and user.password?(password) then
-      user.hosts << e.userhost
-      "#{request.hostname} added to your account #{user.username}"
+    if user and user.password?(password) then
+      user.userhosts << e.userhost
+      "#{e.userhost} added to your account #{user.username}"
     else
       'user and/or password is incorrect'
     end
   end
   
   def logout(e)
-    e.user.hosts.delete(e.userhost)
-    "userhost #{e.hostname} removed from your account."
+    e.user.userhosts.delete(e.userhost)
+    "userhost #{e.userhost} removed from your account."
   end
   
   def whoami(e)
@@ -221,7 +254,7 @@ class Users
     "#{userhost} added to #{e.user.username}"
   end
   
-  def deluserhost(e, userhost)
+  def rmuserhost(e, userhost)
     if e.user.userhosts.delete(userhost) then
       "#{userhost} deleted from #{e.user.username}"
     else

data/zmb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zmb}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kylef"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-03-05}
   s.default_executable = %q{zmb}
   s.description = %q{ZMB, messenger bot}
   s.email = %q{inbox@kylefuller.co.uk}
@@ -27,20 +27,26 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/zmb",
      "lib/zmb.rb",
-     "lib/zmb/commands.rb",
      "lib/zmb/event.rb",
      "lib/zmb/plugin.rb",
      "lib/zmb/settings.rb",
      "lib/zmb/timer.rb",
+     "plugins/announce.rb",
+     "plugins/autorejoin.rb",
      "plugins/bank.rb",
      "plugins/commands.rb",
+     "plugins/dns.rb",
      "plugins/idle.rb",
      "plugins/irc.rb",
+     "plugins/log.rb",
      "plugins/nickserv.rb",
      "plugins/poll.rb",
      "plugins/quote.rb",
      "plugins/relay.rb",
+     "plugins/security.rb",
      "plugins/system.rb",
+     "plugins/url.rb",
+     "plugins/usermodes.rb",
      "plugins/users.rb",
      "test/helper.rb",
      "test/test_zmb.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zmb
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - kylef
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +00:00
+date: 2010-03-05 00:00:00 +00:00
 default_executable: zmb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,20 +50,26 @@ files:
 - VERSION
 - bin/zmb
 - lib/zmb.rb
-- lib/zmb/commands.rb
 - lib/zmb/event.rb
 - lib/zmb/plugin.rb
 - lib/zmb/settings.rb
 - lib/zmb/timer.rb
+- plugins/announce.rb
+- plugins/autorejoin.rb
 - plugins/bank.rb
 - plugins/commands.rb
+- plugins/dns.rb
 - plugins/idle.rb
 - plugins/irc.rb
+- plugins/log.rb
 - plugins/nickserv.rb
 - plugins/poll.rb
 - plugins/quote.rb
 - plugins/relay.rb
+- plugins/security.rb
 - plugins/system.rb
+- plugins/url.rb
+- plugins/usermodes.rb
 - plugins/users.rb
 - test/helper.rb
 - test/test_zmb.rb