X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=61af71acd206f75a46c4892472e549483d9d7e2c;hb=62e179f446ac7bfada965fac47e9613ce60091b4;hp=8fde9ae156efb615addc05c51e2bbb10718382a6;hpb=4fb2251221e9c023905a25c49fc9058b29952d13;p=akkoma

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 8fde9ae15..61af71acd 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -283,23 +283,23 @@ defmodule Pleroma.Web.CommonAPI.Utils do
     |> Formatter.linkify(options)
   end
 
-  def format_input(text, "text/markdown", options) do
-    text
-    |> Formatter.mentions_escape(options)
-    |> Formatter.markdown_to_html()
-    |> Formatter.linkify(options)
-    |> Formatter.html_escape("text/html")
-  end
-
   def format_input(text, "text/x.misskeymarkdown", options) do
     text
-    |> Formatter.html_escape("text/plain")
     |> Formatter.linkify(options)
+    |> Formatter.html_escape("text/x.misskeymarkdown")
     |> (fn {text, mentions, tags} ->
           {String.replace(text, ~r/\r?\n/, "<br>"), mentions, tags}
         end).()
   end
 
+  def format_input(text, "text/markdown", options) do
+    text
+    |> Formatter.mentions_escape(options)
+    |> Formatter.markdown_to_html()
+    |> Formatter.linkify(options)
+    |> Formatter.html_escape("text/html")
+  end
+
   def format_naive_asctime(date) do
     date |> DateTime.from_naive!("Etc/UTC") |> format_asctime
   end
@@ -458,35 +458,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
 
   def get_report_statuses(_, _), do: {:ok, nil}
 
-  # DEPRECATED mostly, context objects are now created at insertion time.
-  def context_to_conversation_id(context) do
-    with %Object{id: id} <- Object.get_cached_by_ap_id(context) do
-      id
-    else
-      _e ->
-        changeset = Object.context_mapping(context)
-
-        case Repo.insert(changeset) do
-          {:ok, %{id: id}} ->
-            id
-
-          # This should be solved by an upsert, but it seems ecto
-          # has problems accessing the constraint inside the jsonb.
-          {:error, _} ->
-            Object.get_cached_by_ap_id(context).id
-        end
-    end
-  end
-
-  def conversation_id_to_context(id) do
-    with %Object{data: %{"id" => context}} <- Repo.get(Object, id) do
-      context
-    else
-      _e ->
-        {:error, dgettext("errors", "No such conversation")}
-    end
-  end
-
   def validate_character_limit("" = _full_payload, [] = _attachments) do
     {:error, dgettext("errors", "Cannot post an empty status without attachments")}
   end