slacky 0.1.4 → 0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slacky (0.1.4)
+    slacky (0.2)
       dotenv
       em-cron
       eventmachine

data/lib/slacky/bot.rb

@@ -138,6 +138,7 @@ module Slacky
 
       @client.on :message do |data|
         next unless ( user = User.find data.user )
+        next unless user.valid?
 
         channel = Channel.find data.channel
         channel = Channel.im data.channel, user if data.channel =~ /^D/ && ! channel
@@ -194,12 +195,17 @@ module Slacky
       print "Getting users from Slack..."
       resp = web_client.users_list presence: 1
       throw resp unless resp.ok
+      User.invalidate_all_users
+      whitelist = @config.whitelist_users || []
       resp.members.map do |member|
         next unless member.profile.email # no bots
         next if member.deleted # no ghosts
-        next if member.is_ultra_restricted # no single channel guests
+        unless whitelist.include?(member.id) || whitelist.include?(member.name) || whitelist.include?("@#{member.name}")
+          next if member.is_ultra_restricted # no single channel guests
+          next if member.is_restricted # no multi channel guests either
+        end
         user = User.find(member.id) || User.new(slack_id: member.id)
-        user.populate(member).save
+        user.populate(member).validate.save
       end
       puts " done!"
     end

data/lib/slacky/config.rb

@@ -44,6 +44,11 @@ module Slacky
       ENV['ACCEPT_CHANNELS'].split(',').map {|c| c.strip}
     end
 
+    def whitelist_users
+      return nil unless ENV['WHITELIST_USERS']
+      ENV['WHITELIST_USERS'].split(',').map {|u| u.strip}
+    end
+
     def log(msg, ex = nil)
       log = File.new(log_file, 'a')
       timestamp = Time.now.strftime('%Y-%m-%d %H:%M:%S')

data/lib/slacky/daemon.rb

@@ -20,6 +20,7 @@ module Slacky
       end
 
       begin
+        Thread.abort_on_exception = true
         @slackthread = Thread.new do
           bot = Bot.new @config
           @bot_class.new bot

data/lib/slacky/message.rb

@@ -39,6 +39,12 @@ module Slacky
       end
     end
 
+    def command_args
+      return nil unless command
+      index = @text.index(command) + command.length
+      @text[index..-1].strip
+    end
+
     def yes?
       [ 'y', 'yes', 'yep' ].include? @text.downcase
     end

data/lib/slacky/user.rb

@@ -3,8 +3,13 @@ require 'json'
 module Slacky
   class User
     attr_accessor :username, :slack_id, :slack_im_id, :first_name, :last_name, :email, :timezone, :presence, :data
+    attr_writer :valid
     attr_reader :tz
 
+    def valid?
+      @valid
+    end
+
     @@decorator = @@config = @@db = nil
 
     def self.decorator=(decorator)
@@ -33,31 +38,51 @@ create table if not exists users (
   email        varchar(128) not null,
   timezone     varchar(256),
   presence     varchar(64),
+  valid        boolean not null default false,
   data         jsonb not null
 );
 SQL
     end
 
+    def self.invalidate_all_users
+      self.db.exec 'update users set valid = FALSE'
+    end
+
     def self.find(user)
+      return nil unless user
       return user.map { |u| User.find u }.compact if user.is_a? Array
-      result = self.db.exec_params "select * from users where slack_id = $1", [ user ]
+      match = user.match(/^<@(.*)>$/)
+      id = ( match ? match[1] : user )
+      result = self.db.exec_params "select * from users where slack_id = $1", [ id ]
       if result.ntuples == 0
-        result = self.db.exec_params "select * from users where username = $1", [ user ]
+        username = ( user =~ /^@/ ? user.sub(/^@/, '') : user )
+        result = self.db.exec_params "select * from users where username = $1", [ username ]
       end
       return nil if result.ntuples == 0
+      hydrate(result)[0]
+    end
 
-      row = result[0]
-      user = self.new username:    row['username'],
-                      slack_id:    row['slack_id'],
-                      slack_im_id: row['slack_im_id'],
-                      first_name:  row['first_name'],
-                      last_name:   row['last_name'],
-                      email:       row['email'],
-                      timezone:    row['timezone'],
-                      presence:    row['presence'],
-                      data:        JSON.parse(row['data'])
-      user.extend @@decorator if @@decorator
-      user
+    def self.find_by_data(query)
+      result = self.db.exec "select * from users where data #{query}"
+      hydrate result
+    end
+
+    def self.hydrate(result)
+      return [] if result.ntuples == 0
+      result.map do |row|
+        user = self.new username:    row['username'],
+                        slack_id:    row['slack_id'],
+                        slack_im_id: row['slack_im_id'],
+                        first_name:  row['first_name'],
+                        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
+        user
+      end
     end
 
     def initialize(attrs={})
@@ -69,6 +94,7 @@ SQL
       @email       = attrs[:email]
       @timezone    = attrs[:timezone] || "America/Los_Angeles"
       @presence    = attrs[:presence]
+      @valid       = attrs[:valid]
       @data        = attrs[:data] || {}
     end
 
@@ -83,11 +109,16 @@ SQL
       self
     end
 
+    def validate
+      @valid = true
+      self
+    end
+
     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, data)
-                           values ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
-                          [ @username, @slack_id, @slack_im_id, @first_name, @last_name, @email, @timezone, @presence, JSON.dump(@data) ]
+      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) ]
       self
     end
 

data/lib/slacky/version.rb

@@ -1,3 +1,3 @@
 module Slacky
-  VERSION = "0.1.4"
+  VERSION = "0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slacky
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
@@ -226,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -862400809388430587
+      hash: 2539155529530202042
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -862400809388430587
+      hash: 2539155529530202042
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23