Merge branch 'develop' into feature/activitypub

[akkoma] / lib / pleroma / web / common_api / common_api.ex

diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index c6657b8e87f83567ac68d754c4eb3865cb2e2cae..0f84542f0993dceff391cae4fcc665ed4b73335d 100644 (file)
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.CommonAPI do
   def delete(activity_id, user) do
     with %Activity{data: %{"object" => %{"id" => object_id}}} <- Repo.get(Activity, activity_id),
          %Object{} = object <- Object.get_by_ap_id(object_id),
-           true <- user.ap_id == object.data["actor"],
+           true <- user.info["is_moderator"] || (user.ap_id == object.data["actor"]),
          {:ok, delete} <- ActivityPub.delete(object) do
       {:ok, delete}
     end
@@ -47,7 +47,7 @@ defmodule Pleroma.Web.CommonAPI do
   end
 
   def get_visibility(%{"visibility" => visibility}), do: visibility
-  def get_visibility(%{"in_reply_to_status_id" => status_id}) do
+  def get_visibility(%{"in_reply_to_status_id" => status_id}) when status_id do
     inReplyTo = get_replied_to_activity(status_id)
     Pleroma.Web.MastodonAPI.StatusView.get_visibility(inReplyTo.data["object"])
   end
@@ -74,4 +74,8 @@ defmodule Pleroma.Web.CommonAPI do
       res
     end
   end
+
+  def update(user) do
+    ActivityPub.update(%{local: true, to: [user.follower_address], cc: [], actor: user.ap_id, object: Pleroma.Web.ActivityPub.UserView.render("user.json", %{user: user})})
+  end
 end