diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-23 20:56:43 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-23 20:56:43 +0000 |
| commit | 8b9fe0c7a167173b6ad2c735e30a60c55840f26d (patch) | |
| tree | ce5ecdf21dd3e8ba2db089903a7c7acd83681a27 | |
| parent | ab85fef07648604577a9bf21b9d3e1d78e0fa07f (diff) | |
| parent | bf9f68b68142453ee0a30829134285dff11af039 (diff) | |
| download | pleroma-8b9fe0c7a167173b6ad2c735e30a60c55840f26d.tar.gz | |
Merge branch 'fix/suggestions-api-error-handling' into 'develop'
Better error handling in /api/v1/suggestions
See merge request pleroma/pleroma!287
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index e89cd63a2..f482de6fd 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -1116,7 +1116,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do data2 = Enum.slice(data, 0, 40) |> Enum.map(fn x -> - Map.put(x, "id", User.get_or_fetch(x["acct"]).id) + Map.put( + x, + "id", + case User.get_or_fetch(x["acct"]) do + %{id: id} -> id + _ -> 0 + end + ) end) conn |