diff --git a/server/go.mod b/server/go.mod index fadb5920..e25b8ccb 100644 --- a/server/go.mod +++ b/server/go.mod @@ -8,6 +8,7 @@ require ( github.com/gabriel-vasile/mimetype v1.4.2 github.com/getsentry/sentry-go v0.24.1 github.com/go-gormigrate/gormigrate/v2 v2.1.1 + github.com/gofrs/uuid/v5 v5.0.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 github.com/guregu/null v4.0.0+incompatible @@ -16,7 +17,6 @@ require ( github.com/microcosm-cc/bluemonday v1.0.25 github.com/mmcdole/gofeed v1.2.1 github.com/onrik/gorm-logrus v0.5.0 - github.com/satori/go.uuid v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.8.4 diff --git a/server/go.sum b/server/go.sum index 41e13053..86e36c83 100644 --- a/server/go.sum +++ b/server/go.sum @@ -148,6 +148,8 @@ github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofrs/uuid/v5 v5.0.0 h1:p544++a97kEL+svbcFbCQVM9KFu0Yo25UoISXGNNH9M= +github.com/gofrs/uuid/v5 v5.0.0/go.mod h1:CDOjlDMVAtN56jqyRUZh58JT31Tiw7/oQyEXZV+9bD8= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= @@ -414,8 +416,6 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= diff --git a/server/model/files.go b/server/model/files.go index 55481c72..3defe7a9 100644 --- a/server/model/files.go +++ b/server/model/files.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/news_alert.go b/server/model/news_alert.go index 3956860a..0956940a 100644 --- a/server/model/news_alert.go +++ b/server/model/news_alert.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/news_source.go b/server/model/news_source.go index 67e9ea43..69b91cfe 100644 --- a/server/model/news_source.go +++ b/server/model/news_source.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/notification.go b/server/model/notification.go index 010382bb..2b76642b 100644 --- a/server/model/notification.go +++ b/server/model/notification.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/notification_confirmation.go b/server/model/notification_confirmation.go index 9608d3c9..94c0bb9c 100644 --- a/server/model/notification_confirmation.go +++ b/server/model/notification_confirmation.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/notification_type.go b/server/model/notification_type.go index d1ed7883..553b2082 100644 --- a/server/model/notification_type.go +++ b/server/model/notification_type.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/roomfinder_building2area.go b/server/model/roomfinder_building2area.go index 476d031c..528cef41 100644 --- a/server/model/roomfinder_building2area.go +++ b/server/model/roomfinder_building2area.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/roomfinder_buildings.go b/server/model/roomfinder_buildings.go index ef228acf..9f249a6d 100644 --- a/server/model/roomfinder_buildings.go +++ b/server/model/roomfinder_buildings.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/roomfinder_buildings2gps.go b/server/model/roomfinder_buildings2gps.go index 99b1f4df..ae474dd8 100644 --- a/server/model/roomfinder_buildings2gps.go +++ b/server/model/roomfinder_buildings2gps.go @@ -6,8 +6,8 @@ import ( "gorm.io/gorm" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/roomfinder_buildings2maps.go b/server/model/roomfinder_buildings2maps.go index 7a503b14..919349ef 100644 --- a/server/model/roomfinder_buildings2maps.go +++ b/server/model/roomfinder_buildings2maps.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/roomfinder_maps.go b/server/model/roomfinder_maps.go index 4df5d5d5..d9a89cff 100644 --- a/server/model/roomfinder_maps.go +++ b/server/model/roomfinder_maps.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/roomfinder_rooms.go b/server/model/roomfinder_rooms.go index 3ea80682..9bd85269 100644 --- a/server/model/roomfinder_rooms.go +++ b/server/model/roomfinder_rooms.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var ( diff --git a/server/model/roomfinder_rooms2maps.go b/server/model/roomfinder_rooms2maps.go index 6acc2f6f..2eaea80b 100644 --- a/server/model/roomfinder_rooms2maps.go +++ b/server/model/roomfinder_rooms2maps.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" + "github.com/gofrs/uuid/v5" "github.com/guregu/null" - uuid "github.com/satori/go.uuid" ) var (