X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api.ex;h=ccd79625cdb4dc9d96d6ef48a7ee8a1a4c59340a;hb=94db9ac4dba6ba02fcae1b9055b532818cf787c7;hp=a8bdbe716fc289dc908fee86319937d049008c66;hpb=1633470e4af885527eac4a6e4076acf14616d4d9;p=akkoma diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index a8bdbe716..ccd79625c 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -16,7 +16,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do opts = opts |> Map.put("blocking_user", user) |> Map.put("user", user) - |> Map.put("type", ["Create", "Announce", "Follow"]) + |> Map.put("type", ["Create", "Announce", "Follow", "Like"]) ActivityPub.fetch_activities([user.ap_id | user.following], opts) |> activities_to_statuses(%{for: user}) @@ -42,8 +42,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do end def fetch_user_statuses(user, opts \\ %{}) do - ActivityPub.fetch_activities([], opts) + opts = opts |> Map.put("type", ["Create", "Announce", "Follow"]) + ActivityPub.fetch_activities([], opts) |> activities_to_statuses(%{for: user}) end @@ -288,7 +289,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do actor = get_in(activity.data, ["actor"]) user = User.get_cached_by_ap_id(actor) # mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"]) - mentioned_users = Enum.map(activity.data["to"] || [], fn (ap_id) -> + mentioned_users = Enum.map(activity.recipients || [], fn (ap_id) -> if ap_id do User.get_cached_by_ap_id(ap_id) else