diff --git a/controllers/upload_controller/upload_controller.go b/controllers/upload_controller/upload_controller.go index 15e912b7853c31afa06421e1615b3c6ea79a5397..c2ad26b6f01e515e84b29f79fc8a39564aef86c2 100644 --- a/controllers/upload_controller/upload_controller.go +++ b/controllers/upload_controller/upload_controller.go @@ -1,6 +1,7 @@ package upload_controller import ( + "errors" "io" "strconv" "time" @@ -10,7 +11,6 @@ import ( "github.com/turt2live/matrix-media-repo/util/stream_util" "github.com/patrickmn/go-cache" - "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/turt2live/matrix-media-repo/common" "github.com/turt2live/matrix-media-repo/common/rcontext" diff --git a/go.mod b/go.mod index 2f845371747820fa5a566c0cd0533ce5204ff2ba..b7a377b2693947031d91d6b95e3b6d0c4d267f66 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/minio/minio-go/v6 v6.0.57 github.com/olebedev/emitter v0.0.0-20230411050614-349169dec2ba github.com/patrickmn/go-cache v2.1.0+incompatible - github.com/pkg/errors v0.9.1 + github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.16.0 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 github.com/rubyist/circuitbreaker v2.2.1+incompatible diff --git a/matrix/auth.go b/matrix/auth.go index c89b686a0ddd8e76f94862a497ff0ce7a8ba3538..df688f022b9f93abce0b60e3effb72fdd14ddf0f 100644 --- a/matrix/auth.go +++ b/matrix/auth.go @@ -1,10 +1,10 @@ package matrix import ( + "errors" "net/url" "time" - "github.com/pkg/errors" "github.com/turt2live/matrix-media-repo/common/rcontext" "github.com/turt2live/matrix-media-repo/util" ) diff --git a/matrix/client_server.go b/matrix/client_server.go index 66a0d5d419b78a445b70d9f7980d53fc31abfeb8..3588ebc9928ab913c0241ddc246ad4e70bdc1d7e 100644 --- a/matrix/client_server.go +++ b/matrix/client_server.go @@ -3,11 +3,11 @@ package matrix import ( "bytes" "encoding/json" + "errors" "io" "net/http" "time" - "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/turt2live/matrix-media-repo/common/rcontext" "github.com/turt2live/matrix-media-repo/util/stream_util" diff --git a/storage/datastore/datastore.go b/storage/datastore/datastore.go index f482e77e9954fbf197f0929dbe728c8e342d8185..719a37838505d5a597cb32a9eb3d2f70b2cbfc72 100644 --- a/storage/datastore/datastore.go +++ b/storage/datastore/datastore.go @@ -1,13 +1,13 @@ package datastore import ( + "errors" "fmt" "io" "github.com/getsentry/sentry-go" "github.com/turt2live/matrix-media-repo/common" - "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/turt2live/matrix-media-repo/common/config" "github.com/turt2live/matrix-media-repo/common/rcontext" diff --git a/storage/datastore/ds_s3/s3_store.go b/storage/datastore/ds_s3/s3_store.go index df7b3725f0e73dd4344cec0047b3e74639cc3949..3a3914e8b9a34cc620eb72cb38ad380e3a2edfa0 100644 --- a/storage/datastore/ds_s3/s3_store.go +++ b/storage/datastore/ds_s3/s3_store.go @@ -1,6 +1,7 @@ package ds_s3 import ( + "errors" "fmt" "io" "os" @@ -11,7 +12,6 @@ import ( "github.com/turt2live/matrix-media-repo/util/ids" "github.com/turt2live/matrix-media-repo/util/stream_util" - "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" "github.com/turt2live/matrix-media-repo/common/config" diff --git a/util/identifiers.go b/util/identifiers.go index 7caf0cda47bcaa0cfb300dc1bc3d7bb6442c5055..f10403deb93e76be0a2eb3d80ae470d234935ee7 100644 --- a/util/identifiers.go +++ b/util/identifiers.go @@ -1,9 +1,8 @@ package util import ( + "errors" "strings" - - "github.com/pkg/errors" ) func SplitMxc(mxc string) (string, string, error) {