cinch-pskreporter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 499d061271bc638d1396ca7d3f83acaf42be6176
-  data.tar.gz: f65c228d8352008c38204dba298aeb1b5b94c0d3
+  metadata.gz: ccc860c13ca1e34dc76e737577ac5d8226eb164e
+  data.tar.gz: 16b692164b2a699a135f5c39ff1db31dadc53908
 SHA512:
-  metadata.gz: 4acba9ffa8c6cec057b893ed7d0c3a631efbc26a3c0fc37e50913327b4a399693363517e82555d4a03c95e4abeb514e954d5ec9c2963eea50222cda4ff8eb71a
-  data.tar.gz: 36f34623147ee5b02728b352274020294e5fb0c690566aca1bfd4e62f0c7d1404dfd69eb95660760a623caed74d8410eb3df3c6630473a8b24e0c0aa98ce53ea
+  metadata.gz: 3235ec2fc5c3597b62d039c546acb42b6b70d103d4ffadad2ae9429268d5bf96afcdef3fbe4a49df9e0e03adb38fbe3b18f12e773edca6d2c17a04d7103d8c1d
+  data.tar.gz: c4a6122d0c779f7849431a01514a47bdd8459b059fc16e331baa6f99d1d09fee920ad6b5d2b7054afce8f955f6696b9ac8c35792f8d4403796089ded62b48646

data/lib/cinch/plugins/pskreporter.rb

@@ -30,6 +30,7 @@ module Cinch::Plugins
 
     def pskreporter_reports(callsign, since_when)
       body = Net::HTTP.get(URI.parse "http://retrieve.pskreporter.info/query?senderCallsign=#{callsign}&flowStartSeconds=#{since_when}&rronly=1&rand=#{rand}")
+      debug body
       doc = REXML::Document.new(body)
       [].tap do |reports|
         doc.each_element("//receptionReport") do |element|
@@ -39,17 +40,34 @@ module Cinch::Plugins
     end
 
     def msg_reports(channel, reports)
-      reports.each do |report|
-        Channel(channel).send(report_text(report))
+      Channel(channel).send(summary_text(reports))
+    end
+
+    def summary_text(reports)
+      max_distance = 0
+      distant_callsign = nil
+      sender_callsign = nil
+      
+      reports.each do |r|
+        d = self.class.distance(*[r.senderLocator, r.receiverLocator].map { |loc| self.class.coords_from_maidenhead(loc) })
+        if d > max_distance
+          max_distance = d
+          distant_callsign = r.receiverCallsign
+        end
+        sender_callsign = r.senderCallsign
       end
+
+      max_distance = max_distance.to_i
+      Format(:grey, "#{sender_callsign} heard in #{reports.size} locations, farthest was #{max_distance}km away (#{distant_callsign})")
     end
 
+    # Unused ATM
     def report_text(r)
       frequency = r.frequency.to_f / 1000
-      if d = self.class.distance(*[r.senderLocation, r.receiverLocation].map { |loc| self.class.coords_from_maidenhead(loc) })
-        "#{r.receiverCallsign} (#{r.receiverLocation}) heard #{r.senderCallsign} (#{r.senderLocation}) = #{d} km @ #{frequency} MHz using #{r.mode}"
+      if d = self.class.distance(*[r.senderLocator, r.receiverLocator].map { |loc| self.class.coords_from_maidenhead(loc) })
+        Format(config[:color], "#{r.receiverCallsign} (#{r.receiverLocator}) heard #{r.senderCallsign} (#{r.senderLocator}) = #{d} km @ #{frequency} kHz using #{r.mode}")
       else
-        "#{r.receiverCallsign} heard #{r.senderCallsign} @ #{frequency} MHz using #{r.mode}"
+        Format(config[:color], "#{r.receiverCallsign} heard #{r.senderCallsign} @ #{frequency} kHz using #{r.mode}")
       end
     end
 

data/lib/cinch/plugins/pskreporter/version.rb

@@ -1,7 +1,7 @@
 module Cinch
   module Plugins
     class PSKReporter
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cinch-pskreporter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jan Szumiec
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake