mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-29 12:12:24 -05:00
[bugfix] More permissive CSV parsing for perm subs, text parse fix (#3638)
* [bugfix] More permissive CSV parsing for perm subs, text parse fix * wee * change the way dry works, slightly * me oh my, i'm just a little guy * we're just normal men
This commit is contained in:
parent
451803b230
commit
8daa4dae34
5 changed files with 184 additions and 53 deletions
|
|
@ -272,6 +272,12 @@ func (p *Processor) DomainPermissionSubscriptionRemove(
|
|||
return nil, gtserror.NewErrorNotFound(err, err.Error())
|
||||
}
|
||||
|
||||
// Convert to API perm sub *before* doing the deletion.
|
||||
apiPermSub, errWithCode := p.apiDomainPermSub(ctx, permSub)
|
||||
if errWithCode != nil {
|
||||
return nil, errWithCode
|
||||
}
|
||||
|
||||
// TODO in next PR: if removeChildren, then remove all
|
||||
// domain permissions that are children of this domain
|
||||
// permission subscription. If not removeChildren, then
|
||||
|
|
@ -282,7 +288,7 @@ func (p *Processor) DomainPermissionSubscriptionRemove(
|
|||
return nil, gtserror.NewErrorInternalError(err)
|
||||
}
|
||||
|
||||
return p.apiDomainPermSub(ctx, permSub)
|
||||
return apiPermSub, nil
|
||||
}
|
||||
|
||||
func (p *Processor) DomainPermissionSubscriptionTest(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue