Merge branch 'development' into fix/jetengine-comp

Author: selul

assets/src/dashboard/parts/connected/settings/Compression.js

@@ -22,6 +22,7 @@ import {
 } from '@wordpress/components';
 
 import { useSelect } from '@wordpress/data';
+import { useEffect } from '@wordpress/element';
 
 /**
  * Internal dependencies.
@@ -46,7 +47,6 @@ const Compression = ({
 			getSampleRate,
 			isLoading
 		} = select( 'optimole' );
-
 		return {
 			sampleImages: getSampleRate(),
 			isLoading: isLoading()
@@ -167,6 +167,13 @@ const Compression = ({
 		data.compression_mode = value;
 		setSettings( data );
 	};
+
+	useEffect( () => {
+		if ( showSample ) {
+			loadSample();
+		}
+	}, [ showSample ]);
+
 	return (
 		<>
 

assets/src/dashboard/parts/connected/settings/index.js

@@ -10,7 +10,7 @@ import Lazyload from './Lazyload';
 import Exclusions from './Exclusions';
 import OffloadMedia from './OffloadMedia';
 import CloudLibrary from './CloudLibrary';
-import { sampleRate, saveSettings } from '../../../utils/api';
+import { saveSettings } from '../../../utils/api';
 import { toggleDamSidebarLink } from '../../../utils/helpers';
 
 const Settings = ({
@@ -59,18 +59,7 @@ const Settings = ({
 		localStorage.setItem( 'optimole_settings_visits', visits ? parseInt( visits ) + 1 : 1 );
 	}, [ tab ]);
 
-	const loadSample = () => {
-		if ( ! showSample ) {
-			setIsSampleLoading( true );
-
-			sampleRate(
-				{
-					quality: settings.quality
-				},
-				() => setIsSampleLoading( false )
-			);
-		}
-
+	const toggleShowSample = () => {
 		setShowSample( ! showSample );
 	};
 
@@ -165,7 +154,7 @@ const Settings = ({
 						<Button
 							variant="default"
 							disabled={ isLoading }
-							onClick={ loadSample }
+							onClick={ toggleShowSample }
 						>
 							{ optimoleDashboardApp.strings.options_strings.view_sample_image }
 						</Button>

inc/compatibilities/jetpack.php

@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Class Optml_jetpack
+ *
+ * @reason Add support for Jetpack plugin custom endpoints.
+ */
+class Optml_jetpack extends Optml_compatibility {
+
+	/**
+	 * Should we load the integration logic.
+	 *
+	 * @return bool Should we load.
+	 */
+	public function should_load() {
+		include_once ABSPATH . 'wp-admin/includes/plugin.php';
+
+		return is_plugin_active( 'jetpack/jetpack.php' );
+	}
+
+	/**
+	 * Register integration details.
+	 *
+	 * @return void
+	 */
+	public function register() {
+		add_filter(
+			'jetpack_sync_before_send_jetpack_published_post',
+			function ( $data ) {
+				if ( ! is_array( $data ) ) {
+					return $data;
+				}
+
+				foreach ( $data as &$value ) {
+					if ( ! $value instanceof \WP_Post ) {
+						continue;
+					}
+
+					if ( ! empty( $value->post_content ) ) {
+						$value->post_content = Optml_Main::instance()->manager->replace_content( $value->post_content );
+					}
+
+					if ( ! empty( $value->post_excerpt ) ) {
+						$value->post_excerpt = Optml_Main::instance()->manager->replace_content( $value->post_excerpt );
+					}
+
+					if ( isset( $value->featured_image ) && ! empty( $value->featured_image ) ) {
+						$value->featured_image = apply_filters( 'optml_content_url', $value->featured_image );
+					}
+				}
+
+				return $data;
+			},
+			10
+		);
+	}
+
+	/**
+	 * Should we early load the compatibility?
+	 *
+	 * @return bool Whether to load the compatibility or not.
+	 */
+	public function should_load_early() {
+		return true;
+	}
+}

inc/manager.php

@@ -101,6 +101,7 @@ final class Optml_Manager {
 		'spectra',
 		'wpsp',
 		'jetengine',
+		'jetpack',
 	];
 	/**
 	 * The current state of the buffer.