X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Fautoop.rb;h=7bff4c250bbef870d2797247a5e5b5bd6d2d83ad;hb=452e323bfdb73d6b93ab96f5fc417891e4aa8f53;hp=fdbcf6e01d1d0536eba1ffd91da657bd01fcac06;hpb=21949774b91eaec6ecde4eaa8ad121e2c0a36b87;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/autoop.rb b/data/rbot/plugins/autoop.rb
index fdbcf6e0..7bff4c25 100644
--- a/data/rbot/plugins/autoop.rb
+++ b/data/rbot/plugins/autoop.rb
@@ -1,68 +1,185 @@
 class AutoOP < Plugin
-    @@handlers = {
-        "addop" => "handle_addop",
-        "rmop" => "handle_rmop",
-        "listop" => "handle_listop"
+  Config.register Config::BooleanValue.new('autoop.on_nick',
+    :default => true,
+    :desc => "Determines if the bot should auto-op when someone changes nick " +
+             "and the new nick matches a listed netmask")
+
+  Config.register Config::StringValue.new('autoop.seed_format',
+    :default => "*!%{user}@*",
+    :desc => "Hostmask format used when seeding channels. Recognized tokens: " +
+             "nick, user, host")
+
+  def help(plugin, topic="")
+    return "perform autoop based on hostmask - usage:" +
+           "add <hostmask> [channel channel ...], rm <hostmask> [channel], " +
+             "If you don't specify which channels, all channels are assumed, " +
+           "list - list current ops, " +
+           "restore [channel] - op anybody that would " +
+             "have been opped if they had just joined, " +
+           "seed [channel] - Find current ops and make sure they will " +
+             "continue to be autoopped"
+  end
+
+  def join(m)
+    return if m.address?
+    @registry.each { |mask,channels|
+      if m.source.matches?(mask.to_irc_netmask(:server => m.server)) &&
+        (channels.empty? || channels.include?(m.channel.to_s))
+        @bot.mode(m.channel, "+o", m.source.nick)
+        return
+      end
     }
-    
-    def help(plugin, topic="")
-        "perform autoop based on hostmask - usage: addop <hostmask>, rmop <hostmask>, listop"
-    end
-    
-    def join(m)
-        if(!m.address?)
-          @registry.each { |mask,channels|
-            if(Irc.netmaskmatch(mask, m.source) && channels.include?(m.channel))
-              @bot.mode(m.channel, "+o", m.sourcenick)
-            end
-          }
+  end
+
+  def nick(m)
+    return if m.address?
+    return unless @bot.config['autoop.on_nick']
+    is_on = m.server.channels.inject(ChannelList.new) { |list, ch|
+      list << ch if ch.users.include?(m.source)
+      list
+    }
+    is_on.each { |channel|
+      ch = channel.to_s
+      @registry.each { |mask,channels|
+        if m.source.matches?(mask.to_irc_netmask(:server => m.server)) &&
+          (channels.empty? || channels.include?(ch))
+          @bot.mode(ch, "+o", m.source.nick)
+          return
         end
+      }
+    }
+  end
+
+  def add(m, params)
+    if params[:channels].empty? || !@registry.has_key?(params[:mask])
+      # if the channels parameter is omitted (meaning all channels), or the
+      # hostmask isn't present in the registry, we just (over)write the channels
+      # in the registry
+      @registry[params[:mask]] = params[:channels].dup
+      m.okay
+    else
+      # otherwise, merge the channels with the ones existing in the registry
+      current_channels = @registry[params[:mask]]
+      if current_channels.empty?
+        m.reply "#{params[:mask]} is already being auto-opped on all channels"
+      else
+        # merge the already set channels
+        @registry[params[:mask]] = (params[:channels] | current_channels).uniq
+        m.okay
+      end
     end
-    
-    def privmsg(m)
-        if(m.private?)
-          if (!m.params || m.params == "list")
-            handle_listop(m)
-          elsif (m.params =~ /^add\s+(.+)$/)
-            handle_addop(m, $1)
-          elsif (m.params =~ /^rm\s+(.+)$/)
-            handle_rmop(m, $1)
-          end
-        end
+  end
+
+  def seed(m, params)
+    chan = params[:channel]
+    if chan == nil
+      if m.public?
+        chan = m.channel
+      else
+        m.reply _("Either specify a channel to seed, or ask in public")
+      end
     end
 
-    def handle_addop(m, params)
-        ma = /^(.+?)(\s+(.+))?$/.match(params)
-        channels = ma[2] ? ma[2] : @bot.config['JOIN_CHANNELS']
-        if(ma[1] && channels)
-            @registry[ma[1]] = channels.split(/,\s*/).collect { |x|
-                x.strip
-            }
-            m.okay
+    current_ops = @bot.server.channel(chan).users.select { |u|
+        u.is_op?(chan) and u.nick != @bot.nick
+    }
+
+    netmasks = current_ops.map { |u|
+      @bot.config['autoop.seed_format'] % {
+        :user => u.user,
+        :nick => u.nick,
+        :host => u.host
+      }
+    }.uniq
+
+    to_add = netmasks.select { |mask|
+        @registry.key?(mask) == false or @registry[mask].empty? == false
+    }
+
+    if to_add.empty?
+      m.reply _("Nobody to add")
+      return
+    end
+
+    results = []
+    to_add.each { |mask|
+      if @registry.key? mask
+        if @registry[mask].include? chan
+          next
         else
-            m.reply @bot.lang.get('dunno')
+          current_channels = @registry[mask].dup
+          @registry[mask] = ([chan] | current_channels).uniq
+          results << _("Added #{mask} in #{chan}")
         end
+      else
+        @registry[mask] = [chan]
+        results << _("Created autoop entry for #{mask} and added #{chan}")
+      end
+    }
+    m.reply results.join ". "
+  end
+
+  def rm(m, params)
+    unless @registry.has_key?(params[:mask])
+      m.reply @bot.lang.get('dunno')
+      return
+    end
+    if (!params[:channels].empty? && @registry[params[:mask]] != nil)
+      params[:channels].each do |c|
+        @registry[params[:mask]] = @registry[params[:mask]].reject {|ele| ele =~ /^#{c}$/i}
+      end
+      if @registry[params[:mask]].empty?
+        @registry.delete(params[:mask])
+      end
+    else
+      @registry.delete(params[:mask])
     end
+    m.okay
+  end
 
-    def handle_rmop(m, params)
-       if(!@registry.delete(params))
-         m.reply @bot.lang.get('dunno')
-       else
-         m.okay
-       end
+  def list(m, params)
+    debug @registry.length
+    if(@registry.length > 0)
+      @registry.each { |mask,channels|
+        m.reply "#{mask} in #{channels.empty? ? 'all channels' : channels.join(', ')}"
+      }
+    else
+      m.reply "No entries"
     end
+  end
 
-    def handle_listop(m)
-        if(@registry.length)
-            @registry.each { |mask,channels|
-                m.reply "#{mask} in #{channels.join(', ')}"
-            }
-        else
-            m.reply "No entrys"
-        end
+  def restore(m, params)
+    chan = params[:channel]
+    if chan == nil
+      if m.public?
+        chan = m.channel
+      else
+        m.reply _("Either specify a channel to restore, or ask in public")
+      end
     end
+
+    current_non_ops = @bot.server.channel(chan).users.select { |u|
+      u.is_op?(chan) == nil and u.nick != @bot.nick
+    }
+
+    @registry.each { |mask,channels|
+      if channels.empty? || channels.include?(chan)
+        current_non_ops.each { |victim|
+          if victim.matches?(mask.to_irc_netmask(:server => m.server))
+            @bot.mode(chan, "+o", victim)
+          end
+        }
+      end
+    }
+  end
 end
 
 plugin = AutoOP.new
-plugin.register("autoop")
 
+plugin.map 'autoop list', :action => 'list'
+plugin.map 'autoop add :mask [*channels]', :action => 'add'
+plugin.map 'autoop rm :mask [*channels]', :action => 'rm'
+plugin.map 'autoop seed [:channel]', :action => 'seed'
+plugin.map 'autoop restore [:channel]', :action => 'restore'
+
+plugin.default_auth('*',false)