c32a5f86b6
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
50 lines
3.6 KiB
Text
50 lines
3.6 KiB
Text
.status
|
|
.status__info
|
|
= link_to TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener' do
|
|
%time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
|
|
%data.dt-published{ value: status.created_at.to_time.iso8601 }
|
|
|
|
.p-author.h-card
|
|
= link_to TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener' do
|
|
.status__avatar
|
|
%div
|
|
- if current_account&.user&.setting_auto_play_gif || autoplay
|
|
= image_tag status.account.avatar_original_url, width: 48, height: 48, alt: '', class: 'u-photo account__avatar'
|
|
- else
|
|
= image_tag status.account.avatar_static_url, width: 48, height: 48, alt: '', class: 'u-photo account__avatar'
|
|
%span.display-name
|
|
%bdi
|
|
%strong.display-name__html.p-name.emojify= display_name(status.account, custom_emojify: true, autoplay: autoplay)
|
|
|
|
%span.display-name__account
|
|
= acct(status.account)
|
|
= fa_icon('lock') if status.account.locked?
|
|
.status__content.emojify<
|
|
- if status.spoiler_text?
|
|
%p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
|
|
%span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}
|
|
%a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
|
|
.e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
|
|
= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
|
|
|
|
- unless status.media_attachments.empty?
|
|
- if status.media_attachments.first.video?
|
|
- video = status.media_attachments.first
|
|
= react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description
|
|
- else
|
|
= react_component :media_gallery, height: 343, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif || autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
|
|
|
|
.status__action-bar
|
|
.status__action-bar__counter
|
|
= link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
|
|
= fa_icon 'reply fw'
|
|
.status__action-bar__counter__label= obscured_counter status.replies_count
|
|
= link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
|
|
- if status.public_visibility? || status.unlisted_visibility?
|
|
= fa_icon 'retweet fw'
|
|
- elsif status.private_visibility?
|
|
= fa_icon 'lock fw'
|
|
- else
|
|
= fa_icon 'envelope fw'
|
|
= link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
|
|
= fa_icon 'star fw'
|