More Fprintf usage

[tofuproxy.git] / rounds / redirectHTML.go
diff --git a/rounds/redirectHTML.go b/rounds/redirectHTML.go

index 2e286d3208ba3da10ab100ac09fe466a98f8abe6..d139eb28ae41157c5e5bfc50ad4a784d81b10a73 100644 (file)
--- a/rounds/redirectHTML.go
+++ b/rounds/redirectHTML.go
@@ -1,7 +1,7 @@
  /*
  tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
               manager, WARC/geminispace browser
-Copyright (C) 2021-2022 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2021-2023 Sergey Matveev <stargrave@stargrave.org>
  
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ func isFeeder(req *http.Request) bool {
         if strings.Contains(req.Header.Get("User-Agent"), "newsboat/") {
                 return true
         }
-       if strings.Contains(req.Header.Get("User-Agent"), "go.stargrave.org-feeder/") {
+       if strings.Contains(req.Header.Get("User-Agent"), "stargrave.org-feeder/") {
                 return true
         }
         return false
@@ -82,14 +82,13 @@ func RoundRedirectHTML(
         w.Header().Add("Content-Type", "text/html")
         w.WriteHeader(http.StatusOK)
         location := resp.Header.Get("Location")
-       w.Write([]byte(
-               fmt.Sprintf(
-                       `<!DOCTYPE html>
+       fmt.Fprintf(
+               w, `<!DOCTYPE html>
  <html><head><title>%d %s: %s redirection</title></head>
  <body><a href="%s">%s</a></body></html>`,
-                       resp.StatusCode, http.StatusText(resp.StatusCode),
-                       redirType, location, location,
-               )))
+               resp.StatusCode, http.StatusText(resp.StatusCode),
+               redirType, location, location,
+       )
         fifos.LogRedir <- fmt.Sprintf(
                 "%s %s\t%s\t%s", req.Method, req.URL, resp.Status, location,
         )