lib/bitbot/plugin.rb in tipjar-0.1.171 vs lib/bitbot/plugin.rb in tipjar-0.1.191

@@ -41,30 +41,44 @@
   end
 
   set :prefix, ""
 
   #
-  # Private messages
+  # Private messages ~ replies sent via PRIVMSG
   #
   match /^help(.*)$/, :method => :on_help, :react_on => :private
   match /^balance$/, :method => :on_balance, :react_on => :private
   match /^history$/, :method => :on_history, :react_on => :private
   match /^withdraw(.*)$/, :method => :on_withdraw, :react_on => :private
   match /^deposit$/, :method => :on_deposit, :react_on => :private
-  match /^\+tip\s+(\w+)\s+([\d.]+)\s+?(.*)/, :method => :on_tip, :react_on => :private
+  match /^ping$/, :method => :on_ping, :react_on => :private
 #  match /^\+prize\s+(\w+)\s+([\d.]+)\s+?(.*)/, :method => :on_prize, :react_on => :private
 
   #
-  # Channel messages
+  # Private messages ~ replies sent via channel
   #
+  match /^\+tip\s+(\w+)\s+([\d.]+)\s+?(.*)/, :method => :on_tip, :react_on => :channel
+
+  #
+  # Channel messages ~ replies sent via channel
+  #
   match /^\+help(.*)$/, :method => :on_help, :react_on => :channel
   match /^\+tipstats$/, :method => :on_tipstats, :react_on => :channel
   match /^\+tip\s+(\w+)\s+([\d.]+)\s+?(.*)/, :method => :on_tip, :react_on => :channel
-  match /^\+doc$/, :method => :on_tipstats, :react_on => :channel
-  match /^\+ticker$/, :method => :on_tipstats, :react_on => :channel
+  match /^\+doc$/, :method => :on_doc, :react_on => :channel
+  match /^\+ticker$/, :method => :on_ticker, :react_on => :channel
+  match /^\+txfee$/, :method => :on_txfee, :react_on => :channel
+  match /^\+version$/, :method => :on_version, :react_on => :channel
 
   #
+  # Channel messages ~ replies sent via PRIVMSG
+  #
+  match /^\+balance$/, :method => :on_balance, :react_on => :private
+  match /^\+help$/, :method => :on_help, :react_on => :private
+  match /^\+history$/, :method => :on_history, :react_on => :private
+
+  #
   # Timer jobs
   #
   timer 60, :method => :on_update_exchange_rates
   timer 60, :method => :on_update_addresses
 #  timer 10, :method => :on_prize_win_check_balance
@@ -72,9 +86,9 @@
   #
   # Also run the timer jobs on connect
   #
   listen_to :connect, :method => :on_update_exchange_rates
   listen_to :connect, :method => :on_update_addresses
-  listen_to :connect, :method => :on_online
-  listen_to :connect, :method => :on_doc
+#  listen_to :connect, :method => :on_online
+#  listen_to :connect, :method => :on_doc
 
 end