Fix #57

diff --git a/data/rbot/plugins/lart.rb b/data/rbot/plugins/lart.rb
index c7200cabeba6632f8cf0d9618ea5a18041b30e93..d4abee3bafdd4ae9b1b83018adca15e4cf432064 100644 (file)
--- a/data/rbot/plugins/lart.rb
+++ b/data/rbot/plugins/lart.rb
@@ -18,158 +18,143 @@
 
 class LartPlugin < Plugin
 
-       # Keep a 1:1 relation between commands and handlers
-       @@handlers = {
-               "lart" => "handle_lart",
-               "praise" => "handle_praise",
-               "addlart" => "handle_addlart",
-               "rmlart" => "handle_rmlart",
-               "addpraise" => "handle_addpraise",
-               "rmpraise" => "handle_rmpraise"
-       }
+  # Keep a 1:1 relation between commands and handlers
+  @@handlers = {
+    "lart" => "handle_lart",
+    "praise" => "handle_praise",
+    "addlart" => "handle_addlart",
+    "rmlart" => "handle_rmlart",
+    "addpraise" => "handle_addpraise",
+    "rmpraise" => "handle_rmpraise"
+  }
 
   def name
     "lart"
   end
 
-       #{{{
-       def initialize
-               super
-               @larts = Array.new
-               @praises = Array.new
-               #read in the lart and praise files
-               if File.exists? "#{@bot.botclass}/lart/larts"
-                       IO.foreach("#{@bot.botclass}/lart/larts") { |line|
-                               @larts << line.chomp
-                       }
-               end
-               if File.exists? "#{@bot.botclass}/lart/praises"
-                       IO.foreach("#{@bot.botclass}/lart/praises") { |line|
-                               @praises << line.chomp
-                       }
-               end
-       end
-       #}}}
-       #{{{
-       def cleanup
-       end
-       #}}}
-       #{{{
-       def save
-               Dir.mkdir("#{@bot.botclass}/lart") if not FileTest.directory? "#{@bot.botclass}/lart"
-               # TODO implement safe saving here too
-               File.open("#{@bot.botclass}/lart/larts", "w") { |file|
-                       file.puts @larts
-               }
-               File.open("#{@bot.botclass}/lart/praises", "w") { |file|
-                       file.puts @praises
-               }
-       end
-       #}}}
-       #{{{
-       def privmsg(m)
-               if not m.params
-                       m.reply "What a crazy fool!  Did you mean |help stats?"
-                       return
-               end
-
-               meth = self.method(@@handlers[m.plugin])
-               meth.call(m) if(@bot.auth.allow?(m.plugin, m.source, m.replyto))
-       end
-       #}}}
-       #{{{
-       def help(plugin, topic="")
-               "Lart: The lart plugin allows you to lart/praise someone in the channel. You can also add new larts and new praises as well as delete them. For the curious, LART is an acronym for Luser Attitude Readjustment Tool. Usage: lart <who> [<reason>] -- larts <who> for <reason>. praise <who> [<reason>] -- praises <who> for <reason>. [add|rm][lart|praise] -- Add or remove a lart or praise."
-       end
-       #}}}
-       # The following are command handlers    {{{
-       #{{{
-       def handle_lart(m)
-               for_idx = m.params =~ /\s+\bfor\b/
-               if for_idx
-                       nick = m.params[0, for_idx]
-               else
-                       nick = m.params
-               end
-               lart = @larts[get_msg_idx(@larts.length)]
-               if lart == nil
-                       m.reply "I dunno any larts"
-                       return
-               end
-               if nick == @bot.nick
-                       lart = replace_who lart, m.sourcenick
-                       lart << " for trying to make me lart myself"
-               else
-                       lart = replace_who lart, nick
-                       lart << m.params[for_idx, m.params.length] if for_idx
-               end
-
-               @bot.action m.replyto, lart
-       end
-       #}}}
-       #{{{
-       def handle_praise(m)
-               for_idx = m.params =~ /\s+\bfor\b/
-               if for_idx
-                       nick = m.params[0, for_idx]
-               else
-                       nick = m.params
-               end
-               praise = @praises[get_msg_idx(@praises.length)]
-               if not praise
-                       m.reply "I dunno any praises"
-                       return
-               end
-
-               if nick == m.sourcenick
-                       praise = @larts[get_msg_idx(@larts.length)]
-                       praise = replace_who praise, nick
-               else
-                       praise = replace_who praise, nick
-                       praise << m.params.gsub(/#{nick}/, "")
-               end
-
-               @bot.action m.replyto, praise
-       end
-       #}}}
-       #{{{
-       def handle_addlart(m)
-               @larts << m.params
-               m.okay
-       end
-       #}}}
-       #{{{
-       def handle_rmlart(m)
-               @larts.delete m.params
-               m.okay
-       end
-       #}}}
-       #{{{
-       def handle_addpraise(m)
-               @praises << m.params
-               m.okay
-       end
-       #}}}
-       #{{{
-       def handle_rmpraise(m)
-               @praises.delete m.params
-               m.okay
-       end
-       #}}}
-       #}}}
-
-       #  The following are utils for larts/praises    {{{
-       #{{{
-       def replace_who(msg, nick)
-               msg.gsub(/<who>/i, "#{nick}")
-       end
-       #}}}
-       #{{{
-       def get_msg_idx(max)
-               idx = rand(max)
-       end
-       #}}}
-       #}}}
+  def initialize
+    super
+    @larts = Array.new
+    @praises = Array.new
+    #read in the lart and praise files
+    if File.exists? "#{@bot.botclass}/lart/larts"
+      IO.foreach("#{@bot.botclass}/lart/larts") { |line|
+        @larts << line.chomp
+      }
+    end
+    if File.exists? "#{@bot.botclass}/lart/praises"
+      IO.foreach("#{@bot.botclass}/lart/praises") { |line|
+        @praises << line.chomp
+      }
+    end
+  end
+
+  def cleanup
+  end
+
+  def save
+    Dir.mkdir("#{@bot.botclass}/lart") if not FileTest.directory? "#{@bot.botclass}/lart"
+    # TODO implement safe saving here too
+    File.open("#{@bot.botclass}/lart/larts", "w") { |file|
+      file.puts @larts
+    }
+    File.open("#{@bot.botclass}/lart/praises", "w") { |file|
+      file.puts @praises
+    }
+  end
+
+  def privmsg(m)
+    if not m.params
+      m.reply "What a crazy fool!  Did you mean |help stats?"
+      return
+    end
+
+    meth = self.method(@@handlers[m.plugin])
+    meth.call(m) if(@bot.auth.allow?(m.plugin, m.source, m.replyto))
+  end
+
+  def help(plugin, topic="")
+    "Lart: The lart plugin allows you to lart/praise someone in the channel. You can also add new larts and new praises as well as delete them. For the curious, LART is an acronym for Luser Attitude Readjustment Tool. Usage: lart <who> [<reason>] -- larts <who> for <reason>. praise <who> [<reason>] -- praises <who> for <reason>. [add|rm][lart|praise] -- Add or remove a lart or praise."
+  end
+
+  # The following are command handler
+
+  def handle_lart(m)
+    for_idx = m.params =~ /\s+\bfor\b/
+    if for_idx
+      nick = m.params[0, for_idx]
+    else
+      nick = m.params
+    end
+    lart = @larts[get_msg_idx(@larts.length)]
+    if lart == nil
+      m.reply "I dunno any larts"
+      return
+    end
+    if nick == @bot.nick
+      lart = replace_who lart, m.sourcenick
+      lart << " for trying to make me lart myself"
+    else
+      lart = replace_who lart, nick
+      lart << m.params[for_idx, m.params.length] if for_idx
+    end
+
+    @bot.action m.replyto, lart
+  end
+
+  def handle_praise(m)
+    for_idx = m.params =~ /\s+\bfor\b/
+    if for_idx
+      nick = m.params[0, for_idx]
+    else
+      nick = m.params
+    end
+    praise = @praises[get_msg_idx(@praises.length)]
+    if not praise
+      m.reply "I dunno any praises"
+      return
+    end
+
+    if nick == m.sourcenick
+      praise = @larts[get_msg_idx(@larts.length)]
+      praise = replace_who praise, nick
+    else
+      praise = replace_who praise, nick
+      praise << m.params.gsub("#{nick}", "")
+    end
+
+    @bot.action m.replyto, praise
+  end
+
+  def handle_addlart(m)
+    @larts << m.params
+    m.okay
+  end
+
+  def handle_rmlart(m)
+    @larts.delete m.params
+    m.okay
+  end
+
+  def handle_addpraise(m)
+    @praises << m.params
+    m.okay
+  end
+
+  def handle_rmpraise(m)
+    @praises.delete m.params
+    m.okay
+  end
+
+  #  The following are utils for larts/praises
+  def replace_who(msg, nick)
+    msg.gsub(/<who>/i, "#{nick}")
+  end
+
+  def get_msg_idx(max)
+    idx = rand(max)
+  end
+
 end
 plugin = LartPlugin.new
 plugin.register("lart")