X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus_controller.ex;h=f39ebaf2b5f92d0701e4f6efae1d0b0d1ec45db0;hb=aeff2d647483d5348cc1da5c901ce55f1c02b733;hp=4e3fbb4f692f8be010ed7150c69102f406d26b4b;hpb=678dd4c8ec85c34e1fded7d48ee0ab26e9555aad;p=akkoma

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 4e3fbb4f6..f39ebaf2b 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -5,41 +5,62 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   alias Pleroma.Web.OStatus.{FeedRepresenter, ActivityRepresenter}
   alias Pleroma.Repo
   alias Pleroma.Web.{OStatus, Federator}
-  import Ecto.Query
+  alias Pleroma.Web.XML
+  alias Pleroma.Web.ActivityPub.ActivityPubController
+  alias Pleroma.Web.ActivityPub.ActivityPub
 
-  def feed_redirect(conn, %{"nickname" => nickname}) do
+  def feed_redirect(conn, %{"nickname" => nickname} = params) do
     user = User.get_cached_by_nickname(nickname)
 
     case get_format(conn) do
       "html" -> Fallback.RedirectController.redirector(conn, nil)
-      _ -> redirect conn, external: OStatus.feed_path(user)
+      "activity+json" -> ActivityPubController.user(conn, params)
+      _ -> redirect(conn, external: OStatus.feed_path(user))
     end
   end
 
-  def feed(conn, %{"nickname" => nickname}) do
+  def feed(conn, %{"nickname" => nickname} = params) do
     user = User.get_cached_by_nickname(nickname)
-    query = from activity in Activity,
-      where: fragment("?->>'actor' = ?", activity.data, ^user.ap_id),
-      limit: 20,
-      order_by: [desc: :id]
 
-    activities = query
-    |> Repo.all
+    query_params =
+      Map.take(params, ["max_id"])
+      |> Map.merge(%{"whole_db" => true, "actor_id" => user.ap_id})
 
-    response = user
-    |> FeedRepresenter.to_simple_form(activities, [user])
-    |> :xmerl.export_simple(:xmerl_xml)
-    |> to_string
+    activities =
+      ActivityPub.fetch_public_activities(query_params)
+      |> Enum.reverse()
+
+    response =
+      user
+      |> FeedRepresenter.to_simple_form(activities, [user])
+      |> :xmerl.export_simple(:xmerl_xml)
+      |> to_string
 
     conn
     |> put_resp_content_type("application/atom+xml")
     |> send_resp(200, response)
   end
 
-  def salmon_incoming(conn, params) do
+  defp decode_or_retry(body) do
+    with {:ok, magic_key} <- Pleroma.Web.Salmon.fetch_magic_key(body),
+         {:ok, doc} <- Pleroma.Web.Salmon.decode_and_validate(magic_key, body) do
+      {:ok, doc}
+    else
+      _e ->
+        with [decoded | _] <- Pleroma.Web.Salmon.decode(body),
+             doc <- XML.parse_document(decoded),
+             uri when not is_nil(uri) <- XML.string_from_xpath("/entry/author[1]/uri", doc),
+             {:ok, _} <- Pleroma.Web.OStatus.make_user(uri, true),
+             {:ok, magic_key} <- Pleroma.Web.Salmon.fetch_magic_key(body),
+             {:ok, doc} <- Pleroma.Web.Salmon.decode_and_validate(magic_key, body) do
+          {:ok, doc}
+        end
+    end
+  end
+
+  def salmon_incoming(conn, _) do
     {:ok, body, _conn} = read_body(conn)
-    {:ok, magic_key} = Pleroma.Web.Salmon.fetch_magic_key(body)
-    {:ok, doc} = Pleroma.Web.Salmon.decode_and_validate(magic_key, body)
+    {:ok, doc} = decode_or_retry(body)
 
     Federator.enqueue(:incoming_doc, doc)
 
@@ -47,17 +68,23 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     |> send_resp(200, "")
   end
 
-  def object(conn, %{"uuid" => uuid}) do
-    with id <- o_status_url(conn, :object, uuid),
-         %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
-         %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
-      case get_format(conn) do
-        "html" -> redirect(conn, to: "/notice/#{activity.id}")
-        _ -> represent_activity(conn, activity, user)
+  # TODO: Data leak
+  def object(conn, %{"uuid" => uuid} = params) do
+    if get_format(conn) == "activity+json" do
+      ActivityPubController.object(conn, params)
+    else
+      with id <- o_status_url(conn, :object, uuid),
+           %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id),
+           %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
+        case get_format(conn) do
+          "html" -> redirect(conn, to: "/notice/#{activity.id}")
+          _ -> represent_activity(conn, activity, user)
+        end
       end
     end
   end
 
+  # TODO: Data leak
   def activity(conn, %{"uuid" => uuid}) do
     with id <- o_status_url(conn, :activity, uuid),
          %Activity{} = activity <- Activity.get_by_ap_id(id),
@@ -69,12 +96,29 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
+  # TODO: Data leak
+  def notice(conn, %{"id" => id}) do
+    with %Activity{} = activity <- Repo.get(Activity, id),
+         %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
+      case get_format(conn) do
+        "html" ->
+          conn
+          |> put_resp_content_type("text/html")
+          |> send_file(200, "priv/static/index.html")
+
+        _ ->
+          represent_activity(conn, activity, user)
+      end
+    end
+  end
+
   defp represent_activity(conn, activity, user) do
-    response = activity
-    |> ActivityRepresenter.to_simple_form(user, true)
-    |> ActivityRepresenter.wrap_with_entry
-    |> :xmerl.export_simple(:xmerl_xml)
-    |> to_string
+    response =
+      activity
+      |> ActivityRepresenter.to_simple_form(user, true)
+      |> ActivityRepresenter.wrap_with_entry()
+      |> :xmerl.export_simple(:xmerl_xml)
+      |> to_string
 
     conn
     |> put_resp_content_type("application/atom+xml")