mastofe

commit: 5ddad41245098f1ab931f732f8b48655a86d57b0
parent: dbd80465c8bc9aa389ea0c656bd8c5d6ad1ee6fa
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 17 Feb 2017 02:20:52 +0100

Do not display non-Status stream entries anymore

Diffstat:
M
app/controllers/stream_entries_controller.rb
2
+-
M
app/models/stream_entry.rb
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
@@ -43,7 +43,7 @@ class StreamEntriesController < ApplicationController
   end
 
   def set_stream_entry
-    @stream_entry = @account.stream_entries.find(params[:id])
+    @stream_entry = @account.stream_entries.where(activity_type: 'Status').find(params[:id])
     @type         = @stream_entry.activity_type.downcase
 
     raise ActiveRecord::RecordNotFound if @stream_entry.activity.nil? || (@stream_entry.hidden? && (@stream_entry.activity_type != 'Status' || (@stream_entry.activity_type == 'Status' && !@stream_entry.activity.permitted?(current_account))))
diff --git a/app/models/stream_entry.rb b/app/models/stream_entry.rb
@@ -55,7 +55,7 @@ class StreamEntry < ApplicationRecord
   end
 
   def activity
-    !new_record? ? send(activity_type.underscore) : super
+    !new_record? ? send(activity_type.underscore) || super : super
   end
 
   private