X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=lib%2Frbot%2Fircbot.rb;h=b2c7a88f91b4cef106066ed3946f831684e1bb67;hb=1676abaf61c9b6c40714e00d6637e3a73d8b527b;hp=89037255d50c490e148bfcf1bcd87074a5b9da8c;hpb=8b0e2e09f81a7d89ceb52e947e9db12a206a8c37;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb index 89037255..b2c7a88f 100644 --- a/lib/rbot/ircbot.rb +++ b/lib/rbot/ircbot.rb @@ -122,8 +122,9 @@ class IrcBot exit 2 end - #botclass = "#{Etc.getpwnam(Etc.getlogin).dir}/.rbot" unless botclass - botclass = "#{ENV['HOME']}/.rbot" unless botclass + botclass = "#{Etc.getpwuid(Process::Sys.geteuid)[:dir]}/.rbot" unless botclass + #botclass = "#{ENV['HOME']}/.rbot" unless botclass + botclass = File.expand_path(botclass) @botclass = botclass.gsub(/\/$/, "") unless FileTest.directory? botclass @@ -136,6 +137,7 @@ class IrcBot end Dir.mkdir("#{botclass}/logs") unless File.exist?("#{botclass}/logs") + Dir.mkdir("#{botclass}/registry") unless File.exist?("#{botclass}/registry") @ping_timer = nil @pong_timer = nil @@ -302,7 +304,7 @@ class IrcBot } @client[:unknown] = proc {|data| #debug "UNKNOWN: #{data[:serverstring]}" - log data[:serverstring], ":unknown" + log data[:serverstring], ".unknown" } end @@ -329,8 +331,8 @@ class IrcBot def mainloop while true begin - connect - @timer.start + connect + @timer.start while true if @socket.select @@ -437,8 +439,9 @@ class IrcBot # log message +message+ to a file determined by +where+. +where+ can be a # channel name, or a nick for private message logging def log(message, where="server") - message.chomp! + message = message.chomp stamp = Time.now.strftime("%Y/%m/%d %H:%M:%S") + where = where.gsub(/[:!?$*()\/\\<>|"']/, "_") unless(@logs.has_key?(where)) @logs[where] = File.new("#{@botclass}/logs/#{where}", "a") @logs[where].sync = true @@ -462,15 +465,25 @@ class IrcBot debug "failed to trap signals, probably running on windows?" end message = @lang.get("quit") if (message.nil? || message.empty?) + debug "Clearing socket" @socket.clearq + debug "Saving" save + debug "Cleaning up" @plugins.cleanup + debug "Logging quits" @channels.each_value {|v| log "@ quit (#{message})", v.name } - @registry.close + # debug "Closing registries" + # @registry.close + debug "Cleaning up the db environment" + DBTree.cleanup_env + debug "Sending quit message" @socket.puts "QUIT :#{message}" + debug "Flushing socket" @socket.flush + debug "Shutting down socket" @socket.shutdown puts "rbot quit (#{message})" end @@ -496,11 +509,11 @@ class IrcBot # call the save method for bot's config, keywords, auth and all plugins def save - @registry.flush @config.save @keywords.save @auth.save @plugins.save + DBTree.cleanup_logs end # call the rescan method for the bot's lang, keywords and all plugins @@ -570,7 +583,8 @@ class IrcBot def status secs_up = Time.new - @startup_time uptime = Utils.secs_to_string secs_up - return "Uptime #{uptime}, #{@plugins.length} plugins active, #{@registry.length} items stored in registry, #{@socket.lines_sent} lines sent, #{@socket.lines_received} received." + # return "Uptime #{uptime}, #{@plugins.length} plugins active, #{@registry.length} items stored in registry, #{@socket.lines_sent} lines sent, #{@socket.lines_received} received." + return "Uptime #{uptime}, #{@plugins.length} plugins active, #{@socket.lines_sent} lines sent, #{@socket.lines_received} received." end # we'll ping the server every 30 seconds or so, and expect a response @@ -635,8 +649,8 @@ class IrcBot return "say | => say to or in private message to " when "action" return "action | => does a /me to or in private message to " - when "topic" - return "topic => set topic of to " + # when "topic" + # return "topic => set topic of to " when "quiet" return "quiet [in here|] => with no arguments, stop speaking in all channels, if \"in here\", stop speaking in this channel, or stop speaking in " when "talk" @@ -679,6 +693,7 @@ class IrcBot end if(m.address?) + delegate_privmsg(m) case m.message when (/^join\s+(\S+)\s+(\S+)$/i) join $1, $2 if(@auth.allow?("join", m.source, m.replyto)) @@ -705,16 +720,19 @@ class IrcBot say $1, $2 if(@auth.allow?("say", m.source, m.replyto)) when (/^action\s+(\S+)\s+(.*)$/i) action $1, $2 if(@auth.allow?("say", m.source, m.replyto)) - when (/^topic\s+(\S+)\s+(.*)$/i) - topic $1, $2 if(@auth.allow?("topic", m.source, m.replyto)) + # when (/^topic\s+(\S+)\s+(.*)$/i) + # topic $1, $2 if(@auth.allow?("topic", m.source, m.replyto)) when (/^mode\s+(\S+)\s+(\S+)\s+(.*)$/i) mode $1, $2, $3 if(@auth.allow?("mode", m.source, m.replyto)) when (/^ping$/i) say m.replyto, "pong" when (/^rescan$/i) if(@auth.allow?("config", m.source, m.replyto)) - m.okay + m.reply "Saving ..." + save + m.reply "Rescanning ..." rescan + m.okay end when (/^quiet$/i) if(auth.allow?("talk", m.source, m.replyto)) @@ -759,8 +777,6 @@ class IrcBot when (/^(hello|howdy|hola|salut|bonjour|sup|niihau|hey|hi(\W|$)|yo(\W|$)).*/i) say m.replyto, @lang.get("hello_X") % m.sourcenick if(m.public?) say m.replyto, @lang.get("hello") if(m.private?) - else - delegate_privmsg(m) end else # stuff to handle when not addressed