mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 12:22:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[bugfix] Use util.IsNil for checking DomainPermission (#4040)

Browse source
This commit is contained in:
tobi 2025-04-22 12:20:45 +02:00 • committed by GitHub
commit 0992ffc057
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/processing/admin/domainpermission.go
View file

@ -267,7 +267,7 @@ func (p *Processor) importOrUpdateDomainPerm(
} }
var errWithCode gtserror.WithCode var errWithCode gtserror.WithCode
if domainPerm != nil { if !util.IsNil(domainPerm) {
// Permission already exists, update it. // Permission already exists, update it.
apiDomainPerm, errWithCode = p.DomainPermissionUpdate( apiDomainPerm, errWithCode = p.DomainPermissionUpdate(
ctx, ctx,
@ -394,15 +394,21 @@ func (p *Processor) DomainPermissionGet(
err = gtserror.New("unrecognized permission type") err = gtserror.New("unrecognized permission type")
} }
if err != nil { if err != nil && errors.Is(err, db.ErrNoEntries) {
if errors.Is(err, db.ErrNoEntries) { err = gtserror.Newf(
err = fmt.Errorf("no domain %s exists with id %s", permissionType.String(), id) "db error getting domain %s with id %s: %w",
return nil, gtserror.NewErrorNotFound(err, err.Error()) permissionType.String(), id, err,
} )
err = gtserror.Newf("error getting domain %s with id %s: %w", permissionType.String(), id, err)
return nil, gtserror.NewErrorInternalError(err) return nil, gtserror.NewErrorInternalError(err)
} }
if util.IsNil(domainPerm) {
errText := fmt.Sprintf(
"no domain %s exists with id %s",
permissionType.String(), id,
)
return nil, gtserror.NewErrorNotFound(errors.New(errText), errText)
}
return p.apiDomainPerm(ctx, domainPerm, export) return p.apiDomainPerm(ctx, domainPerm, export)
} }