Changeset 2550347

Timestamp:

06/18/2021 10:54:43 AM (5 years ago)

Author:

resoc

Message:

Version 1.0.8

Location:

resoc/trunk

Files:

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

resoc/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 5.0
 Tested up to: 5.7.2
-Stable tag: 1.0.7
+Stable tag: 1.0.8
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -81 +81 @@
 == Changelog ==
 
+= 1.0.8 =
+* Improvements for the plugins list page
+* Compatibility with Blog2Social
+
 = 1.0.7 =
 * Compatibility with SEOPress

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

@@ -57 +57 @@
 
     add_action( 'admin_notices', array( $this, 'finish_setup_notice' ));
+
+    add_filter('plugin_action_links', array( $this, 'plugin_action_links' ), 10, 2);
+  }
+
+  public function plugin_action_links( $links, $file ) {
+    static $this_plugin;
+
+    if ( ! $this_plugin ) {
+        $this_plugin = resoc_plugin_base_name();
+    }
+
+    if ( $file == 'resoc/resoc.php' ) {
+      $settings_link = '<a href="' . admin_url( '/themes.php?page=resoc_social_images_appearance_menu' ) . '">' . 'Settings' . '</a>';
+      array_unshift( $links, $settings_link );
+    }
+
+    return $links;
   }
 

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

@@ -33 +33 @@
   public static function is_seopress_active() {
     return is_plugin_active( 'wp-seopress/seopress.php' );
+  }
+
+  public static function is_blog2social_active() {
+    return is_plugin_active( 'blog2social/blog2social.php' );
+  }
+
+  public static function is_blog2social_og_tags_enabled() {
+    $blog2social_options = get_option( 'B2S_PLUGIN_GENERAL_OPTIONS' );
+    if ( $blog2social_options && !$blog2social_options[ 'og_active' ] ) {
+      return false;
+    }
+
+    return true;
   }
 

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

@@ -56 +56 @@
     add_filter( 'jetpack_enable_open_graph', '__return_false' );
 
+    $image_patched = false;
+
     if ( Resoc_Compatibility::is_yoast_seo_active() ) {
       add_filter(
@@ -61 +63 @@
         array( $this, 'get_yoast_og_image' )
       );
-    }
-    else if ( Resoc_Compatibility::is_aiosp_active() ) {
+      Resoc_Utils::log( "Yoast is active, override its OpenGraph image" );
+      $image_patched = true;
+    }
+
+    if ( Resoc_Compatibility::is_aiosp_active() ) {
       add_filter(
         'aioseo_facebook_tags',
@@ -68 +73 @@
         10, 1
       );
-    }
-    else if ( Resoc_Compatibility::is_seopress_active() ) {
+      Resoc_Utils::log( "All in One SEO is active, override its OpenGraph image" );
+      $image_patched = true;
+    }
+
+    if ( Resoc_Compatibility::is_blog2social_active() && Resoc_Compatibility::is_blog2social_og_tags_enabled() ) {
+      add_filter(
+        'b2s_og_meta_image',
+        array( $this, 'override_blog2social_image' ),
+        10, 1
+      );
+      Resoc_Utils::log( "Blog2Social is active, override its OpenGraph image" );
+      $image_patched = true;
+    }
+
+    if ( Resoc_Compatibility::is_seopress_active() ) {
       add_filter(
         'seopress_social_og_thumb',
@@ -75 +93 @@
         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' ) );
-    }
+      Resoc_Utils::log( "SEOPress is active, override its OpenGraph image" );
+      $image_patched = true;
+    }
+
+    if ( $image_patched ) {
+      Resoc_Utils::log( "OpenGraph image of another plugin has been overriden, nothing to do" );
+      return;
+    }
+
+    $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' ) );
     }
 
@@ -100 +124 @@
   }
 
+  public function override_blog2social_image( $blog2social_image ) {
+    $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 ) ) {
+        return wp_get_attachment_image_url( $specific_image_id, 'full' );
+      }
+    }
+
+    return $blog2social_image;
+  }
+
   public function override_aiosp_image_meta( $facebookMeta ) {
     $specific_image_id = get_post_meta(
@@ -147 +188 @@
 
   public function add_opengraph_markups() {
+    Resoc_Utils::log( "Inject OpenGraph markups" );
+
     $post_ID = get_the_ID();
 

resoc/trunk/resoc.php

@@ -14 +14 @@
  *
  * @wordpress-plugin
- * Plugin Name:       Resoc
+ * Plugin Name:       Resoc Social Images
  * 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.7
+ * Description:       Improve the images used to illustrate your content when it is share on social networks and messaging services.
+ * Version:           1.0.8
  * 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.7' );
+define( 'RESOC_VERSION', '1.0.8' );
 
 /**
@@ -81 +81 @@
 }
 run_resoc();
+
+function resoc_plugin_base_name() {
+  return plugin_basename( __FILE__ );
+};