Prefer FollowBot naming convention vs Followbot

[akkoma] / lib / pleroma / web / mastodon_api / views / status_view.ex

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 581b4e952322555529dea89215f992156a2b95d7..3753588f2609a571fe084999f98ad9595269b86b 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -198,8 +198,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     like_count = object.data["like_count"] || 0
     announcement_count = object.data["announcement_count"] || 0
 
-    tags = object.data["tag"] || []
-    sensitive = object.data["sensitive"] || Enum.member?(tags, "nsfw")
+    hashtags = Object.hashtags(object)
+    sensitive = object.data["sensitive"] || Enum.member?(hashtags, "nsfw")
+
+    tags = Object.tags(object)
 
     tag_mentions =
       tags
@@ -386,7 +388,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
         nil
       end
 
-    image_url = get_image_url(image_url_data, page_url_data)
+    image_url = build_image_url(image_url_data, page_url_data)
 
     %{
       type: "link",
@@ -548,8 +550,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
   # Avoid applying URI.merge unless necessary
   # TODO: revert to always attempting URI.merge(image_url_data, page_url_data)
   # when Elixir 1.12 is the minimum supported version
-  @spec get_image_url(struct() | nil, struct()) :: String.t() | nil
-  defp get_image_url(
+  @spec build_image_url(struct() | nil, struct()) :: String.t() | nil
+  defp build_image_url(
          %URI{scheme: image_scheme, host: image_host} = image_url_data,
          %URI{} = _page_url_data
        )
@@ -557,9 +559,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     image_url_data |> to_string
   end
 
-  defp get_image_url(%URI{} = image_url_data, %URI{} = page_url_data) do
+  defp build_image_url(%URI{} = image_url_data, %URI{} = page_url_data) do
     URI.merge(page_url_data, image_url_data) |> to_string
   end
 
-  defp get_image_url(_, _), do: nil
+  defp build_image_url(_, _), do: nil
 end