Changeset 2631473

Timestamp:

11/17/2021 02:34:16 PM (4 years ago)

Author:

milanmk

Message:

Release 1.17.10

Location:

schema-app-structured-data-for-schemaorg

Files:

• tags/1.17.10 (added)
• tags/1.17.10/css (added)
• tags/1.17.10/css/schemaStyle.css (added)
• tags/1.17.10/data (added)
• tags/1.17.10/data/tree.jsonld (added)
• tags/1.17.10/hunch-schema.php (added)
• tags/1.17.10/js (added)
• tags/1.17.10/js/schema.js (added)
• tags/1.17.10/js/schemaAdmin.js (added)
• tags/1.17.10/js/schemaEditor.js (added)
• tags/1.17.10/lib (added)
• tags/1.17.10/lib/HunchSchema (added)
• tags/1.17.10/lib/HunchSchema/Author.php (added)
• tags/1.17.10/lib/HunchSchema/Blog.php (added)
• tags/1.17.10/lib/HunchSchema/Category.php (added)
• tags/1.17.10/lib/HunchSchema/Page.php (added)
• tags/1.17.10/lib/HunchSchema/Post.php (added)
• tags/1.17.10/lib/HunchSchema/Search.php (added)
• tags/1.17.10/lib/HunchSchema/Tag.php (added)
• tags/1.17.10/lib/HunchSchema/Thing.php (added)
• tags/1.17.10/lib/SchemaCron.php (added)
• tags/1.17.10/lib/SchemaEditor.php (added)
• tags/1.17.10/lib/SchemaFront.php (added)
• tags/1.17.10/lib/SchemaServer.php (added)
• tags/1.17.10/lib/SchemaSettings.php (added)
• tags/1.17.10/lib/classmap.php (added)
• tags/1.17.10/readme.txt (added)
• trunk/hunch-schema.php (modified) (1 diff)
• trunk/lib/HunchSchema/Thing.php (modified) (3 diffs)
• trunk/lib/SchemaServer.php (modified) (2 diffs)
• trunk/readme.txt (modified) (3 diffs)

schema-app-structured-data-for-schemaorg/trunk/hunch-schema.php

@@ -5 +5 @@
  * Plugin URI: http://www.schemaapp.com
  * Description: This plugin adds http://schema.org structured data to your website
- * Version: 1.17.9
+ * Version: 1.17.10
  * Author: Hunch Manifest
  * Author URI: https://www.hunchmanifest.com

schema-app-structured-data-for-schemaorg/trunk/lib/HunchSchema/Thing.php

