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

go.mod

@@ -3,8 +3,7 @@ module github.com/owncast/owncast
 go 1.18
 
 require (
-	github.com/amalfra/etag/v2 v2.0.0
-	github.com/aws/aws-sdk-go v1.44.167
+	github.com/aws/aws-sdk-go v1.44.175
 	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
@@ -13,7 +12,6 @@ require (
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
 	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/microcosm-cc/bluemonday v1.0.21
-	github.com/mssola/user_agent v0.5.3
 	github.com/nareix/joy5 v0.0.0-20210317075623-2c912ca30590
 	github.com/oschwald/geoip2-golang v1.8.0
 	github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
@@ -23,7 +21,6 @@ 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/v2 v2.4.0
 )
 
 require (
@@ -35,14 +32,13 @@ require (
 	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/crypto v0.1.0 // indirect
-	golang.org/x/net v0.4.0
-	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/net v0.5.0
+	golang.org/x/sys v0.4.0 // indirect
 )
 
 require github.com/prometheus/client_golang v1.14.0
 
 require (
-	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
@@ -59,14 +55,14 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/nanmu42/gzip v1.2.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/signalsciences/ac v1.2.0 // indirect
 	github.com/ugorji/go/codec v1.2.6 // indirect
-	golang.org/x/text v0.5.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
@@ -81,7 +77,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/v2 v2.1.4
+	github.com/g8rswimmer/go-twitter/v2 v2.1.5
 	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
@@ -90,8 +86,8 @@ require (
 )
 
 require (
-	github.com/amalfra/etag v1.0.0
 	github.com/andybalholm/cascadia v1.3.1
+	github.com/nanmu42/gzip v1.2.0
 	gopkg.in/evanphx/json-patch.v5 v5.6.0
 	mvdan.cc/xurls v1.1.0
 )