X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Freaction.rb;h=879b89fa4735b5286d18afb3f3b17b55d9f9b5d4;hb=6cf365c49ce5fbe24c0a4ff0663550390b501fea;hp=6636cfb412490828d230b86447c62d17f9618530;hpb=2483fe9d57d8d719a7c293ace102f96944d8c717;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/reaction.rb b/data/rbot/plugins/reaction.rb
index 6636cfb4..879b89fa 100644
--- a/data/rbot/plugins/reaction.rb
+++ b/data/rbot/plugins/reaction.rb
@@ -238,7 +238,7 @@ class ReactionPlugin < Plugin
 
   def unreplied(m)
     return unless PrivMessage === m
-    debug "testing #{m} for reactions"
+    debug "testing #{m.inspect} for reactions"
     return if @reactions.empty?
     candidates = @reactions.map { |react|
       blob = react === m
@@ -301,6 +301,14 @@ class ReactionPlugin < Plugin
     }
   end
 
+  def can_add?(m, reaction)
+    return true if reaction.act == :reply
+    return true if reaction.act == :act
+    return true if reaction.act == :ruby and @bot.auth.permit?(m.source, "reaction::react::ruby", m.channel)
+    return true if reaction.act == :cmd and @bot.auth.permit?(m.source, "reaction::react::cmd", m.channel)
+    return false
+  end
+
   def handle_add(m, params)
     trigger = params[:trigger].to_s
     reply = params[:reply].to_s
@@ -324,19 +332,23 @@ class ReactionPlugin < Plugin
     found = reaction.find_reply(reply)
     if found
       # ruby replies need special permission
-      if found.act != :ruby or @bot.auth.permit?(m.source, "reaction::react::ruby", m.channel)
+      if can_add?(m, found)
         found.pct = pct
         found.author = m.sourcenick
         found.date = Time.now
         found.channel = m.channel
       else
-        m.reply _("Sorry, you're not allowed to change ruby replies here")
+        m.reply _("Sorry, you're not allowed to change %{act} replies here") % {
+          :act => found.act
+        }
         return
       end
     else
       found = reaction.add_reply(reply, pct, m.sourcenick, Time.now, m.channel)
-      if found.act == :ruby and not @bot.auth.permit?(m.source, "reaction::react::ruby", m.channel)
-        m.reply _("Sorry, you're not allowed to add ruby replies here")
+      unless can_add?(m, found)
+        m.reply _("Sorry, you're not allowed to add %{act} replies here") % {
+          :act => found.act
+        }
         reaction.rm_reply(reaction.replies.length)
         if new_reaction
           @reactions.delete(reaction)
@@ -438,6 +450,8 @@ plugin.map plugin.add_syntax, :action => 'handle_add',
 
 # ruby reactions are security holes, so give stricter permission
 plugin.default_auth('react::ruby', false)
+# cmd reactions can be security holes too
+plugin.default_auth('react::cmd', false)
 
 plugin.map 'reaction list [:page]', :action => 'handle_list',
   :requirements => { :page => /^\d+$/ }