tkellem 0.9.4 → 0.9.5

data/Gemfile

@@ -4,14 +4,16 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-  gem 'rspec', '~> 2.13.0'
+  gem 'coveralls', require: false
   gem 'mocha', '0.14.0', require: false
+  gem 'rake'
+  gem 'rspec', '~> 2.13.0'
   gem 'simplecov', require: false
-  gem 'coveralls', require: false
 end
 
 group :development do
+  gem 'debugger'
   gem 'guard-rspec'
+  gem 'rake'
   gem 'rspec-nc'
-  gem 'debugger'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tkellem (0.9.4)
+    tkellem (0.9.5)
       activerecord (~> 4.0.0.rc2)
       eventmachine (~> 1.0.3)
       geoip (~> 1.3.2)
@@ -78,6 +78,7 @@ GEM
       slop (~> 3.4)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
+    rake (10.1.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
@@ -116,6 +117,7 @@ DEPENDENCIES
   debugger
   guard-rspec
   mocha (= 0.14.0)
+  rake
   rspec (~> 2.13.0)
   rspec-nc
   simplecov

data/lib/tkellem/bouncer.rb

@@ -101,6 +101,17 @@ class Bouncer
     if forward
       # send to server
       send_msg(msg)
+
+      # replay to other connected clients
+      if msg.command == "PRIVMSG" && (!msg.ctcp? || msg.action?)
+        msg.readdress_to(nick)
+
+        @active_conns.each do |c,s|
+          next if c == client
+          c.send_msg(msg)
+        end
+      end
+
       flag_for_reply(msg.command, forward) if forward != true
     end
   end

data/lib/tkellem/bouncer_connection.rb

@@ -45,6 +45,21 @@ module BouncerConnection
   def ssl_handshake_completed
   end
 
+  def schedule_ping_client
+    EM::Timer.new(60) { ping_client }
+  end
+
+  def ping_client
+    failsafe("ping_client") do
+      send_msg("PING tkellem")
+      @ping_timer = EM::Timer.new(10) do
+        # ping timeout
+        info("PING timeout, closing connection")
+        close_connection
+      end
+    end
+  end
+
   def error!(msg)
     info("ERROR :#{msg}")
     say_as_tkellem(msg)
@@ -57,6 +72,7 @@ module BouncerConnection
     return error!("Unknown connection: #{@conn_name}") unless @bouncer
     @state = :connected
     info "connected"
+    schedule_ping_client
     @bouncer.connect_client(self)
   end
 
@@ -102,6 +118,14 @@ module BouncerConnection
         msg_tkellem(IrcMessage.new(nil, 'TKELLEM', [msg.args.last]))
       elsif command == 'TKELLEM' || command == 'TK'
         msg_tkellem(msg)
+      elsif command == 'PONG'
+        if @ping_timer
+          @ping_timer.cancel
+          @ping_timer = nil
+          # only schedule again if @ping_timer existed, so we don't schedule
+          # multiple if the client just randomly sends PONGs
+          schedule_ping_client
+        end
       elsif command == 'CAP'
         # TODO: full support for CAP -- this just gets mobile colloquy connecting
         if msg.args.first =~ /req/i

data/lib/tkellem/irc_message.rb

@@ -91,6 +91,31 @@ class IrcMessage < Struct.new(:prefix, :command, :args, :ctcp)
     IrcMessage.new(prefix, command, args, ctcp)
   end
 
+  def readdress_to(nick)
+    privmsg = args.first[0] != '#'[0]
+
+    if msg.prefix
+      # to this user
+      if privmsg
+        args[0] = nick
+      else
+        # do nothing, it's good to send
+      end
+    else
+      # from this user
+      if privmsg
+        # a one-on-one chat -- every client i've seen doesn't know how to
+        # display messages from themselves here, so we fake it by just
+        # adding an arrow and pretending the other user said it. shame.
+        prefix = msg.args.first
+        args[0] = nick
+        args[-1] = "-> #{msg.args.last}"
+      else
+        # it's a room, we can just replay
+        prefix = nick
+      end
+    end
+  end
 end
 
 end

data/lib/tkellem/plugins/backlog.rb

@@ -230,28 +230,7 @@ class Backlog
       timestamp = timestamp.in_time_zone(time_zone) if timestamp && time_zone
       timestamp = timestamp.localtime if timestamp && !time_zone
       next unless msg
-      privmsg = msg.args.first[0] != '#'[0]
-      if msg.prefix
-        # to this user
-        if privmsg
-          msg.args[0] = @bouncer.nick
-        else
-          # do nothing, it's good to send
-        end
-      else
-        # from this user
-        if privmsg
-          # a one-on-one chat -- every client i've seen doesn't know how to
-          # display messages from themselves here, so we fake it by just
-          # adding an arrow and pretending the other user said it. shame.
-          msg.prefix = msg.args.first
-          msg.args[0] = @bouncer.nick
-          msg.args[-1] = "-> #{msg.args.last}"
-        else
-          # it's a room, we can just replay
-          msg.prefix = @bouncer.nick
-        end
-      end
+      msg.readdress_to(@bouncer.nick)
       conn.send_msg(msg.with_timestamp(timestamp))
     end
   end

data/lib/tkellem/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Tkellem
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkellem
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -184,12 +184,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4535993549696292820
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4535993549696292820
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -203,4 +209,3 @@ test_files:
 - spec/irc_server_spec.rb
 - spec/plugins/backlog_spec.rb
 - spec/spec_helper.rb
-has_rdoc: