Merge remote-tracking branch 'parent/main' into upstream-20241216

app/views/.rubocop.yml

@@ -1,5 +0,0 @@
-inherit_from: ../../.rubocop.yml
-
-# Disable for the `Rubocop` lints in haml-lint
-Style/IfUnlessModifier:
-  Enabled: false

app/views/admin/reports/_status.html.haml

@@ -44,7 +44,7 @@
         = t("statuses.visibilities.#{status.visibility}")
         ·
 
-        = link_to ActivityPub::TagManager.instance.url_for(status.proper), class: 'detailed-status__link', rel: 'noopener noreferrer' do
+        = link_to ActivityPub::TagManager.instance.url_for(status.proper), class: 'detailed-status__link', rel: 'noopener' do
           = t('admin.statuses.view_publicly')
 
         - if status.proper.sensitive?

app/views/admin/reports/actions/preview.html.haml

@@ -63,7 +63,7 @@
                       = material_symbol 'link'
                       = media_attachment.file_file_name
                 .strike-card__statuses-list__item__meta
-                  = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener noreferrer' do
+                  = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener' do
                     %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
                   - unless status.application.nil?
                     ·

app/views/admin/statuses/show.html.haml

@@ -9,7 +9,7 @@
                data: { confirm: t('admin.reports.are_you_sure') },
                name: :report,
                type: :submit
-  = link_to t('admin.statuses.open'), ActivityPub::TagManager.instance.url_for(@status), class: 'button', target: '_blank', rel: 'noopener noreferrer'
+  = link_to t('admin.statuses.open'), ActivityPub::TagManager.instance.url_for(@status), class: 'button', target: '_blank', rel: 'noopener'
 
 %h3= t('admin.statuses.metadata')
 

app/views/admin/tags/index.html.haml

@@ -29,7 +29,8 @@
 
 %hr.spacer/
 
-.batch-table
+.batch-table.batch-table--no-toolbar
+  .batch-table__toolbar
   .batch-table__body
     - if @tags.empty?
       = nothing_here 'nothing-here--under-tabs nothing-here--no-toolbar'

app/views/admin/tags/show.html.haml

@@ -6,7 +6,7 @@
     .time-period
       = date_range(@time_period)
 
-  = link_to t('admin.tags.open'), tag_url(@tag), class: 'button', target: '_blank', rel: 'noopener noreferrer'
+  = link_to t('admin.tags.open'), tag_url(@tag), class: 'button', target: '_blank', rel: 'noopener'
 
 - if current_user.can?(:view_dashboard)
   .dashboard
@@ -17,7 +17,7 @@
                               label: t('admin.trends.tags.dashboard.tag_accounts_measure'),
                               measure: 'tag_accounts',
                               params: { id: @tag.id },
-                              rel: 'noopener noreferrer',
+                              rel: 'noopener',
                               start_at: @time_period.first,
                               target: '_blank'
     .dashboard__item

app/views/admin/terms_of_service/_links.html.haml

@@ -0,0 +1,6 @@
+.content__heading__tabs
+  = render_navigation renderer: :links do |primary|
+    :ruby
+      primary.item :current, safe_join([material_symbol('description'), t('admin.terms_of_service.current')]), admin_terms_of_service_index_path
+      primary.item :draft, safe_join([material_symbol('description'), t('admin.terms_of_service.draft')]), admin_terms_of_service_draft_path
+      primary.item :previous, safe_join([material_symbol('history'), t('admin.terms_of_service.history')]), admin_terms_of_service_history_path

app/views/admin/terms_of_service/drafts/show.html.haml

@@ -0,0 +1,19 @@
+- content_for :page_title do
+  = t('admin.terms_of_service.title')
+
+- content_for :heading do
+  %h2= t('admin.terms_of_service.title')
+  = render partial: 'admin/terms_of_service/links'
+
+= simple_form_for @terms_of_service, url: admin_terms_of_service_draft_path, method: :put do |form|
+  = render 'shared/error_messages', object: @terms_of_service
+
+  .fields-group
+    = form.input :text, wrapper: :with_block_label, input_html: { rows: 8 }
+
+  .fields-group
+    = form.input :changelog, wrapper: :with_block_label, input_html: { rows: 8 }
+
+  .actions
+    = form.button :button, t('admin.terms_of_service.save_draft'), type: :submit, name: :action_type, value: :save_draft, class: 'button button-secondary'
+    = form.button :button, t('admin.terms_of_service.publish'), type: :submit, name: :action_type, value: :publish

