Fix minor code changes (#1635)

Author: obenland

includes/activity/class-generic-object.php

@@ -106,6 +106,8 @@ public function to_string() {
 	 *
 	 * @param string $method The method name.
 	 * @param string $params The method params.
+	 *
+	 * @return mixed
 	 */
 	public function __call( $method, $params ) {
 		$var = \strtolower( \substr( $method, 4 ) );
@@ -125,6 +127,8 @@ public function __call( $method, $params ) {
 		if ( \strncasecmp( $method, 'add', 3 ) === 0 ) {
 			return $this->add( $var, $params[0] );
 		}
+
+		return null;
 	}
 
 	/**
@@ -158,7 +162,7 @@ public function set( $key, $value ) {
 	 * @param string $key   The key to set.
 	 * @param mixed  $value The value to add.
 	 *
-	 * @return mixed The value.
+	 * @return mixed|void The value.
 	 */
 	public function add( $key, $value ) {
 		if ( empty( $value ) ) {

includes/class-blocks.php

@@ -136,7 +136,7 @@ public static function inject_activitypub_options() {
 		);
 
 		printf(
-			"\n<script>var _activityPubOptions = %s;</script>",
+			"\n<script>let _activityPubOptions = %s;</script>",
 			wp_json_encode( $data )
 		);
 	}
@@ -406,7 +406,7 @@ public static function render_follower( $follower ) {
 		$external_svg = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="components-external-link__icon css-rvs7bx esh4a730" aria-hidden="true" focusable="false"><path d="M18.2 17c0 .7-.6 1.2-1.2 1.2H7c-.7 0-1.2-.6-1.2-1.2V7c0-.7.6-1.2 1.2-1.2h3.2V4.2H7C5.5 4.2 4.2 5.5 4.2 7v10c0 1.5 1.2 2.8 2.8 2.8h10c1.5 0 2.8-1.2 2.8-2.8v-3.6h-1.5V17zM14.9 3v1.5h3.7l-6.4 6.4 1.1 1.1 6.4-6.4v3.7h1.5V3h-6.3z"></path></svg>';
 		$template     =
 			'<a href="%s" title="%s" class="components-external-link activitypub-link" target="_blank" rel="external noreferrer noopener">
-				<img width="40" height="40" src="%s" class="avatar activitypub-avatar" />
+				<img width="40" height="40" src="%s" class="avatar activitypub-avatar" alt="" />
 				<span class="activitypub-actor">
 					<strong class="activitypub-name">%s</strong>
 					<span class="sep">/</span>

includes/class-comment.php

@@ -732,12 +732,12 @@ public static function comment_query( $query ) {
 	/**
 	 * Filter the comment status before it is set.
 	 *
-	 * @param string $approved    The approved comment status.
-	 * @param array  $commentdata The comment data.
+	 * @param int|string|\WP_Error $approved     The approved comment status.
+	 * @param array                $comment_data The comment data.
 	 *
-	 * @return boolean `true` if the comment is approved, `false` otherwise.
+	 * @return int|string|\WP_Error The approval status. 1, 0, 'spam', 'trash', or WP_Error.
 	 */
-	public static function pre_comment_approved( $approved, $commentdata ) {
+	public static function pre_comment_approved( $approved, $comment_data ) {
 		if ( $approved || \is_wp_error( $approved ) ) {
 			return $approved;
 		}
@@ -747,16 +747,16 @@ public static function pre_comment_approved( $approved, $commentdata ) {
 		}
 
 		if (
-			empty( $commentdata['comment_meta']['protocol'] ) ||
-			'activitypub' !== $commentdata['comment_meta']['protocol']
+			empty( $comment_data['comment_meta']['protocol'] ) ||
+			'activitypub' !== $comment_data['comment_meta']['protocol']
 		) {
 			return $approved;
 		}
 
 		global $wpdb;
 
-		$author     = $commentdata['comment_author'];
-		$author_url = $commentdata['comment_author_url'];
+		$author     = $comment_data['comment_author'];
+		$author_url = $comment_data['comment_author_url'];
 		// phpcs:ignore
 		$ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_url = %s and comment_approved = '1' LIMIT 1", $author, $author_url ) );
 

includes/class-debug.php

@@ -56,7 +56,7 @@ public static function log_inbox( $data, $user_id, $type ) {
 	}
 
 	/**
-	 * Log the sent to follower action.
+	 * Logs Follower notifications.
 	 *
 	 * @param array  $result The result of the remote post request.
 	 * @param string $inbox  The inbox URL.

includes/class-embed.php

@@ -151,7 +151,7 @@ public static function get_html_for_object( $activity_object, $inline_css = true
 	 */
 	public static function has_real_oembed( $url, $args = array() ) {
 		// Temporarily remove our filter to avoid infinite loops.
-		\remove_filter( 'pre_oembed_result', array( self::class, 'maybe_use_activitypub_embed' ), 10, 3 );
+		\remove_filter( 'pre_oembed_result', array( self::class, 'maybe_use_activitypub_embed' ) );
 
 		// Try to get a "real" oEmbed result. If found, it'll be cached to avoid unnecessary HTTP requests in `wp_oembed_get`.
 		$oembed_result = \wp_oembed_get( $url, $args );

includes/class-mention.php

@@ -19,9 +19,9 @@ class Mention {
 	 * Initialize the class, registering WordPress hooks.
 	 */
 	public static function init() {
-		\add_filter( 'the_content', array( self::class, 'the_content' ), 99, 1 );
-		\add_filter( 'comment_text', array( self::class, 'the_content' ), 10, 1 );
-		\add_filter( 'activitypub_extra_field_content', array( self::class, 'the_content' ), 10, 1 );
+		\add_filter( 'the_content', array( self::class, 'the_content' ), 99 );
+		\add_filter( 'comment_text', array( self::class, 'the_content' ) );
+		\add_filter( 'activitypub_extra_field_content', array( self::class, 'the_content' ) );
 		\add_filter( 'activitypub_extract_mentions', array( self::class, 'extract_mentions' ), 99, 2 );
 		\add_filter( 'activitypub_activity_object_array', array( self::class, 'filter_activity_object' ), 99 );
 	}

includes/class-migration.php

@@ -421,7 +421,7 @@ private static function migrate_to_4_0_0() {
 	}
 
 	/**
-	 * Upate to 4.1.0
+	 * Update to 4.1.0
 	 *
 	 * * Migrate the `activitypub_post_content_type` to only use `activitypub_custom_post_content`.
 	 */

includes/class-move.php

@@ -65,7 +65,7 @@ public static function account( $from, $to ) {
 	/**
 	 * Move an ActivityPub Actor from one location (internal) to another (external).
 	 *
-	 * This helps migrating local profiles to a new external profile:
+	 * This helps with migrating local profiles to a new external profile:
 	 *
 	 * `Move::externally( 'https://example.com/?author=123', 'https://mastodon.example/users/foo' );`
 	 *
@@ -119,7 +119,7 @@ public static function externally( $from, $to ) {
 	 *
 	 * Move an ActivityPub Actor from one location (internal) to another (internal).
 	 *
-	 * This helps migrating abandoned profiles to `Move` to other profiles:
+	 * This helps with migrating abandoned profiles to `Move` to other profiles:
 	 *
 	 * `Move::internally( 'https://example.com/?author=123', 'https://example.com/?author=321' );`
 	 *
@@ -236,7 +236,7 @@ public static function change_domain( $from, $to ) {
 			if ( $actor instanceof Blog ) {
 				\update_option( 'activitypub_blog_user_old_host_data', $json, false );
 			} else {
-				\update_user_option( $actor->get__id(), 'activitypub_old_host_data', $json, false );
+				\update_user_option( $actor->get__id(), 'activitypub_old_host_data', $json );
 			}
 
 			$results[] = array(