diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-27 19:10:15 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-27 19:10:15 +0000 |
| commit | ea12371a011368237fb84fac26362847ed7375d8 (patch) | |
| tree | 8ea970eaa96028e921116953aef8c0a374785da8 /lib | |
| parent | 00fd9c9e5c5165685de1ed2e178b360a6083bced (diff) | |
| parent | 77f2137383a72aac7d0390ca3bff13b794dcc12c (diff) | |
| download | pleroma-ea12371a011368237fb84fac26362847ed7375d8.tar.gz | |
Merge branch 'discard-invalid-likes' into 'develop'
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 6656a11c6..c2ced51d8 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -141,11 +141,11 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do |> Map.put("actor", get_actor(%{"actor" => actor})) end - def fix_likes(%{"likes" => likes} = object) - when is_bitstring(likes) do - # Check for standardisation - # This is what Peertube does - # curl -H 'Accept: application/activity+json' $likes | jq .totalItems + # Check for standardisation + # This is what Peertube does + # curl -H 'Accept: application/activity+json' $likes | jq .totalItems + # Prismo returns only an integer (count) as "likes" + def fix_likes(%{"likes" => likes} = object) when not is_map(likes) do object |> Map.put("likes", []) |> Map.put("like_count", 0) |