From 7b69dc9219a61214b958fdd965806732fbacc2a9 Mon Sep 17 00:00:00 2001
From: silverpill <silverpill@firemail.cc>
Date: Thu, 22 Dec 2022 20:44:32 +0000
Subject: [PATCH] Use InstanceInfo.description field for HTML content

Also added description_source field for storing Markdown source.
---
 docs/openapi.yaml                  | 5 ++++-
 src/mastodon_api/instance/types.rs | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/openapi.yaml b/docs/openapi.yaml
index d08e424..04cc79b 100644
--- a/docs/openapi.yaml
+++ b/docs/openapi.yaml
@@ -1350,7 +1350,10 @@ components:
           description: A short description defined by the admin.
           type: string
         description:
-          description: Admin-defined description of the site.
+          description: Admin-defined description of the site (HTML).
+          type: string
+        description_source:
+          description: Admin-defined description of the site (Markdown source).
           type: string
         version:
           description: Mastodon API compatibility version and the version of Mitra server.
diff --git a/src/mastodon_api/instance/types.rs b/src/mastodon_api/instance/types.rs
index c1ed8c9..ac7a7b8 100644
--- a/src/mastodon_api/instance/types.rs
+++ b/src/mastodon_api/instance/types.rs
@@ -33,9 +33,8 @@ pub struct InstanceInfo {
     uri: String,
     title: String,
     short_description: String,
-    // TODO: HTML by default
     description: String,
-    description_html: String,
+    description_source: String,
     version: String,
     registrations: bool,
     stats: InstanceStats,
@@ -108,8 +107,8 @@ impl InstanceInfo {
             uri: config.instance().hostname(),
             title: config.instance_title.clone(),
             short_description: config.instance_short_description.clone(),
-            description: config.instance_description.clone(),
-            description_html: markdown_to_html(&config.instance_description),
+            description: markdown_to_html(&config.instance_description),
+            description_source: config.instance_description.clone(),
             version: get_full_api_version(&config.version),
             registrations: config.registrations_open,
             stats: InstanceStats {