aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api.ex
diff options
context:
space:
mode:
authordtluna <dtluna@openmailbox.org>2017-04-28 16:06:57 +0300
committerdtluna <dtluna@openmailbox.org>2017-04-28 16:06:57 +0300
commita9b2ad17596d1b6deca646239a95e94dc644ebf3 (patch)
tree9e086441831f33e191cd62b05b61ece0677491cc /lib/pleroma/web/twitter_api/twitter_api.ex
parent28b203d08fe2e0d7afe3f3ec03a16cef62288b23 (diff)
parentfb5cebc1b5dcfd6af7fa1a81bc5b26275714fa26 (diff)
downloadpleroma-a9b2ad17596d1b6deca646239a95e94dc644ebf3.tar.gz
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 0f39ed7f3..8e2cd98ca 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -66,7 +66,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
with {:ok, activity} <- ActivityPub.insert(activity) do
- add_conversation_id(activity)
+ {:ok, activity} = add_conversation_id(activity)
+ Pleroma.Web.Websub.publish(Pleroma.Web.OStatus.feed_path(user), user, activity)
+ {:ok, activity}
end
end