Add hashtag search support.

And check for empty queries so we don't waste time with them.

Author: toolstack

includes/class-mastodon-api.php

@@ -1522,7 +1522,9 @@ public function api_tag_timelines( $request ) {
 		$args['tag'] = $request->get_param( 'hashtag' );
 
 		$ppp_param = $request->get_param( 'limit' );
-		if( $ppp_param != null ) { $args['posts_per_page'] = $ppp_param; }
+		if ( null !== $ppp_param ) {
+			$args['posts_per_page'] = $ppp_param;
+		}
 
 		$args = apply_filters( 'mastodon_api_timelines_args', $args, $request );
 
@@ -1540,14 +1542,20 @@ public function api_search( $request ) {
 		$ret = array(
 			'accounts' => array(),
 			'statuses' => array(),
+			'hashtags' => array(),
 		);
+		$search_query = trim( $request->get_param( 'q' ) );
+		// Don't allow empty search queries.
+		if ( '' === $search_query ) {
+			return $ret;
+		}
 		if ( ! $type || 'accounts' === $type ) {
-			if ( preg_match( '/^@?' . self::ACTIVITYPUB_USERNAME_REGEXP . '$/i', $request->get_param( 'q' ) ) && ! $request->get_param( 'offset' ) ) {
-				$ret['accounts'][] = $this->get_friend_account_data( $request->get_param( 'q' ), array(), true );
+			if ( preg_match( '/^@?' . self::ACTIVITYPUB_USERNAME_REGEXP . '$/i', $search_query ) && ! $request->get_param( 'offset' ) ) {
+				$ret['accounts'][] = $this->get_friend_account_data( $search_query, array(), true );
 			}
 			$query = new \WP_User_Query(
 				array(
-					'search'         => '*' . $request->get_param( 'q' ) . '*',
+					'search'         => '*' . $search_query . '*',
 					'search_columns' => array(
 						'user_login',
 						'user_nicename',
@@ -1570,10 +1578,10 @@ public function api_search( $request ) {
 				return array();
 			}
 			$args = apply_filters( 'mastodon_api_timelines_args', $args, $request );
-			$valid_url = wp_parse_url( $request->get_param( 'q' ) );
+			$valid_url = wp_parse_url( $search_query );
 			if ( $valid_url && isset( $valid_url['host'] ) ) {
 				if ( ! $request->get_param( 'offset' ) ) {
-					$url = $request->get_param( 'q' );
+					$url = $search_query;
 					$json = $this->get_json( $url, crc32( $url ) );
 					if ( ! is_wp_error( $json ) && isset( $json['id'], $json['attributedTo'] ) ) {
 						$user_id = $this->get_acct( $json['attributedTo'] );
@@ -1588,12 +1596,43 @@ public function api_search( $request ) {
 					}
 				}
 			} elseif ( is_user_logged_in() ) {
-				$args['s'] = $request->get_param( 'q' );
+				$args['s'] = $search_query;
 				$args['offset'] = $request->get_param( 'offset' );
 				$args['posts_per_page'] = $request->get_param( 'limit' );
 				$ret['statuses'] = array_merge( $ret['statuses'], $this->get_posts( $args ) );
 			}
 		}
+		if ( ! $type || 'hashtags' === $type ) {
+			$q_param = $request->get_param( 'q' );
+			$categories = get_categories(
+				array(
+					'orderby'    => 'name',
+					'hide_empty' => false,
+					'search'     => $q_param,
+				)
+			);
+			foreach ( $categories as $category ) {
+				$ret['hashtags'][] = array(
+					'name'    => $category->name,
+					'url'     => get_category_link( $category ),
+					'history' => array(),
+				);
+			}
+			$tags = get_tags(
+				array(
+					'orderby'    => 'name',
+					'hide_empty' => false,
+					'search'     => $q_param,
+				)
+			);
+			foreach ( $tags as $tag ) {
+				$ret['hashtags'][] = array(
+					'name'    => $tag->name,
+					'url'     => get_tag_link( $tag ),
+					'history' => array(),
+				);
+			}
+		}
 		return $ret;
 	}