Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/relationships_controller.rb
Simple merge

diff --cc app/helpers/stream_entries_helper.rb
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

diff --cc app/models/status.rb
Simple merge

diff --cc app/serializers/rest/status_serializer.rb
Simple merge

diff --cc app/services/post_status_service.rb
Simple merge

diff --cc app/views/relationships/show.html.haml
Simple merge

diff --cc app/views/stream_entries/_simple_status.html.haml
index 1952128a0933b6bef733f92a4440d97b01fe68fd,ba22c5340741c04f6f47e408a3a357ef442ec2fe..6d2a408ea3614fbc4d0a3cb6fc310a3ccce183e2
--- 1/app/views/stream_entries/_simple_status.html.haml
--- 2/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@@ -24,12 -24,11 +24,12 @@@
        %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
          %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}&nbsp;
          %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)
 +    .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)
  
-   - if status.poll
-     = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
-       = render partial: 'stream_entries/poll', locals: { status: status, poll: status.poll, autoplay: autoplay }
+   - if status.preloadable_poll
+     = react_component :poll, disabled: true, poll: ActiveModelSerializers::SerializableResource.new(status.preloadable_poll, serializer: REST::PollSerializer, scope: current_user, scope_name: :current_user).as_json do
+       = render partial: 'stream_entries/poll', locals: { status: status, poll: status.preloadable_poll, autoplay: autoplay }
    - elsif !status.media_attachments.empty?
      - if status.media_attachments.first.video?
        - video = status.media_attachments.first

diff --cc app/workers/activitypub/distribute_poll_update_worker.rb
index 5536bd744bad4dfdff47e72808f3830399f53b62,5eaca6fda30aa4655255c603e3d1268e1eb59844..98b2271112c995be64a2ce0d3d181c2a9b78a096
--- 1/app/workers/activitypub/distribute_poll_update_worker.rb
--- 2/app/workers/activitypub/distribute_poll_update_worker.rb
+++ b/app/workers/activitypub/distribute_poll_update_worker.rb
@@@ -9,7 -9,7 +9,7 @@@ class ActivityPub::DistributePollUpdate
      @status  = Status.find(status_id)
      @account = @status.account
  
-     return if @status.poll.nil? || @status.local_only?
 -    return unless @status.preloadable_poll
++    return if @status.preloadable_poll.nil? || @status.local_only?
  
      ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
        [payload, @account.id, inbox_url]

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/pl.yml
index bacb457bfe67e72bb550860834163b326741c821,b7b6e2fad5f37c5f31491339df67851fe210b371..9470e875a9753fc4062fb186b0095ba5e2b43647
--- 1/config/locales/pl.yml
--- 2/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@@ -873,8 -817,6 +818,7 @@@ pl
      edit_profile: Edytuj profil
      export: Eksportowanie danych
      featured_tags: Wyróżnione hashtagi
-     identity_proofs: Dowody tożsamości
 +    flavours: Odmiany
      import: Importowanie danych
      migrate: Migracja konta
      notifications: Powiadomienia