Changeset b6bd9a24014ac9fbc822e9051f216f0506f24cd5

Timestamp:

08/13/08 08:06:33 (3 months ago)

Author:

Giuseppe Bilotta <giuseppe.bilotta@gmail.com>

git-committer:

Giuseppe Bilotta <giuseppe.bilotta@gmail.com> 1218600393 +0200

git-parent:

[940264d1718b5a32d34ac82276a29f0cc1a51941]

git-author:

Giuseppe Bilotta <giuseppe.bilotta@gmail.com> 1218600393 +0200

Message:

message.rb: fix message addressing logic

IRC messages which are not PRIVMSG or NOTICE (i.e. not UserMessage?) are
'addressed' to the bot when they originate from it.

Rather than putting this logic in each one of them (and forgetting about
it for some, e.g. NICK messages), put it in BasicUserMessage?. Compensate
by always setting @address in UserMessage? to test against target
instead.

Files:

• lib/rbot/message.rb (modified) (5 diffs)

lib/rbot/message.rb

@@ -196 +196 @@
-      @message = BasicUserMessage.strip_initial_formatting(@message)
-
-
-
-
+
-
-    end
@@ -324 +322 @@
-      @action = false
-
-target == @bot.myself
+@address = (target == @bot.myself)
-        @private = true
-        @address = true
-        @channel = nil
-        @replyto = source
@@ -544 +541 @@
-    def initialize(bot, server, source, target, message="")
-      super(bot, server, source, target, message)
-      @address = (source == @bot.myself)
-      @modes = []
-    end
@@ -559 +555 @@
-    def initialize(bot, server, source, target, whois)
-      super(bot, server, source, target, "")
-      @address = (target == @bot.myself)
-      @whois = whois
-    end
@@ -630 +625 @@
-      @channel = channel
-      # in this case sourcenick is the nick that could be the bot
-      @address = (source == @bot.myself)
-    end
-  end