From 77e93e7bdb61a298a4862efd6451526fddd17d1c Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Mon, 9 Sep 2024 10:56:03 +0200
Subject: [PATCH 01/18] =?UTF-8?q?=F0=9F=94=96=20Prepare=20version=201.10.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md      | 3 +++
 embed-privacy.php | 2 +-
 readme.txt        | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13e8a7f..00e6d86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.10.1
+* Fixed: Set correct "Tested up to" to WordPress 6.6
+
 ## 1.10.0
 * Added: Thumbnail support for Polylang
 * Added: Filter to prevent orphan thumbnail deletion
diff --git a/embed-privacy.php b/embed-privacy.php
index 3b0c6fa..d1f55cf 100644
--- a/embed-privacy.php
+++ b/embed-privacy.php
@@ -5,7 +5,7 @@
 Plugin Name:		Embed Privacy
 Plugin URL:			https://epiph.yt/en/embed-privacy/
 Description:		Embed Privacy prevents from loading external embeds directly and lets the user control which one should be loaded.
-Version:			1.10.0
+Version:			1.10.1
 Author:				Epiphyt
 Author URI:			https://epiph.yt/en/
 License:			GPL2
diff --git a/readme.txt b/readme.txt
index de202e6..d07757a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: epiphyt, kittmedia, krafit
 Tags: oembed, privacy, gutenberg
 Requires at least: 5.9
-Stable tag: 1.10.0
+Stable tag: 1.10.1
 Tested up to: 6.6
 Requires PHP: 5.6
 License: GPL2

From 6ae1ce3a05baa388d1d38f057e716e8e9dbd739e Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Mon, 9 Sep 2024 12:31:04 +0200
Subject: [PATCH 02/18] =?UTF-8?q?=F0=9F=92=A1=20Fix=20filter=20documentati?=
 =?UTF-8?q?on=20and=20cast=20their=20returns?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/data/class-providers.php      | 2 +-
 inc/data/class-replacer.php       | 6 +++---
 inc/embed/class-replacement.php   | 6 +++++-
 inc/embed/class-template.php      | 4 ++--
 inc/thumbnail/class-thumbnail.php | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/inc/data/class-providers.php b/inc/data/class-providers.php
index 2934d35..a8c1d02 100644
--- a/inc/data/class-providers.php
+++ b/inc/data/class-providers.php
@@ -208,7 +208,7 @@ public function get_list( $type = 'all', $args = [] ) {
 		 * @param	string	$identifier Current identifier
 		 * @param	array	$global_list List with all providers of all identifiers
 		 */
-		$this->list[ $identifier ] = \apply_filters( 'embed_privacy_provider_list', $this->list[ $identifier ], $identifier, $this->list );
+		$this->list[ $identifier ] = (array) \apply_filters( 'embed_privacy_provider_list', $this->list[ $identifier ], $identifier, $this->list );
 		
 		return $this->list[ $identifier ];
 	}
