From 7aafb12700dd5c6caa1068ebcb6ae2dcb92b2fb8 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Tue, 17 Dec 2024 12:32:02 -0500
Subject: [PATCH] Replace deprecated iFrame frameborder with border: 0

---
 app/javascript/mastodon/features/ui/components/embed_modal.tsx | 2 +-
 app/lib/link_details_extractor.rb                              | 2 +-
 lib/sanitize_ext/sanitize_config.rb                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.tsx b/app/javascript/mastodon/features/ui/components/embed_modal.tsx
index 8f623e62b5..2722017a0f 100644
--- a/app/javascript/mastodon/features/ui/components/embed_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.tsx
@@ -101,9 +101,9 @@ const EmbedModal: React.FC<{
           />
 
           <iframe
-            frameBorder='0'
             ref={iframeRef}
             sandbox='allow-scripts allow-same-origin'
+            style={{ border: 0 }}
             title='Preview'
           />
         </div>
diff --git a/app/lib/link_details_extractor.rb b/app/lib/link_details_extractor.rb
index fe7f23f481..a0fc5239b2 100644
--- a/app/lib/link_details_extractor.rb
+++ b/app/lib/link_details_extractor.rb
@@ -145,7 +145,7 @@ class LinkDetailsExtractor
   end
 
   def html
-    player_url.present? ? content_tag(:iframe, nil, src: player_url, width: width, height: height, allowfullscreen: 'true', allowtransparency: 'true', scrolling: 'no', frameborder: '0') : nil
+    player_url.present? ? content_tag(:iframe, nil, src: player_url, width: width, height: height, allowfullscreen: 'true', allowtransparency: 'true', scrolling: 'no', style: 'border: 0') : nil
   end
 
   def width
diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index 36c11a8263..2b89a97fdf 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -136,7 +136,7 @@ class Sanitize
       attributes: {
         'audio' => %w(controls),
         'embed' => %w(height src type width),
-        'iframe' => %w(allowfullscreen frameborder height scrolling src width),
+        'iframe' => %w(allowfullscreen frameborder height scrolling src style width),
         'source' => %w(src type),
         'video' => %w(controls height loop width),
       },