hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2018-09-26 11:27:00 +02:00
commit eebe33e86a
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
5 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -21,13 +21,13 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
if is_binary(Enum.at(actor, 0)) do
Enum.at(actor, 0)
else
Enum.find(actor, fn %{"type" => type} -> type == "Person" end)
Enum.find(actor, fn %{"type" => type} -> type in ["Person", "Service", "Application"] end)
|> Map.get("id")
end
end
def get_actor(%{"actor" => actor}) when is_map(actor) do
actor["id"]
def get_actor(%{"actor" => %{"id" => id}}) when is_bitstring(id) do
id
end
@doc """
@ -206,8 +206,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
|> Map.put("tag", combined)
end
def fix_tag(%{"tag" => %{"type" => "Hashtag"} = tag} = object) do
combined = [tag ++ String.slice(tag["name"], 1..-1)]
def fix_tag(%{"tag" => %{"type" => "Hashtag", "name" => hashtag} = tag} = object) do
combined = [tag, String.slice(hashtag, 1..-1)]
object
|> Map.put("tag", combined)