diff --git a/inc/data/class-replacer.php b/inc/data/class-replacer.php
index e2fc955..9493088 100644
--- a/inc/data/class-replacer.php
+++ b/inc/data/class-replacer.php
@@ -66,11 +66,11 @@ public static function extend_pattern( $pattern, $provider ) {
 		 * 
 		 * @since	1.10.0
 		 * 
-		 * @param	string[]	$allowed_tags List of allowed tags
-		 * @param	string		$provider Embed provider
+		 * @param	string[]									$allowed_tags List of allowed tags
+		 * @param	\epiphyt\Embed_privacy\embed\Provider|null	$provider Embed provider
 		 * @return	array Updated list of allowed tags
 		 */
-		$allowed_tags = \apply_filters( 'embed_privacy_replacer_matcher_elements', $allowed_tags, $provider );
+		$allowed_tags = (array) \apply_filters( 'embed_privacy_replacer_matcher_elements', $allowed_tags, $provider );
 		
 		$tags_regex = '(' . \implode( '|', \array_filter( $allowed_tags, static function( $tag ) {
 			return \preg_quote( $tag, '/' );
diff --git a/inc/embed/class-replacement.php b/inc/embed/class-replacement.php
index ae2492e..9dd6a9c 100644
--- a/inc/embed/class-replacement.php
+++ b/inc/embed/class-replacement.php
@@ -67,7 +67,7 @@ public function get( array $attributes = [] ) {
 		 * @param	bool	$ignore_unknown Whether unknown providers should be ignored
 		 * @param	string	$content The original content
 		 */
-		$ignore_unknown_providers = \apply_filters( 'embed_privacy_ignore_unknown_providers', false, $content );
+		$ignore_unknown_providers = (bool) \apply_filters( 'embed_privacy_ignore_unknown_providers', false, $content );
 		
 		// get default external content
 		// special case for youtube-nocookie.com as it is part of YouTube provider
@@ -111,6 +111,8 @@ private static function get_character_replacements() {
 		/**
 		 * Filter character replacements.
 		 * 
+		 * @since	1.10.0
+		 * 
 		 * @param	array	$replacements Current replacements
 		 */
 		$replacements = (array) \apply_filters( 'embed_privacy_overlay_character_replacements', $replacements );
@@ -423,6 +425,8 @@ private function set_provider( $content, $url = '' ) {
 		/**
 		 * Filter the overlay provider.
 		 * 
+		 * @since	1.10.0
+		 * 
 		 * @param	\epiphyt\Embed_Privacy\embed\Provider	$provider Current provider
 		 * @param	string									$content Content to get the provider from
 		 * @param	string									$url URL to the embedded content
diff --git a/inc/embed/class-template.php b/inc/embed/class-template.php
index 67055fa..122812b 100644
--- a/inc/embed/class-template.php
+++ b/inc/embed/class-template.php
@@ -40,7 +40,7 @@ public static function get( $provider, $output, $attributes = [] ) {
 		/**
 		 * Filter the overlay arguments.
 		 * 
-		 * @deprecated	1.10.0 Use embed_privacy_template_arguments instead
+		 * @deprecated	1.10.0 Use embed_privacy_template_attributes instead
 		 * @since		1.9.0
 		 * 
 		 * @param	array	$attributes Template arguments
@@ -57,7 +57,7 @@ public static function get( $provider, $output, $attributes = [] ) {
 				$output,
 			],
 			'1.10.0',
-			'embed_privacy_template_arguments'
+			'embed_privacy_template_attributes'
 		);
 		
 		/**
diff --git a/inc/thumbnail/class-thumbnail.php b/inc/thumbnail/class-thumbnail.php
index 0d12e86..0f74106 100644
--- a/inc/thumbnail/class-thumbnail.php
+++ b/inc/thumbnail/class-thumbnail.php
@@ -120,7 +120,7 @@ static function( $provider ) {
 					 * @param	string	$id The thumbnail ID
 					 * @param	string	$url The thumbnail URL
 					 * @param	int		$post_id The post ID
-					 * @param	string	$provider The provider name
+					 * @param	string	$provider The provider
 					 */
 					$should_delete = \apply_filters( 'embed_privacy_thumbnail_delete_orphaned', $should_delete, $id, $url, $post_id, $provider );
 					

From 412d9f74ef498a0b11dee0fb60477f910ee58c8b Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Mon, 9 Sep 2024 21:38:44 +0200
Subject: [PATCH 03/18] =?UTF-8?q?=F0=9F=9A=91=20Fix=20potential=20fatal=20?=
 =?UTF-8?q?error=20for=20missing=20is=5Fplugin=5Factive()=20Closes=20#230?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  3 ++
 embed-privacy.php                             |  4 +--
 inc/class-frontend.php                        |  4 ---
 inc/class-system.php                          | 28 +++++++++++++++++++
 inc/integration/class-elementor.php           |  7 ++---
 inc/integration/class-kadence-blocks.php      |  4 ++-
 inc/integration/class-polylang.php            |  4 ++-
 inc/integration/class-shortcodes-ultimate.php |  4 ++-
 readme.txt                                    |  8 +++++-
 9 files changed, 51 insertions(+), 15 deletions(-)
 create mode 100644 inc/class-system.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00e6d86..f655b68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.10.2
+* Fixed: Potential fatal error for missing check of the availability of the function `is_plugin_active`
+
 ## 1.10.1
 * Fixed: Set correct "Tested up to" to WordPress 6.6
 
diff --git a/embed-privacy.php b/embed-privacy.php
index d1f55cf..359a261 100644
--- a/embed-privacy.php
+++ b/embed-privacy.php
@@ -5,7 +5,7 @@
 Plugin Name:		Embed Privacy
 Plugin URL:			https://epiph.yt/en/embed-privacy/
 Description:		Embed Privacy prevents from loading external embeds directly and lets the user control which one should be loaded.
-Version:			1.10.1
+Version:			1.10.2
 Author:				Epiphyt
 Author URI:			https://epiph.yt/en/
 License:			GPL2
@@ -30,7 +30,7 @@
 */
 \defined( 'ABSPATH' ) || exit;
 
-\define( 'EMBED_PRIVACY_VERSION', '1.10.0' );
+\define( 'EMBED_PRIVACY_VERSION', '1.10.2' );
 
 if ( ! \defined( 'EPI_EMBED_PRIVACY_BASE' ) ) {
 	\define( 'EPI_EMBED_PRIVACY_BASE', \WP_PLUGIN_DIR . '/embed-privacy/' );
diff --git a/inc/class-frontend.php b/inc/class-frontend.php
index 019e901..fa18cd9 100644
--- a/inc/class-frontend.php
+++ b/inc/class-frontend.php
@@ -40,10 +40,6 @@ public function print_assets() {
 			'javascriptDetection' => \get_option( 'embed_privacy_javascript_detection' ),
 		] );
 		
-		if ( ! \function_exists( 'is_plugin_active' ) ) {
-			require_once \ABSPATH . \WPINC . '/plugin.php';
-		}
-		
 		/**
 		 * Fires after assets are printed.
 		 * 
diff --git a/inc/class-system.php b/inc/class-system.php
new file mode 100644
index 0000000..0ec4920
--- /dev/null
+++ b/inc/class-system.php
@@ -0,0 +1,28 @@
+<?php
+namespace epiphyt\Embed_Privacy;
+
+/**
+ * System functionality.
+ * 
+ * @author	Epiphyt
+ * @license	GPL2
+ * @package	epiphyt\Embed_Privacy
+ * @since	1.10.2
+ */
+final class System {
+	/**
+	 * Determines whether a plugin is active.
+	 * 
+	 * Basically a wrapper around core's is_plugin_active(), but with auto-loading.
+	 * 
+	 * @param	string	$plugin Path to the plugin file relative to the plugins directory
+	 * @return	bool Whether the plugin is active
+	 */
+	public static function is_plugin_active( $plugin ) {
+		if ( ! \function_exists( 'is_plugin_active' ) ) {
+			include_once \ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		
+		return \is_plugin_active( $plugin );
+	}
+}
diff --git a/inc/integration/class-elementor.php b/inc/integration/class-elementor.php
index 7c6bc8d..85c8bec 100644
--- a/inc/integration/class-elementor.php
+++ b/inc/integration/class-elementor.php
@@ -8,6 +8,7 @@
 use epiphyt\Embed_Privacy\data\Providers;
 use epiphyt\Embed_Privacy\embed\Template;
 use epiphyt\Embed_Privacy\Embed_Privacy;
+use epiphyt\Embed_Privacy\System;
 
 /**
  * Elementor integration for Embed Privacy.
@@ -128,11 +129,7 @@ private static function get_youtube_overlay( $content ) {
 	 * @return	bool Whether Elementor has been used
 	 */
 	public static function is_used() {
-		if ( ! \function_exists( 'is_plugin_active' ) ) {
-			include_once \ABSPATH . 'wp-admin/includes/plugin.php';
-		}
-		
-		return \is_plugin_active( 'elementor/elementor.php' )
+		return System::is_plugin_active( 'elementor/elementor.php' )
 			&& \get_the_ID()
 			&& Plugin::$instance->documents->get( \get_the_ID() )->is_built_with_elementor();
 	}
diff --git a/inc/integration/class-kadence-blocks.php b/inc/integration/class-kadence-blocks.php
index fe0c053..8e27eee 100644
--- a/inc/integration/class-kadence-blocks.php
+++ b/inc/integration/class-kadence-blocks.php
@@ -1,6 +1,8 @@
 <?php
 namespace epiphyt\Embed_Privacy\integration;
 
+use epiphyt\Embed_Privacy\System;
+
 /**
  * Kadence Blocks integration for Embed Privacy.
  * 
@@ -22,7 +24,7 @@ public static function init() {
 	 * Enqueue assets.
 	 */
 	public static function enqueue_assets() {
-		if ( \is_plugin_active( 'kadence-blocks/kadence-blocks.php' ) ) {
+		if ( System::is_plugin_active( 'kadence-blocks/kadence-blocks.php' ) ) {
 			\wp_enqueue_style( 'embed-privacy-kadence-blocks' );
 		}
 	}
diff --git a/inc/integration/class-polylang.php b/inc/integration/class-polylang.php
index 9f25ac7..de1f5a0 100644
--- a/inc/integration/class-polylang.php
+++ b/inc/integration/class-polylang.php
@@ -1,6 +1,8 @@
 <?php
 namespace epiphyt\Embed_Privacy\integration;
 
+use epiphyt\Embed_Privacy\System;
+
 /**
  * Polylang integration for Embed Privacy.
  * 
@@ -44,7 +46,7 @@ public static function register_post_type( array $post_types, $is_settings ) {
 	 */
 	public static function sanitize_name( $name ) {
 		if (
-			\is_plugin_active( 'polylang/polylang.php' )
+			System::is_plugin_active( 'polylang/polylang.php' )
 			&& \function_exists( 'pll_current_language' )
 			&& \str_ends_with( $name, '-' . \pll_current_language() )
 		) {
diff --git a/inc/integration/class-shortcodes-ultimate.php b/inc/integration/class-shortcodes-ultimate.php
index e20b9cb..4e7a3e0 100644
--- a/inc/integration/class-shortcodes-ultimate.php
+++ b/inc/integration/class-shortcodes-ultimate.php
@@ -1,6 +1,8 @@
 <?php
 namespace epiphyt\Embed_Privacy\integration;
 
+use epiphyt\Embed_Privacy\System;
+
 /**
  * Shortcodes Ultimate integration for Embed Privacy.
  * 
@@ -22,7 +24,7 @@ public static function init() {
 	 * Enqueue assets.
 	 */
 	public static function enqueue_assets() {
-		if ( \is_plugin_active( 'shortcodes-ultimate/shortcodes-ultimate.php' ) ) {
+		if ( System::is_plugin_active( 'shortcodes-ultimate/shortcodes-ultimate.php' ) ) {
 			\wp_enqueue_style( 'embed-privacy-shortcodes-ultimate' );
 		}
 	}
diff --git a/readme.txt b/readme.txt
index d07757a..8445979 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: epiphyt, kittmedia, krafit
 Tags: oembed, privacy, gutenberg
 Requires at least: 5.9
-Stable tag: 1.10.1
+Stable tag: 1.10.2
 Tested up to: 6.6
 Requires PHP: 5.6
 License: GPL2
@@ -177,6 +177,12 @@ You can report security bugs through the Patchstack Vulnerability Disclosure Pro
 
 == Changelog ==
 
+= 1.10.2 =
+* Fixed: Potential fatal error for missing check of the availability of the function `is_plugin_active`
+
+= 1.10.1 =
+* Fixed: Set correct "Tested up to" to WordPress 6.6
+
 = 1.10.0 =
 * Added: Thumbnail support for Polylang
 * Added: Filter to prevent orphan thumbnail deletion

From acc378f555c23d1f45bfa0ef82c83bb00b7a44c2 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Tue, 10 Sep 2024 08:06:25 +0200
Subject: [PATCH 04/18] =?UTF-8?q?=F0=9F=A9=B9=20Make=20sure=20version=20ex?=
 =?UTF-8?q?ists?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/embed/class-assets.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/inc/embed/class-assets.php b/inc/embed/class-assets.php
index 9f50d82..5a03974 100644
--- a/inc/embed/class-assets.php
+++ b/inc/embed/class-assets.php
@@ -173,6 +173,7 @@ private function set_background() {
 		if ( $background_id ) {
 			$this->background['path'] = \get_attached_file( $background_id );
 			$this->background['url'] = \wp_get_attachment_url( $background_id );
+			$this->background['version'] = '';
 		}
 		
 		/**
@@ -203,6 +204,7 @@ private function set_logo() {
 		if ( \file_exists( \EPI_EMBED_PRIVACY_BASE . 'assets/images/embed-' . $this->provider . '.png' ) ) {
 			$this->logo['path'] = \EPI_EMBED_PRIVACY_BASE . 'assets/images/embed-' . $this->provider . '.png';
 			$this->logo['url'] = \EPI_EMBED_PRIVACY_URL . 'assets/images/embed-' . $this->provider . '.png';
+			$this->logo['version'] = '';
 		}
 		
 		if ( $this->embed_post instanceof WP_Post ) {
@@ -249,6 +251,7 @@ private function set_thumbnail( $attributes ) {
 		$this->thumbnail = [
 			'path' => $thumbnail['thumbnail_path'],
 			'url' => $thumbnail['thumbnail_url'],
+			'version' => '',
 		];
 		
 		/**

From 3b9ccbe84d06511a4b918a5ce2f432327c642009 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Tue, 10 Sep 2024 09:14:48 +0200
Subject: [PATCH 05/18] =?UTF-8?q?=F0=9F=90=9B=20Make=20sure=20a=20provider?=
 =?UTF-8?q?=20is=20always=20returned?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/data/class-providers.php | 7 ++++---
 inc/embed/class-template.php | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/inc/data/class-providers.php b/inc/data/class-providers.php
index a8c1d02..0c14a10 100644
--- a/inc/data/class-providers.php
+++ b/inc/data/class-providers.php
@@ -35,15 +35,16 @@ public static function init() {
 	 * Get an embed provider by its name.
 	 * 
 	 * @param	string	$name The name to search for
-	 * @return	\epiphyt\Embed_privacy\embed\Provider|null The embed or null
+	 * @return	\epiphyt\Embed_privacy\embed\Provider The embed provider
 	 */
 	public function get_by_name( $name ) {
+		$provider = new Provider();
+		
 		if ( empty( $name ) ) {
-			return null;
+			return $provider;
 		}
 		
 		$embed_providers = $this->get_list();
-		$provider = null;
 		$name = self::sanitize_name( $name );
 		
 		foreach ( $embed_providers as $embed_provider ) {
diff --git a/inc/embed/class-template.php b/inc/embed/class-template.php
index 122812b..41ec756 100644
--- a/inc/embed/class-template.php
+++ b/inc/embed/class-template.php
@@ -22,7 +22,7 @@ final class Template {
 	 * @return	string The overlay template
 	 */
 	public static function get( $provider, $output, $attributes = [] ) {
-		if ( \is_string( $provider ) ) {
+		if ( ! $provider instanceof Provider ) {
 			\_doing_it_wrong(
 				__METHOD__,
 				\sprintf(
@@ -65,9 +65,9 @@ public static function get( $provider, $output, $attributes = [] ) {
 		 * 
 		 * @since	1.10.0
 		 * 
-		 * @param	array	$attributes Template attributes
-		 * @param	string	$provider The embed provider
-		 * @param	string	$output The output before replacing it
+		 * @param	array									$attributes Template attributes
+		 * @param	\epiphyt\Embed_privacy\embed\Provider	$provider The embed provider
+		 * @param	string									$output The output before replacing it
 		 */
 		$attributes = (array) \apply_filters( 'embed_privacy_template_attributes', $attributes, $provider, $output );
 		

From a2703d5fdd6035a23270bc334a7836f733f1563a Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Tue, 10 Sep 2024 09:15:07 +0200
Subject: [PATCH 06/18] =?UTF-8?q?=F0=9F=90=9B=20Fix=20replacing=20unknown?=
 =?UTF-8?q?=20embeds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/embed/class-replacement.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/inc/embed/class-replacement.php b/inc/embed/class-replacement.php
index 9dd6a9c..ef09ba7 100644
--- a/inc/embed/class-replacement.php
+++ b/inc/embed/class-replacement.php
@@ -422,6 +422,10 @@ private function set_provider( $content, $url = '' ) {
 			$this->provider->set_title( $provider );
 		}
 		
+		if ( $this->provider === null ) {
+			$this->provider = new Provider();
+		}
+		
 		/**
 		 * Filter the overlay provider.
 		 * 

From 8fc0b3b3f79c78132ed75e610a27ef78e1981e03 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Tue, 10 Sep 2024 09:52:42 +0200
Subject: [PATCH 07/18] =?UTF-8?q?=F0=9F=9A=91=20Fix=20multiple=20replaceme?=
 =?UTF-8?q?nts=20of=20the=20same=20embed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/embed/class-replacement.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/embed/class-replacement.php b/inc/embed/class-replacement.php
index ef09ba7..774bca4 100644
--- a/inc/embed/class-replacement.php
+++ b/inc/embed/class-replacement.php
@@ -349,6 +349,7 @@ private function replace_content( $content, $attributes ) {
 			&& ! $this->provider->is_unknown()
 			&& ! $this->provider->is_disabled()
 			&& \preg_match( $attributes['regex'], $content, $matches ) !== false
+			&& ! \str_contains( $matches[0], 'embed-privacy-' )
 		) {
 			$content = \preg_replace(
 				$attributes['regex'],

From d7ad35fa93e24c5220ba5763b5c3c434695bf48d Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Tue, 10 Sep 2024 10:13:25 +0200
Subject: [PATCH 08/18] =?UTF-8?q?=F0=9F=92=A1=20Fix=20tab=20width=20in=20d?=
 =?UTF-8?q?ocumentation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/class-embed-privacy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/class-embed-privacy.php b/inc/class-embed-privacy.php
index 4ee2be8..a4b7b5b 100644
--- a/inc/class-embed-privacy.php
+++ b/inc/class-embed-privacy.php
@@ -704,7 +704,7 @@ public function has_embed( $post = null ) {
 	 * @deprecated	1.10.0 Use epiphyt\Embed_Privacy\data\Providers::is_always_active() instead
 	 * @since		1.1.0
 	 * 
-	 * @param	string		$provider The embed provider in lowercase
+	 * @param	string	$provider The embed provider in lowercase
 	 * @return	bool True if provider is always active, false otherwise
 	 */
 	public function is_always_active_provider( $provider ) {

From f47ed89b817eae2d36eceeaa25105eddcbee8998 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Tue, 10 Sep 2024 10:58:05 +0200
Subject: [PATCH 09/18] =?UTF-8?q?=F0=9F=94=96=20Prepare=20version=201.10.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md      |  6 ++++++
 embed-privacy.php |  2 +-
 readme.txt        | 46 ++++++++++------------------------------------
 3 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f655b68..1239c4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.10.3
+* Fixed: Multiple replacements of the same embed
+* Fixed: Replacing unknown embeds
+* Fixed: Always return an embed provider via `Providers::get_by_name()`
+* Fixed: Warning about potentially non-available asset version
+
 ## 1.10.2
 * Fixed: Potential fatal error for missing check of the availability of the function `is_plugin_active`
 
diff --git a/embed-privacy.php b/embed-privacy.php
index 359a261..a9ac945 100644
--- a/embed-privacy.php
+++ b/embed-privacy.php
@@ -5,7 +5,7 @@
 Plugin Name:		Embed Privacy
 Plugin URL:			https://epiph.yt/en/embed-privacy/
 Description:		Embed Privacy prevents from loading external embeds directly and lets the user control which one should be loaded.
-Version:			1.10.2
+Version:			1.10.3
 Author:				Epiphyt
 Author URI:			https://epiph.yt/en/
 License:			GPL2
diff --git a/readme.txt b/readme.txt
index 8445979..92d3b90 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,8 +1,8 @@
 === Embed Privacy ===
 Contributors: epiphyt, kittmedia, krafit
-Tags: oembed, privacy, gutenberg
+Tags: oembed, privacy, gutenberg, iframes, performance
 Requires at least: 5.9
-Stable tag: 1.10.2
+Stable tag: 1.10.3
 Tested up to: 6.6
 Requires PHP: 5.6
 License: GPL2
@@ -43,9 +43,9 @@ The embedding process itself will be privacy-friendly with Embed Privacy. That m
 
 If you use the opt-out functionality with the shortcode or the functionality to allow the user to always display content of certain embed providers, Embed Privacy creates a single cookie called `embed-privacy` with an expiration of 1 year to store the user’s choice.
 
-= Does Embed Privacy support the Gutenberg editor? =
+= Does Embed Privacy support the block editor? =
 
-Sure thing! We enjoy playing with the new WordPress editor and developed Embed Privacy with Gutenberg in mind, the plugin will work no matter the editor you use.
+Sure thing! We enjoy playing with the block editor and developed Embed Privacy with Gutenberg in mind, the plugin will work no matter the editor you use.
 
 = Which embeds are currently supported? =
 
@@ -95,38 +95,6 @@ Since version 1.2.0, you can also add custom embed providers by going to **Setti
 
 Yes! Since version 1.5.0, Embed Privacy supports downloading and displaying thumbnails in posts for SlideShare, Vimeo and YouTube as background of Embed Privacy’s overlay.
 
-= Developers: How to use Embed Privacy’s methods for custom content? =
-
-Since version 1.1.0 you can now use our mechanism for content we don’t support in our plugin. You can do it the following way:
-
-`
-/**
- * Replace specific content with the Embed Privacy overlay of type 'google-maps'.
- * 
- * @param	string		$content The content to replace
- * @return	string The updated content
- */
-function prefix_replace_content_with_overlay( $content ) {
-	// check for Embed Privacy
-	if ( ! class_exists( 'epiphyt\Embed_Privacy\Embed_Privacy' ) ) {
-		return $content;
-	}
-	
-	// get Embed Privacy instance
-	$embed_privacy = epiphyt\Embed_Privacy\Embed_Privacy::get_instance();
-	
-	// check if provider is always active; if so, just return the content
-	if ( ! $embed_privacy->is_always_active_provider( 'google-maps' ) ) {
-		// replace the content with the overlay
-		$content = $embed_privacy->get_output_template( 'Google Maps', 'google-maps', $content );
-		// enqueue assets
-		$embed_privacy->print_assets();
-	}
-	
-	return $content;
-}
-`
-
 = Can users opt-out of already opted in embed providers? =
 
 Yes! You can use the shortcode `[embed_privacy_opt_out]` to add a list of embed providers anywhere you want (recommendation: add it to your privacy policy) to allow your users to opt-out.
@@ -177,6 +145,12 @@ You can report security bugs through the Patchstack Vulnerability Disclosure Pro
 
 == Changelog ==
 
+= 1.10.3 =
+* Fixed: Multiple replacements of the same embed
+* Fixed: Replacing unknown embeds
+* Fixed: Always return an embed provider via `Providers::get_by_name()`
+* Fixed: Warning about potentially non-available asset version
+
 = 1.10.2 =
 * Fixed: Potential fatal error for missing check of the availability of the function `is_plugin_active`
 

From aacea2a5a1cbb1e0458675c4f67a504d148739c3 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Mon, 16 Sep 2024 14:55:00 +0200
Subject: [PATCH 10/18] =?UTF-8?q?=F0=9F=90=9B=20Fix=20cookie=20duration=20?=
 =?UTF-8?q?while=20editing=20it?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/embed-privacy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/embed-privacy.js b/assets/js/embed-privacy.js
index cb6b95f..42a9bfc 100644
--- a/assets/js/embed-privacy.js
+++ b/assets/js/embed-privacy.js
@@ -87,7 +87,7 @@ document.addEventListener( 'DOMContentLoaded', function() {
 			if ( cookie !== null && Object.keys( cookie ).length !== 0 && cookie.constructor === Object ) {
 				cookie[ embedProvider ] = true;
 				
-				set_cookie( 'embed-privacy', JSON.stringify( cookie ) );
+				set_cookie( 'embed-privacy', JSON.stringify( cookie ), 365 );
 			}
 			else {
 				set_cookie( 'embed-privacy', '{"' + embedProvider + '":true}', 365 );

From 1fe04e83d16bfac92684555b4bb25bc7a93465dc Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Mon, 16 Sep 2024 14:55:50 +0200
Subject: [PATCH 11/18] =?UTF-8?q?=F0=9F=90=9B=20Fix=20blocking=20embeds=20?=
 =?UTF-8?q?after=20another=20deactivated/always=20active=20provider?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/class-embed-privacy.php     |   6 +-
 inc/data/class-replacer.php     |  86 +++++++++++++-------------
 inc/embed/class-replacement.php | 104 ++++++++++++++++++++------------
 3 files changed, 114 insertions(+), 82 deletions(-)

diff --git a/inc/class-embed-privacy.php b/inc/class-embed-privacy.php
index a4b7b5b..134ebe1 100644
--- a/inc/class-embed-privacy.php
+++ b/inc/class-embed-privacy.php
@@ -410,10 +410,10 @@ public function get_embed_overlay( $provider, $content ) {
 			return $content;
 		}
 		
-		$overlay = new Replacement( $content );
+		$replacement = new Replacement( $content );
 		
-		if ( $overlay->get_provider()->is_matching( $content ) ) {
-			$content = Template::get( $overlay->get_provider(), $overlay );
+		foreach ( $replacement->get_providers() as $provider ) {
+			$content = Template::get( $provider, $replacement );
 		}
 		
 		return $content;
diff --git a/inc/data/class-replacer.php b/inc/data/class-replacer.php
index 9493088..f4b9f01 100644
--- a/inc/data/class-replacer.php
+++ b/inc/data/class-replacer.php
@@ -153,52 +153,54 @@ public static function replace_oembed( $output, $url, array $attributes ) {
 			return $output;
 		}
 		
-		$overlay = new Replacement( $output, $url );
+		$replacement = new Replacement( $output, $url );
 		
-		// make sure to only run once
-		if ( \str_contains( $output, 'data-embed-provider="' . $overlay->get_provider()->get_name() . '"' ) ) {
-			return $output;
-		}
-		
-		// check if cookie is set
-		if ( Providers::is_always_active( $overlay->get_provider()->get_name() ) ) {
-			return $output;
-		}
-		
-		$embed_title = Oembed::get_title( $output );
-		/* translators: embed title */
-		$attributes['embed_title'] = ! empty( $embed_title ) ? $embed_title : '';
-		$attributes['embed_url'] = $url;
-		$attributes['is_oembed'] = true;
-		$attributes['strip_newlines'] = true;
-		
-		// the default dimensions are useless
-		// so ignore them if recognized as such
-		$defaults = \wp_embed_defaults( $url );
-		
-		if (
-			! empty( $attributes['height'] ) && $attributes['height'] === $defaults['height']
-			&& ! empty( $attributes['width'] ) && $attributes['width'] === $defaults['width']
-		) {
-			unset( $attributes['height'], $attributes['width'] );
+		foreach ( $replacement->get_providers() as $provider ) {
+			// make sure to only run once
+			if ( \str_contains( $output, 'data-embed-provider="' . $provider->get_name() . '"' ) ) {
+				return $output;
+			}
+			
+			// check if cookie is set
+			if ( Providers::is_always_active( $provider->get_name() ) ) {
+				return $output;
+			}
 			
-			$dimensions = Oembed::get_dimensions( $output );
+			$embed_title = Oembed::get_title( $output );
+			/* translators: embed title */
+			$attributes['embed_title'] = ! empty( $embed_title ) ? $embed_title : '';
+			$attributes['embed_url'] = $url;
+			$attributes['is_oembed'] = true;
+			$attributes['strip_newlines'] = true;
 			
-			if ( ! empty( $dimensions ) ) {
-				$attributes = \array_merge( $attributes, $dimensions );
+			// the default dimensions are useless
+			// so ignore them if recognized as such
+			$defaults = \wp_embed_defaults( $url );
+			
+			if (
+				! empty( $attributes['height'] ) && $attributes['height'] === $defaults['height']
+				&& ! empty( $attributes['width'] ) && $attributes['width'] === $defaults['width']
+			) {
+				unset( $attributes['height'], $attributes['width'] );
+				
+				$dimensions = Oembed::get_dimensions( $output );
+				
+				if ( ! empty( $dimensions ) ) {
+					$attributes = \array_merge( $attributes, $dimensions );
+				}
+			}
+			
+			// check for local tweets
+			if ( $provider->is( 'twitter' ) && \get_option( 'embed_privacy_local_tweets' ) ) {
+				return Twitter::get_local_tweet( $output );
+			}
+			
+			$output = $replacement->get( $attributes );
+			
+			if ( $provider->is( 'youtube' ) ) {
+				// replace youtube.com with youtube-nocookie.com
+				$output = \str_replace( 'youtube.com', 'youtube-nocookie.com', $output );
 			}
-		}
-		
-		// check for local tweets
-		if ( $overlay->get_provider()->is( 'twitter' ) && \get_option( 'embed_privacy_local_tweets' ) ) {
-			return Twitter::get_local_tweet( $output );
-		}
-		
-		$output = $overlay->get( $attributes );
-		
-		if ( $overlay->get_provider()->is( 'youtube' ) ) {
-			// replace youtube.com with youtube-nocookie.com
-			$output = \str_replace( 'youtube.com', 'youtube-nocookie.com', $output );
 		}
 		
 		return $output;
diff --git a/inc/embed/class-replacement.php b/inc/embed/class-replacement.php
index 774bca4..6238fa3 100644
--- a/inc/embed/class-replacement.php
+++ b/inc/embed/class-replacement.php
@@ -23,10 +23,15 @@ final class Replacement {
 	private $content = '';
 	
 	/**
-	 * @var		\epiphyt\Embed_privacy\embed\Provider Provider of this overlay
+	 * @var		\epiphyt\Embed_privacy\embed\Provider|null Current processed provider for this replacement
 	 */
 	private $provider;
 	
+	/**
+	 * @var		\epiphyt\Embed_privacy\embed\Provider[] List of matching providers for this replacement
+	 */
+	private $providers = [];
+	
 	/**
 	 * @var		array List of replacements
 	 */
@@ -81,13 +86,19 @@ public function get( array $attributes = [] ) {
 			)
 		) {
 			$attributes['check_always_active'] = true;
-			$new_content = $this->replace_content( $content, $attributes );
 			
-			if ( $new_content !== $content ) {
-				Embed_Privacy::get_instance()->has_embed = true;
-				Embed_Privacy::get_instance()->frontend->print_assets();
-				$content = $new_content;
+			foreach ( $this->get_providers() as $provider ) {
+				$this->provider = $provider;
+				$new_content = $this->replace_content( $content, $attributes );
+				
+				if ( $new_content !== $content ) {
+					Embed_Privacy::get_instance()->has_embed = true;
+					Embed_Privacy::get_instance()->frontend->print_assets();
+					$content = $new_content;
+				}
 			}
+			
+			$this->provider = null;
 		}
 		
 		return $content;
@@ -121,14 +132,31 @@ private static function get_character_replacements() {
 	}
 	
 	/**
-	 * Get the overlay provider.
+	 * Get the current provider.
+	 * 
+	 * @deprecated	1.10.4
 	 * 
-	 * @return	\epiphyt\Embed_privacy\embed\Provider Provider object
+	 * @return	\epiphyt\Embed_privacy\embed\Provider|null Provider object
 	 */
 	public function get_provider() {
+		\_doing_it_wrong(
+			__METHOD__,
+			\esc_html__( 'This method is outdated and will be removed in the future.', 'embed-privacy' ),
+			'1.10.4'
+		);
+		
 		return $this->provider;
 	}
 	
+	/**
+	 * Get all providers to replace an embed of.
+	 * 
+	 * @return	\epiphyt\Embed_privacy\embed\Provider[] Provider object
+	 */
+	public function get_providers() {
+		return $this->providers;
+	}
+	
 	/**
 	 * Replace embedded content with an overlay.
 	 * 
@@ -398,44 +426,46 @@ private function replace_content( $content, $attributes ) {
 	 * @param	string	$url URL to the embedded content
 	 */
 	private function set_provider( $content, $url = '' ) {
+		$current_provider = null;
 		$providers = Providers::get_instance()->get_list();
 		
 		foreach ( $providers as $provider ) {
 			if (
-				$provider->is_matching(
+				! $provider->is_matching(
 					$content,
 					Replacer::extend_pattern( $provider->get_pattern(), $provider )
 				)
-				|| ( ! empty( $url ) && $provider->is_matching( $url ) )
+				|| ( ! empty( $url ) && ! $provider->is_matching( $url ) )
 			) {
-				$this->provider = $provider;
-				break;
+				continue;
 			}
+			
+			$current_provider = $provider;
+			
+			// support unknown oEmbed provider
+			// see https://github.com/epiphyt/embed-privacy/issues/89
+			if ( $current_provider === null && ! empty( $url ) ) {
+				$parsed_url = \wp_parse_url( $url );
+				$provider = isset( $parsed_url['host'] ) ? $parsed_url['host'] : '';
+				$current_provider = new Provider();
+				$current_provider->set_name( $provider );
+				$current_provider->set_title( $provider );
+			}
+			
+			if ( $current_provider === null ) {
+				$current_provider = new Provider();
+			}
+			
+			/**
+			 * Filter the overlay provider.
+			 * 
+			 * @since	1.10.0
+			 * 
+			 * @param	\epiphyt\Embed_Privacy\embed\Provider	$provider Current provider
+			 * @param	string									$content Content to get the provider from
+			 * @param	string									$url URL to the embedded content
+			 */
+			$this->providers[] = \apply_filters( 'embed_privacy_overlay_provider', $current_provider, $content, $url );
 		}
-		
-		// support unknown oEmbed provider
-		// see https://github.com/epiphyt/embed-privacy/issues/89
-		if ( $this->provider === null && ! empty( $url ) ) {
-			$parsed_url = \wp_parse_url( $url );
-			$provider = isset( $parsed_url['host'] ) ? $parsed_url['host'] : '';
-			$this->provider = new Provider();
-			$this->provider->set_name( $provider );
-			$this->provider->set_title( $provider );
-		}
-		
-		if ( $this->provider === null ) {
-			$this->provider = new Provider();
-		}
-		
-		/**
-		 * Filter the overlay provider.
-		 * 
-		 * @since	1.10.0
-		 * 
-		 * @param	\epiphyt\Embed_Privacy\embed\Provider	$provider Current provider
-		 * @param	string									$content Content to get the provider from
-		 * @param	string									$url URL to the embedded content
-		 */
-		$this->provider = \apply_filters( 'embed_privacy_overlay_provider', $this->provider, $content, $url );
 	}
 }

From 144344008096f3f5d8af07502f65045025d1398d Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Mon, 16 Sep 2024 14:57:08 +0200
Subject: [PATCH 12/18] =?UTF-8?q?=F0=9F=94=96=20Prepare=20version=201.10.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md      | 4 ++++
 embed-privacy.php | 2 +-
 readme.txt        | 6 +++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1239c4d..a206a6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.10.4
+* Fixed: Blocking embeds appearing in the same content after a disabled/always active provider
+* Fixed: Cookie lifetime
+
 ## 1.10.3
 * Fixed: Multiple replacements of the same embed
 * Fixed: Replacing unknown embeds
diff --git a/embed-privacy.php b/embed-privacy.php
index a9ac945..9881b66 100644
--- a/embed-privacy.php
+++ b/embed-privacy.php
@@ -5,7 +5,7 @@
 Plugin Name:		Embed Privacy
 Plugin URL:			https://epiph.yt/en/embed-privacy/
 Description:		Embed Privacy prevents from loading external embeds directly and lets the user control which one should be loaded.
-Version:			1.10.3
+Version:			1.10.4
 Author:				Epiphyt
 Author URI:			https://epiph.yt/en/
 License:			GPL2
diff --git a/readme.txt b/readme.txt
index 92d3b90..a6c8b6d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: epiphyt, kittmedia, krafit
 Tags: oembed, privacy, gutenberg, iframes, performance
 Requires at least: 5.9
-Stable tag: 1.10.3
+Stable tag: 1.10.4
 Tested up to: 6.6
 Requires PHP: 5.6
 License: GPL2
@@ -145,6 +145,10 @@ You can report security bugs through the Patchstack Vulnerability Disclosure Pro
 
 == Changelog ==
 
+= 1.10.4 =
+* Fixed: Blocking embeds appearing in the same content after a disabled/always active provider
+* Fixed: Cookie lifetime
+
 = 1.10.3 =
 * Fixed: Multiple replacements of the same embed
 * Fixed: Replacing unknown embeds

From 93feb94386fcfcdfd33b41ba1104df64ab5187a3 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Tue, 17 Sep 2024 13:52:25 +0200
Subject: [PATCH 13/18] =?UTF-8?q?=F0=9F=90=9B=20Fix=20potential=20warning?=
 =?UTF-8?q?=20for=20undefined=20array=20key=20in=20$matches?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/embed/class-replacement.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/inc/embed/class-replacement.php b/inc/embed/class-replacement.php
index 6238fa3..b550961 100644
--- a/inc/embed/class-replacement.php
+++ b/inc/embed/class-replacement.php
@@ -369,14 +369,12 @@ private function replace_content( $content, $attributes ) {
 		\libxml_use_internal_errors( false );
 		
 		// embeds for other elements need to be handled manually
-		// make sure to test before if the regex matches
-		// see: https://github.com/epiphyt/embed-privacy/issues/26
 		if (
 			empty( $this->replacements )
 			&& ! empty( $attributes['regex'] )
 			&& ! $this->provider->is_unknown()
 			&& ! $this->provider->is_disabled()
-			&& \preg_match( $attributes['regex'], $content, $matches ) !== false
+			&& \preg_match( $attributes['regex'], $content, $matches ) === 1
 			&& ! \str_contains( $matches[0], 'embed-privacy-' )
 		) {
 			$content = \preg_replace(

From ef5a106665abbe8b5e7c5495f16031345407b508 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Tue, 24 Sep 2024 18:41:12 +0200
Subject: [PATCH 14/18] =?UTF-8?q?=F0=9F=8D=B1=20Add=20missing=20assets=20f?=
 =?UTF-8?q?or=20Elementor=20YouTube=20video=20See=20#231?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/integration/class-elementor.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/integration/class-elementor.php b/inc/integration/class-elementor.php
index 85c8bec..cc6a8a3 100644
--- a/inc/integration/class-elementor.php
+++ b/inc/integration/class-elementor.php
@@ -166,6 +166,7 @@ public static function replace_youtube( $content ) {
 		
 		if ( \str_contains( $content, 'youtube.com\/watch' ) ) {
 			$content = self::get_youtube_overlay( $content );
+			Embed_Privacy::get_instance()->frontend->print_assets();
 		}
 		
 		return $content;

From 44ae96657cbca6bb524f368b0cb6c73263415de5 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Wed, 25 Sep 2024 16:51:46 +0200
Subject: [PATCH 15/18] =?UTF-8?q?=F0=9F=92=84=20Fix=20hiding=20opt-out=20c?=
 =?UTF-8?q?heckboxes=20if=20they=20should=20be=20See=20#232?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/embed-privacy.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/js/embed-privacy.js b/assets/js/embed-privacy.js
index 42a9bfc..5fc4fda 100644
--- a/assets/js/embed-privacy.js
+++ b/assets/js/embed-privacy.js
@@ -172,8 +172,8 @@ document.addEventListener( 'DOMContentLoaded', function() {
 			if ( embedPrivacy.javascriptDetection === 'yes' && alwaysActiveProviders.indexOf( optOutCheckboxes[ i ].getAttribute( 'data-embed-provider' ) ) !== -1 ) {
 				optOutCheckboxes[ i ].checked = true;
 			}
-			else if ( embedPrivacy.javascriptDetection === 'yes' && ! showAll ) {
-				optOutCheckboxes[ i ].parentNode.classList.add( 'is-hidden' );
+			else if ( ! showAll ) {
+				optOutCheckboxes[ i ].parentNode.parentNode.classList.add( 'is-hidden' );
 				
 				continue;
 			}

From 4d1f4040c171879cef3f4ccba01aca3aeabb6404 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Wed, 25 Sep 2024 17:10:58 +0200
Subject: [PATCH 16/18] =?UTF-8?q?=F0=9F=90=9B=20Fix=20check=20for=20matchi?=
 =?UTF-8?q?ng=20provider=20See=20#233?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inc/embed/class-replacement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/embed/class-replacement.php b/inc/embed/class-replacement.php
index b550961..d4ac172 100644
--- a/inc/embed/class-replacement.php
+++ b/inc/embed/class-replacement.php
@@ -433,7 +433,7 @@ private function set_provider( $content, $url = '' ) {
 					$content,
 					Replacer::extend_pattern( $provider->get_pattern(), $provider )
 				)
-				|| ( ! empty( $url ) && ! $provider->is_matching( $url ) )
+				&& ( ! empty( $url ) && ! $provider->is_matching( $url ) )
 			) {
 				continue;
 			}

From 0eeccfb30ffde294242d490401c055dcad8fe5a1 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Fri, 27 Sep 2024 17:11:34 +0200
Subject: [PATCH 17/18] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20Twitter=20to=20X?=
 =?UTF-8?q?=20See=20#235?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/images/embed-twitter.png   | Bin 1032 -> 0 bytes
 assets/images/embed-x.png         | Bin 0 -> 911 bytes
 inc/admin/class-settings.php      |   2 +-
 inc/class-embed-privacy.php       |  10 ++--
 inc/class-migration.php           |  64 +++++++++++++++++++--
 inc/data/class-replacer.php       |   6 +-
 inc/integration/class-twitter.php |  88 +++--------------------------
 inc/integration/class-x.php       |  90 ++++++++++++++++++++++++++++++
 8 files changed, 164 insertions(+), 96 deletions(-)
 delete mode 100644 assets/images/embed-twitter.png
 create mode 100644 assets/images/embed-x.png
 create mode 100644 inc/integration/class-x.php

diff --git a/assets/images/embed-twitter.png b/assets/images/embed-twitter.png
deleted file mode 100644
index 75478391461c0d711f756ddd0fb5b8d8f4c7824e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1032
zcmeAS@N?(olHy`uVBq!ia0vp^Wk8(3!3-q-e=A!Gq|yR>LR{Sod}J4XqBT0Z-un*F
zMx~M<zhDMw_pGj&i;5MkuKmBq%K4;`-{@Ucl;-ioZ+}E525s7Ner2<1^8p41W_?c=
z$B+ufqc_<nEw++id7##=HcRKzU;dwmTBJ@*6Bo$%X3elx=P&EKlo`|B?&y0v)2`0@
zLCYUO%QT+1Li&$3o1FfrwM}kEcWA&ejbxjZhfI#S@uij?E<eN|T_`<C((I8z!=hD>
zqn#ptgxzL6x$d~z=|ydmdg`AYk)N4*f?sl*lhLb%2@mA9=iTjyzr-Sa@VLvD@^7K%
zrfk`HvhdQ0;+zESr9tcBKTOd)HtjtB^5d1yG<}=+H~zN?TiE|tYo1a4vR`FS_UrU0
z9SAHuWjyCcva)VUt3O|Ti6~!IrBmQh{%l|SPajhsT@!dbp;cXH;*B#KN-|B@_$mTC
zZ|#qr=-OH<8Jctc!PN8D<f^5XUSY4Zs8K7kp2IOu;jX%z>a$<pR{F}{Fw#_(dAx74
zQ<>P;DX-tiy|1vzKE<Escrec(FY1Jn^;h19Y}=2ls|fw<FSh!4_oU}OT;Vfj+<Kn!
zx-VjKwM#JD$JX|vOX{AL6r25;R2kS`%OMw{vpTo;nez($mAySxJ12BWXQeuy^H>?&
zDbD#XT>Q$3L)`|a?Tdn6B|maKk|&#dAby4K-)Dx`Ov|jzuBaaD?!4t%ks7?)b7R5f
z4Y}1>=1z+i=Gm#(WKDBg_I|~6F3t9;$O%SA-utipw^sU5ugayp*-x1qYnk?>X5P0e
z+V;(Gn)H_YTZ@)1;NvZu!D^bZad~{@Zl#0!7Cby_BqOv&Hvh_33k}KGgS#zm7@zYC
ztD0%-x~JD*gZlf5-Hg9wyk5+|8TDetj=KH3Gn<rqnzl<7`kc1*wK(-O*CqYIiX|88
z*-v~~_)l@#OYwV3ZwtMQKC&qth>Saa+GbAp`8_9ECq0NN5OxmCbq^8!x?@3Jd!}b)
z)T_r@^@0DlE?xKbpVKP)&)<V5uX&t#@#vKsUX}MQ{cjCe$EmmCZ4;LZXK9;huxFxE
zU|t%xsIP6G(H|E1Np>r|%$ICBcc`#ach@2h?l@D)UGFVAGmd1Y9nR*`Z{sRnxJ&8u
z!mK$f)pUzv0{LbAvsX!kKYgoH;WXvy4)^=#WcedEF_e4x>=v}XTM{KNrPBD+r1j7I
wjp^SmXstiH?aZ5lrFRoI>^)WUWXJLS^6r)$2T#~f2WB(|Pgg&ebxsLQ05P}m00000

diff --git a/assets/images/embed-x.png b/assets/images/embed-x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2331a7ba81831b5934e150ccc394ff55c045feb
GIT binary patch
literal 911
zcmeAS@N?(olHy`uVBq!ia0vp^2|%30!3-p4^r<ldDdPa25LY1mpG2^I>Z2y0Hi42L
zzhH*<0tV+D8us_!PnfT;z92w?nQb2f1JiF$7srr{duwOio;2G)z@_zFg38nX`^}~<
zDcEgvYuk*6d)Dr4kod*1=HSuzmIo$FvOiy+zn{t4p@i#DS?=5a|K{El+_bxQ|F`|W
z>*Z}?RO;X6Rp(dbZMIF8_?|I&VQCrH)w_>MbIWV$qSkfQe~|MmGPigp{{GIB<#pjA
znF<U3*DAVq|1ooQc)E1rV%NIkcN^U7fBVh5WnJ*E%t6(;Pwb~|UTf3e^D89Qo^c6h
z4_UVC%$l2i-+TX+8f1RruiNR-&aq;NpVtfpK2@Dw6+fq#>1lf>vy?0fo0qD8sX;Gp
zwNFc$>o1W8;h7gYSxQ2G7OR!~G<uz?$gt3O;cBG?O-?Ot6L}`DyFcT?JUgc~hBGes
zvWXmzTWYwFeeS~WZkLvOHk>cCIyqyHBnn<g)e_$2e<}2??H|9EV<nS!FzoSgd9jFN
zg@W<I&Hr|Cx~P=|u!Q(AxV-owdErS(idu<izW^7P@UBOCOP-}TDKB8N5|&~&59qic
zaG>FS$Auj>Y{z0UUL-90XuU;tzwkoC*ODGC88sOTjTZhkcAXS%VjH={pm^0S*U1Oh
zJ7q-VDH|<3?Cd(p$v$$4UG*C6vbzq6PU`6l){{5d1Xx<n<@{U3zrk=}`{m~J7_}|+
zhfLK<imM7NXI?n29Bd{i^>Ndh$3_cJGk^a2PsvF+uB|i%Xyx_<-i%)hAGOzAn{0o`
zNZ9H%b60_zl8KDTn#XOu9KGzGhpqC|oen#mw#ozAmFsY_*6mKn)Lym%gN5<G+?X?b
zUL<CiJh)`AurTgd>79cud0h=$aV{Aa84<_7S_?`&PmMV4`-U&}OD|i%%nPxy0S}ag
ztt6y)3#N0(iZY4<L+F~hl!J=XVvn}cI}R<!DkHBIS_|)bCC$6QVBzF_7ZqyX=P<UK
zOIb8?-W6dKHBtLwU?LU3uVhk`6meYE=Y`s`grn!Do@#m5=Ei)?wWUq*S82>0sVXLR
zo{Q#E8#EWrmg4n(KUG4S_kR37Lo+F{xP5~9mu+H~xTFW1yLH-pKcflP)L*j>YFY!c
O2!p4qpUXO@geCy*RHJMF

literal 0
HcmV?d00001

diff --git a/inc/admin/class-settings.php b/inc/admin/class-settings.php
index f0f0492..32798eb 100644
--- a/inc/admin/class-settings.php
+++ b/inc/admin/class-settings.php
@@ -73,7 +73,7 @@ public static function register() {
 			'embed_privacy',
 			'embed_privacy_general',
 			[
-				'description' => \__( 'By enabling this option, tweets are embedded locally as text without any connection to Twitter, and no privacy overlay is required.', 'embed-privacy' ),
+				'description' => \__( 'By enabling this option, tweets are embedded locally as text without any connection to X, and no privacy overlay is required.', 'embed-privacy' ),
 				'name' => 'embed_privacy_local_tweets',
 				'option_type' => 'option',
 				'title' => \__( 'Local tweets', 'embed-privacy' ),
diff --git a/inc/class-embed-privacy.php b/inc/class-embed-privacy.php
index 134ebe1..186991b 100644
--- a/inc/class-embed-privacy.php
+++ b/inc/class-embed-privacy.php
@@ -22,7 +22,7 @@
 use epiphyt\Embed_Privacy\integration\Maps_Marker;
 use epiphyt\Embed_Privacy\integration\Polylang;
 use epiphyt\Embed_Privacy\integration\Shortcodes_Ultimate;
-use epiphyt\Embed_Privacy\integration\Twitter;
+use epiphyt\Embed_Privacy\integration\X;
 use epiphyt\Embed_Privacy\thumbnail\Thumbnail;
 use ReflectionMethod;
 
@@ -91,7 +91,7 @@ class Embed_Privacy {
 		Maps_Marker::class,
 		Polylang::class,
 		Shortcodes_Ultimate::class,
-		Twitter::class,
+		X::class,
 	];
 	
 	/**
@@ -978,7 +978,7 @@ public function replace_embeds_divi( $item_embed, $url ) { // phpcs:ignore Gener
 	}
 	
 	/**
-	 * Replace twitter embeds.
+	 * Replace X embeds.
 	 * 
 	 * @deprecated	1.6.3
 	 * @since		1.6.1
@@ -1000,7 +1000,7 @@ public function replace_embeds_twitter( $output, $url, $args ) {
 			return $output;
 		}
 		
-		$provider = Providers::get_instance()->get_by_name( 'twitter' );
+		$provider = Providers::get_instance()->get_by_name( 'x' );
 		
 		if ( ! $provider->is_matching( $url ) ) {
 			return $output;
@@ -1012,7 +1012,7 @@ public function replace_embeds_twitter( $output, $url, $args ) {
 		
 		if ( \get_option( 'embed_privacy_local_tweets' ) ) {
 			// check for local tweets
-			return Twitter::get_local_tweet( $output );
+			return X::get_local_tweet( $output );
 		}
 		
 		$args['embed_url'] = $url;
diff --git a/inc/class-migration.php b/inc/class-migration.php
index bc03051..b2efc14 100644
--- a/inc/class-migration.php
+++ b/inc/class-migration.php
@@ -29,7 +29,7 @@ class Migration {
 	 * @var		string Current migration version
 	 * @since	1.2.2
 	 */
-	private $version = '1.8.0';
+	private $version = '1.10.5';
 	
 	/**
 	 * Migration constructor.
@@ -196,31 +196,40 @@ public function migrate( $deprecated = null, $deprecated2 = null ) {
 			case $this->version:
 				// most recent version, do nothing
 				break;
+			case '1.8.0':
+				$this->migrate_1_10_5();
+				break;
 			case '1.7.3':
+				$this->migrate_1_10_5();
 				$this->migrate_1_8_0();
 				break;
 			case '1.7.0':
+				$this->migrate_1_10_5();
 				$this->migrate_1_8_0();
 				$this->migrate_1_7_3();
 				break;
 			case '1.6.0':
+				$this->migrate_1_10_5();
 				$this->migrate_1_8_0();
 				$this->migrate_1_7_3();
 				$this->migrate_1_7_0();
 				break;
 			case '1.5.0':
+				$this->migrate_1_10_5();
 				$this->migrate_1_8_0();
 				$this->migrate_1_7_3();
 				$this->migrate_1_7_0();
 				$this->migrate_1_6_0();
 				break;
 			case '1.4.7':
+				$this->migrate_1_10_5();
 				$this->migrate_1_8_0();
 				$this->migrate_1_7_0();
 				$this->migrate_1_6_0();
 				$this->migrate_1_5_0();
 				break;
 			case '1.4.0':
+				$this->migrate_1_10_5();
 				$this->migrate_1_8_0();
 				$this->migrate_1_7_0();
 				$this->migrate_1_6_0();
@@ -228,6 +237,7 @@ public function migrate( $deprecated = null, $deprecated2 = null ) {
 				$this->migrate_1_4_7();
 				break;
 			case '1.3.0':
+				$this->migrate_1_10_5();
 				$this->migrate_1_8_0();
 				$this->migrate_1_7_0();
 				$this->migrate_1_6_0();
@@ -235,6 +245,7 @@ public function migrate( $deprecated = null, $deprecated2 = null ) {
 				$this->migrate_1_4_0();
 				break;
 			case '1.2.2':
+				$this->migrate_1_10_5();
 				$this->migrate_1_8_0();
 				$this->migrate_1_7_0();
 				$this->migrate_1_6_0();
@@ -243,6 +254,7 @@ public function migrate( $deprecated = null, $deprecated2 = null ) {
 				$this->migrate_1_3_0();
 				break;
 			case '1.2.1':
+				$this->migrate_1_10_5();
 				$this->migrate_1_8_0();
 				$this->migrate_1_7_0();
 				$this->migrate_1_6_0();
@@ -252,6 +264,7 @@ public function migrate( $deprecated = null, $deprecated2 = null ) {
 				$this->migrate_1_2_2();
 				break;
 			case '1.2.0':
+				$this->migrate_1_10_5();
 				$this->migrate_1_8_0();
 				$this->migrate_1_7_0();
 				$this->migrate_1_6_0();
@@ -560,7 +573,7 @@ private function migrate_1_6_0() {
 	 * @see		https://github.com/epiphyt/embed-privacy/issues/163
 	 * @since	1.7.0
 	 * 
-	 * - Update Google Maps regex
+	 * - Update CrowdSignal regex
 	 */
 	private function migrate_1_7_0() {
 		$crowdsignal_provider = \get_posts( [
@@ -674,6 +687,45 @@ private function migrate_1_8_0() {
 		] );
 	}
 	
+	/**
+	 * Migrations for version 1.10.5.
+	 * 
+	 * @see		https://github.com/epiphyt/embed-privacy/issues/235
+	 * @since	1.10.5
+	 * 
+	 * - Rename Twitter to X
+	 */
+	private function migrate_1_10_5() {
+		$twitter_provider = \get_posts( [
+			'meta_key' => 'is_system',
+			'meta_value' => 'yes',
+			'name' => 'twitter',
+			'no_found_rows' => true,
+			'post_type' => 'epi_embed',
+			'update_post_term_cache' => false,
+		] );
+		$twitter_provider = \reset( $twitter_provider );
+		
+		if ( $twitter_provider instanceof WP_Post ) {
+			$x_provider = [
+				'ID' => $twitter_provider->ID,
+				'post_name' => \sanitize_title( \_x( 'X', 'embed provider', 'embed-privacy' ) ),
+				'post_title' => \_x( 'X', 'embed provider', 'embed-privacy' ),
+			];
+			
+			/* translators: embed provider */
+			if ( $twitter_provider->post_content === \sprintf( \__( 'Click here to display content from %s.', 'embed-privacy' ), \_x( 'Twitter', 'embed provider', 'embed-privacy' ) ) ) {
+				/* translators: embed provider */
+				$x_provider['post_content'] = \sprintf( \__( 'Click here to display content from %s.', 'embed-privacy' ), \_x( 'X', 'embed provider', 'embed-privacy' ) );
+			}
+			
+			\wp_update_post( $x_provider );
+			\update_post_meta( $twitter_provider->ID, 'privacy_policy_url', \__( 'https://x.com/privacy', 'embed-privacy' ) );
+			\update_post_meta( $twitter_provider->ID, 'regex_default', '/(twitter|x)\\\.com/' );
+			\update_post_meta( $twitter_provider->ID, 'is_system', 'yes' );
+		}
+	}
+	
 	/**
 	 * Register default embed providers.
 	 */
@@ -1066,13 +1118,13 @@ public function register_default_embed_providers() {
 			[
 				'meta_input' => [
 					'is_system' => 'yes',
-					'privacy_policy_url' => \__( 'https://twitter.com/privacy', 'embed-privacy' ),
-					'regex_default' => '/twitter\\\.com/',
+					'privacy_policy_url' => \__( 'https://x.com/privacy', 'embed-privacy' ),
+					'regex_default' => '/(twitter|x)\\\.com/',
 				],
 				/* translators: embed provider */
-				'post_content' => \sprintf( \__( 'Click here to display content from %s.', 'embed-privacy' ), \_x( 'Twitter', 'embed provider', 'embed-privacy' ) ),
+				'post_content' => \sprintf( \__( 'Click here to display content from %s.', 'embed-privacy' ), \_x( 'X', 'embed provider', 'embed-privacy' ) ),
 				'post_status' => 'publish',
-				'post_title' => \_x( 'Twitter', 'embed provider', 'embed-privacy' ),
+				'post_title' => \_x( 'X', 'embed provider', 'embed-privacy' ),
 				'post_type' => 'epi_embed',
 			],
 			[
diff --git a/inc/data/class-replacer.php b/inc/data/class-replacer.php
index f4b9f01..8765cd2 100644
--- a/inc/data/class-replacer.php
+++ b/inc/data/class-replacer.php
@@ -4,7 +4,7 @@
 use epiphyt\Embed_Privacy\embed\Replacement;
 use epiphyt\Embed_Privacy\Embed_Privacy;
 use epiphyt\Embed_Privacy\handler\Oembed;
-use epiphyt\Embed_Privacy\integration\Twitter;
+use epiphyt\Embed_Privacy\integration\X;
 
 /**
  * Replacer functionality.
@@ -191,8 +191,8 @@ public static function replace_oembed( $output, $url, array $attributes ) {
 			}
 			
 			// check for local tweets
-			if ( $provider->is( 'twitter' ) && \get_option( 'embed_privacy_local_tweets' ) ) {
-				return Twitter::get_local_tweet( $output );
+			if ( $provider->is( 'x' ) && \get_option( 'embed_privacy_local_tweets' ) ) {
+				return X::get_local_tweet( $output );
 			}
 			
 			$output = $replacement->get( $attributes );
diff --git a/inc/integration/class-twitter.php b/inc/integration/class-twitter.php
index cad78f2..907a9bb 100644
--- a/inc/integration/class-twitter.php
+++ b/inc/integration/class-twitter.php
@@ -1,87 +1,13 @@
 <?php
 namespace epiphyt\Embed_Privacy\integration;
 
-use DOMDocument;
-use DOMElement;
-use DOMXPath;
-
 /**
- * Twitter integration for Embed Privacy.
+ * Twitter/X integration for Embed Privacy.
  * 
- * @author	Epiphyt
- * @license	GPL2
- * @package	epiphyt\Embed_Privacy
- * @since	1.10.0
+ * @author		Epiphyt
+ * @deprecated	1.10.5 Use epiphyt\Embed_Privacy\integration\X instead
+ * @license		GPL2
+ * @package		epiphyt\Embed_Privacy
+ * @since		1.10.0
  */
-final class Twitter {
-	/**
-	 * Transform a tweet into a local one.
-	 * 
-	 * @param	string	$html Embed code
-	 * @return	string Local embed
-	 */
-	public static function get_local_tweet( $html ) {
-		\libxml_use_internal_errors( true );
-		$dom = new DOMDocument();
-		$dom->loadHTML(
-			'<html><meta charset="utf-8">' . $html . '</html>',
-			\LIBXML_HTML_NOIMPLIED | \LIBXML_HTML_NODEFDTD
-		);
-		
-		// phpcs:disable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		// remove script tag
-		foreach ( $dom->getElementsByTagName( 'script' ) as $script ) {
-			$script->parentNode->removeChild( $script );
-		}
-		
-		$xpath = new DOMXPath( $dom );
-		
-		// get text node, which represents the author name
-		// and give it a span with class
-		foreach ( $xpath->query( '//blockquote/text()' ) as $node ) {
-			$author_node = $dom->createElement( 'span', $node->nodeValue );
-			$author_node->setAttribute( 'class', 'embed-privacy-author-meta' );
-			$node->parentNode->replaceChild( $author_node, $node );
-		}
-		
-		// wrap author name by a meta div
-		/** @var	\DOMElement $node */
-		foreach ( $dom->getElementsByTagName( 'span' ) as $node ) {
-			if ( $node->getAttribute( 'class' ) !== 'embed-privacy-author-meta' ) {
-				continue;
-			}
-			
-			// create meta cite
-			$parent_node = $dom->createElement( 'cite' );
-			$parent_node->setAttribute( 'class', 'embed-privacy-tweet-meta' );
-			// append created cite to blockquote
-			$node->parentNode->appendChild( $parent_node );
-			// move author meta inside meta cite
-			$parent_node->appendChild( $node );
-		}
-		
-		/** @var	\DOMElement $link */
-		foreach ( $dom->getElementsByTagName( 'a' ) as $link ) {
-			if ( ! \preg_match( '/https?:\/\/twitter.com\/([^\/]+)\/status\/(\d+)/', $link->getAttribute( 'href' ) ) ) {
-				continue;
-			}
-			
-			// modify date in link to tweet
-			$l10n_date = \wp_date( \get_option( 'date_format' ), \strtotime( $link->nodeValue ) );
-			
-			if ( \is_string( $l10n_date ) ) {
-				$link->nodeValue = $l10n_date;
-			}
-			
-			// move link inside meta div
-			if ( isset( $parent_node ) && $parent_node instanceof DOMElement ) {
-				$parent_node->appendChild( $link );
-			}
-		}
-		
-		$content = $dom->saveHTML( $dom->documentElement );
-		// phpcs:enable
-		
-		return \str_replace( [ '<html><meta charset="utf-8">', '</html>' ], [ '<div class="embed-privacy-local-tweet">', '</div>' ], $content );
-	}
-}
+final class Twitter extends X {}
diff --git a/inc/integration/class-x.php b/inc/integration/class-x.php
new file mode 100644
index 0000000..2d84d1a
--- /dev/null
+++ b/inc/integration/class-x.php
@@ -0,0 +1,90 @@
+<?php
+namespace epiphyt\Embed_Privacy\integration;
+
+use DOMDocument;
+use DOMElement;
+use DOMXPath;
+
+/**
+ * Twitter/X integration for Embed Privacy.
+ * 
+ * @author	Epiphyt
+ * @license	GPL2
+ * @package	epiphyt\Embed_Privacy
+ * @since	1.10.5
+ */
+class X {
+	/**
+	 * Transform a tweet into a local one.
+	 * 
+	 * @param	string	$html Embed code
+	 * @return	string Local embed
+	 */
+	public static function get_local_tweet( $html ) {
+		\libxml_use_internal_errors( true );
+		$dom = new DOMDocument();
+		$dom->loadHTML(
+			'<html><meta charset="utf-8">' . $html . '</html>',
+			\LIBXML_HTML_NOIMPLIED | \LIBXML_HTML_NODEFDTD
+		);
+		
+		// phpcs:disable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+		// remove script tag
+		foreach ( $dom->getElementsByTagName( 'script' ) as $script ) {
+			$script->parentNode->removeChild( $script );
+		}
+		
+		$xpath = new DOMXPath( $dom );
+		
+		// get text node, which represents the author name
+		// and give it a span with class
+		foreach ( $xpath->query( '//blockquote/text()' ) as $node ) {
+			$author_node = $dom->createElement( 'span', $node->nodeValue );
+			$author_node->setAttribute( 'class', 'embed-privacy-author-meta' );
+			$node->parentNode->replaceChild( $author_node, $node );
+		}
+		
+		// wrap author name by a meta div
+		/** @var	\DOMElement $node */
+		foreach ( $dom->getElementsByTagName( 'span' ) as $node ) {
+			if ( $node->getAttribute( 'class' ) !== 'embed-privacy-author-meta' ) {
+				continue;
+			}
+			
+			// create meta cite
+			$parent_node = $dom->createElement( 'cite' );
+			$parent_node->setAttribute( 'class', 'embed-privacy-tweet-meta' );
+			// append created cite to blockquote
+			$node->parentNode->appendChild( $parent_node );
+			// move author meta inside meta cite
+			$parent_node->appendChild( $node );
+		}
+		
+		/** @var	\DOMElement $link */
+		foreach ( $dom->getElementsByTagName( 'a' ) as $link ) {
+			if (
+				! \preg_match( '/https?:\/\/twitter.com\/([^\/]+)\/status\/(\d+)/', $link->getAttribute( 'href' ) )
+				&& ! \preg_match( '/https?:\/\/x.com\/([^\/]+)\/status\/(\d+)/', $link->getAttribute( 'href' ) )
+			) {
+				continue;
+			}
+			
+			// modify date in link to tweet
+			$l10n_date = \wp_date( \get_option( 'date_format' ), \strtotime( $link->nodeValue ) );
+			
+			if ( \is_string( $l10n_date ) ) {
+				$link->nodeValue = $l10n_date;
+			}
+			
+			// move link inside meta div
+			if ( isset( $parent_node ) && $parent_node instanceof DOMElement ) {
+				$parent_node->appendChild( $link );
+			}
+		}
+		
+		$content = $dom->saveHTML( $dom->documentElement );
+		// phpcs:enable
+		
+		return \str_replace( [ '<html><meta charset="utf-8">', '</html>' ], [ '<div class="embed-privacy-local-tweet">', '</div>' ], $content );
+	}
+}

From 83b7d8f112f713bc31ab6b7a0dcee48f39ae1fe6 Mon Sep 17 00:00:00 2001
From: Matthias Kittsteiner <mk@kittmedia.com>
Date: Fri, 27 Sep 2024 18:37:36 +0200
Subject: [PATCH 18/18] =?UTF-8?q?=F0=9F=94=96=20Prepare=20version=201.10.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md      | 7 +++++++
 embed-privacy.php | 4 ++--
 readme.txt        | 9 ++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a206a6b..0332e3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.10.5
+* Improved: Renamed Twitter to X
+* Fixed: Check for matching provider
+* Fixed: Missing assets for YouTube overlay in Elementor
+* Fixed: Hiding providers in the opt-out shortcodes if desired
+* Fixed: Potential PHP warning
+
 ## 1.10.4
 * Fixed: Blocking embeds appearing in the same content after a disabled/always active provider
 * Fixed: Cookie lifetime
diff --git a/embed-privacy.php b/embed-privacy.php
index 9881b66..d1d6d1d 100644
--- a/embed-privacy.php
+++ b/embed-privacy.php
@@ -5,7 +5,7 @@
 Plugin Name:		Embed Privacy
 Plugin URL:			https://epiph.yt/en/embed-privacy/
 Description:		Embed Privacy prevents from loading external embeds directly and lets the user control which one should be loaded.
-Version:			1.10.4
+Version:			1.10.5
 Author:				Epiphyt
 Author URI:			https://epiph.yt/en/
 License:			GPL2
@@ -30,7 +30,7 @@
 */
 \defined( 'ABSPATH' ) || exit;
 
-\define( 'EMBED_PRIVACY_VERSION', '1.10.2' );
+\define( 'EMBED_PRIVACY_VERSION', '1.10.5' );
 
 if ( ! \defined( 'EPI_EMBED_PRIVACY_BASE' ) ) {
 	\define( 'EPI_EMBED_PRIVACY_BASE', \WP_PLUGIN_DIR . '/embed-privacy/' );
diff --git a/readme.txt b/readme.txt
index a6c8b6d..cf6436c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: epiphyt, kittmedia, krafit
 Tags: oembed, privacy, gutenberg, iframes, performance
 Requires at least: 5.9
-Stable tag: 1.10.4
+Stable tag: 1.10.5
 Tested up to: 6.6
 Requires PHP: 5.6
 License: GPL2
@@ -145,6 +145,13 @@ You can report security bugs through the Patchstack Vulnerability Disclosure Pro
 
 == Changelog ==
 
+= 1.10.5 =
+* Improved: Renamed Twitter to X
+* Fixed: Check for matching provider
+* Fixed: Missing assets for YouTube overlay in Elementor
+* Fixed: Hiding providers in the opt-out shortcodes if desired
+* Fixed: Potential PHP warning
+
 = 1.10.4 =
 * Fixed: Blocking embeds appearing in the same content after a disabled/always active provider
 * Fixed: Cookie lifetime