1 files changed, 4 insertions, 8 deletions
diff --git a/api/api.go b/api/api.go
index 07db731..cb5101b 100644
--- a/api/api.go
+++ b/api/api.go
@@ -99,19 +99,15 @@ func MakeMux(argv *args.Arguments, dbConn *sql.DB) *http.ServeMux {
 		LogRequestContinuation(requestContext, r, w)(chat.ValidateFren, FailurePassingContinuation)(chat.FetchMessagesContinuation, FailurePassingContinuation)(template.TemplateContinuation("messages.html", false), FailurePassingContinuation)(LogExecutionTimeContinuation, LogExecutionTimeContinuation)(IdContinuation, IdContinuation)
 	})
 
-	messageHandler := messaging.HttpSmsMessagingAdapter{
-		ApiToken:        os.Getenv("HTTPSMS_API_TOKEN"),
-		FromPhoneNumber: os.Getenv("FROM_PHONE_NUMBER"),
-		ToPhoneNumber:   os.Getenv("TO_PHONE_NUMBER"),
-		Endpoint:        argv.HttpSmsEndpoint,
-	}
-	sendMessageContinuation := chat.SendMessageContinuation(&messageHandler)
+	httpsms := messaging.HttpSmsContinuation(os.Getenv("HTTPSMS_API_TOKEN"), os.Getenv("FROM_PHONE_NUMBER"), os.Getenv("TO_PHONE_NUMBER"), argv.HttpSmsEndpoint)
+	ntfy := messaging.SendNtfy(argv.NtfyTopic, argv.NtfyEndpoint)
+	sendMessageContinuation := chat.SendMessageContinuation(messaging.Compose(ntfy, httpsms))
 	mux.HandleFunc("POST /chat", func(w http.ResponseWriter, r *http.Request) {
 		requestContext := makeRequestContext()
 		LogRequestContinuation(requestContext, r, w)(chat.ValidateFren, FailurePassingContinuation)(sendMessageContinuation, FailurePassingContinuation)(template.TemplateContinuation("chat.html", true), FailurePassingContinuation)(LogExecutionTimeContinuation, LogExecutionTimeContinuation)(IdContinuation, IdContinuation)
 	})
 
-	smsEventProcessor := chat.ChatEventProcessorContinuation(os.Getenv("HTTPSMS_SIGNING_KEY"))
+	smsEventProcessor := chat.ChatEventProcessorContinuation(os.Getenv("TO_PHONE_NUMBER"), os.Getenv("HTTPSMS_SIGNING_KEY"), ntfy)
 	mux.HandleFunc("POST /chat/event", func(w http.ResponseWriter, r *http.Request) {
 		requestContext := makeRequestContext()
 		LogRequestContinuation(requestContext, r, w)(smsEventProcessor, FailurePassingContinuation)(LogExecutionTimeContinuation, LogExecutionTimeContinuation)(IdContinuation, IdContinuation)