mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-22 23:28:08 +01:00
bddd9ba36d
* Remove support for OAUTH_REDIRECT_AT_SIGN_IN Fixes #15959 Introduced in #6540, OAUTH_REDIRECT_AT_SIGN_IN allowed skipping the log-in form to instead redirect to the external OmniAuth login provider. However, it did not prevent the log-in form on /about introduced by #10232 from appearing, and completely broke with the introduction of #15228. As I restoring that previous log-in flow without introducing a security vulnerability may require extensive care and knowledge of how OmniAuth works, this commit removes support for OAUTH_REDIRECT_AT_SIGN_IN instead for the time being. * Add OMNIAUTH_ONLY environment variable to enforce external log-in only * Disable user registration when OMNIAUTH_ONLY is set to true * Replace log-in links When OMNIAUTH_ONLY is set with exactly one OmniAuth provider
61 lines
2.7 KiB
Text
61 lines
2.7 KiB
Text
:ruby
|
|
pinned ||= false
|
|
include_threads ||= false
|
|
is_predecessor ||= false
|
|
is_successor ||= false
|
|
direct_reply_id ||= false
|
|
parent_id ||= false
|
|
is_direct_parent = direct_reply_id == status.id
|
|
is_direct_child = parent_id == status.in_reply_to_id
|
|
centered ||= include_threads && !is_predecessor && !is_successor
|
|
h_class = microformats_h_class(status, is_predecessor, is_successor, include_threads)
|
|
style_classes = style_classes(status, is_predecessor, is_successor, include_threads)
|
|
mf_classes = microformats_classes(status, is_direct_parent, is_direct_child)
|
|
entry_classes = h_class + ' ' + mf_classes + ' ' + style_classes
|
|
|
|
- if status.reply? && include_threads
|
|
- if @next_ancestor
|
|
.entry{ class: entry_classes }
|
|
= link_to_older ActivityPub::TagManager.instance.url_for(@next_ancestor)
|
|
|
|
= render partial: 'statuses/status', collection: @ancestors, as: :status, locals: { is_predecessor: true, direct_reply_id: status.in_reply_to_id }
|
|
|
|
.entry{ class: entry_classes }
|
|
|
|
- if status.reblog?
|
|
.status__prepend
|
|
.status__prepend-icon-wrapper
|
|
%i.status__prepend-icon.fa.fa-fw.fa-retweet
|
|
%span
|
|
= link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name muted' do
|
|
%bdi
|
|
%strong.emojify= display_name(status.account, custom_emojify: true)
|
|
= t('stream_entries.reblogged')
|
|
- elsif pinned
|
|
.status__prepend
|
|
.status__prepend-icon-wrapper
|
|
%i.status__prepend-icon.fa.fa-fw.fa-thumb-tack
|
|
%span
|
|
= t('stream_entries.pinned')
|
|
|
|
= render (centered ? 'statuses/detailed_status' : 'statuses/simple_status'), status: status.proper, hide_show_thread: is_predecessor || is_successor
|
|
|
|
- if include_threads
|
|
- if @since_descendant_thread_id
|
|
.entry{ class: entry_classes }
|
|
= link_to_newer short_account_status_url(status.account.username, status, max_descendant_thread_id: @since_descendant_thread_id + 1)
|
|
- @descendant_threads.each do |thread|
|
|
= render partial: 'statuses/status', collection: thread[:statuses], as: :status, locals: { is_successor: true, parent_id: status.id }
|
|
|
|
- if thread[:next_status]
|
|
.entry{ class: entry_classes }
|
|
= link_to_newer ActivityPub::TagManager.instance.url_for(thread[:next_status])
|
|
- if @next_descendant_thread
|
|
.entry{ class: entry_classes }
|
|
= link_to_newer short_account_status_url(status.account.username, status, since_descendant_thread_id: @max_descendant_thread_id - 1)
|
|
|
|
- if include_threads && !embedded_view? && !user_signed_in?
|
|
.entry{ class: entry_classes }
|
|
= link_to_login class: 'load-more load-gap' do
|
|
= fa_icon 'comments'
|
|
= t('statuses.sign_in_to_participate')
|