final touches before easy install.

Author: fiatjaf

.github/workflows/go.yml

@@ -1,61 +1,32 @@
-name: build for all platforms
+name: build and release
 
 on:
-  release:
-    types: [created]
+  push:
+    tags:
+      - '*'
 
 permissions:
   contents: write
 
 jobs:
-
-  releases-matrix:
+  build-and-release:
     name: Build and release binary
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        goos: [linux]
-        goarch: [amd64]
-        exclude:
-          - goarch: arm64
-            goos: windows
-    steps:
-      - uses: actions/checkout@v3
-      - uses: wangyoucao577/go-release-action@v1.40
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          goos: ${{ matrix.goos }}
-          goarch: ${{ matrix.goarch }}
-          overwrite: true
-          md5sum: false
-          sha256sum: false
-          compress_assets: false
-
-  release-docker:
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
     steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v4
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+          go-version: '1.25'
+      - name: Install musl and musl-gcc
+        run: sudo apt-get update && sudo apt-get install -y musl-tools
+      - name: Get templ version
+        run: echo "TEMPL_VERSION=$(grep 'github.com/a-h/templ' go.mod | awk '{print $2}')" >> $GITHUB_ENV
+      - name: Install templ
+        run: go install github.com/a-h/templ/cmd/templ@${{ env.TEMPL_VERSION }}
+      - uses: extractions/setup-just@v2
+      - name: Build binary
+        run: just build
+      - name: Create release
+        uses: softprops/action-gh-release@v2
         with:
-          images: tijlxyz/khatru-pyramid
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
+          files: pyramid-exe

.github/workflows/release.yml

@@ -53,7 +53,7 @@ func processReactions(ctx context.Context, event nostr.Event) {
 	}
 
 	popularThreshold := min(2, (totalMembers*global.Settings.Popular.PercentThreshold)/100)
-	uppermostThreshold := min(2, (totalMembers*global.Settings.Uppermost.PercentThreshold)/100)
+	uppermostThreshold := min(3, (totalMembers*global.Settings.Uppermost.PercentThreshold)/100)
 
 	// for all events we meet the popular threshold for
 	for target, votes := range popularVotes {

curation.go

@@ -1,9 +1,9 @@
 module github.com/fiatjaf/pyramid
 
-go 1.24.2
+go 1.25
 
 require (
-	fiatjaf.com/nostr v0.0.0-20251031160519-32bbff615a04
+	fiatjaf.com/nostr v0.0.0-20251126120447-7261a4b515ed
 	github.com/FastFilter/xorfilter v0.2.1
 	github.com/a-h/templ v0.3.960
 	github.com/kelseyhightower/envconfig v1.4.0
@@ -60,5 +60,3 @@ require (
 	golang.org/x/text v0.27.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace fiatjaf.com/nostr => ../nostrlib

go.mod

@@ -1,3 +1,5 @@
+fiatjaf.com/nostr v0.0.0-20251126120447-7261a4b515ed h1:dip4Bxlfj4/N2oIIGCZpcYRrvfMObcXRcyBM5uYswnM=
+fiatjaf.com/nostr v0.0.0-20251126120447-7261a4b515ed/go.mod h1:ue7yw0zHfZj23Ml2kVSdBx0ENEaZiuvGxs/8VEN93FU=
 github.com/FastFilter/xorfilter v0.2.1 h1:lbdeLG9BdpquK64ZsleBS8B4xO/QW1IM0gMzF7KaBKc=
 github.com/FastFilter/xorfilter v0.2.1/go.mod h1:aumvdkhscz6YBZF9ZA/6O4fIoNod4YR50kIVGGZ7l9I=
 github.com/ImVexed/fasturl v0.0.0-20230304231329-4e41488060f3 h1:ClzzXMDDuUbWfNNZqGeYq4PnYOlwlOVIvSyNaIy0ykg=

go.sum

@@ -107,6 +107,7 @@ func settingsHandler(w http.ResponseWriter, r *http.Request) {
 				moderated.Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Moderated.HTTPBasePath
 				popular.Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Popular.HTTPBasePath
 				uppermost.Relay.ServiceURL = global.Settings.WSScheme() + global.Settings.Domain + "/" + global.Settings.Uppermost.HTTPBasePath
+				go restartSoon()
 				//
 				// theme settings
 			case "background_color":
@@ -428,6 +429,7 @@ func domainSetupHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		go restartSoon()
 		http.Redirect(w, r, "/", 302)
 		return
 	}

handler.go

@@ -360,6 +360,16 @@ func run(ctx context.Context) error {
 
 	mux.Handle("/", relay)
 
+	g, ctx := errgroup.WithContext(ctx)
+
+	if global.S.Port == "443" {
+		// if we don't have a domain name we'll listen only on port 80 without doing the autocert dance yet
+		if global.Settings.Domain == "" {
+			log.Info().Msg("no domain setup yet, running only on port 80 for now")
+			global.S.Port = "80"
+		}
+	}
+
 	server := &http.Server{
 		Addr:    global.S.Host + ":" + global.S.Port,
 		Handler: ipBlockMiddleware(setupCheckMiddleware(mux)),
@@ -368,33 +378,57 @@ func run(ctx context.Context) error {
 		},
 	}
 
-	var listenFunc func() error
 	if global.S.Port == "443" {
 		manager := &autocert.Manager{
 			Prompt:     func(_ string) bool { return true },
 			HostPolicy: autocert.HostWhitelist(global.Settings.Domain),
 			Cache:      autocert.DirCache("certs"),
 		}
-		server.TLSConfig = manager.TLSConfig()
-		listenFunc = func() error { return server.ListenAndServeTLS("", "") }
-		log.Info().Msg("running on https://" + global.S.Host + ":" + global.S.Port)
+
+		// HTTP server on 80 for ACME challenges and user access
+		httpServer := &http.Server{
+			Addr:    global.S.Host + ":80",
+			Handler: manager.HTTPHandler(mux),
+			BaseContext: func(_ net.Listener) context.Context {
+				return ctx
+			},
+		}
+		g.Go(func() error { return httpServer.ListenAndServe() })
+
+		// HTTPS server on 443
+		httpsServer := &http.Server{
+			Addr:    global.S.Host + ":443",
+			Handler: ipBlockMiddleware(mux),
+			BaseContext: func(_ net.Listener) context.Context {
+				return ctx
+			},
+		}
+		httpsServer.TLSConfig = manager.TLSConfig()
+
+		g.Go(func() error { return httpsServer.ListenAndServeTLS("", "") })
+		log.Info().Msg("running on https://" + global.S.Host + ":443 and http://" + global.S.Host + ":80")
+		g.Go(func() error {
+			<-ctx.Done()
+			httpsServer.Shutdown(context.Background())
+			httpServer.Shutdown(context.Background())
+			return nil
+		})
 	} else {
-		listenFunc = server.ListenAndServe
+		g.Go(server.ListenAndServe)
 		log.Info().Msg("running on http://" + global.S.Host + ":" + global.S.Port)
+
+		g.Go(func() error {
+			<-ctx.Done()
+			if err := server.Shutdown(context.Background()); err != nil {
+				return err
+			}
+			if err := server.Close(); err != nil {
+				return err
+			}
+			return nil
+		})
 	}
 
-	g, ctx := errgroup.WithContext(ctx)
-	g.Go(listenFunc)
-	g.Go(func() error {
-		<-ctx.Done()
-		if err := server.Shutdown(context.Background()); err != nil {
-			return err
-		}
-		if err := server.Close(); err != nil {
-			return err
-		}
-		return nil
-	})
 	return g.Wait()
 }