From 6c374b51537126a2cba29f3eaf74faf1fc64ba96 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Mon, 6 May 2019 20:51:20 -0500 Subject: Drop OStatus support. Fix some of the Rspec tests. --- app/controllers/stream_entries_controller.rb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'app/controllers/stream_entries_controller.rb') diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb index 1e16c5157..0c749be0e 100644 --- a/app/controllers/stream_entries_controller.rb +++ b/app/controllers/stream_entries_controller.rb @@ -12,6 +12,7 @@ class StreamEntriesController < ApplicationController before_action :check_account_suspension before_action :set_cache_headers + def show respond_to do |format| format.html do @@ -24,15 +25,6 @@ class StreamEntriesController < ApplicationController 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 @@ -49,7 +41,6 @@ class StreamEntriesController < ApplicationController 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)]], ] ) -- cgit