Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index dd1dc241d12607023343cbe6f6430b33ac48dd64..c2b0bb01da855f48f92512bde5385bbbd25f983a 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -107,6 +107,11 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def mentions_timeline(%{assigns: %{user: user}} = conn, params) do
+    params =
+      params
+      |> Map.put("type", ["Create", "Announce", "Follow", "Like"])
+      |> Map.put("blocking_user", user)
+
     activities = ActivityPub.fetch_activities([user.ap_id], params)
 
     conn