Merge pull request #228 from pfefferle/webmention-compatibility

support latest webmention changes

README.md

@@ -1,11 +1,11 @@
 # Semantic-Linkbacks #
-**Contributors:** pfefferle, dshanske  
+**Contributors:** [pfefferle](https://profiles.wordpress.org/pfefferle), [dshanske](https://profiles.wordpress.org/dshanske)  
 **Donate link:** https://notiz.blog/donate/  
 **Tags:** webmention, pingback, trackback, linkback, microformats, comments, indieweb  
 **Requires at least:** 4.8.2  
 **Requires PHP:** 5.4  
 **Tested up to:** 5.2.2  
-**Stable tag:** 3.9.3  
+**Stable tag:** 3.10.0  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
 

includes/class-linkbacks-avatar-handler.php

@@ -36,7 +36,14 @@ public static function get_avatar_url( $comment ) {
 		if ( is_numeric( $comment ) ) {
 			$comment = get_comment( $comment );
 		}
-		return get_comment_meta( $comment->comment_ID, 'semantic_linkbacks_avatar', true );
+
+		$avatar = get_comment_meta( $comment->comment_ID, 'avatar', true );
+		// Backward Compatibility for Semantic Linkbacks
+		if ( ! $avatar ) {
+			$avatar = get_comment_meta( $comment->comment_ID, 'semantic_linkbacks_avatar', true );
+		}
+
+		return $avatar;
 	}
 
 
@@ -105,9 +112,9 @@ public static function anonymous_avatar_data( $args, $id_or_email ) {
 		if ( $id_or_email instanceof WP_Comment ) {
 			if ( ! empty( $id_or_email->comment_author_email ) ) {
 				if ( self::check_gravatar( $id_or_email ) ) {
-					update_comment_meta( $id_or_email->comment_ID, 'semantic_linkbacks_avatar', $args['url'] );
+					update_comment_meta( $id_or_email->comment_ID, 'avatar', $args['url'] );
 				} else {
-					update_comment_meta( $id_or_email->comment_ID, 'semantic_linkbacks_avatar', self::get_default_avatar() );
+					update_comment_meta( $id_or_email->comment_ID, 'avatar', self::get_default_avatar() );
 					$args['url'] = self::get_default_avatar();
 				}
 				return $args;

includes/class-linkbacks-handler.php

@@ -87,10 +87,10 @@ public static function save_comment_meta( $comment_id ) {
 		if ( ! empty( $_POST['semantic_linkbacks_type'] ) ) {
 			update_comment_meta( $comment_id, 'semantic_linkbacks_type', $_POST['semantic_linkbacks_type'] );
 		}
-		if ( ! empty( $_POST['semantic_linkbacks_avatar'] ) ) {
-			update_comment_meta( $comment_id, 'semantic_linkbacks_avatar', $_POST['semantic_linkbacks_avatar'] );
+		if ( ! empty( $_POST['avatar'] ) ) {
+			update_comment_meta( $comment_id, 'avatar', $_POST['avatar'] );
 		} else {
-			delete_comment_meta( $comment_id, 'semantic_linkbacks_avatar' );
+			delete_comment_meta( $comment_id, 'avatar' );
 		}
 	}
 
@@ -147,7 +147,7 @@ public static function register_meta() {
 			'single'            => true,
 			'show_in_rest'      => true,
 		);
-		register_meta( 'comment', 'semantic_linkbacks_avatar', $args );
+		register_meta( 'comment', 'avatar', $args );
 
 		$args = array(
 			'sanitize_callback' => 'esc_url_raw',

includes/class-linkbacks-mf2-handler.php

@@ -242,7 +242,7 @@ public static function generate_commentdata( $commentdata ) {
 				}
 
 				if ( isset( $author['photo'] ) ) {
-					$commentdata['comment_meta']['semantic_linkbacks_avatar'] = self::first( $author['photo'] );
+					$commentdata['comment_meta']['avatar'] = self::first( $author['photo'] );
 				}
 			}
 		}