diff options
| author | lain <lain@soykaf.club> | 2020-08-28 11:33:11 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-08-28 11:33:11 +0200 |
| commit | 4e022fc16c921dba9299a101b9574c2215270227 (patch) | |
| tree | 2a881b520b96c12490555e8dc8ebce33048318ef /lib | |
| parent | 82bf27172c4aae19e22c8d976da547035ca7feb0 (diff) | |
| parent | 6b01a09a08e14c415ac3bd48ea28c742ee7a3dc8 (diff) | |
| download | pleroma-4e022fc16c921dba9299a101b9574c2215270227.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex index 9244316ed..5272790d3 100644 --- a/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex @@ -182,11 +182,10 @@ defmodule Pleroma.Web.MastodonAPI.TimelineController do with %Pleroma.List{title: _title, following: following} <- Pleroma.List.get(id, user) do params = params - |> Map.new(fn {key, value} -> {to_string(key), value} end) - |> Map.put("type", "Create") - |> Map.put("blocking_user", user) - |> Map.put("user", user) - |> Map.put("muting_user", user) + |> Map.put(:type, "Create") + |> Map.put(:blocking_user, user) + |> Map.put(:user, user) + |> Map.put(:muting_user, user) # we must filter the following list for the user to avoid leaking statuses the user # does not actually have permission to see (for more info, peruse security issue #270). |