Merge 2b58c55a9c into 14cb5ff881

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

app/javascript/mastodon/components/button/button.stories.tsx

@@ -8,6 +8,7 @@ const meta = {
   component: Button,
   args: {
     secondary: false,
+    plain: false,
     compact: false,
     dangerous: false,
     disabled: false,
@@ -57,6 +58,14 @@ export const Secondary: Story = {
   play: buttonTest,
 };
 
+export const Plain: Story = {
+  args: {
+    plain: true,
+    children: 'Plain button',
+  },
+  play: buttonTest,
+};
+
 export const Compact: Story = {
   args: {
     compact: true,
@@ -101,6 +110,14 @@ export const SecondaryDisabled: Story = {
   play: disabledButtonTest,
 };
 
+export const PlainDisabled: Story = {
+  args: {
+    ...Plain.args,
+    disabled: true,
+  },
+  play: disabledButtonTest,
+};
+
 const loadingButtonTest: Story['play'] = async ({
   args,
   canvas,

app/javascript/mastodon/components/button/index.tsx

@@ -9,6 +9,7 @@ interface BaseProps
   extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
   block?: boolean;
   secondary?: boolean;
+  plain?: boolean;
   compact?: boolean;
   dangerous?: boolean;
   loading?: boolean;
@@ -35,6 +36,7 @@ export const Button: React.FC<Props> = ({
   disabled,
   block,
   secondary,
+  plain,
   compact,
   dangerous,
   loading,
@@ -62,6 +64,7 @@ export const Button: React.FC<Props> = ({
     <button
       className={classNames('button', className, {
         'button-secondary': secondary,
+        'button--plain': plain,
         'button--compact': compact,
         'button--block': block,
         'button--dangerous': dangerous,

app/javascript/styles/mastodon/components.scss

@@ -201,6 +201,41 @@
     }
   }
 
+  &.button--plain {
+    color: $highlight-text-color;
+    background: transparent;
+    padding: 6px;
+
+    // The button has no outline, so we use negative margin to
+    // visually align its label with its surroundings while maintaining
+    // a generous click target
+    margin-inline: -6px;
+    border: 1px solid transparent;
+
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: transparent;
+      color: lighten($highlight-text-color, 4%);
+      background-color: transparent;
+      text-decoration: none;
+    }
+
+    &:disabled,
+    &.disabled {
+      opacity: 0.7;
+      border-color: transparent;
+      color: $ui-button-disabled-color;
+
+      &:active,
+      &:focus,
+      &:hover {
+        border-color: transparent;
+        color: $ui-button-disabled-color;
+      }
+    }
+  }
+
   &.button-tertiary {
     background: transparent;
     padding: 6px 17px;

app/models/terms_of_service.rb

@@ -23,7 +23,7 @@ class TermsOfService < ApplicationRecord
   validates :changelog, :effective_date, presence: true, if: -> { published? }
   validates :effective_date, uniqueness: true
 
-  validate :effective_date_cannot_be_in_the_past
+  validate :effective_date_cannot_be_in_the_past, if: :effective_date?
 
   NOTIFICATION_ACTIVITY_CUTOFF = 1.year.freeze
 
@@ -31,6 +31,10 @@ class TermsOfService < ApplicationRecord
     live.first || upcoming.first # For the case when none of the published terms have become effective yet
   end
 
+  def usable_effective_date
+    effective_date || Time.zone.today
+  end
+
   def published?
     published_at.present?
   end
@@ -66,10 +70,14 @@ class TermsOfService < ApplicationRecord
   private
 
   def effective_date_cannot_be_in_the_past
-    return if effective_date.blank?
+    errors.add(:effective_date, :too_soon, date: minimum_allowed_effective_date) if effective_date_too_early?
+  end
 
-    min_date = TermsOfService.live.pick(:effective_date) || Time.zone.today
+  def effective_date_too_early?
+    effective_date < minimum_allowed_effective_date
+  end
 
-    errors.add(:effective_date, :too_soon, date: min_date) if effective_date < min_date
+  def minimum_allowed_effective_date
+    self.class.live.pick(:effective_date) || Time.zone.today
   end
 end

app/serializers/activitypub/note_serializer.rb

@@ -232,6 +232,15 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
       canQuote: {
         automaticApproval: approved_uris,
       },
+      canReply: {
+        always: 'https://www.w3.org/ns/activitystreams#Public',
+      },
+      canLike: {
+        always: 'https://www.w3.org/ns/activitystreams#Public',
+      },
+      canAnnounce: {
+        always: 'https://www.w3.org/ns/activitystreams#Public',
+      },
     }
   end
 

app/views/terms_of_service_interstitial/show.html.haml

@@ -6,8 +6,10 @@
 .simple_form
   %h1.title= t('terms_of_service_interstitial.title', domain: site_hostname)
 
-  - effective_date = @terms_of_service.effective_date || Time.zone.today
-  %p.lead= effective_date.past? ? t('terms_of_service_interstitial.past_preamble_html') : t('terms_of_service_interstitial.future_preamble_html', date: l(effective_date))
+  - if @terms_of_service.usable_effective_date.past?
+    %p.lead= t('terms_of_service_interstitial.past_preamble_html')
+  - else
+    %p.lead= t('terms_of_service_interstitial.future_preamble_html', date: l(@terms_of_service.usable_effective_date))
 
   %p.lead= t('user_mailer.terms_of_service_changed.agreement', domain: site_hostname)
 

app/views/user_mailer/terms_of_service_changed.html.haml

@@ -9,7 +9,7 @@
       %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_version_url(date: @terms_of_service.effective_date), domain: site_hostname, date: l(@terms_of_service.effective_date || Time.zone.today))
+            %p= t('user_mailer.terms_of_service_changed.description_html', path: terms_of_service_version_url(date: @terms_of_service.effective_date), domain: site_hostname, date: l(@terms_of_service.usable_effective_date))
             %p
               %strong= t('user_mailer.terms_of_service_changed.changelog')
             = markdown(@terms_of_service.changelog)

app/views/user_mailer/terms_of_service_changed.text.erb

@@ -2,7 +2,7 @@
 
 ===
 
-<%= t('user_mailer.terms_of_service_changed.description', domain: site_hostname, date: l(@terms_of_service.effective_date || Time.zone.today)) %>
+<%= t('user_mailer.terms_of_service_changed.description', domain: site_hostname, date: l(@terms_of_service.usable_effective_date)) %>
 
 => <%= terms_of_service_version_url(date: @terms_of_service.effective_date) %>
 

spec/models/terms_of_service_spec.rb

@@ -108,6 +108,24 @@ RSpec.describe TermsOfService do
     end
   end
 
+  describe '#usable_effective_date' do
+    subject { terms_of_service.usable_effective_date }
+
+    let(:terms_of_service) { Fabricate.build(:terms_of_service, effective_date:) }
+
+    context 'when effective_date value is set' do
+      let(:effective_date) { 5.days.ago }
+
+      it { is_expected.to eq(effective_date.to_date) }
+    end
+
+    context 'when effective_date value is not set' do
+      let(:effective_date) { nil }
+
+      it { is_expected.to eq(Time.zone.today) }
+    end
+  end
+
   describe '::current' do
     context 'when no terms exist' do
       it 'returns nil' do

yarn.lock

@@ -11957,8 +11957,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.91.0
-  resolution: "sass@npm:1.91.0"
+  version: 1.92.0
+  resolution: "sass@npm:1.92.0"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -11969,7 +11969,7 @@ __metadata:
       optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/5be1c98f7a618cb5f90b62f63d2aa0f78f9bf369c93ec7cd9880752a26b0ead19aa63cc341e8a26ce6c74d080baa5705f1685dff52fe6a3f28a7828ae50182b6
+  checksum: 10c0/bdff9fa6988620e2a81962efdd016e3894d19934cfadc105cf41db767f59dd47afd8ff32840e612ef700cb67e19d9e83c108f1724eb8f0bef56c4877dbe6f14d
   languageName: node
   linkType: hard