TwitterAPI: support follow activities without published date.

[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 778495a3ee24b70e01071c59a709322c95984699..4388217d1020978b460dc0cca0e32142d3ac8bd3 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -19,7 +19,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     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),
@@ -27,6 +27,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
       order_by: [desc: :id]
 
     activities = query
+    |> restrict_max(params)
     |> Repo.all
 
     response = user
@@ -56,6 +57,11 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
+  defp restrict_max(query, %{"max_id" => max_id}) do
+    from activity in query, where: activity.id < ^max_id
+  end
+  defp restrict_max(query, _), do: query
+
   def salmon_incoming(conn, _) do
     {:ok, body, _conn} = read_body(conn)
     {:ok, doc} = decode_or_retry(body)
@@ -66,13 +72,17 @@ 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),
+             %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