app/views/admin/terms_of_service/generates/show.html.haml

@@ -0,0 +1,41 @@
+- content_for :page_title do
+  = t('admin.terms_of_service.generates.title')
+
+- content_for :heading_actions do
+  .back-link
+    = link_to admin_terms_of_service_index_path do
+      = material_symbol 'chevron_left'
+      = t('admin.terms_of_service.back')
+
+%p.lead= t('admin.terms_of_service.generates.explanation_html')
+
+%p.lead= t('admin.terms_of_service.generates.chance_to_review_html')
+
+%hr.spacer/
+
+= simple_form_for @generator, url: admin_terms_of_service_generate_path, method: :post do |form|
+  = render 'shared/error_messages', object: @generator
+
+  .fields-group
+    = form.input :domain, wrapper: :with_label
+
+  .fields-group
+    = form.input :jurisdiction, wrapper: :with_label
+
+  .fields-group
+    = form.input :admin_email, wrapper: :with_label
+
+  .fields-group
+    = form.input :dmca_email, wrapper: :with_label
+
+  .fields-group
+    = form.input :dmca_address, wrapper: :with_label
+
+  .fields-group
+    = form.input :arbitration_address, wrapper: :with_label
+
+  .fields-group
+    = form.input :arbitration_website, wrapper: :with_label
+
+  .actions
+    = form.button :button, t('admin.terms_of_service.generates.action'), type: :submit

app/views/admin/terms_of_service/histories/show.html.haml

@@ -0,0 +1,16 @@
+- content_for :page_title do
+  = t('admin.terms_of_service.history')
+
+- content_for :heading do
+  %h2= t('admin.terms_of_service.title')
+  = render partial: 'admin/terms_of_service/links'
+
+- if @terms_of_service.empty?
+  %p= t('admin.terms_of_service.no_history')
+- else
+  %ol.admin__terms-of-service__history
+    - @terms_of_service.each do |terms_of_service|
+      %li
+        .admin__terms-of-service__history__item
+          %h5= l(terms_of_service.published_at)
+          .prose= markdown(terms_of_service.changelog)

app/views/admin/terms_of_service/index.html.haml

@@ -0,0 +1,39 @@
+- content_for :page_title do
+  = t('admin.terms_of_service.title')
+
+- content_for :heading do
+  %h2= t('admin.terms_of_service.title')
+  = render partial: 'links'
+
+- if @terms_of_service.present?
+  .admin__terms-of-service__container
+    .admin__terms-of-service__container__header
+      .dot-indicator.success
+        .dot-indicator__indicator
+        %span= t('admin.terms_of_service.live')
+      ·
+      %span
+        = t('admin.terms_of_service.published_on_html', date: tag.time(l(@terms_of_service.published_at.to_date), class: 'formatted', date: @terms_of_service.published_at.to_date.iso8601))
+      ·
+      - if @terms_of_service.notification_sent?
+        %span
+          = t('admin.terms_of_service.notified_on_html', date: tag.time(l(@terms_of_service.notification_sent_at.to_date), class: 'formatted', date: @terms_of_service.notification_sent_at.to_date.iso8601))
+      - else
+        = link_to t('admin.terms_of_service.notify_users'), admin_terms_of_service_preview_path(@terms_of_service), class: 'link-button'
+
+    .admin__terms-of-service__container__body
+      .prose
+        = markdown(@terms_of_service.text)
+
+  %hr.spacer/
+
+  %h3= t('admin.terms_of_service.changelog')
+
+  .prose
+    = markdown(@terms_of_service.changelog)
+- else
+  %p.lead= t('admin.terms_of_service.no_terms_of_service_html')
+
+  .content__heading__actions
+    = link_to t('admin.terms_of_service.create'), admin_terms_of_service_draft_path, class: 'button'
+    = link_to t('admin.terms_of_service.generate'), admin_terms_of_service_generate_path, class: 'button button-secondary'

app/views/admin/terms_of_service/previews/show.html.haml

