Merge pull request #7 from indieweb/fixes

Fixes

Author: pfefferle

includes/class-mf2-feed-entry.php

@@ -54,6 +54,7 @@ public function __construct( $post, $with_comments = false ) {
 
 		$this->author['type']  = 'card';
 		$this->author['name']  = get_the_author_meta( 'display_name', $post->post_author );
+		$this->author['value'] = get_the_author_meta( 'display_name', $post->post_author );
 		$this->author['url']   = get_the_author_meta( 'user_url', $post->post_author ) ? get_the_author_meta( 'user_url', $post->post_author ) : get_author_posts_url( $post->post_author );
 		$this->author['photo'] = get_avatar_url( $post->post_author );
 
@@ -67,6 +68,7 @@ public function __construct( $post, $with_comments = false ) {
 				$comment['published']        = mysql2date( DATE_W3C, $post_comment->comment_date_gmt );
 				$comment['author']['type']   = 'card';
 				$comment['author']['name']   = $post_comment->comment_author;
+				$comment['author']['value']  = $post_comment->comment_author;
 
 				if ( $post_comment->comment_author_url ) {
 					$comment['author']['url'] = $post_comment->comment_author_url;
@@ -135,7 +137,12 @@ public function jf2_to_mf2( $entry ) {
 		$return['type']       = array( 'h-' . $entry['type'] );
 		$return['properties'] = array();
 
+		if ( $entry['value'] ) {
+			$return['type'] = $entry['value'];
+		}
+
 		unset( $entry['type'] );
+		unset( $entry['value'] );
 
 		foreach ( $entry as $key => $value ) {
 			if ( empty( $value ) ) {
@@ -157,6 +164,6 @@ public function jf2_to_mf2( $entry ) {
 			$return['properties'][ $key ] = $value;
 		}
 
-		return array_filter( $return );
+		return array_filter( array( $return ) );
 	}
 }

languages/mf2-feed.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the MIT.
 msgid ""
 msgstr ""
-"Project-Id-Version: MF2 Feed 2.0.1\n"
+"Project-Id-Version: MF2 Feed 2.1.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mf2-feed\n"
-"POT-Creation-Date: 2018-08-14 19:34:17+00:00\n"
+"POT-Creation-Date: 2018-11-29 08:49:18+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

mf2-feed.php

@@ -3,7 +3,7 @@
   * Plugin Name: MF2 Feed
   * Plugin URI: http://github.com/indieweb/wordpress-mf2-feed/
   * Description: Adds a Microformats2 JSON feed for every entry
-  * Version: 2.0.1
+  * Version: 2.1.0
   * Author: Matthias Pfefferle
   * Author URI: https://notiz.blog/
   * License: MIT
@@ -14,13 +14,10 @@
 
 add_action( 'init', array( 'Mf2Feed', 'init' ) );
 
-
 // flush rewrite rules
 register_activation_hook( __FILE__, array( 'Mf2Feed', 'activate' ) );
 register_deactivation_hook( __FILE__, 'flush_rewrite_rules' );
 
-
-
 /**
  * Mf2Feed class
  *
@@ -34,7 +31,6 @@ public static function init() {
 		self::setup_feeds();
 		// add 'json' as feed
 		add_action( 'do_feed_mf2', array( 'Mf2Feed', 'do_feed_mf2' ), 10, 1 );
-
 		add_action( 'do_feed_jf2', array( 'Mf2Feed', 'do_feed_jf2' ), 10, 1 );
 
 		add_action( 'wp_head', array( 'Mf2Feed', 'add_html_header' ), 5 );
@@ -67,7 +63,7 @@ public static function do_feed_mf2( $for_comments ) {
 			$post = $post->to_mf2();
 
 			$items            = array();
-			$items['items'][] = $post;
+			$items['items']   = $post;
 		} else {
 			$items = array(
 				"items" => array(
@@ -87,7 +83,7 @@ public static function do_feed_mf2( $for_comments ) {
 
 				$post = new Mf2_Feed_Entry( get_the_ID() );
 
-				$items['items'][0]['children'][] = $post->to_mf2();
+				$items['items'][0]['children'][] = current( $post->to_mf2() );
 			}
 		}
 

readme.md

@@ -4,7 +4,7 @@
 **Tags:** microformats, mf2, jf2, rel-alternate, indieweb  
 **Requires at least:** 4.7  
 **Tested up to:** 4.9.8  
-**Stable tag:** 2.0.1  
+**Stable tag:** 2.1.0  
 **Requires PHP:** 5.3  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
@@ -79,9 +79,14 @@ To install a WordPress Plugin manually:
 
 Project actively developed on Github at [indieweb/wordpress-mf2-feed](https://github.com/indieweb/wordpress-mf2-feed). Please file support issues there.
 
-### 2.0.1 ###
-
-* Fixed "flush rewrite rules"
+### 2.1.0 ###
+
+* Fixed JSON output
+* Fixed "flush rewrite rules" again
+
+### 2.0.1 ###
+
+* Fixed "flush rewrite rules"
 * Added filter to extend the mf2/jf2 data
 
 ### 2.0.0 ###

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://notiz.blog/donate/
 Tags: microformats, mf2, jf2, rel-alternate, indieweb
 Requires at least: 4.7
 Tested up to: 4.9.8
-Stable tag: 2.0.1
+Stable tag: 2.1.0
 Requires PHP: 5.3
 License: MIT
 License URI: http://opensource.org/licenses/MIT
@@ -79,9 +79,14 @@ To install a WordPress Plugin manually:
 
 Project actively developed on Github at [indieweb/wordpress-mf2-feed](https://github.com/indieweb/wordpress-mf2-feed). Please file support issues there.
 
-= 2.0.1 =
-
-* Fixed "flush rewrite rules"
+= 2.1.0 =
+
+* Fixed JSON output
+* Fixed "flush rewrite rules" again
+
+= 2.0.1 =
+
+* Fixed "flush rewrite rules"
 * Added filter to extend the mf2/jf2 data
 
 = 2.0.0 =