X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Ftransmogrifier.ex;h=d759ca2b2faf21a65074a0a09d7fac1cc21dc6b4;hb=3fcdfb75d03efa27903ba5fdd5c78f2b93a4d55b;hp=698cfa0a9d675c6533180e15a123331d43cf66cd;hpb=82e34cae95a204475f4419758c980ddd922be095;p=akkoma diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 698cfa0a9..d759ca2b2 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -20,8 +20,27 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do |> Map.put("actor", object["attributedTo"]) |> fix_attachments |> fix_context + |> fix_in_reply_to + |> fix_emoji end + def fix_in_reply_to(%{"inReplyTo" => in_reply_to_id} = object) when not is_nil(in_reply_to_id) do + case ActivityPub.fetch_object_from_id(in_reply_to_id) do + {:ok, replied_object} -> + activity = Activity.get_create_activity_by_object_ap_id(replied_object.data["id"]) + object + |> Map.put("inReplyTo", replied_object.data["id"]) + |> Map.put("inReplyToAtomUri", object["inReplyToAtomUri"] || in_reply_to_id) + |> Map.put("inReplyToStatusId", activity.id) + |> Map.put("conversation", replied_object.data["context"] || object["conversation"]) + |> Map.put("context", replied_object.data["context"] || object["conversation"]) + e -> + Logger.error("Couldn't fetch #{object["inReplyTo"]} #{inspect(e)}") + object + end + end + def fix_in_reply_to(object), do: object + def fix_context(object) do object |> Map.put("context", object["conversation"]) @@ -38,6 +57,25 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do |> Map.put("attachment", attachments) end + def fix_emoji(object) do + tags = (object["tag"] || []) + emoji = tags |> Enum.filter(fn (data) -> data["type"] == "Emoji" and data["icon"] end) + emoji = emoji |> Enum.reduce(%{}, fn (data, mapping) -> + name = data["name"] + if String.starts_with?(name, ":") do + name = name |> String.slice(1..-2) + end + + mapping |> Map.put(name, data["icon"]["url"]) + end) + + # we merge mastodon and pleroma emoji into a single mapping, to allow for both wire formats + emoji = Map.merge(object["emoji"] || %{}, emoji) + + object + |> Map.put("emoji", emoji) + end + # TODO: validate those with a Ecto scheme # - tags # - emoji @@ -46,24 +84,11 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do %User{} = user <- User.get_or_fetch_by_ap_id(data["actor"]) do object = fix_object(data["object"]) - replied_to_id = if object["inReplyTo"] do - case ActivityPub.fetch_object_from_id(object["inReplyTo"]) do - {:ok, object} -> object.data["id"] - e -> - Logger.error("Couldn't fetch #{object["inReplyTo"]} #{inspect(e)}") - nil - end - else - nil - end - - object = Map.put(object, "inReplyTo", replied_to_id || object["inReplyTo"]) - params = %{ to: data["to"], object: object, actor: user, - context: data["object"]["conversation"], + context: object["conversation"], local: false, published: data["published"], additional: Map.take(data, [ @@ -112,6 +137,42 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do end end + def handle_incoming(%{"type" => "Update", "object" => %{"type" => "Person"} = object, "actor" => actor_id} = data) do + with %User{ap_id: ^actor_id} = actor <- User.get_by_ap_id(object["id"]) do + {:ok, new_user_data} = ActivityPub.user_data_from_user_object(object) + + banner = new_user_data[:info]["banner"] + update_data = new_user_data + |> Map.take([:name, :bio, :avatar]) + |> Map.put(:info, Map.merge(actor.info, %{"banner" => banner})) + + actor + |> User.upgrade_changeset(update_data) + |> User.update_and_set_cache() + + ActivityPub.update(%{local: false, to: data["to"] || [], cc: data["cc"] || [], object: object, actor: actor_id}) + else + e -> + Logger.error(e) + :error + end + end + + # TODO: Make secure. + def handle_incoming(%{"type" => "Delete", "object" => object_id, "actor" => actor, "id" => id} = data) do + object_id = case object_id do + %{"id" => id} -> id + id -> id + end + with %User{} = actor <- User.get_or_fetch_by_ap_id(actor), + {:ok, object} <- get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id), + {:ok, activity} <- ActivityPub.delete(object, false) do + {:ok, activity} + else + e -> :error + end + end + # TODO # Accept # Undo @@ -127,6 +188,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do |> set_sensitive |> add_hashtags |> add_mention_tags + |> add_emoji_tags |> add_attributed_to |> prepare_attachments |> set_conversation @@ -139,7 +201,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do def prepare_outgoing(%{"type" => "Create", "object" => %{"type" => "Note"} = object} = data) do object = object |> prepare_object - data = data |> Map.put("object", object) |> Map.put("@context", "https://www.w3.org/ns/activitystreams") @@ -149,11 +210,31 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do def prepare_outgoing(%{"type" => type} = data) do data = data + |> maybe_fix_object_url |> Map.put("@context", "https://www.w3.org/ns/activitystreams") {:ok, data} end + def maybe_fix_object_url(data) do + if is_binary(data["object"]) and not String.starts_with?(data["object"], "http") do + case ActivityPub.fetch_object_from_id(data["object"]) do + {:ok, relative_object} -> + if relative_object.data["external_url"] do + data = data + |> Map.put("object", relative_object.data["external_url"]) + else + data + end + e -> + Logger.error("Couldn't fetch #{data["object"]} #{inspect(e)}") + data + end + else + data + end + end + def add_hashtags(object) do tags = (object["tag"] || []) |> Enum.map fn (tag) -> %{"href" => Pleroma.Web.Endpoint.url() <> "/tags/#{tag}", "name" => "##{tag}", "type" => "Hashtag"} end @@ -175,6 +256,22 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do |> Map.put("tag", tags ++ mentions) end + # TODO: we should probably send mtime instead of unix epoch time for updated + def add_emoji_tags(object) do + tags = object["tag"] || [] + emoji = object["emoji"] || [] + out = emoji |> Enum.map(fn {name, url} -> + %{"icon" => %{"url" => url, "type" => "Image"}, + "name" => ":" <> name <> ":", + "type" => "Emoji", + "updated" => "1970-01-01T00:00:00Z", + "id" => url} + end) + + object + |> Map.put("tag", tags ++ out) + end + def set_conversation(object) do Map.put(object, "conversation", object["context"]) end @@ -212,7 +309,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do maybe_retire_websub(user.ap_id) # Only do this for recent activties, don't go through the whole db. - since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000 + # Only look at the last 1000 activities. + since = (Repo.aggregate(Activity, :max, :id) || 0) - 1_000 q = from a in Activity, where: ^old_follower_address in a.recipients, where: a.id > ^since, @@ -226,16 +324,19 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do data = data |> Map.put(:info, Map.merge(user.info, data[:info])) + already_ap = User.ap_enabled?(user) {:ok, user} = User.upgrade_changeset(user, data) |> Repo.update() - # This could potentially take a long time, do it in the background - if async do - Task.start(fn -> + if !already_ap do + # This could potentially take a long time, do it in the background + if async do + Task.start(fn -> + user_upgrade_task(user) + end) + else user_upgrade_task(user) - end) - else - user_upgrade_task(user) + end end {:ok, user}