From a7b6cd450473e0987f726b969c8d10824a1d7500 Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Fri, 10 Apr 2026 10:25:40 -0700
Subject: [PATCH] bskyweb: update to golang v1.26 (#10208)

---
 Dockerfile                      | 2 +-
 Dockerfile.embedr               | 2 +-
 bskyweb/cmd/bskyweb/renderer.go | 2 +-
 bskyweb/cmd/embedr/render.go    | 2 +-
 bskyweb/cmd/embedr/server.go    | 8 ++++----
 bskyweb/go.mod                  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 371e8402c7..32a45d2ca9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.25-bookworm AS build-env
+FROM golang:1.26-bookworm AS build-env
 
 WORKDIR /usr/src/social-app
 
diff --git a/Dockerfile.embedr b/Dockerfile.embedr
index 29b042dddc..4f13b6d1a6 100644
--- a/Dockerfile.embedr
+++ b/Dockerfile.embedr
@@ -1,4 +1,4 @@
-FROM golang:1.25-bookworm AS build-env
+FROM golang:1.26-bookworm AS build-env
 
 WORKDIR /usr/src/social-app
 
diff --git a/bskyweb/cmd/bskyweb/renderer.go b/bskyweb/cmd/bskyweb/renderer.go
index 6e02456f53..8f74de0c89 100644
--- a/bskyweb/cmd/bskyweb/renderer.go
+++ b/bskyweb/cmd/bskyweb/renderer.go
@@ -54,7 +54,7 @@ func NewRenderer(prefix string, fs *embed.FS, debug bool) *Renderer {
 	}
 }
 
-func (r Renderer) Render(w io.Writer, name string, data interface{}, c echo.Context) error {
+func (r Renderer) Render(w io.Writer, name string, data any, c echo.Context) error {
 	var ctx pongo2.Context
 
 	if data != nil {
diff --git a/bskyweb/cmd/embedr/render.go b/bskyweb/cmd/embedr/render.go
index cc8f0759a0..171f13384c 100644
--- a/bskyweb/cmd/embedr/render.go
+++ b/bskyweb/cmd/embedr/render.go
@@ -11,6 +11,6 @@ type Template struct {
 	templates *template.Template
 }
 
-func (t *Template) Render(w io.Writer, name string, data interface{}, c echo.Context) error {
+func (t *Template) Render(w io.Writer, name string, data any, c echo.Context) error {
 	return t.templates.ExecuteTemplate(w, name, data)
 }
diff --git a/bskyweb/cmd/embedr/server.go b/bskyweb/cmd/embedr/server.go
index 8168197ca3..8315949ae3 100644
--- a/bskyweb/cmd/embedr/server.go
+++ b/bskyweb/cmd/embedr/server.go
@@ -180,9 +180,9 @@ func serve(cctx *cli.Context) error {
 
 	// Create CORS middleware for oembed
 	oembedCORS := middleware.CORSWithConfig(middleware.CORSConfig{
-			AllowOrigins: []string{"*"},
-			AllowMethods: []string{http.MethodGet, http.MethodHead, http.MethodOptions},
-			AllowHeaders: []string{"Origin", "Content-Type", "Accept"},
+		AllowOrigins: []string{"*"},
+		AllowMethods: []string{http.MethodGet, http.MethodHead, http.MethodOptions},
+		AllowHeaders: []string{"Origin", "Content-Type", "Accept"},
 	})
 
 	e.GET("/robots.txt", echo.WrapHandler(staticHandler))
@@ -271,7 +271,7 @@ func (srv *Server) errorHandler(err error, c echo.Context) {
 		code = he.Code
 	}
 	c.Logger().Error(err)
-	data := map[string]interface{}{
+	data := map[string]any{
 		"statusCode": code,
 	}
 	c.Render(code, "error.html", data)
diff --git a/bskyweb/go.mod b/bskyweb/go.mod
index 654c40a131..5274340c14 100644
--- a/bskyweb/go.mod
+++ b/bskyweb/go.mod
@@ -1,6 +1,6 @@
 module github.com/bluesky-social/social-app/bskyweb
 
-go 1.25
+go 1.26
 
 require (
 	github.com/bluesky-social/indigo v0.0.0-20250729223159-573ae927246a