Merge branch 'pleroma-conversations' into 'develop'

Extended Pleroma Conversations See merge request pleroma/pleroma!1535
2019-08-16 12:55:33 +00:00 · 2019-08-16 12:55:33 +00:00 · 7ab2dbbdb6
commit 7ab2dbbdb6
parent 0f24edcd8d d3af9e19ed
24 changed files with 655 additions and 99 deletions
--- a/lib/pleroma/web/streamer.ex
+++ b/lib/pleroma/web/streamer.ex
@ -202,7 +202,7 @@ defmodule Pleroma.Web.Streamer do
      payload:
        Pleroma.Web.MastodonAPI.ConversationView.render("participation.json", %{
          participation: participation,
-          user: participation.user
+          for: participation.user
        })
        |> Jason.encode!()
    }