Remove oembed for now, will submit it in another MR. Fix warnings

[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..55dbcab9302e56fbdc939da096be0ec1748fe913 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -16,7 +16,9 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   def feed_redirect(conn, %{"nickname" => nickname}) do
     case get_format(conn) do
       "html" ->
-        Fallback.RedirectController.redirector(conn, nil)
+        with %User{} = user <- User.get_cached_by_nickname(nickname) do
+          Fallback.RedirectController.redirector_with_meta(conn, %{user: user})
+        end
 
       "activity+json" ->
         ActivityPubController.call(conn, :user)
@@ -134,7 +136,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)
+          Fallback.RedirectController.redirector_with_meta(conn, %{activity: activity, user: user})
 
         _ ->
           represent_activity(conn, format, activity, user)
@@ -151,15 +153,6 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
-  defp serve_static_with_meta(conn, activity) 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)
-    conn
-    |> put_resp_content_type("text/html")
-    |> send_resp(200, response)
-  end
-
   defp represent_activity(
          conn,
          "activity+json",