x

Author: zoom-ua

pollbot/pollbot/db.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/keybase/go-keybase-chat-bot/kbchat/types/chat1"
-	"github.com	keybase/managed-bots/base"
+	"github.com/keybase/managed-bots/base"
 )
 
 type TallyResult struct {

triviabot/triviabot/session.go

@@ -1,7 +1,6 @@
 package triviabot
 
 import (
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -123,12 +122,7 @@ func (s *session) getCategory() int {
 }
 
 func (s *session) getAPIToken() (string, error) {
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet,
-		"https://opentdb.com/api_token.php?command=request", nil)
-	if err != nil {
-		return "", err
-	}
-	resp, err := http.DefaultClient.Do(req)
+	resp, err := http.Get("https://opentdb.com/api_token.php?command=request")
 	if err != nil {
 		return "", err
 	}
@@ -182,11 +176,7 @@ func (s *session) getNextQuestion() error {
 		url := fmt.Sprintf("https://opentdb.com/api.php?amount=1&category=%d&token=%s&type=multiple",
 			s.getCategory(), token)
 		s.Debug("getNextQuestion: url: %s", url)
-		req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, url, nil)
-		if err != nil {
-			return err
-		}
-		resp, err := http.DefaultClient.Do(req)
+		resp, err := http.Get(url)
 		if err != nil {
 			return err
 		}

zoombot/zoombot/api.go

@@ -2,7 +2,6 @@ package zoombot
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -154,11 +153,7 @@ type DeauthorizationEvent struct {
 
 func GetUser(client *http.Client, userID string) (*GetUserResponse, error) {
 	apiURL := fmt.Sprintf("%s/users/%s", apiBaseURLV2, userID)
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, apiURL, nil)
-	if err != nil {
-		return nil, err
-	}
-	resp, err := client.Do(req)
+	resp, err := client.Get(apiURL)
 	if err != nil {
 		return nil, err
 	}
@@ -192,11 +187,7 @@ func CreateMeeting(client *http.Client, userID string, request *CreateMeetingReq
 		return nil, err
 	}
 
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodPost, apiURL, bytes.NewBuffer(payload))
-	if err != nil {
-		return nil, err
-	}
-	resp, err := client.Do(req)
+	resp, err := client.Post(apiURL, "application/json", bytes.NewBuffer(payload))
 	if err != nil {
 		return nil, err
 	}