Add hashtag search support.

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

Author: toolstack

includes/class-mastodon-api.php

@@ -1526,7 +1526,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 );
 
@@ -1547,7 +1549,12 @@ public function api_search( $request ) {
 			'hashtags' => array(),
 		);
 
-		$q = $request->get_param( 'q' );
+		$q = trim( $request->get_param( 'q' ) );
+		// Don't allow empty search queries.
+		if ( '' === $q ) {
+			return $ret;
+		}
+
 		$query_is_url = parse_url( $q );
 		if ( $query_is_url ) {
 			if ( 'true' !== $request->get_param( 'resolve' ) || ! is_user_logged_in() ) {
@@ -1596,7 +1603,6 @@ public function api_search( $request ) {
 								array(
 									'id'     => $json['id'] . '#create-activity',
 									'object' => $json,
-
 								),
 								$user_id
 							);
@@ -1609,6 +1615,37 @@ public function api_search( $request ) {
 					$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;
 	}