driftwood 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf713110adaec5423a677c0298e3b976872d7ef
-  data.tar.gz: 4d2a952a4311b32825349329b0d01a9f39e490b1
+  metadata.gz: 577ddadc21bbfaa22fec813d3b3129f6c2c22b14
+  data.tar.gz: 4c398d3e159fdc8c0b400ae25aff5d88ff6ac71f
 SHA512:
-  metadata.gz: 921d7b07c456f0e16e14a121f5aef3c1c3111b052d47f463d11ac8617cef59339bf93f27857c14b658871a8ce24f2ab4a6e6c89b03a90bd81922237de3ba9be6
-  data.tar.gz: 57089dcf55b76c5654a3de1662296e5de675d13b882de2f89b717df6dd82902330950195cfbc9db43fb4b7e72bf38e5ffb8e61a75dd92640b95f7e9043c49112
+  metadata.gz: 639d06b08ad608fe3a40acc9828ca7ef669c3fb77525f17ea6bdf87e96772bc264c178bd2c70aa57c8bc47bbb6ff1f365d3cdfa90445258f72064cd41e168305
+  data.tar.gz: a8dd564442f732181b712ce80eef36e441c6f9d7f04a9655a76043349304bb71868f8b08895eb584f722f30773886f81bc93d8e27fd950fbffdfe47d7223e14e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.0.4
+
+Fully purge deleted users
+Log channel joins
+
 # v0.0.3
 
 Corrected teams object filter

data/lib/driftwood.rb

@@ -46,6 +46,17 @@ class Driftwood < Sinatra::Base
       user = @slack.normalize_user(event_data['user'])
       $logger.info "Registered new user: #{user['name']} (#{user['real_name']})"
       @bigquery.insert_user(user)
+# send them welcome infos
+
+    end
+
+    @slack.register_handler('member_joined_channel') do |team_id, event_data|
+      user    = @slack.user_info(event_data['team'], event_data['user'])
+      user    = @slack.normalize_user(user)
+      channel = @slack.channel_name(event_data['team'], event_data['channel'])
+      $logger.info "User #{user['name']} (#{user['real_name']}) joined ##{channel}"
+# send them welcome infos
+
     end
 
     @slack.register_handler('message') do |team_id, event_data|
@@ -66,6 +77,17 @@ class Driftwood < Sinatra::Base
         $logger.error e.message
         $logger.debug e.backtrace.join("\n")
       end
+
+      loop do
+        sleep 86400 # Once a day; 60 * 60 * 24
+        begin
+          $logger.info "Purging deleted users..."
+          @bigquery.purge_deleted_users
+        rescue => e
+          $logger.error e.message
+          $logger.debug e.backtrace.join("\n")
+        end
+      end
     end
 
   end

data/lib/driftwood/bigquery.rb

@@ -126,6 +126,10 @@ class Driftwood::Bigquery
                      :creation => Time.now.strftime('%Y-%m-%d %H:%M:%S%z')).success?
   end
 
+  def purge_deleted_users
+    @dataset.query('DELETE FROM slack_users WHERE deleted = true')
+  end
+
   # Ensure that all users have creation dates. If they don't have one yet, assume now
   # This will catch any users who've been created during downtime if we restart the service
   def reconcile_user_creations()

data/lib/driftwood/slack.rb

@@ -219,7 +219,7 @@ class Driftwood::Slack
 
     users.each do |row|
       normalize_user(row)
-    end
+    end.compact
   end
 
   def messages(team_id, starting_from = 0)
@@ -287,12 +287,14 @@ class Driftwood::Slack
   end
 
   def normalize_user(user)
+    # Why slack? Why?
+    return if user['deleted']
+
     preserve_fields = [ 'team_id', 'user_id', 'name', 'real_name','display_name',
                         'updated', 'deleted', 'tz', 'tz_offset', 'is_owner', 'is_admin',
                         'status_text', 'status_emoji', 'image_72', 'image_192',
+                        'title', 'phone', 'skype', 'email',
                       ]
-    # Why slack? Why?
-    preserve_fields.concat ['title', 'phone', 'skype', 'email'] unless user['deleted']
 
     user['user_id']      = user.delete('id')
     user['title']        = user['profile']['title']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: driftwood
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra