From c9f08f77ed8a262a4db806d814e2701794873a70 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 08:55:26 +0200
Subject: [PATCH 1/7] fix(deps): update dependency sass to v1.77.7 (#30981)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 85a336a4a3..cf7e5a8b95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15462,15 +15462,15 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.77.6
-  resolution: "sass@npm:1.77.6"
+  version: 1.77.7
+  resolution: "sass@npm:1.77.7"
   dependencies:
     chokidar: "npm:>=3.0.0 <4.0.0"
     immutable: "npm:^4.0.0"
     source-map-js: "npm:>=0.6.2 <2.0.0"
   bin:
     sass: sass.js
-  checksum: 10c0/fe5a393c0aa29eda9f83c06be9b94788b61fe8bad0616ee6e3a25d21ab504f430d40c0064fdca89b02b8e426411ae6dcd906c91f2e48c263575c3d392b6daeb1
+  checksum: 10c0/6cacbf4b5165d30a9be0f09438aed85ff0617e5087442e65c23c8464750ff1b9988855a58f36b420b62f992d1e82403f99810aba7731519d3d026847e21a5635
   languageName: node
   linkType: hard
 

From d0137910c61a565cfdaa8cf29d3e15e6345e5066 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 12:04:11 +0200
Subject: [PATCH 2/7] chore(deps): update dependency ruby to v3.3.4 (#30969)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .ruby-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ruby-version b/.ruby-version
index 619b537668..a0891f563f 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.3
+3.3.4

From 8dea897a3b2a6be08911515d291eb679dc3cd792 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 10:04:52 +0000
Subject: [PATCH 3/7] chore(deps): update docker.io/ruby docker tag to v3.3.4
 (#30980)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 7f7eca06da..52d3758dc6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ARG BUILDPLATFORM=${BUILDPLATFORM}
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.3.x"]
 # renovate: datasource=docker depName=docker.io/ruby
-ARG RUBY_VERSION="3.3.3"
+ARG RUBY_VERSION="3.3.4"
 # # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="20"

From 9984fca9a065e49acde0858487bc3cf10a744cea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 12:40:19 +0200
Subject: [PATCH 4/7] New Crowdin Translations (automated) (#30983)

Co-authored-by: GitHub Actions <noreply@github.com>
---
 app/javascript/mastodon/locales/cs.json | 16 +++++-----
 app/javascript/mastodon/locales/ry.json | 41 ++++++++++++++++++++++++-
 config/locales/cs.yml                   |  2 +-
 config/locales/doorkeeper.lv.yml        |  6 ++--
 config/locales/ry.yml                   | 20 ++++++++++++
 5 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index e96e283970..12de5d5ecd 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -197,7 +197,7 @@
   "copy_icon_button.copied": "Zkopírováno do schránky",
   "copypaste.copied": "Zkopírováno",
   "copypaste.copy_to_clipboard": "Zkopírovat do schránky",
-  "directory.federated": "Ze známého fedivesmíru",
+  "directory.federated": "Ze známého fediversu",
   "directory.local": "Pouze z {domain}",
   "directory.new_arrivals": "Nově příchozí",
   "directory.recently_active": "Nedávno aktivní",
@@ -213,7 +213,7 @@
   "domain_block_modal.block_account_instead": "Raději blokovat @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "Lidé z tohoto serveru mohou interagovat s vašimi starými příspěvky.",
   "domain_block_modal.they_cant_follow": "Nikdo z tohoto serveru vás nemůže sledovat.",
-  "domain_block_modal.they_wont_know": "Nebude vědět, že je zablokován.",
+  "domain_block_modal.they_wont_know": "Nebude vědět, že je zablokován*a.",
   "domain_block_modal.title": "Blokovat doménu?",
   "domain_block_modal.you_will_lose_followers": "Všichni vaši sledující z tohoto serveru budou odstraněni.",
   "domain_block_modal.you_wont_see_posts": "Neuvidíte příspěvky ani upozornění od uživatelů z tohoto serveru.",
@@ -341,7 +341,7 @@
   "hashtag.column_settings.tag_mode.any": "Jakýkoliv z těchto",
   "hashtag.column_settings.tag_mode.none": "Žádný z těchto",
   "hashtag.column_settings.tag_toggle": "Zahrnout v tomto sloupci další štítky",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} účastník} few {{counter} účastníci} other {{counter} účastníků}}",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} účastník*ice} few {{counter} účastníci} other {{counter} účastníků}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
   "hashtag.counter_by_uses_today": "Dnes {count, plural, one {{counter} příspěvek} few {{counter} příspěvky} other {{counter} příspěvků}}",
   "hashtag.follow": "Sledovat hashtag",
@@ -440,7 +440,7 @@
   "mute_modal.show_options": "Zobrazit možnosti",
   "mute_modal.they_can_mention_and_follow": "Mohou vás zmínit a sledovat, ale neuvidíte je.",
   "mute_modal.they_wont_know": "Nebudou vědět, že byli skryti.",
-  "mute_modal.title": "Ztlumit uživatele?",
+  "mute_modal.title": "Ztlumit uživatele*ku?",
   "mute_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které je zmiňují.",
   "mute_modal.you_wont_see_posts": "Stále budou moci vidět vaše příspěvky, ale vy jejich neuvidíte.",
   "navigation_bar.about": "O aplikaci",
@@ -566,8 +566,8 @@
   "onboarding.share.message": "Jsem {username} na #Mastodonu! Pojď mě sledovat na {url}",
   "onboarding.share.next_steps": "Možné další kroky:",
   "onboarding.share.title": "Sdílejte svůj profil",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
-  "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.lead": "Nyní jste součástí Mastodonu, unikátní sociální sítě, kde vy - ne algoritmus - vytváří vaše vlastní prožitky. Začněte na této nové sociální platformě:",
+  "onboarding.start.skip": "Nepotřebujete pomoci začít?",
   "onboarding.start.title": "Dokázali jste to!",
   "onboarding.steps.follow_people.body": "Mastodon je o sledování zajimavých lidí.",
   "onboarding.steps.follow_people.title": "Přispůsobit vlastní domovský kanál",
@@ -581,7 +581,7 @@
   "onboarding.tips.accounts_from_other_servers": "<strong>Víte, že?</strong> Protože je Mastodon decentralizovaný, některé profily, na které narazíte, budou hostovány na jiných serverech, než je ten váš. A přesto s nimi můžete bezproblémově komunikovat! Jejich server se nachází v druhé polovině uživatelského jména!",
   "onboarding.tips.migration": "<strong>Víte, že?</strong> Pokud máte pocit, že {domain} pro vás v budoucnu není vhodnou volbou, můžete se přesunout na jiný Mastodon server, aniž byste přišli o své sledující. Můžete dokonce hostovat svůj vlastní server!",
   "onboarding.tips.verification": "<strong>Víte, že?</strong> Svůj účet můžete ověřit tak, že na své webové stránky umístíte odkaz na váš Mastodon profil a odkaz na stránku přidáte do svého profilu. Nejsou k tomu potřeba žádné poplatky ani dokumenty!",
-  "password_confirmation.exceeds_maxlength": "Potvrzení hesla překračuje maximální délku hesla",
+  "password_confirmation.exceeds_maxlength": "Potvrzení hesla překračuje maximální povolenou délku hesla",
   "password_confirmation.mismatching": "Zadaná hesla se neshodují",
   "picture_in_picture.restore": "Vrátit zpět",
   "poll.closed": "Uzavřeno",
@@ -665,7 +665,7 @@
   "report.unfollow": "Přestat sledovat @{name}",
   "report.unfollow_explanation": "Tento účet sledujete. Abyste už neviděli jeho příspěvky ve své domovské časové ose, přestaňte jej sledovat.",
   "report_notification.attached_statuses": "{count, plural, one {{count} připojený příspěvek} few {{count} připojené příspěvky} many {{count} připojených příspěvků} other {{count} připojených příspěvků}}",
-  "report_notification.categories.legal": "Zákonné",
+  "report_notification.categories.legal": "Právní ustanovení",
   "report_notification.categories.other": "Ostatní",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.violation": "Porušení pravidla",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index f3a68b15a1..4f2e2410ef 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -82,6 +82,7 @@
   "alert.unexpected.title": "Ийой!",
   "announcement.announcement": "Голошіня",
   "audio.hide": "Зпрятати звук",
+  "block_modal.remote_users_caveat": "Попросиме ґазду сервера {domain} честовати вашоє рішеня. Айбо не ґарантуєме повный соглас, бо даякі серверы можут брати блокованя по-инчакому. Публичні дописы годно быти видко незалоґованым хосновачам.",
   "block_modal.show_less": "Указати менше",
   "block_modal.show_more": "Указати бульше",
   "block_modal.they_cant_mention": "Они не можут вас споминати авадь слідовати.",
@@ -111,5 +112,43 @@
   "column.direct": "Шептаня",
   "column.directory": "Никати профілі",
   "column.domain_blocks": "Заблоковані домены",
-  "column.favourites": "Убраноє"
+  "column.favourites": "Убраноє",
+  "column.follow_requests": "Запросы на пудписку",
+  "column.lists": "Исписы",
+  "column.mutes": "Стишені хосновачі",
+  "column.notifications": "Убвіщеня",
+  "column.pins": "Закріплені публикації",
+  "column_back_button.label": "Назад",
+  "column_header.hide_settings": "Спрятати штімованя",
+  "column_header.moveLeft_settings": "Посунути колонку до ліва",
+  "column_header.moveRight_settings": "Посунути колонку до права",
+  "column_header.pin": "Закріпити",
+  "column_header.show_settings": "Указати штімованя",
+  "column_header.unpin": "Удкріпити",
+  "column_subheading.settings": "Штімованя",
+  "compose.language.change": "Поміняти язык",
+  "compose.language.search": "Глядати языкы...",
+  "compose.published.body": "Пост опубликованый.",
+  "compose.saved.body": "Пост усокоченый.",
+  "compose_form.direct_message_warning_learn_more": "Читайте бульше",
+  "compose_form.encryption_warning": "Публикації на Mastodon не шіфрувут ся. Не шырьте чутливу інформацію через Mastodon.",
+  "compose_form.hashtag_warning": "Сись пост не буде ся появляти у исписови по гештеґови, бо вун не є публичный. Лишек публичні посты буде видко за гештеґом.",
+  "compose_form.lock_disclaimer": "Ваш профіл є {locked}. Хоть-тко може ся на вас пудписати, обы видїти ваші ексклузівні посты.",
+  "compose_form.lock_disclaimer.lock": "замкнено",
+  "compose_form.placeholder": "Што нового?",
+  "compose_form.poll.duration": "Трывалость убзвідованя",
+  "compose_form.poll.multiple": "Дакулько варіантув",
+  "compose_form.poll.option_placeholder": "Варіант {number}",
+  "compose_form.poll.single": "Уберіт єден",
+  "compose_form.poll.switch_to_multiple": "Змінити убзвідованя обы поволити дакулько варіантув",
+  "compose_form.poll.switch_to_single": "Змінити убзвідованя обы поволити лишек єден варіант",
+  "compose_form.poll.type": "Стіл",
+  "compose_form.publish": "Публикація",
+  "compose_form.publish_form": "Нова публикація",
+  "compose_form.reply": "Удповідь",
+  "copypaste.copy_to_clipboard": "Копіровати у памнять",
+  "directory.recently_active": "Недавно актівні",
+  "disabled_account_banner.account_settings": "Штімованя акаунта",
+  "disabled_account_banner.text": "Ваш акаунт {disabledAccount} раз є неактівный.",
+  "dismissable_banner.community_timeline": "Туй сут недавні публикації уд профілув на серверови {domain}."
 }
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 20e7e4d46b..7e0aaaeefb 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -118,7 +118,7 @@ cs:
       promote: Povýšit
       protocol: Protokol
       public: Veřejný
-      push_subscription_expires: Odebírání PuSH expiruje
+      push_subscription_expires: Odebírání PuSH vyprší
       redownload: Obnovit profil
       redownloaded_msg: Profil účtu %{username} byl úspěšně obnoven ze zdroje
       reject: Zamítnout
diff --git a/config/locales/doorkeeper.lv.yml b/config/locales/doorkeeper.lv.yml
index 5aa5daef3f..11c5020305 100644
--- a/config/locales/doorkeeper.lv.yml
+++ b/config/locales/doorkeeper.lv.yml
@@ -25,7 +25,7 @@ lv:
         edit: Labot
         submit: Apstiprināt
       confirmations:
-        destroy: Vai esi pārliecināts?
+        destroy: Vai tiešām?
       edit:
         title: Labot lietotni
       form:
@@ -69,7 +69,7 @@ lv:
       buttons:
         revoke: Atsaukt
       confirmations:
-        revoke: Vai esi pārliecināts?
+        revoke: Vai tiešām?
       index:
         authorized_at: Autorizētas %{date}
         description_html: Šīs ir lietotnes, kas var piekļūt Tavam kontam ar API. Ja šeit ir lietotnes, kuras neatpazīsti, vai lietotne darbojas ne tā, kā paredzēts, vari atsaukt tās piekļuvi.
@@ -135,6 +135,7 @@ lv:
         media: Multividesu pielikumi
         mutes: Apklusinātie
         notifications: Paziņojumi
+        profile: Tavs Mastodon profils
         push: Uznirstošie paziņojumi
         reports: Ziņojumi
         search: Meklēt
@@ -165,6 +166,7 @@ lv:
       admin:write:reports: veikt moderācijas darbības pārskatos
       crypto: lieto pilnīgu šifrēšanu
       follow: mainīt konta attiecības
+      profile: lasīt tikai Tava konta profila informāciju
       push: saņemt savus push paziņojumus
       read: lasīt visus sava konta datus
       read:accounts: apskatīt kontu informāciju
diff --git a/config/locales/ry.yml b/config/locales/ry.yml
index 6fe57b65cd..e384b7f1b7 100644
--- a/config/locales/ry.yml
+++ b/config/locales/ry.yml
@@ -1 +1,21 @@
+---
 ry:
+  accounts:
+    follow: Пудписати ся
+    following: Пудпискы
+    posts:
+      few: Публикації
+      one: Публикація
+      other: Публикації
+    posts_tab_heading: Публикації
+  imports:
+    titles:
+      following: Імпортованя пудписок
+    types:
+      following: Испис пудписок
+  notification_mailer:
+    follow:
+      body: "%{name} ся пудписує ся на вас!"
+      subject: "%{name} ся пудписує ся на вас"
+  relationships:
+    following: Пудпискы

