random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up ReactController

Browse Source
This commit is contained in:
Alex Gleason 2019-11-17 21:30:54 -06:00
parent b3bdddf374
commit a925509384
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/react_controller.rb
View File

@ -15,18 +15,6 @@ class ReactController < ApplicationController
def set_data_for_meta def set_data_for_meta
return if find_route_matches 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? if request.path.starts_with?('/tags') && params[:tag].present?
@tag = Tag.find_normalized(params[:tag]) @tag = Tag.find_normalized(params[:tag])
end end

2
app/views/layouts/application.html.haml
View File

@ -22,7 +22,7 @@
= render 'tags/meta', tag: @tag, initial_state_json: @initial_state_json = render 'tags/meta', tag: @tag, initial_state_json: @initial_state_json
- elsif @stream_entry && @account - elsif @stream_entry && @account
= render 'stream_entries/meta', stream_entry: @stream_entry, account: @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 = 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 %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title