Update class-webmention-sender.php

janboddez · Nov 28, 2023 · c6241a8 · c6241a8
1 parent f9e83cd
commit c6241a8
Showing 1 changed file with 19 additions and 28 deletions.
diff --git a/includes/class-webmention-sender.php b/includes/class-webmention-sender.php
@@ -62,24 +62,20 @@ public static function schedule_webmention( $obj_id, $obj = null, $deprecated =
 
 		$urls = array();
 
-		// Fetch our post or comment's HTML.
 		if ( $obj instanceof \WP_Post ) {
+			// Fetch our post's HTML.
 			$html = apply_filters( 'the_content', $obj->post_content );
-		} else {
-			$html = make_clickable( get_comment_text( $obj ) );
-
-			if ( ! empty( $obj->comment_parent ) ) {
-				// Add in the parent's, if any, Webmention source.
-				$source = get_comment_meta( $obj->comment_parent, 'indieblocks_webmention_source', true );
-				if ( ! empty( $source ) ) {
-					$urls[] = $source;
-				}
+
+			// Scan it for outgoing links.
+			$urls = static::find_outgoing_links( $html );
+		} elseif ( ! empty( $obj->comment_parent ) ) {
+			// Add in the parent's, if any, Webmention source.
+			$source = get_comment_meta( $obj->comment_parent, 'indieblocks_webmention_source', true );
+			if ( ! empty( $source ) ) {
+				$urls[] = $source;
 			}
 		}
 
-		// Scan it for outgoing links.
-		$urls = array_merge( $urls, static::find_outgoing_links( $html ) );
-
 		// Parse in targets that may have been there previously, but don't
 		// delete them, yet.
 		$history = get_meta( $obj, '_indieblocks_webmention_history' );
@@ -93,8 +89,7 @@ public static function schedule_webmention( $obj_id, $obj = null, $deprecated =
 			return;
 		}
 
-		$urls = array_unique( $urls );
-
+		$urls     = array_unique( $urls );
 		$schedule = false;
 
 		foreach ( $urls as $url ) {
@@ -158,24 +153,20 @@ public static function send_webmention( $obj ) {
 
 		$urls = array();
 
-		// Fetch our post or comment's HTML.
 		if ( $obj instanceof \WP_Post ) {
+			// Fetch our post's HTML.
 			$html = apply_filters( 'the_content', $obj->post_content );
-		} else {
-			$html = make_clickable( get_comment_text( $obj ) );
-
-			if ( ! empty( $obj->comment_parent ) ) {
-				// Add in the parent's, if any, Webmention source.
-				$source = get_comment_meta( $obj->comment_parent, 'indieblocks_webmention_source', true );
-				if ( ! empty( $source ) ) {
-					$urls[] = $source;
-				}
+
+			// Scan it for outgoing links.
+			$urls = static::find_outgoing_links( $html );
+		} elseif ( ! empty( $obj->comment_parent ) ) {
+			// Add in the parent's, if any, Webmention source.
+			$source = get_comment_meta( $obj->comment_parent, 'indieblocks_webmention_source', true );
+			if ( ! empty( $source ) ) {
+				$urls[] = $source;
 			}
 		}
 
-		// Scan it for outgoing links.
-		$urls = array_merge( $urls, static::find_outgoing_links( $html ) );
-
 		// Parse in (_and_ then forget) targets that may have been there before.
 		// This also means that "historic" targets are excluded from retries!
 		// Note that we _also_ retarget pages that threw an error or we