about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-02-12 00:48:53 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-02-12 01:19:14 +0100
commit0518492158af247f3b99a8f27f4498d1bcc91117 (patch)
tree4e82d1e73bd9a8ac1096d788b684283c8f8c93dd /app/controllers
parent94d21827174c52a6b70ba2e45f098223f5d904fa (diff)
Stop trying to shoehorn all Salmon updates into the poor database-connected
StreamEntry model. Simply render Salmon slaps as they are needed
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/accounts_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index b837f006e..00f8047fd 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -16,7 +16,7 @@ class AccountsController < ApplicationController
       end
 
       format.atom do
-        @entries = @account.stream_entries.order('id desc').where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id])
+        @entries = @account.stream_entries.order('id desc').where(activity_type: 'Status').where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id])
       end
 
       format.activitystreams2