1 files changed, 17 insertions, 7 deletions
diff --git a/app/views/shared/_tweet.json.jbuilder b/app/views/shared/_tweet.json.jbuilder
index a6c22ae..467249a 100644
--- a/app/views/shared/_tweet.json.jbuilder
+++ b/app/views/shared/_tweet.json.jbuilder
@@ -1,18 +1,28 @@
 json.(item, :id, :text, :source, :tweeted_at, :favorites_count, :retweets_count)
 
 json.user do |json|
-  json.partial! "shared/user", :user => item.user
+  unless @include_user
+    json.id item.user_id
+  else
+    json.partial! "shared/user", :user => item.user
+  end
 end
 
-unless @trim_user
-  json.favorites item.favorites.order("id") do |json, favorite|
-    json.user do |json|
+json.favorites item.favorites.order("id") do |json, favorite|
+  json.user do |json|
+    unless @include_user
+      json.id favorite.user_id
+    else
       json.partial! "shared/user", :user => favorite.user || User.new
     end
   end
-  json.retweets item.retweets.order("id") do |json, retweet|
-    json.id retweet.id
-    json.user do |json|
+end
+json.retweets item.retweets.order("id") do |json, retweet|
+  json.id retweet.id
+  json.user do |json|
+    unless @include_user
+      json.id retweet.user_id
+    else
       json.partial! "shared/user", :user => retweet.user || User.new
     end
   end