From 182b9248c0e798e4b0fba8339d2817ed2f094b42 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 10 Jul 2024 14:23:24 +0200
Subject: [PATCH 5/7] Fix SCSS mixed declarations deprecation (#30986)

---
 app/javascript/styles/mastodon/components.scss | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index c114885d17..da86a4caa7 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1366,6 +1366,8 @@ body > [data-popper-placement] {
   min-height: 54px;
   border-bottom: 1px solid var(--background-border-color);
   cursor: auto;
+  opacity: 1;
+  animation: fade 150ms linear;
 
   @keyframes fade {
     0% {
@@ -1377,9 +1379,6 @@ body > [data-popper-placement] {
     }
   }
 
-  opacity: 1;
-  animation: fade 150ms linear;
-
   .media-gallery,
   .video-player,
   .audio-player,
@@ -4851,8 +4850,10 @@ a.status-card {
     &__menu {
       @include search-popout;
 
-      padding: 0;
-      background: $ui-secondary-color;
+      & {
+        padding: 0;
+        background: $ui-secondary-color;
+      }
     }
 
     &__menu-list {

From 36592d10aa497db6c9a9764ee539242cc2cfdec7 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Wed, 10 Jul 2024 14:57:25 +0200
Subject: [PATCH 6/7] Change Sidekiq readiness file to use an environment
 variable (#30988)

---
 Dockerfile                     |  4 +++-
 config/initializers/sidekiq.rb | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 52d3758dc6..758db9bcc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -67,7 +67,9 @@ ENV \
 # Optimize jemalloc 5.x performance
   MALLOC_CONF="narenas:2,background_thread:true,thp:never,dirty_decay_ms:1000,muzzy_decay_ms:0" \
 # Enable libvips, should not be changed
-  MASTODON_USE_LIBVIPS=true
+  MASTODON_USE_LIBVIPS=true \
+# Sidekiq will touch tmp/sidekiq_process_has_started_and_will_begin_processing_jobs to indicate it is ready. This can be used for a readiness check in Kubernetes
+  MASTODON_SIDEKIQ_READY_FILENAME=sidekiq_process_has_started_and_will_begin_processing_jobs
 
 # Set default shell used for running commands
 SHELL ["/bin/bash", "-o", "pipefail", "-o", "errexit", "-c"]
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index e1d98b8ba3..5b2f317bf2 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -2,19 +2,24 @@
 
 require_relative '../../lib/mastodon/sidekiq_middleware'
 
-SIDEKIQ_WILL_PROCESSES_JOBS_FILE = Rails.root.join('tmp', 'sidekiq_process_has_started_and_will_begin_processing_jobs').freeze
-
 Sidekiq.configure_server do |config|
   config.redis = REDIS_SIDEKIQ_PARAMS
 
   # This is used in Kubernetes setups, to signal that the Sidekiq process has started and will begin processing jobs
   # This comes from https://github.com/sidekiq/sidekiq/wiki/Kubernetes#sidekiq
-  config.on(:startup) do
-    FileUtils.touch(SIDEKIQ_WILL_PROCESSES_JOBS_FILE)
-  end
+  ready_filename = ENV.fetch('MASTODON_SIDEKIQ_READY_FILENAME', nil)
+  if ready_filename
+    raise 'MASTODON_SIDEKIQ_READY_FILENAME is not a valid filename' if File.basename(ready_filename) != ready_filename
 
-  config.on(:shutdown) do
-    FileUtils.rm_f(SIDEKIQ_WILL_PROCESSES_JOBS_FILE)
+    ready_path = Rails.root.join('tmp', ready_filename)
+
+    config.on(:startup) do
+      FileUtils.touch(ready_path)
+    end
+
+    config.on(:shutdown) do
+      FileUtils.rm_f(ready_path)
+    end
   end
 
   config.server_middleware do |chain|

From 2ea9336b6855b44126a55106a81e96ea68eaf8ff Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Wed, 10 Jul 2024 16:25:39 +0200
Subject: [PATCH 7/7] Do not pass unknown encoding names to nokogiri. (#30987)

---
 app/lib/link_details_extractor.rb              |  9 ++++++++-
 .../alternative_utf8_spelling_in_header.txt    | 18 ++++++++++++++++++
 spec/services/fetch_link_card_service_spec.rb  |  9 +++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/requests/alternative_utf8_spelling_in_header.txt

diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index 72992d2f42..d81f4a3062 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -274,7 +274,7 @@ class LinkDetailsExtractor
   end
 
   def detect_encoding_and_parse_document
-    [detect_encoding, nil, @html_charset].uniq.each do |encoding|
+    [detect_encoding, nil, header_encoding].uniq.each do |encoding|
       document = Nokogiri::HTML(@html, nil, encoding)
       return document if document.to_s.valid_encoding?
     end
@@ -286,6 +286,13 @@ class LinkDetailsExtractor
     guess&.fetch(:confidence, 0).to_i > 60 ? guess&.fetch(:encoding, nil) : nil
   end
 
+  def header_encoding
+    Encoding.find(@html_charset).name if @html_charset
+  rescue ArgumentError
+    # Encoding from HTTP header is not recognized by ruby
+    nil
+  end
+
   def detector
     @detector ||= CharlockHolmes::EncodingDetector.new.tap do |detector|
       detector.strip_tags = true
diff --git a/spec/fixtures/requests/alternative_utf8_spelling_in_header.txt b/spec/fixtures/requests/alternative_utf8_spelling_in_header.txt
new file mode 100644
index 0000000000..7aaea370e8
--- /dev/null
+++ b/spec/fixtures/requests/alternative_utf8_spelling_in_header.txt
@@ -0,0 +1,18 @@
+HTTP/1.1 200 OK
+server: nginx
+date: Thu, 13 Jun 2024 14:33:13 GMT
+content-type: text/html; charset=utf8
+content-length: 192
+accept-ranges: bytes
+
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>Webserver Configs R Us</title>
+</head>
+<body>
+  <h2>Welcome</h2>
+  <p>Sneaky non-UTF character: �</p>
+</body>
+</html>
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 342902cdb3..2f64f40558 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -32,6 +32,7 @@ RSpec.describe FetchLinkCardService do
     stub_request(:get, 'http://example.com/aergerliche-umlaute').to_return(request_fixture('redirect_with_utf8_url.txt'))
     stub_request(:get, 'http://example.com/page_without_title').to_return(request_fixture('page_without_title.txt'))
     stub_request(:get, 'http://example.com/long_canonical_url').to_return(request_fixture('long_canonical_url.txt'))
+    stub_request(:get, 'http://example.com/alternative_utf8_spelling_in_header').to_return(request_fixture('alternative_utf8_spelling_in_header.txt'))
 
     Rails.cache.write('oembed_endpoint:example.com', oembed_cache) if oembed_cache
 
@@ -292,6 +293,14 @@ RSpec.describe FetchLinkCardService do
         expect(status.preview_card).to be_nil
       end
     end
+
+    context 'with a URL where the `Content-Type` header uses `utf8` instead of `utf-8`' do
+      let(:status) { Fabricate(:status, text: 'test http://example.com/alternative_utf8_spelling_in_header') }
+
+      it 'does not create a preview card' do
+        expect(status.preview_card.title).to eq 'Webserver Configs R Us'
+      end
+    end
   end
 
   context 'with a remote status' do