Merge branch 'master' of re4k.info:aclog

1 files changed, 7 insertions, 7 deletions

diff --git a/app/models/tweet.rb b/app/models/tweet.rb
index 4b09171..0b24c59 100644
--- a/app/models/tweet.rb
+++ b/app/models/tweet.rb
@@ -1,3 +1,5 @@
+require "digest/md5"
+
 class Tweet < ActiveRecord::Base
   extend Aclog::Twitter
 
@@ -150,15 +152,13 @@ class Tweet < ActiveRecord::Base
   end
 
   def self.cache_list(expires_in)
-    key = "tweets/#{scoped.to_sql}"
+    key = "tweets/ids/#{Digest::MD5.hexdigest(scoped.to_sql)}"
     ids = Rails.cache.read(key)
-    if ids
-      Tweet.where(id: ids).order("CASE #{ids.each_with_index.map {|m, i| "WHEN ID = #{m} THEN #{i}" }.join(" ")} END")
-    else
-      # use map instead of pluck: not to excecute new SQL
-      Rails.cache.write(key, scoped.map(&:id), expires_in: expires_in)
-      scoped
+    unless ids
+      ids = scoped.pluck(:id)
+      Rails.cache.write(key, ids, expires_in: expires_in)
     end
+    unscoped.where(id: ids).order("CASE tweets.id #{ids.each_with_index.map {|m, i| "WHEN #{m} THEN #{i}" }.join(" ")} END")
   end
 end