1 files changed, 11 insertions, 3 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 463f34198..ce350ad23 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -57,11 +57,19 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     end)
   end
 
-  defp get_context_id(%{data: %{"context_id" => context_id}}) when not is_nil(context_id),
+  defp get_context_id(%{data: %{"context_id" => context_id}}) when is_binary(context_id),
     do: context_id
 
-  defp get_context_id(%{data: %{"context" => context}}) when is_binary(context),
-    do: Utils.context_to_conversation_id(context)
+  defp get_context_id(%{data: %{"context_id" => context_id}}) when is_integer(context_id),
+    do: to_string(context_id)
+
+  defp get_context_id(%{data: %{"context" => context}}) when is_binary(context) do
+    case Utils.context_to_conversation_id(context) do
+      id when is_binary(id) -> id
+      id when is_integer(id) -> to_string(id)
+      _ -> nil
+    end
+  end
 
   defp get_context_id(_), do: nil