X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Fostatus_controller.ex;h=53278431e1b766b78c8cc09f825f8e43b4703d76;hb=4856ba596f5682a48a5cd17cacb607d996764f7a;hp=d442d16fdaad95cd2ddb70ce23cbe5b73322e5cc;hpb=30e9b22f96f2bf1cd895e993190f40afba159bb6;p=akkoma

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index d442d16fd..53278431e 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -6,31 +6,35 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   alias Pleroma.Repo
   alias Pleroma.Web.{OStatus, Federator}
   alias Pleroma.Web.XML
-  import Ecto.Query
+  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")
@@ -64,13 +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)
+  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),
+           {_, true} <- {:public?, ActivityPub.is_public?(activity)},
+           %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
+      else
+        {:public?, false} ->
+          conn
+          |> put_status(404)
+          |> json("Not found")
       end
     end
   end
@@ -78,33 +92,48 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   def activity(conn, %{"uuid" => uuid}) do
     with id <- o_status_url(conn, :activity, uuid),
          %Activity{} = activity <- Activity.get_by_ap_id(id),
+         {_, true} <- {:public?, ActivityPub.is_public?(activity)},
          %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
+    else
+      {:public?, false} ->
+        conn
+        |> put_status(404)
+        |> json("Not found")
     end
   end
 
   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
+    with %Activity{} = activity <- Repo.get(Activity, id),
+         {_, true} <- {:public?, ActivityPub.is_public?(activity)},
+         %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)
+
+        _ ->
+          represent_activity(conn, activity, user)
       end
+    else
+      {:public?, false} ->
+        conn
+        |> put_status(404)
+        |> json("Not found")
     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")