Merge 3994366651 into 14cb5ff881

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

.devcontainer/compose.yaml

@@ -55,6 +55,24 @@ services:
     networks:
       - internal_network
 
+  valkey:
+    image: valkey/valkey:8-alpine
+    restart: unless-stopped
+    volumes:
+      - valkey-data:/data
+    networks:
+      - internal_network
+
+  dragonfly:
+    image: docker.dragonflydb.io/dragonflydb/dragonfly
+    restart: unless-stopped
+    volumes:
+      - dragonfly-data:/data
+    networks:
+      - internal_network
+    ulimits:
+      memlock: -1
+
   es:
     image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
     restart: unless-stopped
@@ -84,6 +102,8 @@ services:
 volumes:
   postgres-data:
   redis-data:
+  valkey-data:
+  dragonfly-data:
   es-data:
   lt-data:
 

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/lib/admin/metrics/dimension/software_versions_dimension.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dimension::BaseDimension
-  include Redisable
+  include Admin::Metrics::Dimension::StoreHelper
 
   def key
     'software_versions'
@@ -45,13 +45,11 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
   end
 
   def redis_version
-    value = redis_info['redis_version']
-
     {
       key: 'redis',
-      human_key: 'Redis',
+      human_key: store_name,
-      value: value,
+      value: store_version,
-      human_value: value,
+      human_value: store_version,
     }
   end
 
@@ -117,8 +115,4 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
   rescue Terrapin::CommandNotFoundError, Terrapin::ExitStatusError, Oj::ParseError
     nil
   end
-
-  def redis_info
-    @redis_info ||= redis.info
-  end
 end

app/lib/admin/metrics/dimension/space_usage_dimension.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension::BaseDimension
-  include Redisable
   include ActionView::Helpers::NumberHelper
+  include Admin::Metrics::Dimension::StoreHelper
 
   def key
     'space_usage'
@@ -27,14 +27,12 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension
   end
 
   def redis_size
-    value = redis_info['used_memory']
-
     {
       key: 'redis',
-      human_key: 'Redis',
+      human_key: store_name,
-      value: value.to_s,
+      value: store_size.to_s,
       unit: 'bytes',
-      human_value: number_to_human_size(value),
+      human_value: number_to_human_size(store_size),
     }
   end
 
@@ -57,10 +55,6 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension
     }
   end
 
-  def redis_info
-    @redis_info ||= redis.info
-  end
-
   def search_size
     return unless Chewy.enabled?
 

app/lib/admin/metrics/dimension/store_helper.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Admin::Metrics::Dimension::StoreHelper
+  include Redisable
+
+  protected
+
+  def store_name
+    return 'Valkey' if redis_info.key?('valkey_version')
+    return 'Dragonfly' if redis_info.key?('dragonfly_version')
+
+    'Redis'
+  end
+
+  def store_version
+    redis_info['valkey_version'] || redis_info['dragonfly_version'] || redis_info['redis_version']
+  end
+
+  def store_size
+    redis_info['used_memory']
+  end
+
+  private
+
+  def redis_info
+    @redis_info ||= redis.info
+  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
 

yarn.lock

@@ -11957,8 +11957,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.91.0
+  version: 1.92.0
-  resolution: "sass@npm:1.91.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