pleroma

commit: 366559c5a33c30de181782418cd1b52f65d0ca5a
parent 04c8f6b4d1e2a9a30f66b0ffb99d7a17a1510a3e
Author: marcin mikołajczak <git@mkljczk.pl>
Date:   Fri, 11 Aug 2023 14:59:58 +0200

Make status.language == nil for 'und' value

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>

Diffstat:
M
lib/pleroma/web/mastodon_api/views/status_view.ex
8
++++++--
M
test/pleroma/web/mastodon_api/views/status_view_test.exs
10
++++++++++

2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -200,7 +200,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       mentions: mentions,
       tags: reblogged[:tags] || [],
       application: build_application(object.data["generator"]),
-      language: object.data["language"],
+      language: get_language(object),
       emojis: [],
       pleroma: %{
         local: activity.local,
@@ -391,7 +391,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
       mentions: mentions,
       tags: build_tags(tags),
       application: build_application(object.data["generator"]),
-      language: object.data["language"],
+      language: get_language(object),
       emojis: build_emojis(object.data["emoji"]),
       pleroma: %{
         local: activity.local,
@@ -756,4 +756,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
   defp get_source_content_type(_source) do
     Utils.get_content_type(nil)
   end
+
+  defp get_language(%{data: %{"language" => "und"}}), do: nil
+
+  defp get_language(object), do: object.data["language"]
 end
diff --git a/test/pleroma/web/mastodon_api/views/status_view_test.exs b/test/pleroma/web/mastodon_api/views/status_view_test.exs
@@ -780,6 +780,16 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
     assert status.language == "pl"
   end
 
+  test "doesn't show post language if it's 'und'" do
+    user = insert(:user)
+
+    {:ok, post} = CommonAPI.post(user, %{status: "sdifjogijodfg", language: "und"})
+
+    status = StatusView.render("show.json", activity: post)
+
+    assert status.language == nil
+  end
+
   test "with a source object" do
     note =
       insert(:note,