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

ensure 'none' gets included in serializable visibilities (#4007)

Browse source
This commit is contained in:
kim 2025-04-14 12:33:37 +00:00 • committed by GitHub
commit 67fc1fd904
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
internal/processing/status/create.go
View file

@ -221,9 +221,8 @@ func (p *Processor) Create(
return nil, errWithCode
}
if err := p.processVisibility(ctx, form, requester.Settings.Privacy, status); err != nil {
return nil, gtserror.NewErrorInternalError(err)
}
// Process the incoming created status visibility.
processVisibility(form, requester.Settings.Privacy, status)
// Process policy AFTER visibility as it relies
// on status.Visibility and form.Visibility being set.
@ -485,12 +484,11 @@ func (p *Processor) processThreadID(ctx context.Context, status *gtsmodel.Status
return nil
}
func (p *Processor) processVisibility(
ctx context.Context,
func processVisibility(
form *apimodel.StatusCreateRequest,
accountDefaultVis gtsmodel.Visibility,
status *gtsmodel.Status,
) error {
) {
switch {
// Visibility set on form, use that.
case form.Visibility != "":
@ -500,21 +498,19 @@ func (p *Processor) processVisibility(
// this back on the form for later use.
case accountDefaultVis != 0:
status.Visibility = accountDefaultVis
form.Visibility = p.converter.VisToAPIVis(ctx, accountDefaultVis)
form.Visibility = typeutils.VisToAPIVis(accountDefaultVis)
// What? Fall back to global default, set
// this back on the form for later use.
default:
status.Visibility = gtsmodel.VisibilityDefault
form.Visibility = p.converter.VisToAPIVis(ctx, gtsmodel.VisibilityDefault)
form.Visibility = typeutils.VisToAPIVis(gtsmodel.VisibilityDefault)
}
// Set federated according to "local_only" field,
// assuming federated (ie., not local-only) by default.
localOnly := util.PtrOrValue(form.LocalOnly, false)
status.Federated = util.Ptr(!localOnly)
return nil
}
func processInteractionPolicy(