X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fmessage.rb;h=3292cb8323a1f9aad8c638c25a69059002a40fda;hb=c986bc82f4b856818e97e24fbf5fc11eef5f25c2;hp=d7f614ab7b884c12c96fc2070126fb548c389d6f;hpb=2a96c9198c1f6e13407d0999083f6ce5e0bc06fa;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git
diff --git a/lib/rbot/message.rb b/lib/rbot/message.rb
index d7f614ab..3292cb83 100644
--- a/lib/rbot/message.rb
+++ b/lib/rbot/message.rb
@@ -1,28 +1,45 @@
module Irc
+ BotConfig.register BotConfigArrayValue.new('core.address_prefix',
+ :default => [], :wizard => true,
+ :desc => "what non nick-matching prefixes should the bot respond to as if addressed (e.g !, so that '!foo' is treated like 'rbot: foo')"
+ )
+
+ BotConfig.register BotConfigBooleanValue.new('core.reply_with_nick',
+ :default => false, :wizard => true,
+ :desc => "if true, the bot will prepend the nick to what he has to say when replying (e.g. 'markey: you can't do that!')"
+ )
+
+ BotConfig.register BotConfigStringValue.new('core.nick_postfix',
+ :default => ':', :wizard => true,
+ :desc => "when replying with nick put this character after the nick of the user the bot is replying to"
+ )
+
+ Bold = "\002"
+ Underline = "\037"
+ Reverse = "\026"
+ Color = "\003"
+ ColorRx = /#{Color}\d\d?(?:,\d\d?)?/
# base user message class, all user messages derive from this
# (a user message is defined as having a source hostmask, a target
# nick/channel and a message part)
class BasicUserMessage
-
+
# associated bot
attr_reader :bot
-
+
+ # associated server
+ attr_reader :server
+
# when the message was received
attr_reader :time
- # hostmask of message source
+ # User that originated the message
attr_reader :source
-
- # nick of message source
- attr_reader :sourcenick
-
- # url part of message source
- attr_reader :sourceaddress
-
- # nick/channel message was sent to
+
+ # User/Channel message was sent to
attr_reader :target
-
+
# contents of the message
attr_accessor :message
@@ -31,10 +48,13 @@ module Irc
# instantiate a new Message
# bot:: associated bot class
- # source:: hostmask of the message source
- # target:: nick/channel message is destined for
- # message:: message part
- def initialize(bot, source, target, message)
+ # server:: Server where the message took place
+ # source:: User that sent the message
+ # target:: User/Channel is destined for
+ # message:: actual message
+ def initialize(bot, server, source, target, message)
+ @msg_wants_id = false unless defined? @msg_wants_id
+
@time = Time.now
@bot = bot
@source = source
@@ -42,19 +62,41 @@ module Irc
@target = target
@message = BasicUserMessage.stripcolour message
@replied = false
+ @server = server
- # split source into consituent parts
- if source =~ /^((\S+)!(\S+))$/
- @sourcenick = $2
- @sourceaddress = $3
+ @identified = false
+ if @msg_wants_id && @server.capabilities[:"identify-msg"]
+ if @message =~ /^([-+])(.*)/
+ @identified = ($1=="+")
+ @message = $2
+ else
+ warning "Message does not have identification"
+ end
end
-
- if target && target.downcase == @bot.nick.downcase
+
+ if target && target == @bot.myself
@address = true
end
-
+
end
-
+
+ # Access the nick of the source
+ #
+ def sourcenick
+ @source.nick
+ end
+
+ # Access the user@host of the source
+ #
+ def sourceaddress
+ "#{@source.user}@#{@source.host}"
+ end
+
+ # Was the message from an identified user?
+ def identified?
+ return @identified
+ end
+
# returns true if the message was addressed to the bot.
# This includes any private message to the bot, or any public message
# which looks like it's addressed to the bot, e.g. "bot: foo", "bot, foo",
@@ -71,7 +113,7 @@ module Irc
# strip mIRC colour escapes from a string
def BasicUserMessage.stripcolour(string)
return "" unless string
- ret = string.gsub(/\cC\d\d?(?:,\d\d?)?/, "")
+ ret = string.gsub(ColorRx, "")
#ret.tr!("\x00-\x1f", "")
ret
end
@@ -83,10 +125,10 @@ module Irc
# The +message+ member will have any bot addressing "^bot: " removed
# (address? will return true in this case)
class UserMessage < BasicUserMessage
-
+
# for plugin messages, the name of the plugin invoked by the message
attr_reader :plugin
-
+
# for plugin messages, the rest of the message, with the plugin name
# removed
attr_reader :params
@@ -98,28 +140,28 @@ module Irc
# channel the message was in, nil for privately addressed messages
attr_reader :channel
-
+
# for PRIVMSGs, true if the message was a CTCP ACTION (CTCP stuff
# will be stripped from the message)
attr_reader :action
-
+
# instantiate a new UserMessage
# bot:: associated bot class
# source:: hostmask of the message source
# target:: nick/channel message is destined for
# message:: message part
- def initialize(bot, source, target, message)
- super(bot, source, target, message)
+ def initialize(bot, server, source, target, message)
+ super(bot, server, source, target, message)
@target = target
@private = false
@plugin = nil
@action = false
-
- if target.downcase == @bot.nick.downcase
+
+ if target == @bot.myself
@private = true
@address = true
@channel = nil
- @replyto = @sourcenick
+ @replyto = source
else
@replyto = @target
@channel = @target
@@ -127,25 +169,25 @@ module Irc
# check for option extra addressing prefixes, e.g "|search foo", or
# "!version" - first match wins
- bot.addressing_prefixes.each {|mprefix|
+ bot.config['core.address_prefix'].each {|mprefix|
if @message.gsub!(/^#{Regexp.escape(mprefix)}\s*/, "")
@address = true
break
end
}
-
+
# even if they used above prefixes, we allow for silly people who
- # combine all possible types, e.g. "|rbot: hello", or
+ # combine all possible types, e.g. "|rbot: hello", or
# "/msg rbot rbot: hello", etc
- if @message.gsub!(/^\s*#{bot.nick}\s*([:;,>]|\s)\s*/, "")
+ if @message.gsub!(/^\s*#{Regexp.escape(bot.nick)}\s*([:;,>]|\s)\s*/i, "")
@address = true
end
-
+
if(@message =~ /^\001ACTION\s(.+)\001/)
@message = $1
@action = true
end
-
+
# free splitting for plugins
@params = @message.dup
if @params.gsub!(/^\s*(\S+)[\s$]*/, "")
@@ -173,25 +215,81 @@ module Irc
# @bot.say m.replyto, string
# So if the message is private, it will reply to the user. If it was
# in a channel, it will reply in the channel.
- def reply(string)
- @bot.say @replyto, string
+ def plainreply(string, options={})
+ @bot.say @replyto, string, options
+ @replied = true
+ end
+
+ # Same as reply, but when replying in public it adds the nick of the user
+ # the bot is replying to
+ def nickreply(string, options={})
+ extra = self.public? ? "#{@source}#{@bot.config['core.nick_postfix']} " : ""
+ @bot.say @replyto, extra + string, options
+ @replied = true
+ end
+
+ # the default reply style is to nickreply unless the reply already contains
+ # the nick or core.reply_with_nick is set to false
+ #
+ def reply(string, options={})
+ if @bot.config['core.reply_with_nick'] and not string =~ /\b#{@source}\b/
+ return nickreply(string, options)
+ end
+ plainreply(string, options)
+ end
+
+ # convenience method to reply to a message with an action. It's the
+ # same as doing:
+ # @bot.action m.replyto, string
+ # So if the message is private, it will reply to the user. If it was
+ # in a channel, it will reply in the channel.
+ def act(string, options={})
+ @bot.action @replyto, string, options
@replied = true
end
# convenience method to reply "okay" in the current language to the
# message
+ def plainokay
+ self.plainreply @bot.lang.get("okay")
+ end
+
+ # Like the above, but append the username
+ def nickokay
+ str = @bot.lang.get("okay").dup
+ if self.public?
+ # remove final punctuation
+ str.gsub!(/[!,.]$/,"")
+ str += ", #{@source}"
+ end
+ self.plainreply str
+ end
+
+ # the default okay style is the same as the default reply style
+ #
def okay
- @bot.say @replyto, @bot.lang.get("okay")
+ if @bot.config['core.reply_with_nick']
+ return nickokay
+ end
+ plainokay
end
end
# class to manage IRC PRIVMSGs
class PrivMessage < UserMessage
+ def initialize(bot, server, source, target, message)
+ @msg_wants_id = true
+ super
+ end
end
-
+
# class to manage IRC NOTICEs
class NoticeMessage < UserMessage
+ def initialize(bot, server, source, target, message)
+ @msg_wants_id = true
+ super
+ end
end
# class to manage IRC KICKs
@@ -200,9 +298,9 @@ module Irc
class KickMessage < BasicUserMessage
# channel user was kicked from
attr_reader :channel
-
- def initialize(bot, source, target, channel, message="")
- super(bot, source, target, message)
+
+ def initialize(bot, server, source, target, channel, message="")
+ super(bot, server, source, target, message)
@channel = channel
end
end
@@ -210,14 +308,22 @@ module Irc
# class to pass IRC Nick changes in. @message contains the old nickame,
# @sourcenick contains the new one.
class NickMessage < BasicUserMessage
- def initialize(bot, source, oldnick, newnick)
- super(bot, source, oldnick, newnick)
+ def initialize(bot, server, source, oldnick, newnick)
+ super(bot, server, source, oldnick, newnick)
+ end
+
+ def oldnick
+ return @target
+ end
+
+ def newnick
+ return @message
end
end
class QuitMessage < BasicUserMessage
- def initialize(bot, source, target, message="")
- super(bot, source, target, message)
+ def initialize(bot, server, source, target, message="")
+ super(bot, server, source, target, message)
end
end
@@ -229,10 +335,10 @@ module Irc
# topic set on channel
attr_reader :channel
- def initialize(bot, source, channel, timestamp, topic="")
- super(bot, source, channel, topic)
+ def initialize(bot, server, source, channel, topic=ChannelTopic.new)
+ super(bot, server, source, channel, topic.text)
@topic = topic
- @timestamp = timestamp
+ @timestamp = topic.set_on
@channel = channel
end
end
@@ -241,14 +347,14 @@ module Irc
class JoinMessage < BasicUserMessage
# channel joined
attr_reader :channel
- def initialize(bot, source, channel, message="")
- super(bot, source, channel, message)
+ def initialize(bot, server, source, channel, message="")
+ super(bot, server, source, channel, message)
@channel = channel
# in this case sourcenick is the nick that could be the bot
- @address = (sourcenick.downcase == @bot.nick.downcase)
+ @address = (source == @bot.myself)
end
end
-
+
# class to manage channel parts
# same as a join, but can have a message too
class PartMessage < JoinMessage