Escape "query" parameter

"query" parameter may contains any characters such as "&".

Author: thinca

endpoint.go

@@ -6,8 +6,8 @@ const (
 	retrieveSingleTweetURL    = "https://api.twitter.com/2/tweets/%v"
 	userTweetTimelineURL      = "https://api.twitter.com/2/users/%v/tweets"
 	userMentionTimelineURL    = "https://api.twitter.com/2/users/%v/mentions"
-	searchRecentTweetsURL     = "https://api.twitter.com/2/tweets/search/recent?query=%v"
-	countsRecentTweetsURL     = "https://api.twitter.com/2/tweets/counts/recent?query=%v"
+	searchRecentTweetsURL     = "https://api.twitter.com/2/tweets/search/recent"
+	countsRecentTweetsURL     = "https://api.twitter.com/2/tweets/counts/recent"
 	addOrDeleteRulesURL       = "https://api.twitter.com/2/tweets/search/stream/rules"
 	retrieveStreamRulesURL    = "https://api.twitter.com/2/tweets/search/stream/rules"
 	connectToStreamURL        = "https://api.twitter.com/2/tweets/search/stream"
@@ -31,7 +31,7 @@ const (
 	spacesURL                    = "https://api.twitter.com/2/spaces?ids="
 	usersPurchasedSpaceTicketURL = "https://api.twitter.com/2/spaces/%v/buyers"
 	discoverSpacesURL            = "https://api.twitter.com/2/spaces/by/creator_ids?user_ids="
-	searchSpacesURL              = "https://api.twitter.com/2/spaces/search?query=%v"
+	searchSpacesURL              = "https://api.twitter.com/2/spaces/search"
 )
 
 const (

search_spaces.go

@@ -12,9 +12,8 @@ func searchSpaces(ctx context.Context, c *client, searchTerm string, opt ...*Sea
 	if searchTerm == "" {
 		return nil, errors.New("search spaces: searchTerm parameter is required")
 	}
-	ep := fmt.Sprintf(searchSpacesURL, searchTerm)
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, ep, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, searchSpacesURL, nil)
 	if err != nil {
 		return nil, fmt.Errorf("search spaces new request with ctx: %w", err)
 	}
@@ -29,7 +28,7 @@ func searchSpaces(ctx context.Context, c *client, searchTerm string, opt ...*Sea
 	default:
 		return nil, errors.New("search spaces: too many options")
 	}
-	sopt.addQuery(req)
+	sopt.addQuery(req, searchTerm)
 
 	resp, err := c.client.Do(req)
 	if err != nil {

search_tweet.go

@@ -16,9 +16,7 @@ func searchRecentTweets(ctx context.Context, c *client, tweet string, opt ...*Se
 		return nil, errors.New("search recent tweets: tweet parameter must be less than or equal to 512 characters")
 	}
 
-	ep := fmt.Sprintf(searchRecentTweetsURL, tweet)
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, ep, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, searchRecentTweetsURL, nil)
 	if err != nil {
 		return nil, fmt.Errorf("search recent tweets new request with ctx: %w", err)
 	}
@@ -44,7 +42,7 @@ func searchRecentTweets(ctx context.Context, c *client, tweet string, opt ...*Se
 	if sopt.MaxResults < minimumMaxResults || sopt.MaxResults > maximumMaxResults {
 		return nil, fmt.Errorf("search recent tweets: max results must be between %d and %d", minimumMaxResults, maximumMaxResults)
 	}
-	sopt.addQuery(req)
+	sopt.addQuery(req, tweet)
 
 	resp, err := c.client.Do(req)
 	if err != nil {

space_option.go

@@ -13,8 +13,9 @@ type SearchSpacesOption struct {
 	UserFields  []UserField
 }
 
-func (s *SearchSpacesOption) addQuery(req *http.Request) {
+func (s *SearchSpacesOption) addQuery(req *http.Request, searchTerm string) {
 	q := req.URL.Query()
+	q.Add("query", searchTerm)
 	if len(s.Expansions) > 0 {
 		q.Add("expansions", strings.Join(expansionsToString(s.Expansions), ","))
 	}

tweet_counts.go

@@ -12,9 +12,8 @@ func countsRecentTweet(ctx context.Context, c *client, tweet string, opt ...*Twe
 	if tweet == "" {
 		return nil, errors.New("counts recent tweets: tweet parameter is required")
 	}
-	ep := fmt.Sprintf(countsRecentTweetsURL, tweet)
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, ep, nil)
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, countsRecentTweetsURL, nil)
 	if err != nil {
 		return nil, fmt.Errorf("counts recent tweets new request with ctx: %w", err)
 	}
@@ -29,7 +28,7 @@ func countsRecentTweet(ctx context.Context, c *client, tweet string, opt ...*Twe
 	default:
 		return nil, errors.New("counts recent tweets: only one option is allowed")
 	}
-	topt.addQuery(req)
+	topt.addQuery(req, tweet)
 
 	resp, err := c.client.Do(req)
 	if err != nil {

tweet_option.go

@@ -176,8 +176,9 @@ type SearchTweetsOption struct {
 	UserFields  []UserField
 }
 
-func (t SearchTweetsOption) addQuery(req *http.Request) {
+func (t SearchTweetsOption) addQuery(req *http.Request, tweet string) {
 	q := req.URL.Query()
+	q.Add("query", tweet)
 	if !t.EndTime.IsZero() {
 		q.Add("end_time", t.EndTime.Format(time.RFC3339))
 	}
@@ -227,8 +228,9 @@ type TweetCountsOption struct {
 	Granularity string
 }
 
-func (t *TweetCountsOption) addQuery(req *http.Request) {
+func (t *TweetCountsOption) addQuery(req *http.Request, tweet string) {
 	q := req.URL.Query()
+	q.Add("query", tweet)
 	if !t.StartTime.IsZero() {
 		// YYYY-MM-DDTHH:mm:ssZ (ISO 8601/RFC 3339).
 		q.Add("start_time", t.StartTime.Format(time.RFC3339))