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/processing | |
| 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/processing')
| -rw-r--r-- | internal/processing/status/util.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/internal/processing/status/util.go b/internal/processing/status/util.go index 05a3bf48e..f2640929d 100644 --- a/internal/processing/status/util.go +++ b/internal/processing/status/util.go @@ -223,8 +223,11 @@ func (p *processor) ProcessTags(ctx context.Context, form *apimodel.AdvancedStat return fmt.Errorf("error generating hashtags from status: %s", err) } for _, tag := range gtsTags { - if err := p.db.Put(ctx, tag); err != nil && err != db.ErrAlreadyExists { - return fmt.Errorf("error putting tags in db: %s", err) + if err := p.db.Put(ctx, tag); err != nil { + var alreadyExistsError *db.ErrAlreadyExists + if !errors.As(err, &alreadyExistsError) { + return fmt.Errorf("error putting tags in db: %s", err) + } } tags = append(tags, tag.ID) } |