config.rb: system wide overrides in /etc/rbot.conf

[user/henk/code/ruby/rbot.git] / lib / rbot / message.rb

diff --git a/lib/rbot/message.rb b/lib/rbot/message.rb
index ba0d8cc9762f0e851ae67abe9086b364c2c3d832..abe53ce013245ebf217225ca848ff482c03887c9 100644 (file)
--- a/lib/rbot/message.rb
+++ b/lib/rbot/message.rb
@@ -33,6 +33,7 @@ module Irc
   Reverse = "\026"
   Italic = "\011"
   NormalText = "\017"
+  AttributeRx = /#{Bold}|#{Underline}|#{Reverse}|#{Italic}|#{NormalText}/
 
   # Color is prefixed by \003 and followed by optional
   # foreground and background specifications, two-digits-max
@@ -132,11 +133,9 @@ module Irc
     attr_accessor :ignored
     alias :ignored? :ignored
 
-    # should the message handler be excuted in new thread?
-    # if set to true or false, this overrides :thread option in map. if it's nil,
-    # the map option takes effect
-    attr_accessor :thread
-    alias :thread? :thread
+    # set this to true if the method that delegates the message is run in a thread
+    attr_accessor :in_thread
+    alias :in_thread? :in_thread
 
     # instantiate a new Message
     # bot::      associated bot class
@@ -156,7 +155,7 @@ module Irc
       @replied = false
       @server = server
       @ignored = false
-      @thread = nil
+      @in_thread = false
 
       @identified = false
       if @msg_wants_id && @server.capabilities[:"identify-msg"]