Merge remote-tracking branch 'origin/develop' into webv2

go.mod

@@ -3,8 +3,8 @@ module github.com/owncast/owncast
 go 1.18
 
 require (
-	github.com/amalfra/etag v1.0.0
-	github.com/aws/aws-sdk-go v1.44.160
+	github.com/amalfra/etag/v2 v2.0.0
+	github.com/aws/aws-sdk-go v1.44.167
 	github.com/go-fed/activity v1.0.1-0.20210803212804-d866ba75dd0f
 	github.com/go-fed/httpsig v1.1.0
 	github.com/go-ole/go-ole v1.2.6 // indirect
@@ -23,7 +23,7 @@ require (
 	github.com/yuin/goldmark v1.5.3
 	golang.org/x/mod v0.7.0
 	golang.org/x/time v0.3.0
-	mvdan.cc/xurls v1.1.0
+	mvdan.cc/xurls/v2 v2.4.0
 )
 
 require (
@@ -65,7 +65,7 @@ require github.com/SherClockHolmes/webpush-go v1.2.0
 require (
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/dghubble/oauth1 v0.7.2
-	github.com/g8rswimmer/go-twitter v1.1.5-0.20220129031223-e62b74626b0a
+	github.com/g8rswimmer/go-twitter/v2 v2.1.4
 	github.com/go-test/deep v1.0.4 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/gorilla/css v1.0.0 // indirect
@@ -74,8 +74,10 @@ require (
 )
 
 require (
+	github.com/amalfra/etag v1.0.0
 	github.com/andybalholm/cascadia v1.3.1
 	gopkg.in/evanphx/json-patch.v5 v5.6.0
+	mvdan.cc/xurls v1.1.0
 )
 
 replace github.com/go-fed/activity => github.com/owncast/activity v1.0.1-0.20211229051252-7821289d4026