aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authordtluna <dtluna@openmailbox.org>2017-04-24 01:11:38 +0300
committerdtluna <dtluna@openmailbox.org>2017-04-24 01:11:38 +0300
commitf723b2369160ee08f7155e299aa44410b26b7e51 (patch)
tree28002bd419c12b812598a95d8bd2b49fef06b9ba /lib
parent6b6bc9435c3c8ea86a1463c491c80ba28b0b1cc7 (diff)
downloadpleroma-f723b2369160ee08f7155e299aa44410b26b7e51.tar.gz
Add error response to self-repeats
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 19de0665c..3f27ad1ac 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -163,11 +163,16 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
activity = Repo.get(Activity, id)
- {:ok, status} = TwitterAPI.retweet(user, activity)
- response = Poison.encode!(status)
+ if activity.data["actor"] == user.ap_id do
+ bad_request_reply(conn, "You cannot repeat your own notice.")
+ else
+ {:ok, status} = TwitterAPI.retweet(user, activity)
+ response = Poison.encode!(status)
- conn
- |> json_reply(200, response)
+ conn
+
+ |> json_reply(200, response)
+ end
end
def register(conn, params) do