Do not display non-Status stream entries anymore

8 years ago · 5ddad41245
parent dbd80465c8
commit 5ddad41245
2 changed files with 2 additions and 2 deletions
--- 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))))
--- 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