@@ -0,0 +1,20 @@
+- content_for :page_title do
+  = t('admin.terms_of_service.preview.title')
+
+- content_for :heading_actions do
+  .back-link
+    = link_to admin_terms_of_service_index_path do
+      = material_symbol 'chevron_left'
+      = t('admin.terms_of_service.back')
+
+%p.lead
+  = t('admin.terms_of_service.preview.explanation_html', count: @user_count, display_count: number_with_delimiter(@user_count), date: l(@terms_of_service.published_at.to_date))
+
+.prose
+  = markdown(@terms_of_service.changelog)
+
+%hr.spacer/
+
+.content__heading__actions
+  = link_to t('admin.terms_of_service.preview.send_preview', email: current_user.email), admin_terms_of_service_test_path(@terms_of_service), method: :post, class: 'button button-secondary'
+  = link_to t('admin.terms_of_service.preview.send_to_all', count: @user_count, display_count: number_with_delimiter(@user_count)), admin_terms_of_service_distribution_path(@terms_of_service), method: :post, class: 'button', data: { confirm: t('admin.reports.are_you_sure') }

app/views/admin/trends/statuses/_status.html.haml

@@ -6,7 +6,7 @@
     .one-liner
       = admin_account_link_to status.account
 
-      = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', class: 'emojify', rel: 'noopener noreferrer' do
+      = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', class: 'emojify', rel: 'noopener' do
         = one_line_preview(status)
 
         - status.ordered_media_attachments.each do |media_attachment|

app/views/admin/trends/tags/_tag.html.haml

@@ -8,7 +8,7 @@
 
       %br/
 
-      = link_to tag_path(tag), target: '_blank', rel: 'noopener noreferrer' do
+      = link_to tag_path(tag), target: '_blank', rel: 'noopener' do
         = t('admin.trends.tags.used_by_over_week', count: tag.history.reduce(0) { |sum, day| sum + day.accounts })
 
       - if tag.trendable?

app/views/application/_card.html.haml

@@ -2,7 +2,7 @@
 - compact ||= false
 
 .card.h-card
-  = link_to account_url, target: '_blank', rel: 'noopener noreferrer' do
+  = link_to account_url, target: '_blank', rel: 'noopener' do
     - unless compact
       .card__img
         = image_tag account.header.url, alt: ''

app/views/auth/registrations/new.html.haml

@@ -37,7 +37,7 @@
               required: true
     = f.input :password_confirmation,
               hint: false,
-              input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password' },
+              input_html: { 'aria-label': t('simple_form.labels.defaults.confirm_password'), autocomplete: 'new-password', maxlength: User.password_length.last },
               placeholder: t('simple_form.labels.defaults.confirm_password'),
               required: true
     = f.input :confirm_password,
@@ -72,8 +72,8 @@
   .fields-group
     = f.input :agreement,
               as: :boolean,
-              label: t('auth.privacy_policy_agreement_html', rules_path: about_more_path, privacy_policy_path: privacy_policy_path),
-              required: true,
+              label: t('auth.user_agreement_html', privacy_policy_path: privacy_policy_path, terms_of_service_path: terms_of_service_path),
+              required: false,
               wrapper: :with_label
 
   - if Setting.registration_button_message.present?
@@ -82,5 +82,3 @@
 
   .actions
     = f.button :button, @invite.present? ? t('auth.register') : sign_up_message, type: :submit
-
-.form-footer= render 'auth/shared/links'

app/views/auth/registrations/rules.html.haml

@@ -27,5 +27,3 @@
     - accept_path = @invite_code.present? ? public_invite_url(invite_code: @invite_code, accept: @accept_token) : new_user_registration_path(accept: @accept_token)
     = link_to t('auth.rules.accept'), accept_path, class: 'button'
     = link_to t('auth.rules.back'), root_path, class: 'button button-tertiary'
-
-.form-footer= render 'auth/shared/links'

app/views/auth/setup/show.html.haml

@@ -11,17 +11,17 @@
 
   = render 'shared/error_messages', object: @user
 
-  %p.lead
-    %strong= t('auth.setup.link_not_received')
-  %p.lead= t('auth.setup.email_below_hint_html')
+  %details
+    %summary.lead
+      %strong= t('auth.setup.link_not_received')
 
-  .fields-group
-    = f.input :email,
-              hint: false,
-              input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'off' },
-              required: true
+    %p.lead= t('auth.setup.email_below_hint_html')
 
