Allow authoring MFM

config/config.exs

@@ -222,7 +222,8 @@ config :pleroma, :instance,
     "text/plain",
     "text/html",
     "text/markdown",
-    "text/bbcode"
+    "text/bbcode",
+    "text/x.misskeymarkdown"
   ],
   staff_transparency: [],
   autofollowed_nicknames: [],

lib/pleroma/emoji.ex

@@ -165,7 +165,7 @@ defmodule Pleroma.Emoji do
 
   def maybe_quote(name), do: name
 
-  def emoji_url(%{"type" => "EmojiReact", "content" => emoji, "tag" => []}), do: nil
+  def emoji_url(%{"type" => "EmojiReact", "content" => _, "tag" => []}), do: nil
 
   def emoji_url(%{"type" => "EmojiReact", "content" => emoji, "tag" => tags}) do
     tag =

lib/pleroma/web/activity_pub/object_validators/article_note_page_validator.ex

@@ -29,6 +29,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do
     end
 
     field(:replies, {:array, ObjectValidators.ObjectID}, default: [])
+    field(:source, :map)
   end
 
   def cast_and_apply(data) do
@@ -79,6 +80,17 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do
 
   defp fix_replies(data), do: data
 
+  # https://github.com/misskey-dev/misskey/pull/8787
+  defp fix_misskey_content(%{"source" => %{"mediaType" => "text/x.misskeymarkdown"}} = object), do: object
+
+  defp fix_misskey_content(%{"_misskey_content" => content} = object) do
+    object
+    |> Map.put("source", %{"content" => content, "mediaType" => "text/x.misskeymarkdown" })
+    |> Map.delete("_misskey_content")
+  end
+
+  defp fix_misskey_content(data), do: data
+
   defp fix(data) do
     data
     |> CommonFixes.fix_actor()
@@ -86,6 +98,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do
     |> fix_url()
     |> fix_tag()
     |> fix_replies()
+    |> fix_misskey_content()
     |> Transmogrifier.fix_emoji()
     |> Transmogrifier.fix_content_map()
   end

lib/pleroma/web/common_api/activity_draft.ex

@@ -213,13 +213,14 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
       end
 
     emoji = Map.merge(emoji, summary_emoji)
-
     {:ok, note_data, _meta} = Builder.note(draft)
-
     object =
       note_data
       |> Map.put("emoji", emoji)
-      |> Map.put("source", draft.status)
+      |> Map.put("source", %{
+        "content" => draft.status,
+        "mediaType" => draft.params[:content_type]
+      })
       |> Map.put("generator", draft.params[:generator])
 
     %__MODULE__{draft | object: object}

lib/pleroma/web/common_api/utils.ex

@@ -291,6 +291,15 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> Formatter.html_escape("text/html")
   end
 
+  def format_input(text, "text/x.misskeymarkdown", options) do
+    text
+    |> Formatter.html_escape("text/plain")
+    |> Formatter.linkify(options)
+    |> (fn {text, mentions, tags} ->
+          {String.replace(text, ~r/\r?\n/, "<br>"), mentions, tags}
+        end).()
+  end
+
   def format_naive_asctime(date) do
     date |> DateTime.from_naive!("Etc/UTC") |> format_asctime
   end

lib/pleroma/web/mastodon_api/views/status_view.ex

@@ -80,7 +80,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
 
   def render("index.json", opts) do
     reading_user = opts[:for]
-
     # To do: check AdminAPIControllerTest on the reasons behind nil activities in the list
     activities = Enum.filter(opts.activities, & &1)
 
@@ -329,7 +328,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
         )
 
     {pinned?, pinned_at} = pin_data(object, user)
-
     %{
       id: to_string(activity.id),
       uri: object.data["id"],
@@ -376,6 +374,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
         emoji_reactions: emoji_reactions,
         parent_visible: visible_for_user?(reply_to, opts[:for]),
         pinned_at: pinned_at
+      },
+      akkoma: %{
+        source: object.data["source"]
       }
     }
   end