From: lain <lain@soykaf.club>
Date: Mon, 28 May 2018 10:39:49 +0000 (+0200)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=461f201caae68cd781240fa40f8b6502ba7e57cb;hp=8216d5e40e31970b450524d39b634a84f6ec415c;p=akkoma

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 dd1dc241d..c2b0bb01d 100644
--- 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