diff options
| author |  tsmethurst <tobi.smethurst@klarrio.com> | 2021-03-15 18:59:38 +0100 |
|---|---|---|
| committer | tsmethurst <tobi.smethurst@klarrio.com> | 2021-03-15 18:59:38 +0100 |
| commit | cca676dcb3824e9f9ee21ecf0a2cf8c55b0d4ad9 (patch) | |
| tree | 0aef8a75cbd731eb1637fcac6964b9eea1adcb78 /internal/db | |
| parent | bit of experimenting and tidying (diff) | |
| download | gotosocial-cca676dcb3824e9f9ee21ecf0a2cf8c55b0d4ad9.tar.xz | |
tests
Diffstat (limited to 'internal/db')
| -rw-r--r-- | internal/db/db.go | 2 | ||||
| -rw-r--r-- | internal/db/postgres.go | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/internal/db/db.go b/internal/db/db.go index 9ed196b2f..03e30b41b 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -24,8 +24,8 @@ import ( "strings" "github.com/go-fed/activity/pub" - "github.com/go-oauth2/oauth2/v4" "github.com/gotosocial/gotosocial/internal/config" + "github.com/gotosocial/oauth2/v4" "github.com/sirupsen/logrus" ) diff --git a/internal/db/postgres.go b/internal/db/postgres.go index 0453b207b..96452d5ae 100644 --- a/internal/db/postgres.go +++ b/internal/db/postgres.go @@ -30,13 +30,12 @@ import ( "github.com/go-fed/activity/streams" "github.com/go-fed/activity/streams/vocab" - "github.com/go-oauth2/oauth2/v4" "github.com/go-pg/pg/extra/pgdebug" "github.com/go-pg/pg/v10" "github.com/go-pg/pg/v10/orm" "github.com/gotosocial/gotosocial/internal/config" "github.com/gotosocial/gotosocial/internal/gtsmodel" - "github.com/gotosocial/gotosocial/internal/oauth" + "github.com/gotosocial/oauth2/v4" "github.com/sirupsen/logrus" ) @@ -46,7 +45,7 @@ type postgresService struct { log *logrus.Entry cancel context.CancelFunc locks *sync.Map - tokenStore *oauth.PGTokenStore + tokenStore oauth2.TokenStore } // newPostgresService returns a postgresService derived from the provided config, which implements the go-fed DB interface. |