Merge pull request #804 from Codeinwp/fix/offload-url-replacement

fix: offloading URL replacement not happening

Author: selul

inc/url_replacer.php

@@ -266,6 +266,12 @@ private function normalize_image( $url, $original_url, $args, $is_uploaded = fal
 			return $this->get_dam_url( $image );
 		}
 
+		$offloaded_id = $this->is_offloaded_url( $image->getSource() );
+
+		if ( $offloaded_id !== 0 ) {
+			return $this->get_offloaded_url( $offloaded_id, $image->getUrl(), $image->getSource() );
+		}
+
 		return $image->getUrl();
 	}
 
@@ -366,4 +372,46 @@ private function get_dam_url( Image $image ) {
 	private function is_dam_url( $url ) {
 		return is_string( $url ) && strpos( $url, Optml_Dam::URL_DAM_FLAG ) !== false;
 	}
+
+	/**
+	 * Check if the URL is offloaded.
+	 *
+	 * @param string $source_url The source image URL.
+	 *
+	 * @return int
+	 */
+	private function is_offloaded_url( $source_url ) {
+		$attachment_id = 0;
+
+		if ( strpos( $source_url, Optml_Media_Offload::KEYS['not_processed_flag'] ) !== false ) {
+			$attachment_id = (int) Optml_Media_Offload::get_attachment_id_from_url( $source_url );
+		} else {
+			$attachment_id = $this->attachment_url_to_post_id( $source_url );
+		}
+
+		if ( $attachment_id === 0 ) {
+			return 0;
+		}
+
+		if ( ! $this->is_completed_offload( $attachment_id ) ) {
+			return 0;
+		}
+
+		return (int) $attachment_id;
+	}
+
+	/**
+	 * Get the offloaded URL for an image.
+	 *
+	 * @param int    $id The attachment ID.
+	 * @param string $optimized_url The optimized image URL.
+	 * @param string $source_url The source image URL.
+	 *
+	 * @return string
+	 */
+	private function get_offloaded_url( $id, $optimized_url, $source_url ) {
+		$suffix   = wp_get_attachment_metadata( $id )['file'];
+
+		return str_replace( $source_url, ltrim( $suffix, '/' ), $optimized_url );
+	}
 }

tests/test-media.php renamed to tests/Test_Media.php

@@ -401,12 +401,11 @@ public function test_filter_saved_data() {
 		$this->assertStringContainsString('300x300.jpg', $replaced['post_content'] );
 	}
 	public function test_replace_alternative_domain(){
-
-
-		$url = Optml_Media_Offload::get_original_url( self::$sample_attachement );
-		$this->assertEquals( $this->attachment_url_to_post_id( $url ), self::$sample_attachement );
+		$attachment = self::factory()->attachment->create_upload_object( OPTML_PATH . 'tests/assets/'.self::$files[0].'.jpg' );
+		$url = Optml_Media_Offload::get_original_url( $attachment );
+		$this->assertEquals( $this->attachment_url_to_post_id( $url ), $attachment );
 		$url = str_replace('example.org', 'www.example.org', $url);
-		$this->assertEquals( $this->attachment_url_to_post_id( $url ), self::$sample_attachement );
+		$this->assertEquals( $this->attachment_url_to_post_id( $url ), $attachment );
 
 		$scaled_url = Optml_Media_Offload::get_original_url( self::$sample_attachment_scaled );