@@ -382 +382 @@
 
 
-    protected function get_youtube_video( $id ) {
+    protected function get_youtube_video( $id = '' ) {
         if ( ! empty( $id ) ) {
             $transient_id = sprintf( 'HunchSchema-Markup-YouTube-%s', $id );
@@ -392 +392 @@
 
 
-            $response = wp_remote_retrieve_body( wp_remote_get( sprintf( 'https://api.schemaapp.com/schemaorg/video.json?ids=%s', $id ) ) );
+            $response = wp_remote_retrieve_body( wp_remote_get( sprintf( 'https://api.schemaapp.com/markup/markup?url=https://www.youtube.com/watch?v=%s', $id ) ) );
 
             if ( ! empty( $response ) ) {
-                // First delete then set; set method only updates expiry time if transient already exists
-                delete_transient( $transient_id );
-                set_transient( $transient_id, json_decode( $response ), ( 14 * DAY_IN_SECONDS ) );
-
-                return json_decode( $response );
+                $response_json = json_decode( $response );
+                $markup = $response_json->items->{"https://www.youtube.com/watch?v={$id}"} ?? false;
+
+                if ( $markup ) {
+                    // First delete then set; set method only updates expiry time if transient already exists
+                    delete_transient( $transient_id );
+                    set_transient( $transient_id, $markup, ( 14 * DAY_IN_SECONDS ) );
+
+                    return $markup;
+                }
             }
         }
@@ -411 +416 @@
             // https?://(?:[0-9A-Z-]+\.)?(?:youtu\.be/|youtube(?:-nocookie)?\.com\S*?[^\w\s-])([\w-]{11})(?=[^\w-]|$)(?![?=&+%\w.-]*(?:[\'"][^<>]*>|</a>))[?=&+%\w.-]*
             // https?://(?:[0-9A-Z-]+\.)?(?:youtu\.be/|youtube(?:-nocookie)?\.com\S*?[^\w\s-])([\w-]{11})(?=[^\w-]|$)[?=&+%\w.-]*
-            preg_match_all( '~https?://(?:www\.)?(?:youtu\.be/|youtube(?:-nocookie)?\.com\S*?[^\w\s-])([\w-]{11})(?=[^\w-]|$)[?=&+%\w.-]*~im', $string, $matches );
+            preg_match_all( '~(?:https?:)?//(?:www\.)?(?:youtu\.be/|youtube(?:-nocookie)?\.com\S*?[^\w\s-])([\w-]{11})(?=[^\w-]|$)[?=&+%\w.-]*~im', $string, $matches );
 
             if ( isset( $matches[1] ) && count( $matches[1] ) ) {

schema-app-structured-data-for-schemaorg/trunk/lib/SchemaServer.php

@@ -102 +102 @@
 
         /**
-         * Get a resource's schema data through API.
+         * Get a resource's schema data through API. Markup returned by all data sources are merged together.
          *
          * @uses SchemaServer->getResource()
@@ -116 +116 @@
             }
 
-            $schema_data = '';
-            $remote_error = false;
+            $schema_data = array();
 
             foreach ( $this->data_sources as $data_source ) {
-                $remote_response = wp_remote_get( $data_source );
+                $request = wp_remote_get( $data_source );
 
-                if ( ! is_wp_error( $remote_response ) && wp_remote_retrieve_response_code( $remote_response ) == 200 ) {
-                    $schema_data = wp_remote_retrieve_body( $remote_response );
+                if ( is_wp_error( $request ) || wp_remote_retrieve_response_code( $request ) != 200 ) {
+                    return '';
+                }
 
-                    // Check if editor schema data is not empty or literal 'null' or empty json array
-                    if ( ! empty( $schema_data ) && $schema_data !== 'null' && $schema_data !== '[]' ) {
-                        // First delete then set; set method only updates expiry time if transient already exists
-                        delete_transient( $this->transient_id );
-                        set_transient( $this->transient_id, $schema_data, 86400 ); // Expiry 1 day
+                $response = wp_remote_retrieve_body( $request );
 
-                        break;
+                // Check if editor schema data is not empty or literal 'null' or empty json array
+                if ( ! empty( $response ) && $response !== 'null' && $response !== '[]' ) {
+                    $response_json = json_decode( $response );
+
+                    if ( is_array( $response_json ) ) {
+                        $schema_data = array_merge( $schema_data, $response_json );
+                    } else {
+                        $schema_data[] = $response_json;
                     }
-                } else {
-                    $remote_error = true;
                 }
             }
 
-            // Store empty schema data from API
-            if ( empty( $schema_data ) && ! $remote_error ) {
-                delete_transient( $this->transient_id );
-                set_transient( $this->transient_id, $schema_data, 604800 ); // Expiry 7 days
-            }
+            // Expiry is 7 days for empty schema data or else 1 day
+            $transient_expiry = empty( $schema_data ) ? 604800 : 86400;
+            $schema_data = ( count( $schema_data ) == 1 ) ? reset( $schema_data ) : $schema_data;
 
-            return $schema_data;
+            // First delete then set; set method only updates expiry time if transient already exists
+            delete_transient( $this->transient_id );
+            set_transient( $this->transient_id, wp_json_encode( $schema_data ), $transient_expiry );
+
+            return empty( $schema_data ) ? '' : wp_json_encode( $schema_data );
         }
 

schema-app-structured-data-for-schemaorg/trunk/readme.txt

@@ -9 +9 @@
 Requires PHP: 5.4
 Tested up to: 5.8
-Stable tag: 1.17.9
+Stable tag: 1.17.10
 License: GPL2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -80 +80 @@
 == Changelog ==
 
+= 1.17.10 =
+Release Date - 16 November 2021
+
+- Improve, Updated YouTube URL matching for URLs without protocol
+- Improve, Merging of Editor and Highlighter markup
+- Fix, Late escaping of data for display
+
 = 1.17.9 =
 Release Date - 8 October 2021
@@ -527 +534 @@
 == Upgrade Notice ==
 
-= 1.17.9 =
-- Updated sanitization when saving data and escaping of HTML data for displaying
+= 1.17.10 =
+- Updated YouTube URL matching, Merging of Editor and Highlighter markup