Remove Webmention Dependence on Pings

includes/class-avatar-store.php

@@ -185,7 +185,7 @@ public static function store_avatar( $comment_id ) {
 		if ( empty( $author ) ) {
 			return false;
 		}
-		$host   = webmention_extract_domain( get_url_from_webmention( $comment ) );
+		$host       = webmention_extract_domain( get_url_from_webmention( $comment ) );
 		$avatar_url = self::sideload_avatar( $avatar, $host, $author );
 
 		if ( $avatar_url ) {

includes/class-sender.php

@@ -208,14 +208,15 @@ public static function send_webmentions( $post_id ) {
 		$urls = webmention_extract_urls( $post->post_content, $support_media_urls );
 
 		// filter links
-		$targets = apply_filters( 'webmention_links', $urls, $post_id );
-		$targets = array_unique( $targets );
-		$pung    = get_pung( $post );
+		$targets   = apply_filters( 'webmention_links', $urls, $post_id );
+		$targets   = array_unique( $targets );
+		$mentioned = get_post_meta( $post->ID, 'webmention_last_mentioned_urls', true );
+		$mentioned = empty( $mentioned ) ? array() : $mentioned;
 
 		// Find previously sent Webmentions and send them one last time.
-		$deletes = array_diff( $pung, $targets );
+		$deletes = array_diff( $mentioned, $targets );
 
-		$ping = array();
+		$mentions = array();
 
 		foreach ( $targets as $target ) {
 			// send Webmention
@@ -225,16 +226,13 @@ public static function send_webmentions( $post_id ) {
 				continue;
 			}
 
-			// check response
-			if (
-				! is_wp_error( $response ) &&
-				wp_remote_retrieve_response_code( $response ) < 400
-			) {
-				$ping[] = $target;
-			}
+			$code = wp_remote_retrieve_response_code( $response );
 
-			// reschedule if server responds with a http error 5xx
-			if ( wp_remote_retrieve_response_code( $response ) >= 500 ) {
+			// check response
+			if ( ! is_wp_error( $response ) && $code < 400 ) {
+				$mentions[] = $target;
+			} elseif ( $code >= 500 ) {
+				// reschedule if server responds with a http error 5xx
 				self::reschedule( $post_id );
 			}
 		}
@@ -246,23 +244,23 @@ public static function send_webmentions( $post_id ) {
 			// reschedule if server responds with a http error 5xx
 			if ( wp_remote_retrieve_response_code( $response ) >= 500 ) {
 				self::reschedule( $post_id );
-				$ping[] = $deleted;
+				$mentions[] = $deleted;
 			}
 		}
 
+		if ( ! empty( $mentions ) ) {
+			update_post_meta( $post_id, 'webmention_last_mentioned_urls', $mentions );
+		}
+
+		$pung    = get_pung( $post );
+
 		if ( ! empty( $ping ) ) {
-			self::update_ping( $post, $ping );
+			self::update_ping( $post, array_merge( $pung, $ping ) );
 		}
 
-		return $ping;
+		return $mentions;
 	}
 
-	/*
-	 * Update the Pinged List as Opposed to Adding to It.
-	 *
-	 * @param int|WP_Post $post_id Post.
-	 * @param array $pinged Array of URLs
-	*/
 	public static function update_ping( $post_id, $pinged ) {
 		global $wpdb;
 		$post = get_post( $post_id );

includes/functions.php

@@ -550,18 +550,23 @@ function ifset( &$var, $return = false ) { // phpcs:ignore Universal.NamingConve
  * @return boolean if webmentions are open
  */
 function webmentions_open( $post = null ) {
-	$_post   = get_post( $post );
-	$post_id = $_post ? $_post->ID : 0;
-
-	// If the post type does not support Webmentions do not even check further
-	if ( ! post_type_supports( get_post_type( $post_id ), 'webmentions' ) ) {
-		return false;
+	$post    = get_post( $post );
+	$post_id = $post ? $post->ID : 0;
+	$open    = false;
+	if ( $post ) {
+		// Always consider the home mention link page to be open.
+		if ( get_option( 'webmention_home_mentions' ) === $post->ID ) {
+			$open = true;
+		} elseif ( ! post_type_supports( get_post_type( $post ), 'webmentions' ) ) {
+			// If the post type does not support Webmentions do not even check further.
+			$open = false;
+		} else {
+			// If the webmentions_closed meta ID has a value then consider webmentions to be open.
+			$open = get_post_meta( $post->ID, 'webmentions_closed', true );
+			$open = empty( $open ) ? true : false;
+		}
 	}
 
-	if ( get_option( 'webmention_home_mentions' ) === $post_id ) {
-		return true;
-	}
-	$open = ( $_post && ( pings_open( $post ) ) );
 	/**
 	 * Filters whether the current post is open for webmentions.
 	 *
@@ -572,23 +577,6 @@ function webmentions_open( $post = null ) {
 	return apply_filters( 'webmentions_open', $open, $post_id );
 }
 
-/**
- * Return enabled status of Homepage Webmentions.
- *
- * @since 3.8.9
- *
- * @param bool $open    Whether the current post is open for pings.
- * @param int  $post_id The post ID.
- * @return boolean if pings are open
- */
-function webmention_pings_open( $open, $post_id ) {
-	if ( get_option( 'webmention_home_mentions' ) === $post_id ) {
-		return true;
-	}
-
-	return $open;
-}
-
 /**
  * Retrieve the default comment status for a given post type.
  *
@@ -602,16 +590,7 @@ function webmention_pings_open( $open, $post_id ) {
  * @return string
  */
 function webmention_get_default_comment_status( $status, $post_type, $comment_type ) {
-	if ( 'webmention' === $comment_type ) {
-		return post_type_supports( $post_type, 'webmentions' ) ? 'open' : 'closed';
-	}
-
-	// Since support for the pingback comment type is used to keep pings open...
-	if ( ( 'pingback' === $comment_type ) ) {
-		return ( post_type_supports( $post_type, 'webmentions' ) ? 'open' : $status );
-	}
-
-	return $status;
+	return is_registered_webmention_comment_type( $comment_type ) ? 'open' : $status;
 }
 
 /**

webmention.php

@@ -134,7 +134,6 @@ function init() {
 
 	// Default Comment Status.
 	add_filter( 'get_default_comment_status', 'webmention_get_default_comment_status', 11, 3 );
-	add_filter( 'pings_open', 'webmention_pings_open', 10, 2 );
 
 	// Load language files.
 	load_plugin_textdomain( 'webmention', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );