ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redirect to account status page for page of status stream entry (#7104) 

Commit 519119f657 missed a change for
stream entry page. Instead of duplicating the change, redirect to account
status page. It would also help crawlers (of search engines, for example)
to understand a stream entry URL and its corresponding status URL points
to the same page.
rebase/4.0.0rc2
Akihiko Odaki 2018-04-16 17:04:31 +09:00 committed by Eugen Rochko
parent 7c43ed04fe
commit a1049e9380
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/stream_entries_controller.rb
View File

@ -15,8 +15,7 @@ class StreamEntriesController < ApplicationController
def show def show
respond_to do |format| respond_to do |format|
format.html do format.html do
@ancestors = @stream_entry.activity.reply? ? cache_collection(@stream_entry.activity.ancestors(current_account), Status) : [] redirect_to short_account_status_url(params[:account_username], @stream_entry.activity) if @type == 'status'
@descendants = cache_collection(@stream_entry.activity.descendants(current_account), Status)
end end
format.atom do format.atom do

10
spec/controllers/stream_entries_controller_spec.rb
View File

@ -66,16 +66,12 @@ RSpec.describe StreamEntriesController, type: :controller do
describe 'GET #show' do describe 'GET #show' do
include_examples 'before_action', :show include_examples 'before_action', :show
it 'renders with HTML' do it 'redirects to status page' do
ancestor = Fabricate(:status) status = Fabricate(:status)
status = Fabricate(:status, in_reply_to_id: ancestor.id)
descendant = Fabricate(:status, in_reply_to_id: status.id)
get :show, params: { account_username: status.account.username, id: status.stream_entry.id } get :show, params: { account_username: status.account.username, id: status.stream_entry.id }
expect(assigns(:ancestors)).to eq [ancestor] expect(response).to redirect_to(short_account_status_url(status.account, status))
expect(assigns(:descendants)).to eq [descendant]
expect(response).to have_http_status(:success)
end end
it 'returns http success with Atom' do it 'returns http success with Atom' do