mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[feature] Parse content warning to HTML, serialize via client API as plaintext (#3876)
* [feature] Parse content warning as HTML, serialize via API to plaintext * tidy up some cruft * whoops * oops * i'm da joker baybee * clemency muy lorde * rename some of the text functions for clarity * jiggle the opts * fiddle de deee * hopefully the last test fix i ever have to do in my beautiful life
This commit is contained in:
@ -301,7 +301,7 @@ func (p *Processor) Edit(
|
||||
// update the other necessary status fields.
|
||||
status.Content = content.Content
|
||||
status.ContentWarning = content.ContentWarning
|
||||
status.Text = form.Status
|
||||
status.Text = form.Status // raw
|
||||
status.ContentType = contentType
|
||||
status.Language = content.Language
|
||||
status.Sensitive = &form.Sensitive
|
||||
@ -309,6 +309,13 @@ func (p *Processor) Edit(
|
||||
status.Attachments = media
|
||||
status.EditedAt = now
|
||||
|
||||
// Only store ContentWarningText if the parsed
|
||||
// result is different from the given SpoilerText,
|
||||
// otherwise skip to avoid duplicating db columns.
|
||||
if content.ContentWarning != form.SpoilerText {
|
||||
status.ContentWarningText = form.SpoilerText
|
||||
}
|
||||
|
||||
if poll != nil {
|
||||
// Set relevent fields for latest with poll.
|
||||
status.ActivityStreamsType = ap.ActivityQuestion
|
||||
|
Reference in New Issue
Block a user