Merge pull request #47 from picosh/am/soju-webpush

commit: 5e82119
parent: ef20430
author: Antonio Mika
date: 2023-10-15 03:06:21 +0000 UTC

Merge pull request #47 from picosh/am/soju-webpush

Added simple diff for soju to fix firefox and ios webpush

2 files changed, +17, -0

M bouncer/Dockerfile

A bouncer/subscriber-change.diff

M bouncer/Dockerfile

+4, -0

 1@@ -6,8 +6,12 @@ RUN apk add --no-cache git sqlite-libs sqlite-dev build-base
 2 
 3 RUN git clone https://github.com/emersion/soju
 4 
 5+COPY subscriber-change.diff .
 6+
 7 WORKDIR /app/soju
 8 
 9+RUN git apply ../subscriber-change.diff
10+
11 ENV LDFLAGS="-linkmode external -extldflags -static"
12 ENV GOFLAGS="-tags=moderncsqlite"
13

A bouncer/subscriber-change.diff

+13, -0

 1@@ -0,0 +1,13 @@
 2+diff --git a/server.go b/server.go
 3+index 00d7560..98f0424 100644
 4+--- a/server.go
 5++++ b/server.go
 6+@@ -339,7 +339,7 @@ func (s *Server) sendWebPush(ctx context.Context, sub *webpush.Subscription, vap
 7+ 		},
 8+ 		VAPIDPublicKey:  s.webPush.VAPIDKeys.Public,
 9+ 		VAPIDPrivateKey: s.webPush.VAPIDKeys.Private,
10+-		Subscriber:      "https://soju.im",
11++		Subscriber:      "hello@pico.sh",
12+ 		TTL:             7 * 24 * 60 * 60, // seconds
13+ 		Urgency:         urgency,
14+ 		RecordSize:      2048,