X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus_controller.ex;h=5dbee20e1c9429f112db4d8b0362ca9e2f31f070;hb=46486595ff96e0af0c3193e60879a8e67f77b933;hp=23ca8e08827e540f7cb74b9b02de6f364da769a0;hpb=9b3a6cdb07383631c9ac11ce5de51306f6c4a464;p=akkoma

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 23ca8e088..5dbee20e1 100644
--- 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, Metadata}
+  alias Pleroma.Web.{OStatus, Federator}
   alias Pleroma.Web.XML
   alias Pleroma.Web.ActivityPub.ObjectView
   alias Pleroma.Web.ActivityPub.ActivityPubController
@@ -16,7 +16,11 @@ 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_or_id(nickname) do
+          Fallback.RedirectController.redirector_with_meta(conn, %{user: user})
+        else
+          nil -> {:error, :not_found}
+        end
 
       "activity+json" ->
         ActivityPubController.call(conn, :user)
@@ -134,7 +138,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, user)
+          Fallback.RedirectController.redirector_with_meta(conn, %{activity: activity, user: user})
 
         _ ->
           represent_activity(conn, format, activity, user)
@@ -151,15 +155,6 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
-  defp serve_static_with_meta(conn, activity, user) do
-    {:ok, index_content } = File.read(Application.app_dir(:pleroma, "priv/static/index.html"))
-    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)
-  end
-
   defp represent_activity(
          conn,
          "activity+json",