refactor

4 files changed, 8 insertions, 14 deletions

diff --git a/app/models/account.rb b/app/models/account.rb
index f515768..e71d0f1 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -30,20 +30,21 @@ class Account < ActiveRecord::Base
   end
 
   def client
-    @client ||= Twitter::REST::Client.new(consumer_key: Settings.consumer.key,
-                                          consumer_secret: Settings.consumer.secret,
-                                          access_token: oauth_token,
-                                          access_token_secret: oauth_token_secret)
+    @_client ||= Twitter::REST::Client.new(consumer_key: Settings.consumer.key,
+                                           consumer_secret: Settings.consumer.secret,
+                                           access_token: oauth_token,
+                                           access_token_secret: oauth_token_secret)
   end
 
   def following?(target_id)
+    target_id = target_id.id if target_id.is_a? User
     friends.member? target_id
   end
 
   def friends
     @_friends ||=
     Rails.cache.fetch("accounts/#{self.id}/friends", expires_in: Settings.cache.friends) do
-      Set.new self.client.friend_ids
+      Set.new client.friend_ids
     end
   end
 end
diff --git a/app/models/tweet.rb b/app/models/tweet.rb
index 9f769d2..b5cf06e 100644
--- a/app/models/tweet.rb
+++ b/app/models/tweet.rb
@@ -10,8 +10,6 @@ class Tweet < ActiveRecord::Base
   has_many :favoriters, ->  { order("favorites.id") }, through: :favorites, source: :user
   has_many :retweeters, -> { order("retweets.id") }, through: :retweets, source: :user
 
-  scope :eager_load_for_html, -> { eager_load(:user) }
-
   scope :recent, ->(period = 3.days) { where("tweets.id > ?", snowflake_min(Time.zone.now - period)) }
   scope :reacted, ->(count = nil) { where("reactions_count >= ?", (count || 1).to_i) }
   scope :not_protected, -> { joins(:user).references(:user).where(users: { protected: false }) }
diff --git a/app/models/user.rb b/app/models/user.rb
index 913a83d..6b584e4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -57,13 +57,8 @@ class User < ActiveRecord::Base
     !registered? || registered? && account.private?
   end
 
-  def following?(user)
-    raise Aclog::Exceptions::UserNotRegistered unless registered?
-    account.following?(user.id)
-  end
-
   def permitted_to_see?(user)
-    !user.protected? || user.id == self.id || self.following?(user) || false
+    !user.protected? || user.id == self.id || (self.registered? && account.following?(user))
   end
 
   def stats
diff --git a/app/models/worker_manager.rb b/app/models/worker_manager.rb
index 4cd9d52..9366f56 100644
--- a/app/models/worker_manager.rb
+++ b/app/models/worker_manager.rb
@@ -19,7 +19,7 @@ class WorkerManager
 
     private
     def client
-      @client ||= begin
+      @_client ||= begin
         transport = MessagePack::RPC::UNIXTransport.new
         MessagePack::RPC::Client.new(transport, Rails.root.join("tmp", "sockets", "collector.sock").to_s)
       rescue Errno::ECONNREFUSED, Errno::ENOENT