Update news API integration to use NewsAPI and improve request handling

Author: mervyn-teo

README.md

@@ -27,7 +27,7 @@ $ go build -o chat ./cmd/api
 - fill in the json with your own API keys
   - you can get your openRouter API key from [here](https://openrouter.ai/settings/keys)
   - you can get your Discord bot token from [here](https://discord.com/developers/applications)
-  - you can get your news API token from [here](https://currentsapi.services/)
+  - you can get your news API token from [here](https://newsapi.org/)
   - follow this page to get your [Youtube API key](https://developers.google.com/youtube/v3/getting-started)
 
 **5. Run the bot**

internal/tools/newsFunctions.go

@@ -12,7 +12,7 @@ import (
 
 func getNews() (string, error) {
 	log.Printf("User requested news\n")
-	baseURL := "https://api.currentsapi.services/v1/latest-news"
+	baseURL := "https://newsapi.org/v2/top-headlines"
 
 	// Construct the URL with query parameters
 	u, err := url.Parse(baseURL)
@@ -22,12 +22,20 @@ func getNews() (string, error) {
 
 	// Add query parameters
 	params := url.Values{}
-	params.Add("language", "en")
-	params.Add("apiKey", storage.Setting.NewsAPIToken) // Use the API key from settings
-	u.RawQuery = params.Encode()                       // Encode and attach parameters
+	params.Add("country", "us")
+	u.RawQuery = params.Encode()
+
+	req, err := http.NewRequest("GET", u.String(), nil)
+	if err != nil {
+		return "", fmt.Errorf("failed to create new request: %w", err)
+	}
+
+	req.Header.Add("X-Api-Key", storage.Setting.NewsAPIToken)
 
 	// Make the GET request
-	resp, err := http.Get(u.String())
+	client := &http.Client{}
+	resp, err := client.Do(req)
+
 	if err != nil {
 		return "", fmt.Errorf("failed to make GET request: %w", err)
 	}
@@ -55,7 +63,7 @@ func getNews() (string, error) {
 
 func searchNews(args SearchNewsArgs) (string, error) {
 	log.Printf("User requested search news\n")
-	baseURL := "https://api.currentsapi.services/v1/search"
+	baseURL := "https://newsapi.org/v2/everything"
 
 	// Construct the URL with query parameters
 	u, err := url.Parse(baseURL)
@@ -65,21 +73,36 @@ func searchNews(args SearchNewsArgs) (string, error) {
 	// Add query parameters
 	params := url.Values{}
 	params.Add("language", "en")
-	params.Add("apiKey", storage.Setting.NewsAPIToken) // Use the API key from settings
-	params.Add("end_date", args.EndDate)
-	params.Add("type", args.NewsType)
-	params.Add("country", args.Country)
-	params.Add("category", args.Category)
-	params.Add("page_number", strconv.Itoa(args.PageNumber))
-	params.Add("domain", args.Domain)
-	params.Add("domains_not", args.DomainsNot)
-	params.Add("keywords", args.Keywords)
-	params.Add("page_size", strconv.Itoa(args.PageSize))
-	params.Add("limit", strconv.Itoa(args.Limit))
+	params.Add("to", args.EndDate)
+
+	if args.PageNumber <= 0 {
+		args.PageNumber = 1
+	}
+
+	params.Add("page", strconv.Itoa(args.PageNumber))
+	params.Add("domains", args.Domain)
+	params.Add("excludeDomains", args.DomainsNot)
+	params.Add("q", args.Keywords)
+
+	if args.PageSize <= 0 {
+		args.PageSize = 10
+	}
+
+	params.Add("pageSize", strconv.Itoa(args.PageSize))
 	u.RawQuery = params.Encode()
 
 	// Make the GET request
-	resp, err := http.Get(u.String())
+	req, err := http.NewRequest("GET", u.String(), nil)
+	if err != nil {
+		return "", fmt.Errorf("failed to create new request: %w", err)
+	}
+
+	req.Header.Add("X-Api-Key", storage.Setting.NewsAPIToken)
+
+	// Make the GET request
+	client := &http.Client{}
+	resp, err := client.Do(req)
+
 	if err != nil {
 		return "", fmt.Errorf("failed to make GET request: %w", err)
 	}
@@ -92,6 +115,12 @@ func searchNews(args SearchNewsArgs) (string, error) {
 
 	// Check for successful response status code
 	if resp.StatusCode != http.StatusOK {
+		body, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return "", fmt.Errorf("failed to read response body: %w", err)
+		}
+
+		log.Println("News response: " + string(body))
 		return "", fmt.Errorf("API request failed with status code: %d", resp.StatusCode)
 	}