Merge pull request #150 from dshanske/invite

Add invite property

Author: pfefferle

README.md

@@ -5,7 +5,7 @@
 **Requires at least:** 4.8.2  
 **Requires PHP:** 5.4  
 **Tested up to:** 4.9.1  
-**Stable tag:** 3.7.3  
+**Stable tag:** 3.7.4  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
 
@@ -68,6 +68,9 @@ The Webmention and Pingback logos are made by [Aaron Parecki](http://aaronpareck
 
 Project actively developed on Github at [pfefferle/wordpress-semantic-linkbacks](https://github.com/pfefferle/wordpress-semantic-linkbacks). Please file support issues there.
 
+### 3.7.4 ###
+* Replace `rsvp-invite` property which is not in use with `invite` property and add unit tests
+
 ### 3.7.3 ###
 
 * Replace tracking with interested property as noted on https://indieweb.org/rsvp

includes/class-linkbacks-handler.php

@@ -221,9 +221,9 @@ public static function get_comment_type_excerpts() {
 			// translators: Name verb on domain
 			'rsvp:maybe'    => __( 'Maybe %1$s will be <strong>attending</strong>.', 'semantic-linkbacks' ),
 			// translators: Name verb on domain
-			'rsvp:invited'  => __( '%1$s is <strong>invited</strong>.', 'semantic-linkbacks' ),
-			// translators: Name verb on domain
 			'rsvp:interested' => __( '%1$s is <strong>interested</strong> in this event.', 'semantic-linkbacks' ),
+			// translators: Name verb on domain
+			'invited'       => __( '%1$s is <strong>invited</strong>.', 'semantic-linkbacks' ),
 		);
 
 		return $strings;
@@ -247,9 +247,9 @@ public static function get_comment_type_strings() {
 			'bookmark'      => __( 'Bookmark', 'semantic-linkbacks' ),
 			'rsvp:yes'      => __( 'RSVP', 'semantic-linkbacks' ),
 			'rsvp:no'       => __( 'RSVP', 'semantic-linkbacks' ),
-			'rsvp:invited'  => __( 'RSVP', 'semantic-linkbacks' ),
 			'rsvp:maybe'    => __( 'RSVP', 'semantic-linkbacks' ),
 			'rsvp:interested' => __( 'RSVP', 'semantic-linkbacks' ),
+			'invited'       => __( 'Invited', 'semantic-linkbacks' ),
 		);
 
 		return $strings;
@@ -594,8 +594,8 @@ public static function comment_class( $classes, $class, $comment_id, $post_id )
 			'rsvp:yes'      => array( 'u-rsvp' ),
 			'rsvp:no'       => array( 'u-rsvp' ),
 			'rsvp:maybe'    => array( 'u-rsvp' ),
-			'rsvp:invited'  => array( 'u-rsvp' ),
 			'rsvp:interested' => array( 'u-rsvp' ),
+			'invited'       => array( 'u-invitee' ),
 		);
 
 		$semantic_linkbacks_type = self::get_type( $comment );

includes/class-linkbacks-mf2-handler.php

@@ -64,6 +64,11 @@ public static function get_class_mapper() {
 		 * @link http://indiewebcamp.com/rsvp
 		 */
 		$class_mapper['rsvp'] = 'rsvp';
+		/*
+		 * invite
+		 * @link https://indieweb.org/invitation
+		 */
+		$class_mapper['invitee'] = 'invite';
 
 		/*
 		 * tag
@@ -160,6 +165,10 @@ public static function generate_commentdata( $commentdata ) {
 			$author = self::get_representative_author( $mf_array, $source );
 			$author = self::flatten_microformats( $author );
 		}
+		// If this is an invite than the invite should be displayed instead of the author
+		if ( isset( $properties['invitee'] ) ) {
+			$author = $properties['invitee'];
+		}
 
 		// if author is present use the informations for the comment
 		if ( $author ) {
@@ -247,6 +256,9 @@ public static function generate_commentdata( $commentdata ) {
 			// get post type
 			$commentdata['comment_meta']['semantic_linkbacks_type'] = wp_slash( self::get_entry_type( $commentdata['target'], $entry, $mf_array ) );
 		}
+		if ( isset( $properties['invitee'] ) ) {
+			$commentdata['comment_meta']['semantic_linkbacks_type'] = wp_slash( 'invite' );
+		}
 
 		$whitelist = array(
 			'author',

languages/semantic-linkbacks.pot

@@ -2,10 +2,10 @@
 # This file is distributed under the MIT.
 msgid ""
 msgstr ""
-"Project-Id-Version: Semantic-Linkbacks 3.7.2\n"
+"Project-Id-Version: Semantic-Linkbacks 3.7.4\n"
 "Report-Msgid-Bugs-To: "
 "http://wordpress.org/support/plugin/semantic-linkbacks\n"
-"POT-Creation-Date: 2017-12-29 09:07:37+00:00\n"
+"POT-Creation-Date: 2017-12-29 10:21:09+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,12 +66,12 @@ msgstr ""
 
 #: includes/class-linkbacks-handler.php:224
 #. translators: Name verb on domain
-msgid "%1$s is <strong>invited</strong>."
+msgid "%1$s is <strong>interested</strong> in this event."
 msgstr ""
 
 #: includes/class-linkbacks-handler.php:226
 #. translators: Name verb on domain
-msgid "%1$s <strong>tracks</strong> this event."
+msgid "%1$s is <strong>invited</strong>."
 msgstr ""
 
 #: includes/class-linkbacks-handler.php:240
@@ -106,10 +106,13 @@ msgstr ""
 #: includes/class-linkbacks-handler.php:249
 #: includes/class-linkbacks-handler.php:250
 #: includes/class-linkbacks-handler.php:251
-#: includes/class-linkbacks-handler.php:252
 msgid "RSVP"
 msgstr ""
 
+#: includes/class-linkbacks-handler.php:252 templates/linkbacks.php:102
+msgid "Invited"
+msgstr ""
+
 #: includes/class-linkbacks-handler.php:266
 msgid "this Article"
 msgstr ""
@@ -269,10 +272,6 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: templates/linkbacks.php:102
-msgid "Invited"
-msgstr ""
-
 #: templates/linkbacks.php:114
 msgid "Maybe"
 msgstr ""

readme.txt

@@ -5,7 +5,7 @@ Tags: webmention, pingback, trackback, linkback, microformats, comments, indiewe
 Requires at least: 4.8.2
 Requires PHP: 5.4
 Tested up to: 4.9.1
-Stable tag: 3.7.3
+Stable tag: 3.7.4
 License: MIT
 License URI: http://opensource.org/licenses/MIT
 
@@ -68,6 +68,9 @@ The Webmention and Pingback logos are made by [Aaron Parecki](http://aaronpareck
 
 Project actively developed on Github at [pfefferle/wordpress-semantic-linkbacks](https://github.com/pfefferle/wordpress-semantic-linkbacks). Please file support issues there.
 
+= 3.7.4 =
+* Replace `rsvp-invite` property which is not in use with `invite` property and add unit tests
+
 = 3.7.3 =
 
 * Replace tracking with interested property as noted on https://indieweb.org/rsvp

semantic-linkbacks.php

@@ -5,7 +5,7 @@
  * Description: Semantic Linkbacks for WebMentions, Trackbacks and Pingbacks
  * Author: Matthias Pfefferle
  * Author URI: https://notiz.blog/
- * Version: 3.7.3
+ * Version: 3.7.4
  * License: MIT
  * License URI: http://opensource.org/licenses/MIT
  * Text Domain: semantic-linkbacks
@@ -20,7 +20,7 @@
  * @author Matthias Pfefferle
  */
 class Semantic_Linkbacks_Plugin {
-	public static $version = '3.7.2';
+	public static $version = '3.7.4';
 	/**
 	 * Initialize the plugin, registering WordPress hooks.
 	 */

tests/templates/brid-gy-invite.html

@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Bridgy Response</title>
+<style type="text/css">
+body {
+	  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+.p-uid {
+	  display: none;
+}
+.u-photo {
+	  max-width: 50px;
+	    border-radius: 4px;
+}
+.e-content {
+	  margin-top: 10px;
+	    font-size: 1.3em;
+}
+</style>
+</head>
+<article class="h-entry">
+	  <span class="p-uid">tag:facebook.com,2013:169650146961455_rsvp_318643335139472</span>
+	    
+	    
+	    
+	    <span class="p-author h-card">
+		        <data class="p-uid" value="tag:facebook.com,2013:5410052"></data>
+			<data class="p-numeric-id" value="5410052"></data>
+			    <a class="p-name u-url" href="https://www.facebook.com/5410052">Chris Aldrich</a>
+			        
+			        <img class="u-photo" src="https://graph.facebook.com/v2.10/5410052/picture?type=large" alt="" />
+				  </span>
+
+				    <a class="p-name u-url" href="https://www.facebook.com/169650146961455#318643335139472">invited</a>
+				      <div class="">
+					          <span class="p-invitee h-card">
+							          <a class="p-name u-url" href="http://example.com/webmention/target/placeholder">Angelo Gladding</a>
+								      
+								      <img class="u-photo" src="https://graph.facebook.com/v2.10/318643335139472/picture?type=large" alt="" />
+								        </span>
+
+									  
+									  </div>
+
+
+
+
+									    <a class="u-in-reply-to" href="http://example.com/webmention/target/placeholder"></a>
+
+
+								    </article>
+
+								    </html>
+

tests/templates/brid-gy-invite.json

@@ -0,0 +1,7 @@
+{
+  "comment_author": "Angelo Gladding",
+  "comment_author_url": "http://example.com/webmention/target/placeholder",
+  "comment_meta": {
+    "semantic_linkbacks_type": "invite"
+  }
+}

tests/test-microformats.php

@@ -1,5 +1,17 @@
 <?php
 class MicroformatsTest extends WP_UnitTestCase {
+
+	public static function assertArraySubset( array $expectation, array $reality, $strict = false, $message = '' ) {
+		foreach ( $expectation as $key => $value ) {
+			self::assertArrayHasKey( $key, $reality, $message );
+			if ( is_array( $value ) ) {
+				self::assertArraySubset( $value, $reality[ $key ], $strict, $message . '[' . $key . ']' );
+			} else {
+				self::assertEquals( $value, $reality[ $key ], $message . '[' . $key . ']' );
+			}
+		}
+	}
+
 	/**
 	 * @dataProvider templateProvider
 	 */