aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/account.rb
diff options
context:
space:
mode:
authorRhenium <rhenium@rhe.jp>2013-12-16 12:44:15 +0900
committerRhenium <rhenium@rhe.jp>2013-12-16 12:45:50 +0900
commit3b6b25ad0551f6f8bc2dcc8a3e3a2e9db3356fe4 (patch)
tree7c4abbdf4c3df33bacb295dcae45586403827b63 /app/models/account.rb
parenta83895a7f2b5e8ccdb9eb216b3c3e2af1ef45835 (diff)
downloadaclog-3b6b25ad0551f6f8bc2dcc8a3e3a2e9db3356fe4.tar.gz
refactor settings
Diffstat (limited to 'app/models/account.rb')
-rw-r--r--app/models/account.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/models/account.rb b/app/models/account.rb
index 5348368..7b777ec 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -11,7 +11,6 @@ class Account < ActiveRecord::Base
account = where(user_id: hash[:user_id]).first_or_initialize
account.oauth_token = hash[:oauth_token]
account.oauth_token_secret = hash[:oauth_token_secret]
- account.consumer_version = hash[:consumer_version]
account.status = Account::ACTIVE
account.save if account.changed?
account
@@ -48,8 +47,8 @@ class Account < ActiveRecord::Base
end
def client
- Twitter::REST::Client.new(consumer_key: Settings.collector.consumer[consumer_version].key,
- consumer_secret: Settings.collector.consumer[consumer_version].secret,
+ Twitter::REST::Client.new(consumer_key: Settings.consumer.key,
+ consumer_secret: Settings.consumer.secret,
oauth_token: oauth_token,
oauth_token_secret: oauth_token_secret)
end