From 3d291bcc55ffa789f99ada3c37a285aaa50e2b82 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 17 Feb 2017 02:20:52 +0100 Subject: [PATCH] Do not display non-Status stream entries anymore --- app/controllers/stream_entries_controller.rb | 2 +- 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 index da284d80ee..c43d372ed3 100644 --- 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 index 8b41c8c39f..ae7ae446e9 100644 --- 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