mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
a1049e9380
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.
65 lines
1.8 KiB
Ruby
65 lines
1.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class StreamEntriesController < ApplicationController
|
|
include Authorization
|
|
include SignatureVerification
|
|
|
|
layout 'public'
|
|
|
|
before_action :set_account
|
|
before_action :set_stream_entry
|
|
before_action :set_link_headers
|
|
before_action :check_account_suspension
|
|
before_action :set_cache_headers
|
|
|
|
def show
|
|
respond_to do |format|
|
|
format.html do
|
|
redirect_to short_account_status_url(params[:account_username], @stream_entry.activity) if @type == 'status'
|
|
end
|
|
|
|
format.atom do
|
|
unless @stream_entry.hidden?
|
|
skip_session!
|
|
expires_in 3.minutes, public: true
|
|
end
|
|
render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.entry(@stream_entry, true))
|
|
end
|
|
end
|
|
end
|
|
|
|
def embed
|
|
redirect_to embed_short_account_status_url(@account, @stream_entry.activity), status: 301
|
|
end
|
|
|
|
private
|
|
|
|
def set_account
|
|
@account = Account.find_local!(params[:account_username])
|
|
end
|
|
|
|
def set_link_headers
|
|
response.headers['Link'] = LinkHeader.new(
|
|
[
|
|
[account_stream_entry_url(@account, @stream_entry, format: 'atom'), [%w(rel alternate), %w(type application/atom+xml)]],
|
|
[ActivityPub::TagManager.instance.uri_for(@stream_entry.activity), [%w(rel alternate), %w(type application/activity+json)]],
|
|
]
|
|
)
|
|
end
|
|
|
|
def set_stream_entry
|
|
@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?
|
|
authorize @stream_entry.activity, :show? if @stream_entry.hidden?
|
|
rescue Mastodon::NotPermittedError
|
|
# Reraise in order to get a 404
|
|
raise ActiveRecord::RecordNotFound
|
|
end
|
|
|
|
def check_account_suspension
|
|
gone if @account.suspended?
|
|
end
|
|
end
|