Extract opengraph/oembed into separate module

[akkoma] / lib / pleroma / web / ostatus / ostatus_controller.ex

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 27ec24f576b939cac7ae777a469c0e4c3cacba7f..23ca8e08827e540f7cb74b9b02de6f364da769a0 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -4,7 +4,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   alias Pleroma.{User, Activity, Object}
   alias Pleroma.Web.OStatus.{FeedRepresenter, ActivityRepresenter}
   alias Pleroma.Repo
-  alias Pleroma.Web.{OStatus, Federator}
+  alias Pleroma.Web.{OStatus, Federator, Metadata}
   alias Pleroma.Web.XML
   alias Pleroma.Web.ActivityPub.ObjectView
   alias Pleroma.Web.ActivityPub.ActivityPubController
@@ -134,7 +134,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
          %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
       case format = get_format(conn) do
         "html" ->
-          serve_static_with_meta(conn, activity)
+          serve_static_with_meta(conn, activity, user)
 
         _ ->
           represent_activity(conn, format, activity, user)
@@ -151,10 +151,10 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
-  defp serve_static_with_meta(conn, activity) do
+  defp serve_static_with_meta(conn, activity, user) do
     {:ok, index_content } = File.read(Application.app_dir(:pleroma, "priv/static/index.html"))
-    links = OStatus.metadata(request_url(conn))
-    response = String.replace(index_content, "<!--server-generated-meta-->", links)
+    tags = Metadata.build_tags(activity, user, request_url(conn))
+    response = String.replace(index_content, "<!--server-generated-meta-->", tags)
     conn
     |> put_resp_content_type("text/html")
     |> send_resp(200, response)