mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 20:03:24 +00:00
aec61a703f
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version.
71 lines
3.3 KiB
Plaintext
71 lines
3.3 KiB
Plaintext
:ruby
|
|
hide_show_thread ||= false
|
|
|
|
.status{ class: "status-#{status.visibility}" }
|
|
.status__info
|
|
= link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__relative-time u-url u-uid', target: stream_link_target, rel: 'noopener noreferrer' do
|
|
%span.status__visibility-icon><
|
|
= visibility_icon status
|
|
%time.time-ago{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
|
|
- if status.edited?
|
|
%abbr{ title: t('statuses.edited_at_html', date: l(status.edited_at.to_date)) }
|
|
*
|
|
%data.dt-published{ value: status.created_at.to_time.iso8601 }
|
|
|
|
.p-author.h-card
|
|
= link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'status__display-name u-url', target: stream_link_target, rel: 'noopener noreferrer' do
|
|
.status__avatar
|
|
%div
|
|
- if prefers_autoplay?
|
|
= image_tag status.account.avatar_original_url, alt: '', class: 'u-photo account__avatar'
|
|
- else
|
|
= image_tag status.account.avatar_static_url, 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: prefers_autoplay?)
|
|
= ' '
|
|
%span.display-name__account
|
|
= acct(status.account)
|
|
= fa_icon('lock') if status.account.locked?
|
|
.status__content.emojify{ data: ({ spoiler: current_account&.user&.setting_expand_spoilers ? 'expanded' : 'folded' } if status.spoiler_text?) }<
|
|
- if status.spoiler_text?
|
|
%p<
|
|
%span.p-summary> #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)}
|
|
%button.status__content__spoiler-link= t('statuses.show_more')
|
|
.e-content{ lang: status.language }<
|
|
= prerender_custom_emojis(status_content_format(status), status.emojis)
|
|
|
|
- if status.preloadable_poll
|
|
= render_poll_component(status)
|
|
|
|
- if !status.ordered_media_attachments.empty?
|
|
- if status.ordered_media_attachments.first.video?
|
|
= render_video_component(status, width: 610, height: 343)
|
|
- elsif status.ordered_media_attachments.first.audio?
|
|
= render_audio_component(status, width: 610, height: 343)
|
|
- else
|
|
= render_media_gallery_component(status, height: 343)
|
|
- elsif status.preview_card
|
|
= render_card_component(status)
|
|
|
|
- if !status.in_reply_to_id.nil? && status.in_reply_to_account_id == status.account.id && !hide_show_thread
|
|
= link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__content__read-more-button', target: stream_link_target, rel: 'noopener noreferrer' do
|
|
= t 'statuses.show_thread'
|
|
|
|
.status__action-bar
|
|
%span.status__action-bar-button.icon-button.icon-button--with-counter
|
|
- if status.in_reply_to_id.nil?
|
|
= fa_icon 'reply fw'
|
|
- else
|
|
= fa_icon 'reply-all fw'
|
|
%span.icon-button__counter= obscured_counter status.replies_count
|
|
%span.status__action-bar-button.icon-button
|
|
- if status.distributable?
|
|
= fa_icon 'retweet fw'
|
|
- elsif status.private_visibility? || status.limited_visibility?
|
|
= fa_icon 'lock fw'
|
|
- else
|
|
= fa_icon 'at fw'
|
|
%span.status__action-bar-button.icon-button
|
|
= fa_icon 'star fw'
|