Merge pull request #199 from dshanske/follow

Follow

Author: pfefferle

README.md

@@ -5,7 +5,7 @@
 **Requires at least:** 4.8.2  
 **Requires PHP:** 5.4  
 **Tested up to:** 4.9.7  
-**Stable tag:** 3.8.0  
+**Stable tag:** 3.8.1  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
 
@@ -46,6 +46,7 @@ The IndieWeb community defines several types of feedback:
 * Listen: <http://indieweb.org/listen>
 * Watch: <http://indieweb.org/watch>
 * Read: <http://indieweb.org/read>
+* Follow: <http://indieweb.org/follow>
 * Classic "Mentions": <http://indieweb.org/mentions>
 
 ### How do I extend this plugin? ###
@@ -85,6 +86,12 @@ The plugin uses a locally cached version of the mystery icon normally provided b
 
 Project actively developed on Github at [pfefferle/wordpress-semantic-linkbacks](https://github.com/pfefferle/wordpress-semantic-linkbacks). Please file support issues there.
 
+### 3.8.1 ###
+* Add follow post as type
+* Add warning to settings page if php-mbstring not installed
+* Return false in Emoji function if php-mbstring not installed
+* Add approve link to emails sent
+
 ### 3.8.0 ###
 
 * Add locally hosted copy of the mystery man icon and serve it if there is no gravatar

composer.json

@@ -15,7 +15,7 @@
   "require": {
     "php": ">=5.3.0",
     "composer/installers": "~1.0",
-    "mf2/mf2": "^0.4.2",
+    "mf2/mf2": "^0.4.3",
     "p3k/emoji-detector": "^0.2.0"
   },
   "require-dev": {

composer.lock

@@ -299,6 +299,9 @@ public static function get_comment_type_excerpts() {
 			'watch'           => __( '%1$s <strong>watched</strong> %2$s (via <a href="%3$s">%4$s</a>).', 'semantic-linkbacks' ),
 			// translators: Name verb on domain
 			'read'            => __( '%1$s <strong>read</strong> %2$s (via <a href="%3$s">%4$s</a>).', 'semantic-linkbacks' ),
+			// translators: Name verb on domain
+			'follow'            => __( '%1$s <strong>followed</strong> %2$s (via <a href="%3$s">%4$s</a>).', 'semantic-linkbacks' ),
+
 		);
 
 		return $strings;
@@ -329,6 +332,7 @@ public static function get_comment_type_strings( $type = null ) {
 			'listen'          => __( 'Listen', 'semantic-linkbacks' ),
 			'watch'           => __( 'Watch', 'semantic-linkbacks' ),
 			'read'            => __( 'Read', 'semantic-linkbacks' ),
+			'follow'            => __( 'Follow', 'semantic-linkbacks' ),
 			'reacji'          => __( 'Reacji', 'semantic-linkbacks' )
 		);
 		if ( ! $type ) {
@@ -653,6 +657,7 @@ public static function comment_class( $classes, $class, $comment_id, $post_id )
 			'listen'          => array( 'u-listen' ),
 			'read'            => array( 'u-read' ),
 			'watch'           => array( 'u-watch' ),
+			'follow'           => array( 'u-follow' ),
 		);
 
 		$semantic_linkbacks_type = self::get_type( $comment );

includes/class-linkbacks-handler.php

@@ -98,6 +98,13 @@ public static function get_class_mapper() {
 		$class_mapper['watch-of'] = 'watch';
 		$class_mapper['watch']    = 'watch';
 
+		/*
+		 * follow
+		 * @link http://indieweb.org/follow
+		 */
+		$class_mapper['follow-of'] = 'follow';
+
+
 		return apply_filters( 'semantic_linkbacks_microformats_class_mapper', $class_mapper );
 	}
 

includes/class-linkbacks-mf2-handler.php

@@ -23,7 +23,7 @@ public static function init() {
 		if ( WP_DEBUG ) {
 			// For testing outgoing comment email
 			add_filter( 'bulk_actions-edit-comments', array( 'Linkbacks_Notifications', 'register_bulk_send' ) );
-			add_filter( 'handle_bulk_actions-edit-comments', array( 'Linkbacks_Notifications', 'bulk_send_Notifications' ), 10, 3 );
+			add_filter( 'handle_bulk_actions-edit-comments', array( 'Linkbacks_Notifications', 'bulk_send_notifications' ), 10, 3 );
 		}
 	}
 
@@ -45,7 +45,7 @@ public static function register_bulk_send( $bulk_actions ) {
 	/**
 	 * Handle Bulk Send Outgoing EMail
 	 */
-	public static function bulk_send_Notifications( $redirect_to, $doaction, $comment_ids ) {
+	public static function bulk_send_notifications( $redirect_to, $doaction, $comment_ids ) {
 		if ( ! in_array( $doaction, array( 'resend_notification_email', 'resend_moderation_email', 'send_pushover_text' ), true ) ) {
 			return $redirect_to;
 		}
@@ -77,6 +77,7 @@ public static function bulk_send_Notifications( $redirect_to, $doaction, $commen
 	 */
 	public static function comment_notification_text( $notify_message, $comment_id ) {
 		$comment = get_comment( $comment_id );
+		$post    = get_post( $comment->comment_post_ID );
 		if ( ! Linkbacks_Handler::get_type( $comment ) ) {
 			return $notify_message;
 		}
@@ -88,7 +89,7 @@ public static function comment_notification_text( $notify_message, $comment_id )
 		return $notify_message;
 
 	}
-	
+
 	/**
 	 * Generate the moderation text
 	 *
@@ -97,9 +98,11 @@ public static function comment_notification_text( $notify_message, $comment_id )
 	 */
 	public static function moderate_text( $comment ) {
 		$comment = get_comment( $comment );
+		/* translators: Comment moderation. 1: Comment action URL */
+		$message = sprintf( __( 'Approve it: %s', 'semantic-linkbacks' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
 		if ( EMPTY_TRASH_DAYS ) {
 			/* translators: Trash it URL */
-			$message = sprintf( __( 'Trash it: %s', 'semantic-linkbacks' ), admin_url( "comment.php?action=trash&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
+			$message .= sprintf( __( 'Trash it: %s', 'semantic-linkbacks' ), admin_url( "comment.php?action=trash&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
 		} else {
 			/* translators: Delete it URL */
 			$message .= sprintf( __( 'Delete it: %s', 'semantic-linkbacks' ), admin_url( "comment.php?action=delete&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
@@ -108,7 +111,7 @@ public static function moderate_text( $comment ) {
 		$message .= sprintf( __( 'Spam it: %s', 'semantic-linkbacks' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
 		return $message;
 	}
-	
+
 	/**
 	 * Filter the comment notification subject
 	 *

includes/class-linkbacks-notifications.php

@@ -53,6 +53,10 @@ protected static function get_comment_author_link( $comment_id = 0 ) {
 	}
 
 	protected static function is_reaction( $comment ) {
+		// If this library is not installed then emoji detection will not work
+		if ( ! function_exists( 'mb_internal_encoding' ) ) {
+			return false;
+		}
 		return Emoji\is_single_emoji( trim( wp_strip_all_tags( $comment->comment_content ) ) ) && empty( $comment->comment_parent );
 	}
 

includes/class-linkbacks-walker-comment.php

@@ -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.7
-Stable tag: 3.8.0
+Stable tag: 3.8.1
 License: MIT
 License URI: http://opensource.org/licenses/MIT
 
@@ -46,6 +46,7 @@ The IndieWeb community defines several types of feedback:
 * Listen: <http://indieweb.org/listen>
 * Watch: <http://indieweb.org/watch>
 * Read: <http://indieweb.org/read>
+* Follow: <http://indieweb.org/follow>
 * Classic "Mentions": <http://indieweb.org/mentions>
 
 = How do I extend this plugin? =
@@ -85,6 +86,12 @@ The plugin uses a locally cached version of the mystery icon normally provided b
 
 Project actively developed on Github at [pfefferle/wordpress-semantic-linkbacks](https://github.com/pfefferle/wordpress-semantic-linkbacks). Please file support issues there.
 
+= 3.8.1 =
+* Add follow post as type
+* Add warning to settings page if php-mbstring not installed
+* Return false in Emoji function if php-mbstring not installed
+* Add approve link to emails sent
+
 = 3.8.0 =
 
 * Add locally hosted copy of the mystery man icon and serve it if there is no gravatar

readme.txt

@@ -5,7 +5,7 @@
  * Description: Semantic Linkbacks for WebMentions, Trackbacks and Pingbacks
  * Author: Matthias Pfefferle
  * Author URI: https://notiz.blog/
- * Version: 3.8.0
+ * Version: 3.8.1
  * License: MIT
  * License URI: http://opensource.org/licenses/MIT
  * Text Domain: semantic-linkbacks
@@ -23,7 +23,7 @@
  * @author Matthias Pfefferle
  */
 class Semantic_Linkbacks_Plugin {
-	public static $version = '3.8.0';
+	public static $version = '3.8.1';
 	/**
 	 * Initialize the plugin, registering WordPress hooks.
 	 */
@@ -132,6 +132,12 @@ public static function plugin_textdomain() {
 	 */
 	public static function settings() {
 		_e( 'For webmentions that do not have avatars you can pick from several locally served default avatars in the Discussion Settings', 'semantic-linkbacks' );
+
+		if ( ! function_exists( 'mb_internal_encoding' ) ) {
+?>
+		<p class="notice notice-warning"><?php _e( 'This server does not have the php-mbstring package installed and Emoji reactions have been disabled.', 'semantic-linkbacks' ); ?></p>
+<?php
+		}
 	}
 
 	/**

semantic-linkbacks.php

@@ -116,7 +116,19 @@
 </div>
 <?php endif; ?>
 
-
+<?php if ( in_array( 'follow', $facepiles, true ) && has_linkbacks( 'follow' ) ) : ?>
+<div class="follows">
+	<h3><?php echo __( 'Following', 'semantic-linkbacks' ); ?></h3>
+	<?php
+	list_linkbacks(
+		array(
+			'type' => 'follow',
+		),
+		get_linkbacks( 'follow' )
+	);
+	?>
+</div>
+<?php endif; ?>
 
 <?php if ( in_array( 'watch', $facepiles, true ) && has_linkbacks( 'watch' ) ) : ?>
 <div class="watches">