9 files changed, 18 insertions, 15 deletions
diff --git a/internal/api/client/admin/reportsget_test.go b/internal/api/client/admin/reportsget_test.go
index 8639e0c6e..ec15b05d3 100644
--- a/internal/api/client/admin/reportsget_test.go
+++ b/internal/api/client/admin/reportsget_test.go
@@ -508,7 +508,7 @@ func (suite *ReportsGetTestSuite) TestReportsGetAll() {
         "muted": false,
         "bookmarked": false,
         "pinned": false,
-        "content": "dark souls status bot: \"thoughts of dog\"",
+        "content": "\u003cp\u003edark souls status bot: \"thoughts of dog\"\u003c/p\u003e",
         "reblog": null,
         "account": {
           "id": "01F8MH5ZK5VRH73AKHQM6Y9VNX",
@@ -765,7 +765,7 @@ func (suite *ReportsGetTestSuite) TestReportsGetCreatedByAccount() {
         "muted": false,
         "bookmarked": false,
         "pinned": false,
-        "content": "dark souls status bot: \"thoughts of dog\"",
+        "content": "\u003cp\u003edark souls status bot: \"thoughts of dog\"\u003c/p\u003e",
         "reblog": null,
         "account": {
           "id": "01F8MH5ZK5VRH73AKHQM6Y9VNX",
@@ -1022,7 +1022,7 @@ func (suite *ReportsGetTestSuite) TestReportsGetTargetAccount() {
         "muted": false,
         "bookmarked": false,
         "pinned": false,
-        "content": "dark souls status bot: \"thoughts of dog\"",
+        "content": "\u003cp\u003edark souls status bot: \"thoughts of dog\"\u003c/p\u003e",
         "reblog": null,
         "account": {
           "id": "01F8MH5ZK5VRH73AKHQM6Y9VNX",
diff --git a/internal/api/client/search/searchget_test.go b/internal/api/client/search/searchget_test.go
index 2c4efd19c..318010387 100644
--- a/internal/api/client/search/searchget_test.go
+++ b/internal/api/client/search/searchget_test.go
@@ -916,7 +916,7 @@ func (suite *SearchGetTestSuite) TestSearchAAny() {
 	}
 
 	suite.Len(searchResult.Accounts, 5)
-	suite.Len(searchResult.Statuses, 8)
+	suite.Len(searchResult.Statuses, 9)
 	suite.Len(searchResult.Hashtags, 0)
 }
 
@@ -959,7 +959,7 @@ func (suite *SearchGetTestSuite) TestSearchAAnyFollowingOnly() {
 	}
 
 	suite.Len(searchResult.Accounts, 2)
-	suite.Len(searchResult.Statuses, 8)
+	suite.Len(searchResult.Statuses, 9)
 	suite.Len(searchResult.Hashtags, 0)
 }
 
@@ -1002,7 +1002,7 @@ func (suite *SearchGetTestSuite) TestSearchAStatuses() {
 	}
 
 	suite.Len(searchResult.Accounts, 0)
-	suite.Len(searchResult.Statuses, 8)
+	suite.Len(searchResult.Statuses, 9)
 	suite.Len(searchResult.Hashtags, 0)
 }
 
diff --git a/internal/api/client/statuses/statusboost_test.go b/internal/api/client/statuses/statusboost_test.go
index fc750ca38..a9fee34f7 100644
--- a/internal/api/client/statuses/statusboost_test.go
+++ b/internal/api/client/statuses/statusboost_test.go
@@ -144,7 +144,7 @@ func (suite *StatusBoostTestSuite) TestPostBoost() {
     },
     "bookmarked": true,
     "card": null,
-    "content": "hello world! #welcome ! first post on the instance :rainbow: !",
+    "content": "<p>hello world! <a href=\"http://localhost:8080/tags/welcome\" class=\"mention hashtag\" rel=\"tag nofollow noreferrer noopener\" target=\"_blank\">#<span>welcome</span></a> ! first post on the instance :rainbow: !</p>",
     "content_type": "text/plain",
     "created_at": "right the hell just now babyee",
     "edited_at": null,
@@ -331,7 +331,7 @@ func (suite *StatusBoostTestSuite) TestPostBoostOwnFollowersOnly() {
     },
     "bookmarked": false,
     "card": null,
-    "content": "hi!",
+    "content": "<p>hi!</p>",
     "content_type": "text/plain",
     "created_at": "right the hell just now babyee",
     "edited_at": null,
diff --git a/internal/api/client/statuses/statusfave_test.go b/internal/api/client/statuses/statusfave_test.go
index 42b812fdf..983935184 100644
--- a/internal/api/client/statuses/statusfave_test.go
+++ b/internal/api/client/statuses/statusfave_test.go
@@ -103,7 +103,7 @@ func (suite *StatusFaveTestSuite) TestPostFave() {
   },
   "bookmarked": false,
   "card": null,
-  "content": "🐕🐕🐕🐕🐕",
+  "content": "<p>🐕🐕🐕🐕🐕</p>",
   "content_type": "text/plain",
   "created_at": "right the hell just now babyee",
   "edited_at": null,
diff --git a/internal/api/client/statuses/statushistory_test.go b/internal/api/client/statuses/statushistory_test.go
index 61c15b58a..fe650402f 100644
--- a/internal/api/client/statuses/statushistory_test.go
+++ b/internal/api/client/statuses/statushistory_test.go
@@ -91,7 +91,7 @@ func (suite *StatusHistoryTestSuite) TestGetHistory() {
 
 	suite.Equal(`[
   {
-    "content": "hello everyone!",
+    "content": "\u003cp\u003ehello everyone!\u003c/p\u003e",
     "spoiler_text": "introduction post",
     "sensitive": true,
     "created_at": "2021-10-20T10:40:37.000Z",
diff --git a/internal/api/client/statuses/statusmute_test.go b/internal/api/client/statuses/statusmute_test.go
index 174ac14dc..a98eff78a 100644
--- a/internal/api/client/statuses/statusmute_test.go
+++ b/internal/api/client/statuses/statusmute_test.go
@@ -108,7 +108,7 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() {
   "muted": true,
   "bookmarked": false,
   "pinned": false,
-  "content": "hello everyone!",
+  "content": "\u003cp\u003ehello everyone!\u003c/p\u003e",
   "reblog": null,
   "application": {
     "name": "really cool gts application",
@@ -198,7 +198,7 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() {
   "muted": false,
   "bookmarked": false,
   "pinned": false,
-  "content": "hello everyone!",
+  "content": "\u003cp\u003ehello everyone!\u003c/p\u003e",
   "reblog": null,
   "application": {
     "name": "really cool gts application",
diff --git a/internal/api/client/statuses/statusunfave_test.go b/internal/api/client/statuses/statusunfave_test.go
index 4ef28b3b7..d02de47a5 100644
--- a/internal/api/client/statuses/statusunfave_test.go
+++ b/internal/api/client/statuses/statusunfave_test.go
@@ -129,7 +129,6 @@ func (suite *StatusUnfaveTestSuite) TestPostAlreadyNotFaved() {
 	err = json.Unmarshal(b, statusReply)
 	assert.NoError(suite.T(), err)
 
-	assert.Equal(suite.T(), targetStatus.ContentWarning, statusReply.SpoilerText)
 	assert.Equal(suite.T(), targetStatus.Content, statusReply.Content)
 	assert.True(suite.T(), statusReply.Sensitive)
 	assert.Equal(suite.T(), apimodel.VisibilityPublic, statusReply.Visibility)
diff --git a/internal/api/model/status.go b/internal/api/model/status.go
index fe82f09e3..ec09f702d 100644
--- a/internal/api/model/status.go
+++ b/internal/api/model/status.go
@@ -127,6 +127,10 @@ type Status struct {
 type WebStatus struct {
 	*Status
 
+	// HTML version of spoiler content
+	// (ie., not converted to plaintext).
+	SpoilerContent string `json:"-"`
+
 	// Override API account with web account.
 	Account *WebAccount `json:"account"`
 
diff --git a/internal/api/util/opengraph.go b/internal/api/util/opengraph.go
index 094c80021..770bada83 100644
--- a/internal/api/util/opengraph.go
+++ b/internal/api/util/opengraph.go
@@ -67,7 +67,7 @@ func OGBase(instance *apimodel.InstanceV1) *OGMeta {
 	}
 
 	og := &OGMeta{
-		Title:       text.SanitizeToPlaintext(instance.Title) + " - GoToSocial",
+		Title:       text.StripHTMLFromText(instance.Title) + " - GoToSocial",
 		Type:        "website",
 		Locale:      locale,
 		URL:         instance.URI,
@@ -161,7 +161,7 @@ func AccountTitle(account *apimodel.WebAccount, accountDomain string) string {
 // ParseDescription returns a string description which is
 // safe to use as a template.HTMLAttr inside templates.
 func ParseDescription(in string) string {
-	i := text.SanitizeToPlaintext(in)
+	i := text.StripHTMLFromText(in)
 	i = strings.ReplaceAll(i, "\n", " ")
 	i = strings.Join(strings.Fields(i), " ")
 	i = html.EscapeString(i)