Allow moderators to delete posts.

[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 67688ace4bce7e3b1790788ce140446047e2387f..4d48c5d2b9c5550bf13079fccd46892f5d483b3b 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -17,7 +17,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),
@@ -25,6 +25,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
       order_by: [desc: :id]
 
     activities = query
+    |> restrict_max(params)
     |> Repo.all
 
     response = user
@@ -46,7 +47,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
         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, user} <- Pleroma.Web.OStatus.make_user(uri, true),
+             {: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}
@@ -54,7 +55,12 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
-  def salmon_incoming(conn, params) do
+  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)
 
@@ -86,6 +92,19 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     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
+      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)