From 4ede5dc9e183a7703468c0207af7ce4db73f3d67 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 13 Sep 2024 12:27:26 +0300
Subject: [PATCH] dependencies: switch to new import path for websocket library

---
 go.mod                                | 2 +-
 go.sum                                | 4 ++--
 pkg/signalmeow/contactdiscovery.go    | 2 +-
 pkg/signalmeow/provisioning.go        | 2 +-
 pkg/signalmeow/web/signalwebsocket.go | 2 +-
 pkg/signalmeow/wspb/wspb.go           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index b8ef2818..5f8253b7 100644
--- a/go.mod
+++ b/go.mod
@@ -5,6 +5,7 @@ go 1.22.0
 toolchain go1.23.1
 
 require (
+	github.com/coder/websocket v1.8.12
 	github.com/emersion/go-vcard v0.0.0-20230815062825-8fda7d206ec9
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.0
@@ -18,7 +19,6 @@ require (
 	golang.org/x/net v0.29.0
 	google.golang.org/protobuf v1.34.2
 	maunium.net/go/mautrix v0.20.1-0.20240913091647-96e68fb485d2
-	nhooyr.io/websocket v1.8.17
 )
 
 require (
diff --git a/go.sum b/go.sum
index 16e07ab6..feffeab5 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
 github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
+github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
+github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -97,5 +99,3 @@ maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
 maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
 maunium.net/go/mautrix v0.20.1-0.20240913091647-96e68fb485d2 h1:po9hbdGRCQq2Sb3+f5ED/TxA1RpUstmwRLTyX4ecjW4=
 maunium.net/go/mautrix v0.20.1-0.20240913091647-96e68fb485d2/go.mod h1:amzKPIZVO7v1piD2JhKG1RvGZoV+5wEZfoHaEXOjjqA=
-nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y=
-nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
diff --git a/pkg/signalmeow/contactdiscovery.go b/pkg/signalmeow/contactdiscovery.go
index 660439c9..b732339c 100644
--- a/pkg/signalmeow/contactdiscovery.go
+++ b/pkg/signalmeow/contactdiscovery.go
@@ -27,12 +27,12 @@ import (
 	"sync"
 	"time"
 
+	"github.com/coder/websocket"
 	"github.com/google/uuid"
 	"github.com/rs/zerolog"
 	"github.com/tidwall/gjson"
 	"go.mau.fi/util/exerrors"
 	"google.golang.org/protobuf/proto"
-	"nhooyr.io/websocket"
 
 	"go.mau.fi/mautrix-signal/pkg/libsignalgo"
 	signalpb "go.mau.fi/mautrix-signal/pkg/signalmeow/protobuf"
diff --git a/pkg/signalmeow/provisioning.go b/pkg/signalmeow/provisioning.go
index 5c09457d..213c2462 100644
--- a/pkg/signalmeow/provisioning.go
+++ b/pkg/signalmeow/provisioning.go
@@ -26,12 +26,12 @@ import (
 	"net/url"
 	"time"
 
+	"github.com/coder/websocket"
 	"github.com/google/uuid"
 	"github.com/rs/zerolog"
 	"go.mau.fi/util/exerrors"
 	"go.mau.fi/util/random"
 	"google.golang.org/protobuf/proto"
-	"nhooyr.io/websocket"
 
 	"go.mau.fi/mautrix-signal/pkg/libsignalgo"
 	signalpb "go.mau.fi/mautrix-signal/pkg/signalmeow/protobuf"
diff --git a/pkg/signalmeow/web/signalwebsocket.go b/pkg/signalmeow/web/signalwebsocket.go
index 8b9698b6..986e17c5 100644
--- a/pkg/signalmeow/web/signalwebsocket.go
+++ b/pkg/signalmeow/web/signalwebsocket.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/coder/websocket"
 	"github.com/rs/zerolog"
-	"nhooyr.io/websocket"
 
 	signalpb "go.mau.fi/mautrix-signal/pkg/signalmeow/protobuf"
 	"go.mau.fi/mautrix-signal/pkg/signalmeow/wspb"
diff --git a/pkg/signalmeow/wspb/wspb.go b/pkg/signalmeow/wspb/wspb.go
index c58628fb..2c2ccd84 100644
--- a/pkg/signalmeow/wspb/wspb.go
+++ b/pkg/signalmeow/wspb/wspb.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/coder/websocket"
 	"google.golang.org/protobuf/proto"
-	"nhooyr.io/websocket"
 )
 
 // Read reads a protobuf message from c into v.