X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/3cdbd017da9ae7a7045f4272f16d4b262fd01c79..42b4acd4ba70d3c12da4513d139717e592eefe4a:/telegram_fake_helper_test.go?ds=inline

diff --git a/telegram_fake_helper_test.go b/telegram_fake_helper_test.go
index b71eee0..5ed4e2d 100644
--- a/telegram_fake_helper_test.go
+++ b/telegram_fake_helper_test.go
@@ -50,67 +50,41 @@ type TelegramFake struct {
 	images  map[string][]byte
 }
 
-// Add makes update available to getUpdates.
-func (f *TelegramFake) Add(update TelegramUpdate) {
-	f.mutex.Lock()
-
-	f.updates = append(f.updates, update)
-	f.mutex.Unlock()
+// newTelegramFake starts a fake Bot API server that stops at the end of the
+// test.
+func newTelegramFake(t *testing.T) *TelegramFake {
+	t.Helper()
 
-	select {
-	case f.added <- struct{}{}:
-	default:
+	f := &TelegramFake{
+		added:   make(chan struct{}, 1),
+		stopped: make(chan struct{}),
 	}
-}
 
-// Calls returns the calls so far.
-func (f *TelegramFake) Calls() []TelegramFakeCall {
-	f.mutex.Lock()
-	defer f.mutex.Unlock()
-
-	return append([]TelegramFakeCall(nil), f.calls...)
-}
-
-// Sent returns the texts of the sendMessage calls and the Markdown of the
-// sendRichMessage calls that succeeded, in order.
-func (f *TelegramFake) Sent() []string {
-	var texts []string
-
-	for _, call := range f.Calls() {
-		switch {
-		case !call.ok:
-		case call.method == "sendMessage":
-			texts = append(texts, call.params["text"].(string))
-		case call.method == "sendRichMessage":
-			texts = append(texts, call.params["rich_message"].(map[string]any)["markdown"].(string))
-		}
-	}
+	f.Server = httptest.NewServer(http.HandlerFunc(f.serve))
+	t.Cleanup(f.Close)
+	t.Cleanup(func() {
+		close(f.stopped)
+	})
 
-	return texts
+	return f
 }
 
-func (f *TelegramFake) Image(id string, data []byte) {
-	f.mutex.Lock()
-	defer f.mutex.Unlock()
+// newTelegramLocalFake returns the same fake API without network goroutines.
+// Its RoundTrip handles requests directly for tests with fake time.
+func newTelegramLocalFake(t *testing.T) *TelegramFake {
+	t.Helper()
 
-	if f.images == nil {
-		f.images = make(map[string][]byte)
+	f := &TelegramFake{
+		Server:  &httptest.Server{URL: "https://example.com"},
+		added:   make(chan struct{}, 1),
+		stopped: make(chan struct{}),
 	}
 
-	f.images[id] = data
-}
-
-// RoundTrip handles a request in memory, so synctest can control its timers.
-func (f *TelegramFake) RoundTrip(request *http.Request) (*http.Response, error) {
-	response := httptest.NewRecorder()
-	f.serve(response, request)
-
-	ctx := request.Context()
-	if ctx.Err() != nil {
-		return nil, ctx.Err()
-	}
+	t.Cleanup(func() {
+		close(f.stopped)
+	})
 
-	return response.Result(), nil
+	return f
 }
 
 func (f *TelegramFake) serve(w http.ResponseWriter, r *http.Request) {
@@ -127,7 +101,9 @@ func (f *TelegramFake) serve(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		_, _ = w.Write(data)
+		// The client can cancel a media request before this reply is
+		// written.
+		w.Write(data) // nolint: errcheck
 
 		return
 	}
@@ -214,7 +190,9 @@ func (f *TelegramFake) serve(w http.ResponseWriter, r *http.Request) {
 			wait = 1
 		}
 
-		_, _ = fmt.Fprintf(w, `{"ok":false,"error_code":%d,"description":%q,"parameters":{"retry_after":%d}}`, status, description, wait)
+		// A test can cancel the request after the handler selects its
+		// reply.
+		fmt.Fprintf(w, `{"ok":false,"error_code":%d,"description":%q,"parameters":{"retry_after":%d}}`, status, description, wait) // nolint: errcheck
 
 		return
 	}
@@ -223,7 +201,8 @@ func (f *TelegramFake) serve(w http.ResponseWriter, r *http.Request) {
 	f.record(call)
 
 	if method == "getFile" {
-		_ = json.NewEncoder(w).Encode(map[string]any{
+		// A cancelled client does not need a response body.
+		json.NewEncoder(w).Encode(map[string]any{ // nolint: errcheck
 			"ok":     true,
 			"result": map[string]any{"file_path": params["file_id"]},
 		})
@@ -232,7 +211,9 @@ func (f *TelegramFake) serve(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if method != "getUpdates" {
-		_, _ = io.WriteString(w, `{"ok":true,"result":true}`)
+		// A cancelled client does not need a response body.
+		io.WriteString(w, `{"ok":true,"result":true}`) // nolint: errcheck
+
 		return
 	}
 
@@ -248,7 +229,8 @@ func (f *TelegramFake) serve(w http.ResponseWriter, r *http.Request) {
 		updates = f.from(offset)
 	}
 
-	_ = json.NewEncoder(w).Encode(map[string]any{
+	// A cancelled client does not need a response body.
+	json.NewEncoder(w).Encode(map[string]any{ // nolint: errcheck
 		"ok":     true,
 		"result": updates,
 	})
@@ -283,40 +265,67 @@ func (f *TelegramFake) from(offset int64) []TelegramUpdate {
 	return updates
 }
 
-// newTelegramFake starts a fake Bot API server that stops at the end of the
-// test.
-func newTelegramFake(t *testing.T) *TelegramFake {
-	t.Helper()
+// Add makes update available to getUpdates.
+func (f *TelegramFake) Add(update TelegramUpdate) {
+	f.mutex.Lock()
 
-	f := &TelegramFake{
-		added:   make(chan struct{}, 1),
-		stopped: make(chan struct{}),
+	f.updates = append(f.updates, update)
+	f.mutex.Unlock()
+
+	select {
+	case f.added <- struct{}{}:
+	default:
 	}
+}
 
-	f.Server = httptest.NewServer(http.HandlerFunc(f.serve))
-	t.Cleanup(f.Close)
-	t.Cleanup(func() {
-		close(f.stopped)
-	})
+// Sent returns the texts of the sendMessage calls and the Markdown of the
+// sendRichMessage calls that succeeded, in order.
+func (f *TelegramFake) Sent() []string {
+	var texts []string
 
-	return f
+	for _, call := range f.Calls() {
+		switch {
+		case !call.ok:
+		case call.method == "sendMessage":
+			texts = append(texts, call.params["text"].(string))
+		case call.method == "sendRichMessage":
+			texts = append(texts, call.params["rich_message"].(map[string]any)["markdown"].(string))
+		}
+	}
+
+	return texts
 }
 
-// newTelegramLocalFake returns the same fake API without network goroutines.
-// Its RoundTrip handles requests directly for tests with fake time.
-func newTelegramLocalFake(t *testing.T) *TelegramFake {
-	t.Helper()
+// Calls returns the calls so far.
+func (f *TelegramFake) Calls() []TelegramFakeCall {
+	f.mutex.Lock()
+	defer f.mutex.Unlock()
 
-	f := &TelegramFake{
-		Server:  &httptest.Server{URL: "https://example.com"},
-		added:   make(chan struct{}, 1),
-		stopped: make(chan struct{}),
+	return append([]TelegramFakeCall(nil), f.calls...)
+}
+
+func (f *TelegramFake) Image(id string, data []byte) {
+	f.mutex.Lock()
+	defer f.mutex.Unlock()
+
+	if f.images == nil {
+		f.images = make(map[string][]byte)
 	}
-	t.Cleanup(func() {
-		close(f.stopped)
-	})
 
-	return f
+	f.images[id] = data
+}
+
+// RoundTrip handles a request in memory, so synctest can control its timers.
+func (f *TelegramFake) RoundTrip(request *http.Request) (*http.Response, error) {
+	response := httptest.NewRecorder()
+	f.serve(response, request)
+
+	ctx := request.Context()
+	if ctx.Err() != nil {
+		return nil, ctx.Err()
+	}
+
+	return response.Result(), nil
 }
 
 // telegramOwnerMessage returns a text message of the owner in the private chat.