tkellem 0.9.0.beta6 → 0.9.0.beta7

data/lib/tkellem/daemon.rb

@@ -88,7 +88,6 @@ class Tkellem::Daemon
 
   def start
     trap("INT") { EM.stop }
-    remove_files
     EM.run do
       @admin = EM.start_unix_domain_server(socket_file, Tkellem::SocketServer)
       Tkellem::TkellemServer.new
@@ -103,6 +102,7 @@ class Tkellem::Daemon
     Process.setsid
     exit if fork
     @daemon = true
+    remove_files
     File.open(pid_file, 'wb') { |f| f.write(Process.pid.to_s) }
 
     STDIN.reopen("/dev/null")

data/lib/tkellem/irc_message.rb

@@ -78,10 +78,15 @@ class IrcMessage < Struct.new(:prefix, :command, :args, :ctcp)
   end
 
   def with_timestamp(timestamp)
+    if timestamp <= 24.hours.ago
+      timestring = timestamp.strftime("%Y-%m-%d %H:%M:%S")
+    else
+      timestring = timestamp.strftime("%H:%M:%S")
+    end
     args = self.args
     if args && args[-1]
       args = args.dup
-      args[-1] = "#{timestamp.strftime("%H:%M:%S")}> #{args[-1]}"
+      args[-1] = "#{timestring}> #{args[-1]}"
     end
     IrcMessage.new(prefix, command, args, ctcp)
   end

data/lib/tkellem/plugins/backlog.rb

@@ -95,7 +95,10 @@ class Backlog
 
   def get_stream(ctx, for_reading = false)
     mode = for_reading ? 'rb' : 'ab'
-    stream_path(ctx).open(mode) do |stream|
+    ctx = ctx.gsub(%r{[\./\\]}, '')
+    path = stream_path(ctx)
+    return unless path.file?
+    path.open(mode) do |stream|
       if !for_reading
         stream.seek(0, IO::SEEK_END)
       end
@@ -186,7 +189,12 @@ class Backlog
     contexts.each do |ctx_name|
       get_stream(ctx_name, true) do |stream|
         last_line_len = 0
-        BackwardsFileReader.scan(stream) { |line| last_line_len = line.length; Time.parse(line[0,19]) >= start_time }
+        BackwardsFileReader.scan(stream) do |line|
+          # remember this last line length so we can scan past it
+          last_line_len = line.length
+          timestamp = Time.parse(line[0,19]) rescue nil
+          !timestamp || timestamp >= start_time
+        end
         stream.seek(last_line_len, IO::SEEK_CUR)
         send_backlog(conn, ctx_name, stream)
       end
@@ -252,8 +260,10 @@ class BacklogCommand < TkellemBot::Command
   end
 
   def execute
-    hours = args.pop.to_f
-    hours = 1 if hours <= 0 || hours >= (24*31)
+    hour_str = args.pop
+    hours = hour_str.to_f
+    hours *= 24 if hour_str && hour_str[-1] == 'd'[-1]
+    hours = 1 if hours <= 0 || hours >= (24*365)
     cutoff = hours.hours.ago
     backlog = Backlog.get_instance(bouncer)
     rooms = [args.pop].compact

data/lib/tkellem/version.rb

@@ -1,3 +1,3 @@
 module Tkellem
-  VERSION = "0.9.0.beta6"
+  VERSION = "0.9.0.beta7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkellem
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta6
+  version: 0.9.0.beta7
   prerelease: 6
 platform: ruby
 authors:
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3227479256214669237
+      hash: 3003758682723293778
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: