From f7182ddc8b44f71f6991941b9356454e4468bcd7 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 20 May 2025 19:14:17 +0200
Subject: [PATCH] Change libvips to be enabled by default (#34741)

---
 .github/workflows/test-ruby.yml     | 14 +++++++-------
 config/application.rb               |  2 +-
 config/initializers/deprecations.rb |  6 ++++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index 2fa28a587c..3efa35bc03 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -143,7 +143,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg imagemagick libpam-dev
+          additional-system-dependencies: ffmpeg libpam-dev
 
       - name: Load database schema
         run: |
@@ -173,8 +173,8 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
-  test-libvips:
-    name: Libvips tests
+  test-imagemagick:
+    name: ImageMagick tests
     runs-on: ubuntu-latest
 
     needs:
@@ -220,7 +220,7 @@ jobs:
       CAS_ENABLED: true
       BUNDLE_WITH: 'pam_authentication test'
       GITHUB_RSPEC: ${{ matrix.ruby-version == '.ruby-version' && github.event.pull_request && 'true' }}
-      MASTODON_USE_LIBVIPS: true
+      MASTODON_USE_LIBVIPS: false
 
     strategy:
       fail-fast: false
@@ -245,7 +245,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg libpam-dev
+          additional-system-dependencies: ffmpeg imagemagick libpam-dev
 
       - name: Load database schema
         run: './bin/rails db:create db:schema:load db:seed'
@@ -324,7 +324,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg imagemagick
+          additional-system-dependencies: ffmpeg
 
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
@@ -443,7 +443,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg imagemagick
+          additional-system-dependencies: ffmpeg
 
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
diff --git a/config/application.rb b/config/application.rb
index d88334f933..0939455ab9 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -95,7 +95,7 @@ module Mastodon
       require 'mastodon/redis_configuration'
       ::REDIS_CONFIGURATION = Mastodon::RedisConfiguration.new
 
-      config.x.use_vips = ENV['MASTODON_USE_LIBVIPS'] == 'true'
+      config.x.use_vips = ENV['MASTODON_USE_LIBVIPS'] != 'false'
 
       if config.x.use_vips
         require_relative '../lib/paperclip/vips_lazy_thumbnail'
diff --git a/config/initializers/deprecations.rb b/config/initializers/deprecations.rb
index f9f3745d6a..55293abe8a 100644
--- a/config/initializers/deprecations.rb
+++ b/config/initializers/deprecations.rb
@@ -16,3 +16,9 @@ if ENV['REDIS_NAMESPACE']
 
   abort message
 end
+
+if ENV['MASTODON_USE_LIBVIPS'] == 'false'
+  warn <<~MESSAGE
+    WARNING: Mastodon support for ImageMagick is deprecated and will be removed in future versions. Please consider using libvips instead.
+  MESSAGE
+end