Browse Source

Revert server-side part of "Add logged-out access to the web UI"

closed-social-glitch-2
Claire 2 years ago
parent
commit
e7ab476db2
3 changed files with 10 additions and 10 deletions
  1. +4
    -0
      app/lib/permalink_redirector.rb
  2. +4
    -8
      app/views/home/index.html.haml
  3. +2
    -2
      spec/lib/permalink_redirector_spec.rb

+ 4
- 0
app/lib/permalink_redirector.rb View File

@ -17,6 +17,10 @@ class PermalinkRedirector
find_status_url_by_id(path_segments[2])
elsif path_segments[1] == 'accounts' && path_segments[2] =~ /\d/
find_account_url_by_id(path_segments[2])
elsif path_segments[1] == 'timelines' && path_segments[2] == 'tag' && path_segments[3].present?
find_tag_url_by_name(path_segments[3])
elsif path_segments[1] == 'tags' && path_segments[2].present?
find_tag_url_by_name(path_segments[2])
end
end
end

+ 4
- 8
app/views/home/index.html.haml View File

@ -1,14 +1,10 @@
- content_for :header_tags do
- if user_signed_in?
= preload_pack_asset 'features/getting_started.js', crossorigin: 'anonymous'
= preload_pack_asset 'features/compose.js', crossorigin: 'anonymous'
= preload_pack_asset 'features/home_timeline.js', crossorigin: 'anonymous'
= preload_pack_asset 'features/notifications.js', crossorigin: 'anonymous'
= render partial: 'shared/og'
= preload_pack_asset 'features/getting_started.js', crossorigin: 'anonymous'
= preload_pack_asset 'features/compose.js', crossorigin: 'anonymous'
= preload_pack_asset 'features/home_timeline.js', crossorigin: 'anonymous'
= preload_pack_asset 'features/notifications.js', crossorigin: 'anonymous'
%meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
= render_initial_state
.notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }

+ 2
- 2
spec/lib/permalink_redirector_spec.rb View File

@ -21,7 +21,7 @@ describe PermalinkRedirector do
it 'returns path for legacy tag links' do
redirector = described_class.new('web/timelines/tag/hoge')
expect(redirector.redirect_path).to be_nil
expect(redirector.redirect_path).to eq '/tags/hoge'
end
it 'returns path for pretty account links' do
@ -36,7 +36,7 @@ describe PermalinkRedirector do
it 'returns path for pretty tag links' do
redirector = described_class.new('web/tags/hoge')
expect(redirector.redirect_path).to be_nil
expect(redirector.redirect_path).to eq '/tags/hoge'
end
end
end

Loading…
Cancel
Save