diff options
| author |  Forest Johnson <forest.n.johnson@gmail.com> | 2022-02-07 11:04:31 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-02-07 12:04:31 +0100 |
| commit | 6ed368cbebcae087aec1f31ee8d69ac6c47ead9f (patch) | |
| tree | ab3cd855aea308e2db719f2ac67a8e38cd6c920c /internal/federation/federatingdb/create.go | |
| parent | don't bother negotiating Accept for webfinger (#381) (diff) | |
| download | gotosocial-6ed368cbebcae087aec1f31ee8d69ac6c47ead9f.tar.xz | |
[feature] add authorization to the already-existing authentication (#365)
* add ensureUserIsAuthorizedOrRedirect to /oauth/authorize
* adding authorization (email confirm, account approve, etc) to TokenCheck
* revert un-needed changes to signin.go
* oops what happened here
* error css
* add account.SuspendedAt check
* remove redundant checks from oauth util Authed function
* wip tests
* tests passing
* stop stripping useful information from ErrAlreadyExists
* that feeling of scraping the dryer LINT off the screen
* oops I didn't mean to get rid of this NewTestRouter function
* make tests work with recorder
* re-add ConfigureTemplatesWithGin to handle template path err
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
Diffstat (limited to 'internal/federation/federatingdb/create.go')
| -rw-r--r-- | internal/federation/federatingdb/create.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/federation/federatingdb/create.go b/internal/federation/federatingdb/create.go index b07f4f04f..6c86151f3 100644 --- a/internal/federation/federatingdb/create.go +++ b/internal/federation/federatingdb/create.go @@ -231,7 +231,8 @@ func (f *federatingDB) createNote(ctx context.Context, note vocab.ActivityStream status.ID = statusID if err := f.db.PutStatus(ctx, status); err != nil { - if err == db.ErrAlreadyExists { + var alreadyExistsError *db.ErrAlreadyExists + if errors.As(err, &alreadyExistsError) { // the status already exists in the database, which means we've already handled everything else, // so we can just return nil here and be done with it. return nil |