lib/slacky/user.rb in slacky-0.2.8 vs lib/slacky/user.rb in slacky-0.2.9

@@ -1,10 +1,10 @@
 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
 
     def valid?
       @valid
@@ -35,11 +35,10 @@
   slack_im_id  varchar(20),
   first_name   varchar(64),
   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
 );
 SQL
     end
@@ -75,11 +74,10 @@
                         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
@@ -91,22 +89,20 @@
       @slack_im_id = attrs[:slack_im_id]
       @first_name  = attrs[:first_name]
       @last_name   = attrs[:last_name]
       @email       = attrs[:email]
       @timezone    = attrs[:timezone] || "America/Los_Angeles"
-      @presence    = attrs[:presence]
       @valid       = attrs[:valid]
       @data        = attrs[:data] || {}
     end
 
     def populate(member)
       @username   = member.name
       @first_name = member.profile.first_name
       @last_name  = member.profile.last_name
       @email      = member.profile.email
       @timezone   = member.tz
-      @presence   = member['presence']
       @data       = {} unless @data
       self
     end
 
     def validate
@@ -114,12 +110,12 @@
       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, 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
 
     def reset
       @data = {}