Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity

[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 c6700ae782e9bb00715c0f95a9775efc4eb95b59..e6822463d534a1a44d20e1bdbb9f3153d3f8c29a 100644 (file)
--- 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}
   alias Pleroma.Web.OStatus.{FeedRepresenter, ActivityRepresenter}
   alias Pleroma.Repo
-  alias Pleroma.Web.OStatus
+  alias Pleroma.Web.{OStatus, Federator}
   import Ecto.Query
 
   def feed_redirect(conn, %{"nickname" => nickname}) do
@@ -22,7 +22,8 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     activities = query
     |> Repo.all
 
-    response = FeedRepresenter.to_simple_form(user, activities, [user])
+    response = user
+    |> FeedRepresenter.to_simple_form(activities, [user])
     |> :xmerl.export_simple(:xmerl_xml)
     |> to_string
 
@@ -33,10 +34,10 @@ defmodule Pleroma.Web.OStatus.OStatusController do
 
   def salmon_incoming(conn, params) do
     {:ok, body, _conn} = read_body(conn)
-    magic_key = Pleroma.Web.Salmon.fetch_magic_key(body)
+    {:ok, magic_key} = Pleroma.Web.Salmon.fetch_magic_key(body)
     {:ok, doc} = Pleroma.Web.Salmon.decode_and_validate(magic_key, body)
 
-    Pleroma.Web.OStatus.handle_incoming(doc)
+    Federator.enqueue(:incoming_doc, doc)
 
     conn
     |> send_resp(200, "")
@@ -47,7 +48,8 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     activity = Activity.get_create_activity_by_object_ap_id(id)
     user = User.get_cached_by_ap_id(activity.data["actor"])
 
-    response = ActivityRepresenter.to_simple_form(activity, user, true)
+    response = activity
+    |> ActivityRepresenter.to_simple_form(user, true)
     |> ActivityRepresenter.wrap_with_entry
     |> :xmerl.export_simple(:xmerl_xml)
     |> to_string