summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2007-10-31 21:44:57 +0000
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2007-10-31 21:44:57 +0000
commit10d483c38cb1ca260bdc089d511e8d812d4882ba (patch)
tree8b38487ba46631d1c28f818222d2258dd1765664
parenta22c1e21a11f136864577db64f90b0ef557c6ac2 (diff)
reaction plugin: improve trigger_syntax further
-rw-r--r--data/rbot/plugins/reaction.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/data/rbot/plugins/reaction.rb b/data/rbot/plugins/reaction.rb
index 16288030..c493c271 100644
--- a/data/rbot/plugins/reaction.rb
+++ b/data/rbot/plugins/reaction.rb
@@ -149,7 +149,7 @@ class ReactionPlugin < Plugin
# We'd like to use backreferences for the trigger syntax
# but we can't because it will be merged with the Plugin#map()
# regexp
- TRIGGER_SYNTAX = /^(?:act:)?(?:!.*?!|\/.*?\/|".*?"|'.*?')/
+ TRIGGER_SYNTAX = /^(?:act:)?(?:!.*?!|\/.*?\/|".*?"|'.*?'|\S+)/
def add_syntax
return ADD_SYNTAX
@@ -388,7 +388,6 @@ plugin = ReactionPlugin.new
plugin.map plugin.add_syntax, :action => 'handle_add',
:requirements => { :trigger => plugin.trigger_syntax }
-plugin.map plugin.add_syntax.sub('*', ':'), :action => 'handle_add'
plugin.map 'reaction list [:page]', :action => 'handle_list',
:requirements => { :page => /^\d+$/ }
@@ -400,8 +399,6 @@ plugin.map plugin.move_syntax, :action => 'handle_move',
:source => plugin.trigger_syntax,
:dest => plugin.trigger_syntax
}
-plugin.map plugin.move_syntax.sub('*', ':'), :action => 'handle_move'
-
plugin.map 'reaction del[ete] *trigger [:n]', :action => 'handle_rm', :auth_path => 'del!',
:requirements => { :trigger => plugin.trigger_syntax, :n => /^\d+$/ }