diff --git a/app/controllers/react_controller.rb b/app/controllers/react_controller.rb index 62534ade..70632c62 100644 --- a/app/controllers/react_controller.rb +++ b/app/controllers/react_controller.rb @@ -15,18 +15,6 @@ class ReactController < ApplicationController def set_data_for_meta return if find_route_matches - if params[:username].present? - @account = Account.find_local(params[:username]) - elsif params[:account_username].present? - @account = Account.find_local(params[:account_username]) - - if params[:id].present? && !@account.nil? - @status = @account.statuses.find(params[:id]) - @stream_entry = @status.stream_entry - @type = @stream_entry.activity_type.downcase - end - end - if request.path.starts_with?('/tags') && params[:tag].present? @tag = Tag.find_normalized(params[:tag]) end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7b237f55..aaffff1b 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -22,7 +22,7 @@ = render 'tags/meta', tag: @tag, initial_state_json: @initial_state_json - elsif @stream_entry && @account = render 'stream_entries/meta', stream_entry: @stream_entry, account: @account - - elsif @account + - elsif @account && @account.local? = render 'accounts/meta', account: @account, older_url: nil, newer_url: nil %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title