Change remaining references from nick to user

wjessop · Sep 23, 2011 · a59ec60 · a59ec60
1 parent de7f65b
commit a59ec60
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/examples/bot.rb b/examples/bot.rb
@@ -62,7 +62,7 @@
      play "drama"
    end
 
-   match "multi-condition match", :conditions => {:channel => [401839, "Monitoring"], :nick => ["Will Jessop", "Noah Lorang"]} do
+   match "multi-condition match", :conditions => {:channel => [401839, "Monitoring"], :user => ["Will Jessop", "Noah Lorang"]} do
      # Reply in the current channel
      say "multi-condition match"
    end

diff --git a/lib/scamp/action.rb b/lib/scamp/action.rb
@@ -1,6 +1,6 @@
 #
 # Actions are run in the context of a Scamp::Action.
-# This allows us to make channel, nick etc. methods
+# This allows us to make channel, user etc. methods
 # available on a per-message basis
 #
 

diff --git a/lib/scamp/matcher.rb b/lib/scamp/matcher.rb
@@ -68,7 +68,7 @@ def run(msg, match = nil)
     def conditions_satisfied_by(msg)
       bot.logger.debug "Checking message against #{conditions.inspect}"
 
-      # item will be :nick or :channel
+      # item will be :user or :channel
       # cond is the int or string value.
       conditions.each do |item, cond|
         bot.logger.debug "Checking #{item} against #{cond}"