diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-08 19:35:16 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-08 19:35:16 +0200 |
| commit | 8f9c43343e239b3f3fd28651ca508f3ee1e4562c (patch) | |
| tree | 818676770db7e0cfc79804d7e0addd02e0dcccec /lib | |
| parent | b9da7d3219dae3f9654548dc61e22439e994b2a4 (diff) | |
| parent | 3320c9b176d7665a9d99e235458e04ade1999afe (diff) | |
| download | pleroma-8f9c43343e239b3f3fd28651ca508f3ee1e4562c.tar.gz | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/ostatus/ostatus.ex | 2 |
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 |