-  .actions
-    = f.button :button, t('auth.resend_confirmation'), type: :submit, class: 'button timer-button', disabled: true
+    .fields-group
+      = f.input :email,
+                hint: false,
+                input_html: { 'aria-label': t('simple_form.labels.defaults.email'), autocomplete: 'off', placeholder: t('simple_form.labels.defaults.email') },
+                required: true
 
-.form-footer= render 'auth/shared/links'
+    .actions
+      = f.button :button, t('auth.resend_confirmation'), type: :submit, class: 'button timer-button', disabled: true

app/views/disputes/strikes/_card.html.haml

@@ -27,7 +27,7 @@
                   = material_symbol 'link'
                   = media_attachment.file_file_name
             .strike-card__statuses-list__item__meta
-              = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener noreferrer' do
+              = link_to ActivityPub::TagManager.instance.url_for(status), target: '_blank', rel: 'noopener' do
                 %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
               - unless status.application.nil?
                 ·

app/views/filters/statuses/_status_filter.html.haml

@@ -19,11 +19,11 @@
         = media_attachment.file_file_name
 
     .detailed-status__meta
-      = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'name-tag', target: '_blank', rel: 'noopener noreferrer' do
+      = link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'name-tag', target: '_blank', rel: 'noopener' do
         = image_tag(status.account.avatar.url, width: 15, height: 15, alt: '', class: 'avatar')
         .username= status.account.acct
       ·
-      = link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime', rel: 'noopener noreferrer' do
+      = link_to ActivityPub::TagManager.instance.url_for(status), class: 'detailed-status__datetime', rel: 'noopener' do
         %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
       - if status.edited?
         ·

app/views/oauth/authorized_applications/index.html.haml

@@ -9,7 +9,7 @@
   - @applications.each do |application|
     .applications-list__item{ id: dom_id(application) }
       - if application.website.present?
-        = link_to application.name, application.website, target: '_blank', rel: 'noopener noreferrer', class: 'announcements-list__item__title'
+        = link_to application.name, application.website, target: '_blank', rel: 'noopener', class: 'announcements-list__item__title'
       - else
         %strong.announcements-list__item__title
           = application.name

app/views/redirects/show.html.haml

@@ -11,4 +11,4 @@
   .redirect__message
     %h1= t('redirects.title', instance: site_hostname)
     %p= t('redirects.prompt')
-    %p= link_to @redirect_path, @redirect_path, rel: 'noreferrer noopener'
+    %p= link_to @redirect_path, @redirect_path, rel: 'noopener'

app/views/terms_of_service/show.html.haml

@@ -0,0 +1,6 @@
+- content_for :page_title, t('terms_of_service.title')
+
+- content_for :header_tags do
+  = render partial: 'shared/og'
+
+= render 'shared/web_app'

app/views/user_mailer/terms_of_service_changed.html.haml

@@ -0,0 +1,17 @@
+= content_for :heading do
+  = render 'application/mailer/heading',
+           image_url: frontend_asset_url('images/mailer-new/heading/user.png'),
+           subtitle: t('user_mailer.terms_of_service_changed.subtitle', domain: site_hostname),
+           title: t('user_mailer.terms_of_service_changed.title')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td.email-prose
+            %p= t('user_mailer.terms_of_service_changed.description_html', path: terms_of_service_url, domain: site_hostname)
+            %p
+              %strong= t('user_mailer.terms_of_service_changed.changelog')
+            = markdown(@terms_of_service.changelog)
+            %p= t('user_mailer.terms_of_service_changed.agreement', domain: site_hostname)
+            %p= t('user_mailer.terms_of_service_changed.sign_off', domain: site_hostname)

app/views/user_mailer/terms_of_service_changed.text.erb

@@ -0,0 +1,14 @@
+<%= t('user_mailer.terms_of_service_changed.title') %>
+
+===
+
+<%= t('user_mailer.terms_of_service_changed.description', domain: site_hostname) %>
+
+=> <%= terms_of_service_url %>
+
+<%= t('user_mailer.terms_of_service_changed.changelog') %>
+
+<%= @terms_of_service.changelog %>
+<%= t('user_mailer.terms_of_service_changed.agreement', domain: site_hostname) %>
+
+<%= t('user_mailer.terms_of_service_changed.sign_off', domain: site_hostname) %>