remove Typhoeus

4 files changed, 2 insertions, 29 deletions

diff --git a/Gemfile b/Gemfile
index ad4ac38..ead5fa7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,6 @@ gem 'msgpack'
 gem 'msgpack-rpc'
 gem 'em-work_queue'
 
-gem 'typhoeus', require: "typhoeus/adapters/faraday"
 gem 'twitter'
 gem 'omniauth-twitter'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e3d9f2c..40fb89f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,9 +53,6 @@ GEM
     em-work_queue (0.0.1)
       eventmachine
     erubis (2.7.0)
-    ethon (0.5.12)
-      ffi (>= 1.3.0)
-      mime-types (~> 1.18)
     eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -66,7 +63,6 @@ GEM
       railties (>= 3.0.0)
     faraday (0.8.7)
       multipart-post (~> 1.1)
-    ffi (1.8.1)
     haml (4.0.2)
       tilt
     haml-rails (0.4)
@@ -174,8 +170,6 @@ GEM
       faraday (~> 0.8, < 0.10)
       multi_json (~> 1.0)
       simple_oauth (~> 0.2)
-    typhoeus (0.6.3)
-      ethon (~> 0.5.11)
     tzinfo (0.3.37)
     uglifier (2.1.1)
       execjs (>= 0.3.0)
@@ -214,7 +208,6 @@ DEPENDENCIES
   sass-rails (~> 4.0.0.rc1)
   thin
   twitter
-  typhoeus
   uglifier (>= 1.0.3)
   unicorn
   webmock
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 111dd40..7a53584 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -1,8 +1,7 @@
 class Notification
   def self.notify_favorite(tweet)
-    tweet.reload
-    if [50, 100, 250, 500, 1000].include?(tweet.favorites_count)
-      reply_favs(tweet, tweet.favorites_count) if tweet.user.registered?
+    if [50, 100, 250, 500, 1000].include?(tweet.favorites.count)
+      reply_favs(tweet, tweet.favorites.count) if tweet.user.registered?
     end
   end
 
diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb
deleted file mode 100644
index 6c88253..0000000
--- a/config/initializers/faraday.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# https://github.com/sferik/twitter/blob/2ec6142/lib/twitter/default.rb#L28
-Twitter.middleware = Faraday::Builder.new do |builder|
-  # Convert file uploads to Faraday::UploadIO objects
-  builder.use Twitter::Request::MultipartWithFile
-  # Checks for files in the payload
-  builder.use Faraday::Request::Multipart
-  # Convert request params to "www-form-urlencoded"
-  builder.use Faraday::Request::UrlEncoded
-  # Handle 4xx server responses
-  builder.use Twitter::Response::RaiseError, Twitter::Error::ClientError
-  # Parse JSON response bodies using MultiJson
-  builder.use Twitter::Response::ParseJson
-  # Handle 5xx server responses
-  builder.use Twitter::Response::RaiseError, Twitter::Error::ServerError
-  # Set Faraday's HTTP adapter
-  builder.adapter :typhoeus
-end
-