Changeset 2548884

Timestamp:

06/16/2021 11:48:48 AM (5 years ago)

Author:

resoc

Message:

Version 1.0.2

Location:

resoc/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/class-resoc-admin.php (modified) (3 diffs)
• admin/class-resoc-settings.php (modified) (2 diffs)
• admin/css/resoc-admin.css (modified) (1 diff)
• includes/class-resoc-utils.php (modified) (1 diff)
• includes/class-resoc.php (modified) (2 diffs)
• public/class-resoc-public.php (modified) (1 diff)
• resoc.php (modified) (2 diffs)

resoc/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 5.0
 Tested up to: 5.7.2
-Stable tag: 1.0.1
+Stable tag: 1.0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -81 +81 @@
 == Changelog ==
 
+= 1.0.2 =
+* Compatibility with Yoast SEO and All in One SEO
+* Detect conflicts with other plugins
+* Generate image on auto-save
+* Generate image only on change
+
 = 1.0.1 =
 * Minor fix in post save

resoc/trunk/admin/class-resoc-admin.php

@@ -66 +66 @@
     }
 
-    if ( wp_is_post_autosave( $post_ID ) ) {
-      Resoc_Utils::log( "Post " . $post_ID . " is autosaving, skip" );
-      return;
-    }
-
     $feature_image_url = Resoc_Utils::get_post_featured_image_url( $post_ID );
     if ( !$feature_image_url ) {
@@ -96 +91 @@
     );
 
+    $current_request_hash = Resoc_Utils::hash_request( $request );
+    $previous_request_hash = get_post_meta( $post_ID, Resoc::POST_META_LATEST_REQUEST_HASH, true );
+    if ( $previous_request_hash && $previous_request_hash == $current_request_hash ) {
+      Resoc_Utils::log( "No change since the last time the image was generated, do nothing" );
+      return;
+    }
+
     $social_image = Resoc_Utils::create_social_image( $request );
     if ( !$social_image ) {
@@ -112 +114 @@
 
     update_post_meta( $post_ID, Resoc::POST_META_OG_IMAGE_ID, $social_image_id );
+
+    update_post_meta( $post_ID, Resoc::POST_META_LATEST_REQUEST_HASH, $current_request_hash );
 
     Resoc_Utils::log( "OpenGraph image " . $social_image_id . " attached to post " . $post_ID );

resoc/trunk/admin/class-resoc-settings.php

@@ -87 +87 @@
     }
 
+    if ( Resoc_Compatibility::conflicting_plugin() ) {
+      include_once( plugin_dir_path(__FILE__) . 'partials' . DIRECTORY_SEPARATOR . 'appearance-conflict-fallback.php' );
+      return;
+    }
+
     include_once( plugin_dir_path(__FILE__) . 'partials' . DIRECTORY_SEPARATOR . 'appearance.php' );
   }
@@ -167 +172 @@
         </p>
 
-        <div class="resoc-before-after">
-          <div class="before">
-            <h3>Before</h3>
-            <p>No branding, generic stock image</p>
-            <img src="<?php echo esc_attr( plugin_dir_url( __FILE__ ) . 'img/before.jpg' ) ?>" />
-          </div>
-          <div class="before-after-link">
-            &rarr;
-          </div>
-          <div class="after">
-            <h3>After</h3>
-            <p>Branded, eye catching</p>
-            <img src="<?php echo esc_attr( plugin_dir_url( __FILE__ ) . 'img/after.jpg' ) ?>" />
-          </div>
-        </div>
+        <?php
+          include_once( plugin_dir_path(__FILE__) . 'partials' . DIRECTORY_SEPARATOR . 'before-after.php' );
+        ?>
 
         <p>

resoc/trunk/admin/css/resoc-admin.css

@@ -51 +51 @@
   display: none;
 }
+
+.resoc-title-error {
+  color: red;
+}
+
+.resoc-narrow-section {
+  max-width: 600px;
+}

resoc/trunk/includes/class-resoc-utils.php

@@ -130 +130 @@
     }
   }
+
+  public static function hash_request( $request ) {
+    return sha1( print_r( $request, true ) );
+  }
 }

resoc/trunk/includes/class-resoc.php

@@ -117 +117 @@
         require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-resoc-utils.php';
 
+        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-resoc-compatibility.php';
+
         /**
          * The class responsible for defining all actions that occur in the admin area.
@@ -225 +227 @@
     }
 
-  const POST_META_OG_IMAGE_ID = 'resoc_og_image_id';
+  const POST_META_OG_IMAGE_ID         = 'resoc_og_image_id';
+  const POST_META_LATEST_REQUEST_HASH = 'resoc_latest_request_hash';
 }

resoc/trunk/public/class-resoc-public.php

@@ -53 +53 @@
         $this->version = $version;
 
-    add_action( 'wp_head', array( $this, 'add_opengraph_markups' ) );
+    // Disable Jetpack Open Graph markups
+    add_filter( 'jetpack_enable_open_graph', '__return_false' );
+
+    if ( Resoc_Compatibility::is_yoast_seo_active() ) {
+      add_filter(
+        'wpseo_add_opengraph_images',
+        array( $this, 'get_yoast_og_image' )
+      );
+    }
+    else if ( Resoc_Compatibility::is_aiosp_active() ) {
+      add_filter(
+        'aioseo_facebook_tags',
+        array( $this, 'override_aiosp_image_meta' ),
+        10, 1
+      );
+    }
+    else {
+      $conflicting_plugin = Resoc_Compatibility::conflicting_plugin();
+
+      if ( $conflicting_plugin ) {
+        Resoc_Utils::log( "Conflict with " . $conflicting_plugin . ", do nothing" );
+        return;
+      }
+
+      add_action( 'wp_head', array( $this, 'add_opengraph_markups' ) );
+    }
     }
+
+  public function get_yoast_og_image( $wpseo_opengraph_image ) {
+    $post_id = get_the_ID();
+    $specific_image_id = get_post_meta(
+      $post_id,
+      Resoc::POST_META_OG_IMAGE_ID,
+      true
+    );
+    if ( $specific_image_id ) {
+      $wpseo_opengraph_image->add_image_by_id( $specific_image_id );
+    }
+  }
+
+  public function override_aiosp_image_meta( $facebookMeta ) {
+    $specific_image_id = get_post_meta(
+      get_the_ID(),
+      Resoc::POST_META_OG_IMAGE_ID,
+      true
+    );
+    if ( $specific_image_id ) {
+      $image_data = wp_get_attachment_metadata( $specific_image_id );
+
+      if ( is_array( $image_data ) ) {
+        $image_data['url'] = wp_get_attachment_image_url( $specific_image_id, 'full' );
+        $facebookMeta['og:image'] = $image_data['url'];
+
+        if ( $image_data['width'] && $image_data['height'] ) {
+          $facebookMeta['og:image:width'] = $image_data['width'];
+          $facebookMeta['og:image:height'] = $image_data['height'];
+        }
+      }
+    }
+
+    return $facebookMeta;
+  }
 
   public function add_opengraph_markups() {

resoc/trunk/resoc.php

@@ -17 +17 @@
  * Plugin URI:        https://resoc.io/resoc-uri/
  * Description:       This is a short description of what the plugin does. It's displayed in the WordPress admin area.
- * Version:           1.0.1
+ * Version:           1.0.2
  * Author:            Resoc
  * Author URI:        https://resoc.io/
@@ -36 +36 @@
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'RESOC_VERSION', '1.0.1' );
+define( 'RESOC_VERSION', '1.0.2' );
 
 /**