SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[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
parent a87be80c90
commit 0992ffc057
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
if domainPerm != nil {
if !util.IsNil(domainPerm) {
// Permission already exists, update it.
apiDomainPerm, errWithCode = p.DomainPermissionUpdate(
ctx,
@ -394,15 +394,21 @@ func (p *Processor) DomainPermissionGet(
err = gtserror.New("unrecognized permission type")
}
if err != nil {
if errors.Is(err, db.ErrNoEntries) {
err = fmt.Errorf("no domain %s exists with id %s", permissionType.String(), id)
return nil, gtserror.NewErrorNotFound(err, err.Error())
}
err = gtserror.Newf("error getting domain %s with id %s: %w", permissionType.String(), id, err)
if err != nil && errors.Is(err, db.ErrNoEntries) {
err = gtserror.Newf(
"db error getting domain %s with id %s: %w",
permissionType.String(), id, 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)
}