diff options
| author | Gabe Kangas <gabek@real-ity.com> | 2022-01-04 14:35:51 -0800 |
|---|---|---|
| committer | Gabe Kangas <gabek@real-ity.com> | 2022-01-06 23:02:49 -0800 |
| commit | 275df9a024214213b2478364070e7b14bc01f29e (patch) | |
| tree | 793d3fe5607554d53f8c9c35245cf1c4c5defb80 | |
| parent | 5fa2e7a5fb3b5f4e83512e3316e3ee7958e4ada8 (diff) | |
Remove markdown rendering of go live message. Reorganize text. Remove content warning. Closes #1645
| -rw-r--r-- | activitypub/outbox/outbox.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/activitypub/outbox/outbox.go b/activitypub/outbox/outbox.go index 61fed7f0f..1ca84722a 100644 --- a/activitypub/outbox/outbox.go +++ b/activitypub/outbox/outbox.go @@ -31,8 +31,6 @@ func SendLive() error { return nil } - textContent = utils.RenderSimpleMarkdown(textContent) - tagStrings := []string{} reg := regexp.MustCompile("[^a-zA-Z0-9]+") @@ -59,7 +57,7 @@ func SendLive() error { if title := data.GetStreamTitle(); title != "" { streamTitle = fmt.Sprintf("<p>%s</p>", title) } - textContent = fmt.Sprintf("<p>%s</p><a href=\"%s\">%s</a>%s<p>%s</p>", textContent, data.GetServerURL(), data.GetServerURL(), streamTitle, tagsString) + textContent = fmt.Sprintf("<p>%s</p><p>%s</p><p>%s</p><a href=\"%s\">%s</a>", textContent, streamTitle, tagsString, data.GetServerURL(), data.GetServerURL()) activity, _, note, noteID := createBaseOutboundMessage(textContent) @@ -84,11 +82,6 @@ func SendLive() error { } if data.GetNSFW() { - // Content warning is done via the summary property. - summary := streams.NewActivityStreamsSummaryProperty() - summary.AppendXMLSchemaString("Potentially NSFW") - note.SetActivityStreamsSummary(summary) - // Mark content as sensitive. sensitive := streams.NewActivityStreamsSensitiveProperty() sensitive.AppendXMLSchemaBoolean(true) |