astra/ntfy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Re-add "message" as event type

Browse source
This commit is contained in:
Philipp Heckel 2021-10-29 08:29:27 -04:00
parent ad17be1683
commit 4677e724ee
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
server/message.go
View file

@ -6,6 +6,7 @@ import "time"
const ( const (
openEvent = "open" openEvent = "open"
keepaliveEvent = "keepalive" keepaliveEvent = "keepalive"
messageEvent = "message"
) )
// message represents a message published to a topic // message represents a message published to a topic
@ -39,5 +40,5 @@ func newKeepaliveMessage() *message {
// newDefaultMessage is a convenience method to create a notification message // newDefaultMessage is a convenience method to create a notification message
func newDefaultMessage(msg string) *message { func newDefaultMessage(msg string) *message {
return newMessage("", msg) return newMessage(messageEvent, msg)
} }

2
server/server.go
View file

@ -219,7 +219,7 @@ func (s *Server) handleSubscribeSSE(w http.ResponseWriter, r *http.Request) erro
if err := json.NewEncoder(&buf).Encode(&msg); err != nil { if err := json.NewEncoder(&buf).Encode(&msg); err != nil {
return "", err return "", err
} }
if msg.Event != "" { if msg.Event != messageEvent {
return fmt.Sprintf("event: %s\ndata: %s\n", msg.Event, buf.String()), nil // Browser's .onmessage() does not fire on this! return fmt.Sprintf("event: %s\ndata: %s\n", msg.Event, buf.String()), nil // Browser's .onmessage() does not fire on this!
} }
return fmt.Sprintf("data: %s\n", buf.String()), nil return fmt.Sprintf("data: %s\n", buf.String()), nil