cincodenada
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not display non-Status stream entries anymore

This commit is contained in:
Eugen Rochko 2017-02-17 02:20:52 +01:00
parent dbd80465c8
commit 5ddad41245
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/stream_entries_controller.rb
View File

@ -43,7 +43,7 @@ class StreamEntriesController < ApplicationController
end end
def set_stream_entry 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 @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)))) 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))))

2
app/models/stream_entry.rb
View File

@ -55,7 +55,7 @@ class StreamEntry < ApplicationRecord
end end
def activity def activity
!new_record? ? send(activity_type.underscore) : super !new_record? ? send(activity_type.underscore) || super : super
end end
private private