lita-tipbot 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06920063e35501d1189c69663b4b2ed45e086599
-  data.tar.gz: e9e8bb68f06ad1582992b97f7919ea0902f0c0da
+  metadata.gz: 859a431c9a77933c570e155163949d68dc414008
+  data.tar.gz: e1809b39eb9360a88515c3efab0e84f511bda247
 SHA512:
-  metadata.gz: 56a490fb443fd223a6e1a0094d363d3b95366b62ac775842c3ae12b104419839fbea619200aaac71665ffa96432377b7bfc840ac871d2f6ce934f5f431cb9849
-  data.tar.gz: d182d21450cfb3cff9a4b36428c58de433e6d86b63cba7ec70f2bde5cd04b1f692e7091e3d865ac52dfaa3caf5d9cd8268813739d4575e5e18feb907b3c7707b
+  metadata.gz: 9617ea735081584d93662a9242e10befd1d8d44a37019aefbbe976b25647088ce9c927edb75084ff00e179c20cf5c84bffd3566802ceff522ddfced509358e03
+  data.tar.gz: be2237048c0ded054733f7cd0644fde59cd40fb033cf84892d85f8f19d2b753201e7f9b310c57d15a246985723d73f58db16d927c04fbbfce1e3cfe8c2c6a8f0

data/lib/lita/handlers/tipbot.rb

@@ -180,6 +180,9 @@ module Lita
         users    = active_room_members room_jid
 
         users.shuffle.each do |user|
+          # skip tipper
+          next if user['mention_name'] == response.user.mention_name
+
           log.info "tipping #{user['email']}"
 
           dest_hash = hash_email user['email']
@@ -232,10 +235,12 @@ module Lita
       # instead: make one call for all users, then check
       # to see if each is an active participant
       def active_room_members(room_jid)
+        log.debug "looking up room jid: #{room_jid}"
         data = room_data(room_jid)
+        log.debug "room_data: #{data.inspect}"
         results = []
         data['participants'].each do |p|
-          user = hipchat_api.users_show(p['id'])
+          user = hipchat_api.users_show(p['user_id'])
           next if user['user']['status'] != 'available'
           next if exclude_user? user['user']
           results << user['user']
@@ -250,13 +255,15 @@ module Lita
       def room_data(room_jid)
         room_id = room_id_from_jid room_jid
         data = hipchat_api.rooms_show room_id
+        log.debug "room #{room_id} data: #{data.inspect}"
         data['room']
       end
 
       def room_id_from_jid(room_jid)
         data = hipchat_api.rooms_list
+        log.debug "all room data: #{data.inspect}"
         room = data['rooms'].select {|r| r['xmpp_jid'] == room_jid}.first
-        room.nil? ? nil : room['id']
+        room.nil? ? nil : room['room_id']
       end
 
     end

data/lita-tipbot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-tipbot"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Chris Chalfant"]
   spec.email         = ["chalfants@gmail.com"]
   spec.description   = "Tip people with dogecoins!"

data/spec/lita/handlers/tipbot_spec.rb

@@ -62,6 +62,37 @@ describe Lita::Handlers::Tipbot, lita_handler: true do
     expect(replies.first).to eq('foo')
   end
 
+  describe '#make_it_rain' do
+    let(:active_users) {
+      [
+        {
+          'name' => user.name,
+          'mention_name' => user.mention_name,
+          'email' => 'test@foo.com'
+        },
+        {
+          'name' => 'someguy',
+          'mention_name' => '@someguy',
+          'email' => 'someguy@foo.com'
+        }
+      ]
+    }
+
+    before(:each) do
+      allow(subject).to receive(:active_room_members).and_return(active_users)
+      subject.tipbot_api = double(tip: 'foo')
+      send_message("tipbot make it rain")
+    end
+
+    it 'tips a user' do
+      expect(replies).to include("A coin for someguy!")
+    end
+
+    it 'does not tip the tipper' do
+      expect(replies).to_not include("A coin for #{user.name}")
+    end
+  end
+
   describe '#hash_email' do
     it 'hashes properly' do
       email = 'cchalfant@leafsoftwaresolutions.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-tipbot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Chalfant