slacky 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b1a15776f6f9235b8f37d87cc800f4b62e8385
-  data.tar.gz: feef405968a6385b2baeff1cc9f9ecb0ac424c2a
+  metadata.gz: c00851b9a82b08d05f19156859e17b6493d8969f
+  data.tar.gz: 155bbd326633f6ea7f9497d49d75489343bc3c58
 SHA512:
-  metadata.gz: 0b6d6d5f2fc9646b6a02bb04879a7144b19c7c5b841134f644cf82fd69494b672c243fe17932ef042871ed57f904228daf25918ed5ad4547120de4fed4b2b597
-  data.tar.gz: d939d9c93f836cb81b362358a2e774714353b60342222ba22f5d5513ece20840b8acb4973ec0f727e7f6979ea6e550bcc1a5095bab084b414617ba1865611c39
+  metadata.gz: 774aa4b339e48d943573d0828879ff70b99f3d9a5743f82a4098fa44008b343c37a11881022c6701c4c130b82ea3ad99ea288066ffd82020c9f758677f174925
+  data.tar.gz: c91c5aca34dbc9015c90fbf0f2489fdfdfbfc065ec4d8e1c888eab724d5afd515162fdbc7a2908c9c1515809a5e7d981dcfc8c7b76aee9bed3f218156c61f493

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slacky (0.2.8)
+    slacky (0.2.9)
       dotenv
       em-cron
       eventmachine
@@ -14,51 +14,50 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+    activesupport (5.1.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    dotenv (2.2.0)
+    concurrent-ruby (1.0.5)
+    dotenv (2.2.1)
     em-cron (0.2.0)
       eventmachine
       parse-cron (~> 0.1)
-    eventmachine (1.2.2)
-    factory_girl (4.7.0)
+    eventmachine (1.2.5)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faraday (0.11.0)
+    faraday (0.14.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    faye-websocket (0.10.6)
+    faye-websocket (0.10.7)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    gli (2.15.0)
-    hashie (3.5.3)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.4)
+    gli (2.17.1)
+    hashie (3.5.7)
+    i18n (1.0.0)
+      concurrent-ruby (~> 1.0)
+    minitest (5.11.3)
     multipart-post (2.0.0)
     parse-cron (0.1.4)
-    pg (0.19.0)
-    rake (11.1.2)
-    slack-ruby-client (0.7.9)
+    pg (1.0.0)
+    rake (12.3.1)
+    slack-ruby-client (0.11.1)
       activesupport
       faraday (>= 0.9)
       faraday_middleware
       gli
       hashie
-      json
       websocket-driver
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2016.10)
+    tzinfo-data (1.2018.4)
       tzinfo (>= 1.0.0)
-    websocket-driver (0.6.5)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby

data/lib/slacky/bookkeeper.rb

@@ -9,12 +9,6 @@ module Slacky
     end
 
     def keep_the_books
-      @client.on :presence_change do |data|
-        next unless ( user = User.find data.user )
-        user.presence = data['presence']
-        user.save
-      end
-
       @client.on :channel_created do |data|
         web_client.channels_info(channel: data.channel.id).tap do |resp|
           if resp.ok

data/lib/slacky/bot.rb

@@ -178,7 +178,7 @@ module Slacky
 
     def populate_users
       print "Getting users from Slack..."
-      resp = web_client.users_list presence: 1
+      resp = web_client.users_list
       throw resp unless resp.ok
       User.invalidate_all_users
       whitelist = @config.whitelist_users || []

data/lib/slacky/user.rb

@@ -2,7 +2,7 @@ require 'json'
 
 module Slacky
   class User
-    attr_accessor :username, :slack_id, :slack_im_id, :first_name, :last_name, :email, :timezone, :presence, :data
+    attr_accessor :username, :slack_id, :slack_im_id, :first_name, :last_name, :email, :timezone, :data
     attr_writer :valid
     attr_reader :tz
 
@@ -37,7 +37,6 @@ create table if not exists users (
   last_name    varchar(64),
   email        varchar(128) not null,
   timezone     varchar(256),
-  presence     varchar(64),
   valid        boolean not null default false,
   data         jsonb not null
 );
@@ -77,7 +76,6 @@ SQL
                         last_name:   row['last_name'],
                         email:       row['email'],
                         timezone:    row['timezone'],
-                        presence:    row['presence'],
                         valid:       row['valid'],
                         data:        JSON.parse(row['data'])
         user.extend @@decorator if @@decorator
@@ -93,7 +91,6 @@ SQL
       @last_name   = attrs[:last_name]
       @email       = attrs[:email]
       @timezone    = attrs[:timezone] || "America/Los_Angeles"
-      @presence    = attrs[:presence]
       @valid       = attrs[:valid]
       @data        = attrs[:data] || {}
     end
@@ -104,7 +101,6 @@ SQL
       @last_name  = member.profile.last_name
       @email      = member.profile.email
       @timezone   = member.tz
-      @presence   = member['presence']
       @data       = {} unless @data
       self
     end
@@ -116,9 +112,9 @@ SQL
 
     def save
       User.db.exec_params "delete from users where slack_id = $1", [ @slack_id ]
-      User.db.exec_params "insert into users (username, slack_id, slack_im_id, first_name, last_name, email, timezone, presence, valid, data)
-                           values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)",
-                          [ @username, @slack_id, @slack_im_id, @first_name, @last_name, @email, @timezone, @presence, @valid, JSON.dump(@data) ]
+      User.db.exec_params "insert into users (username, slack_id, slack_im_id, first_name, last_name, email, timezone, valid, data)
+                           values ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
+                          [ @username, @slack_id, @slack_im_id, @first_name, @last_name, @email, @timezone, @valid, JSON.dump(@data) ]
       self
     end
 

data/lib/slacky/version.rb

@@ -1,3 +1,3 @@
 module Slacky
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slacky
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Michael Wynholds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client