From 6fceb087af629e7723c51607eb89db345c20eccb Mon Sep 17 00:00:00 2001 From: Rhenium Date: Fri, 21 Feb 2014 16:32:57 +0900 Subject: fix tweets#user_discovered_by --- app/models/tweet.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/models/tweet.rb') diff --git a/app/models/tweet.rb b/app/models/tweet.rb index a89288c..e0cb347 100644 --- a/app/models/tweet.rb +++ b/app/models/tweet.rb @@ -27,9 +27,10 @@ class Tweet < ActiveRecord::Base scope :discovered_by, -> user { load_count = all.limit_value.to_i + all.offset_value.to_i load_count = nil if load_count == 0 - un = [:favorites, :retweets].map {|m| user.__send__(m).select(:tweet_id).order(tweet_id: :desc).limit(load_count).to_sql }.join(") UNION (") - joins("INNER JOIN ((#{un})) reactions ON reactions.tweet_id = tweets.id") + un = [:favorites, :retweets].map {|m| joins(m).where(m => { user: user }).order(id: :desc).limit(load_count).to_sql }.map {|m| "(#{m})" }.join(" UNION ") + + from("(#{un}) AS tweets") } def twitter_url -- cgit v1.2.3