aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-05-08 18:19:45 +0200
committerRoger Braun <roger@rogerbraun.net>2017-05-08 18:19:45 +0200
commit3320c9b176d7665a9d99e235458e04ade1999afe (patch)
tree3a26f9a06e4224ae1ac1abd4e610bf22590e30b4 /lib
parent730378616071fd35a70b722fdcd8b35070b0b330 (diff)
downloadpleroma-3320c9b176d7665a9d99e235458e04ade1999afe.tar.gz
Fix remote users retweeting local stuff.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/ostatus/ostatus.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 01f65affc..8c1da0920 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -176,7 +176,7 @@ defmodule Pleroma.Web.OStatus do
# TODO: Bail out sooner and use transaction.
if Object.get_by_ap_id(id) do
- {:error, "duplicate activity"}
+ {:ok, Activity.get_create_activity_by_object_ap_id(id)}
else
ActivityPub.create(to, actor, context, object, %{}, date, false)
end