diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-04-23 10:37:29 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-04-23 10:37:29 +0200 |
| commit | 4649ba2d627ab1c42e9067d0af783ae05ac8ae11 (patch) | |
| tree | 4bc0c9062e597e2d85c005d93ef6dbacf098e84a /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | 361a8c42197a92f044fc3d0ceadeee5e3590e96f (diff) | |
| parent | cef4a4d7095eae474c0bebaa4b0fb0001f140672 (diff) | |
| download | pleroma-4649ba2d627ab1c42e9067d0af783ae05ac8ae11.tar.gz | |
Merge branch 'ostatus' into develop
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 4 |
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 1053120c4..0f84cffbd 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 |