mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-23 00:16:16 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Write status content type on create/edit

Browse source
This commit is contained in:
ewin 2025-03-03 13:46:37 -05:00
commit e51a787162
No known key found for this signature in database
4 changed files with 57 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

39
internal/processing/status/edit.go
View file

@ -33,6 +33,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/id"
"github.com/superseriousbusiness/gotosocial/internal/log"
"github.com/superseriousbusiness/gotosocial/internal/messages"
"github.com/superseriousbusiness/gotosocial/internal/typeutils"
"github.com/superseriousbusiness/gotosocial/internal/util/xslices"
)
@ -84,11 +85,14 @@ func (p *Processor) Edit(
return nil, errWithCode
}
// Process incoming content type and update as needed
p.processContentType(ctx, form, status, requester.Settings.StatusContentType)
// Process incoming status edit content fields.
content, errWithCode := p.processContent(ctx,
requester,
statusID,
string(form.ContentType),
form.ContentType,
form.Status,
form.SpoilerText,
form.Language,
@ -256,6 +260,7 @@ func (p *Processor) Edit(
edit.Content = status.Content
edit.ContentWarning = status.ContentWarning
edit.Text = status.Text
edit.ContentType = status.ContentType
edit.Language = status.Language
edit.Sensitive = status.Sensitive
edit.StatusID = status.ID
@ -342,6 +347,38 @@ func (p *Processor) Edit(
return p.c.GetAPIStatus(ctx, requester, status)
}
// Updates the content type of the status
func (p *Processor) processContentType(
ctx context.Context,
form *apimodel.StatusEditRequest,
status *gtsmodel.Status,
accountDefaultContentType string,
) {
switch {
// Content type set on form, update the status with the new value.
case form.ContentType != "":
status.ContentType = typeutils.APIContentTypeToContentType(form.ContentType)
// No content type on the form, get the status's current content type and
// set it back on the form for later use.
case status.ContentType != 0:
form.ContentType = p.converter.ContentTypeToAPIContentType(ctx, status.ContentType)
// Old statuses may not have a saved content type; update the status to the
// user's preference and set this back on the form for later use.
case accountDefaultContentType != "":
// TODO: is this conversion from string to StatusContentType safe
status.ContentType = typeutils.APIContentTypeToContentType(apimodel.StatusContentType(accountDefaultContentType))
form.ContentType = apimodel.StatusContentType(accountDefaultContentType)
// uhh.. Fall back to global default, set
// this back on the form for later use.
default:
status.ContentType = gtsmodel.StatusContentTypeDefault
form.ContentType = apimodel.StatusContentTypeDefault
}
}
// HistoryGet gets edit history for the target status, taking account of privacy settings and blocks etc.
func (p *Processor) HistoryGet(ctx context.Context, requester *gtsmodel.Account, targetStatusID string) ([]*apimodel.StatusEdit, gtserror.WithCode) {
target, errWithCode := p.c.GetVisibleTargetStatus(ctx,