require 'rbot/load-gettext'
require 'rbot/config'
require 'rbot/config-compat'
-# require 'rbot/utils'
require 'rbot/irc'
require 'rbot/rfc2812'
require 'rbot/botuser'
require 'rbot/timer'
require 'rbot/plugins'
-# require 'rbot/channel'
require 'rbot/message'
require 'rbot/language'
require 'rbot/dbhash'
require 'rbot/registry'
-# require 'rbot/httputil'
module Irc
# handles them or passes them to plugins, and contains core functionality.
class Bot
COPYRIGHT_NOTICE = "(c) Tom Gilbert and the rbot development team"
- SOURCE_URL = "http://linuxbrit.co.uk/rbot"
+ SOURCE_URL = "http://ruby-rbot.org"
# the bot's Auth data
attr_reader :auth
# debug "Message target is #{data[:target].inspect}"
# debug "Bot is #{myself.inspect}"
- ignored = false
@config['irc.ignore_users'].each { |mask|
if m.source.matches?(server.new_netmask(mask))
- ignored = true
- break
+ m.ignored = true
end
}
irclogprivmsg(m)
- unless ignored
- @plugins.delegate "listen", m
- @plugins.delegate("ctcp_listen", m) if m.ctcp
- @plugins.privmsg(m) if m.address?
- if not m.replied
- @plugins.delegate "unreplied", m
- end
- end
+ @plugins.irc_delegate('privmsg', m) unless m.ignored?
}
@client[:notice] = proc { |data|
message = NoticeMessage.new(self, server, data[:source], data[:target], data[:message])
data[:is_on].each { |ch|
irclog "@ #{old} is now known as #{new}", ch
}
- @plugins.delegate("listen", m)
- @plugins.delegate("nick", m)
+ @plugins.irc_delegate("nick", m)
}
@client[:quit] = proc {|data|
source = data[:source]
data[:was_on].each { |ch|
irclog "@ Quit: #{source}: #{message}", ch
}
- @plugins.delegate("listen", m)
- @plugins.delegate("quit", m)
+ @plugins.irc_delegate("quit", m)
}
@client[:mode] = proc {|data|
irclog "@ Mode #{data[:modestring]} by #{data[:source]}", data[:channel]
m = JoinMessage.new(self, server, data[:source], data[:channel], data[:message])
irclogjoin(m)
- @plugins.delegate("listen", m)
- @plugins.delegate("join", m)
+ @plugins.irc_delegate("join", m)
sendq("WHO #{data[:channel]}", data[:channel], 2) if m.address?
}
@client[:part] = proc {|data|
m = PartMessage.new(self, server, data[:source], data[:channel], data[:message])
irclogpart(m)
- @plugins.delegate("listen", m)
- @plugins.delegate("part", m)
+ @plugins.irc_delegate("part", m)
}
@client[:kick] = proc {|data|
m = KickMessage.new(self, server, data[:source], data[:target], data[:channel],data[:message])
irclogkick(m)
- @plugins.delegate("listen", m)
- @plugins.delegate("kick", m)
+ @plugins.irc_delegate("kick", m)
}
@client[:invite] = proc {|data|
- if data[:target] == myself
- join data[:channel] if @auth.allow?("join", data[:source], data[:source].nick)
- end
+ m = InviteMessage.new(self, server, data[:source], data[:target], data[:channel])
+
+ @plugins.irc_delegate("invite", m)
}
@client[:changetopic] = proc {|data|
m = TopicMessage.new(self, server, data[:source], data[:channel], data[:topic])
irclogtopic(m)
- @plugins.delegate("listen", m)
- @plugins.delegate("topic", m)
+ @plugins.irc_delegate("topic", m)
}
@client[:topic] = proc { |data|
irclog "@ Topic is \"#{data[:topic]}\"", data[:channel]
irclog "@ Topic set by #{topic.set_by} on #{topic.set_on}", channel
m = TopicMessage.new(self, server, data[:source], channel, topic)
- @plugins.delegate("listen", m)
- @plugins.delegate("topic", m)
+ @plugins.irc_delegate("topic", m)
}
@client[:names] = proc { |data|
@plugins.delegate "names", data[:channel], data[:users]
def disconnect(message=nil)
message = @lang.get("quit") if (!message || message.empty?)
if @socket.connected?
- debug "Clearing socket"
- @socket.clearq
- debug "Sending quit message"
- @socket.emergency_puts "QUIT :#{message}"
- debug "Flushing socket"
- @socket.flush
+ begin
+ debug "Clearing socket"
+ @socket.clearq
+ debug "Sending quit message"
+ @socket.emergency_puts "QUIT :#{message}"
+ debug "Flushing socket"
+ @socket.flush
+ rescue SocketError => e
+ error "error while disconnecting socket: #{e.pretty_inspect}"
+ end
debug "Shutting down socket"
@socket.shutdown
end