No OneTemporary
Actions

Authored By

Unknown

Size

93 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
	index 39e2bb8a9..279bf6365 100644
	--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
	+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
	@@ -1,760 +1,763 @@
	defmodule Pleroma.Web.ActivityPub.Transmogrifier do
	@moduledoc """
	A module to handle coding from internal to wire ActivityPub and back.
	"""
	alias Pleroma.User
	alias Pleroma.Object
	alias Pleroma.Activity
	alias Pleroma.Repo
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.ActivityPub.Utils

	import Ecto.Query

	require Logger

	def get_actor(%{"actor" => actor}) when is_binary(actor) do
	actor
	end

	def get_actor(%{"actor" => actor}) when is_list(actor) do
	if is_binary(Enum.at(actor, 0)) do
	Enum.at(actor, 0)
	else
	Enum.find(actor, fn %{"type" => type} -> type == "Person" end)
	\|> Map.get("id")
	end
	end

	def get_actor(%{"actor" => actor}) when is_map(actor) do
	actor["id"]
	end

	@doc """
	Modifies an incoming AP object (mastodon format) to our internal format.
	"""
	def fix_object(object) do
	object
	\|> fix_actor
	\|> fix_attachments
	\|> fix_context
	\|> fix_in_reply_to
	\|> fix_emoji
	\|> fix_tag
	\|> fix_content_map
	\|> fix_addressing
	end

	def fix_addressing_list(map, field) do
	if is_binary(map[field]) do
	map
	\|> Map.put(field, [map[field]])
	else
	map
	end
	end

	def fix_addressing(map) do
	map
	\|> fix_addressing_list("to")
	\|> fix_addressing_list("cc")
	\|> fix_addressing_list("bto")
	\|> fix_addressing_list("bcc")
	end

	def fix_actor(%{"attributedTo" => actor} = object) do
	object
	\|> Map.put("actor", get_actor(%{"actor" => actor}))
	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} ->
	with %Activity{} = activity <-
	Activity.get_create_activity_by_object_ap_id(replied_object.data["id"]) do
	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"])
	else
	e ->
	Logger.error("Couldn't fetch #{object["inReplyTo"]} #{inspect(e)}")
	object
	end

	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
	+ context = object["context"] \|\| object["conversation"] \|\| Utils.generate_context_id()
	+
	object
	- \|> Map.put("context", object["conversation"])
	+ \|> Map.put("context", context)
	+ \|> Map.put("conversation", context)
	end

	def fix_attachments(object) do
	attachments =
	(object["attachment"] \|\| [])
	\|> Enum.map(fn data ->
	url = [%{"type" => "Link", "mediaType" => data["mediaType"], "href" => data["url"]}]
	Map.put(data, "url", url)
	end)

	object
	\|> 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"]

	name =
	if String.starts_with?(name, ":") do
	name \|> String.slice(1..-2)
	else
	name
	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

	def fix_tag(object) do
	tags =
	(object["tag"] \|\| [])
	\|> Enum.filter(fn data -> data["type"] == "Hashtag" and data["name"] end)
	\|> Enum.map(fn data -> String.slice(data["name"], 1..-1) end)

	combined = (object["tag"] \|\| []) ++ tags

	object
	\|> Map.put("tag", combined)
	end

	# content map usually only has one language so this will do for now.
	def fix_content_map(%{"contentMap" => content_map} = object) do
	content_groups = Map.to_list(content_map)
	{_, content} = Enum.at(content_groups, 0)

	object
	\|> Map.put("content", content)
	end

	def fix_content_map(object), do: object

	# TODO: validate those with a Ecto scheme
	# - tags
	# - emoji
	def handle_incoming(%{"type" => "Create", "object" => %{"type" => objtype} = object} = data)
	- when objtype in ["Article", "Note"] do
	+ when objtype in ["Article", "Note", "Video"] do
	actor = get_actor(data)

	data =
	Map.put(data, "actor", actor)
	\|> fix_addressing

	with nil <- Activity.get_create_activity_by_object_ap_id(object["id"]),
	%User{} = user <- User.get_or_fetch_by_ap_id(data["actor"]) do
	object = fix_object(data["object"])

	params = %{
	to: data["to"],
	object: object,
	actor: user,
	context: object["conversation"],
	local: false,
	published: data["published"],
	additional:
	Map.take(data, [
	"cc",
	"id"
	])
	}

	ActivityPub.create(params)
	else
	%Activity{} = activity -> {:ok, activity}
	_e -> :error
	end
	end

	def handle_incoming(
	%{"type" => "Follow", "object" => followed, "actor" => follower, "id" => id} = data
	) do
	with %User{local: true} = followed <- User.get_cached_by_ap_id(followed),
	%User{} = follower <- User.get_or_fetch_by_ap_id(follower),
	{:ok, activity} <- ActivityPub.follow(follower, followed, id, false) do
	if not User.locked?(followed) do
	ActivityPub.accept(%{
	to: [follower.ap_id],
	actor: followed.ap_id,
	object: data,
	local: true
	})

	User.follow(follower, followed)
	end

	{:ok, activity}
	else
	_e -> :error
	end
	end

	defp mastodon_follow_hack(%{"id" => id, "actor" => follower_id}, followed) do
	with true <- id =~ "follows",
	%User{local: true} = follower <- User.get_cached_by_ap_id(follower_id),
	%Activity{} = activity <- Utils.fetch_latest_follow(follower, followed) do
	{:ok, activity}
	else
	_ -> {:error, nil}
	end
	end

	defp mastodon_follow_hack(_), do: {:error, nil}

	defp get_follow_activity(follow_object, followed) do
	with object_id when not is_nil(object_id) <- Utils.get_ap_id(follow_object),
	{_, %Activity{} = activity} <- {:activity, Activity.get_by_ap_id(object_id)} do
	{:ok, activity}
	else
	# Can't find the activity. This might a Mastodon 2.3 "Accept"
	{:activity, nil} ->
	mastodon_follow_hack(follow_object, followed)

	_ ->
	{:error, nil}
	end
	end

	def handle_incoming(
	%{"type" => "Accept", "object" => follow_object, "actor" => actor, "id" => id} = data
	) do
	with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
	{:ok, follow_activity} <- get_follow_activity(follow_object, followed),
	%User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity.data["actor"]),
	{:ok, activity} <-
	ActivityPub.accept(%{
	to: follow_activity.data["to"],
	type: "Accept",
	actor: followed.ap_id,
	object: follow_activity.data["id"],
	local: false
	}) do
	if not User.following?(follower, followed) do
	{:ok, follower} = User.follow(follower, followed)
	end

	{:ok, activity}
	else
	_e -> :error
	end
	end

	def handle_incoming(
	%{"type" => "Reject", "object" => follow_object, "actor" => actor, "id" => id} = data
	) do
	with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
	{:ok, follow_activity} <- get_follow_activity(follow_object, followed),
	%User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity.data["actor"]),
	{:ok, activity} <-
	ActivityPub.accept(%{
	to: follow_activity.data["to"],
	type: "Accept",
	actor: followed.ap_id,
	object: follow_activity.data["id"],
	local: false
	}) do
	User.unfollow(follower, followed)

	{:ok, activity}
	else
	_e -> :error
	end
	end

	def handle_incoming(
	%{"type" => "Like", "object" => object_id, "actor" => actor, "id" => id} = _data
	) do
	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, _object} <- ActivityPub.like(actor, object, id, false) do
	{:ok, activity}
	else
	_e -> :error
	end
	end

	def handle_incoming(
	%{"type" => "Announce", "object" => object_id, "actor" => actor, "id" => id} = _data
	) do
	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, _object} <- ActivityPub.announce(actor, object, id, false) do
	{:ok, activity}
	else
	_e -> :error
	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"]
	locked = new_user_data[:info]["locked"] \|\| false

	update_data =
	new_user_data
	\|> Map.take([:name, :bio, :avatar])
	\|> Map.put(:info, Map.merge(actor.info, %{"banner" => banner, "locked" => locked}))

	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 = Utils.get_ap_id(object_id)

	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

	def handle_incoming(
	%{
	"type" => "Undo",
	"object" => %{"type" => "Announce", "object" => object_id},
	"actor" => actor,
	"id" => id
	} = _data
	) do
	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.unannounce(actor, object, id, false) do
	{:ok, activity}
	else
	_e -> :error
	end
	end

	def handle_incoming(
	%{
	"type" => "Undo",
	"object" => %{"type" => "Follow", "object" => followed},
	"actor" => follower,
	"id" => id
	} = _data
	) do
	with %User{local: true} = followed <- User.get_cached_by_ap_id(followed),
	%User{} = follower <- User.get_or_fetch_by_ap_id(follower),
	{:ok, activity} <- ActivityPub.unfollow(follower, followed, id, false) do
	User.unfollow(follower, followed)
	{:ok, activity}
	else
	e -> :error
	end
	end

	@ap_config Application.get_env(:pleroma, :activitypub)
	@accept_blocks Keyword.get(@ap_config, :accept_blocks)

	def handle_incoming(
	%{
	"type" => "Undo",
	"object" => %{"type" => "Block", "object" => blocked},
	"actor" => blocker,
	"id" => id
	} = _data
	) do
	with true <- @accept_blocks,
	%User{local: true} = blocked <- User.get_cached_by_ap_id(blocked),
	%User{} = blocker <- User.get_or_fetch_by_ap_id(blocker),
	{:ok, activity} <- ActivityPub.unblock(blocker, blocked, id, false) do
	User.unblock(blocker, blocked)
	{:ok, activity}
	else
	e -> :error
	end
	end

	def handle_incoming(
	%{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = data
	) do
	with true <- @accept_blocks,
	%User{local: true} = blocked = User.get_cached_by_ap_id(blocked),
	%User{} = blocker = User.get_or_fetch_by_ap_id(blocker),
	{:ok, activity} <- ActivityPub.block(blocker, blocked, id, false) do
	User.unfollow(blocker, blocked)
	User.block(blocker, blocked)
	{:ok, activity}
	else
	e -> :error
	end
	end

	def handle_incoming(
	%{
	"type" => "Undo",
	"object" => %{"type" => "Like", "object" => object_id},
	"actor" => actor,
	"id" => id
	} = _data
	) do
	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.unlike(actor, object, id, false) do
	{:ok, activity}
	else
	_e -> :error
	end
	end

	def handle_incoming(_), do: :error

	def get_obj_helper(id) do
	if object = Object.normalize(id), do: {:ok, object}, else: nil
	end

	def set_reply_to_uri(%{"inReplyTo" => inReplyTo} = object) do
	with false <- String.starts_with?(inReplyTo, "http"),
	{:ok, %{data: replied_to_object}} <- get_obj_helper(inReplyTo) do
	Map.put(object, "inReplyTo", replied_to_object["external_url"] \|\| inReplyTo)
	else
	_e -> object
	end
	end

	def set_reply_to_uri(obj), do: obj

	# Prepares the object of an outgoing create activity.
	def prepare_object(object) do
	object
	\|> set_sensitive
	\|> add_hashtags
	\|> add_mention_tags
	\|> add_emoji_tags
	\|> add_attributed_to
	\|> prepare_attachments
	\|> set_conversation
	\|> set_reply_to_uri
	end

	# @doc
	# """
	# internal -> Mastodon
	# """

	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")

	{:ok, data}
	end

	# Mastodon Accept/Reject requires a non-normalized object containing the actor URIs,
	# because of course it does.
	def prepare_outgoing(%{"type" => "Accept"} = data) do
	with follow_activity <- Activity.normalize(data["object"]) do
	object = %{
	"actor" => follow_activity.actor,
	"object" => follow_activity.data["object"],
	"id" => follow_activity.data["id"],
	"type" => "Follow"
	}

	data =
	data
	\|> Map.put("object", object)
	\|> Map.put("@context", "https://www.w3.org/ns/activitystreams")

	{:ok, data}
	end
	end

	def prepare_outgoing(%{"type" => "Reject"} = data) do
	with follow_activity <- Activity.normalize(data["object"]) do
	object = %{
	"actor" => follow_activity.actor,
	"object" => follow_activity.data["object"],
	"id" => follow_activity.data["id"],
	"type" => "Follow"
	}

	data =
	data
	\|> Map.put("object", object)
	\|> Map.put("@context", "https://www.w3.org/ns/activitystreams")

	{:ok, data}
	end
	end

	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)

	object
	\|> Map.put("tag", tags)
	end

	def add_mention_tags(object) do
	recipients = object["to"] ++ (object["cc"] \|\| [])

	mentions =
	recipients
	\|> Enum.map(fn ap_id -> User.get_cached_by_ap_id(ap_id) end)
	\|> Enum.filter(& &1)
	\|> Enum.map(fn user ->
	%{"type" => "Mention", "href" => user.ap_id, "name" => "@#{user.nickname}"}
	end)

	tags = object["tag"] \|\| []

	object
	\|> 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

	def set_sensitive(object) do
	tags = object["tag"] \|\| []
	Map.put(object, "sensitive", "nsfw" in tags)
	end

	def add_attributed_to(object) do
	attributedTo = object["attributedTo"] \|\| object["actor"]

	object
	\|> Map.put("attributedTo", attributedTo)
	end

	def prepare_attachments(object) do
	attachments =
	(object["attachment"] \|\| [])
	\|> Enum.map(fn data ->
	[%{"mediaType" => media_type, "href" => href} \| _] = data["url"]
	%{"url" => href, "mediaType" => media_type, "name" => data["name"], "type" => "Document"}
	end)

	object
	\|> Map.put("attachment", attachments)
	end

	defp user_upgrade_task(user) do
	old_follower_address = User.ap_followers(user)

	q =
	from(
	u in User,
	where: ^old_follower_address in u.following,
	update: [
	set: [
	following:
	fragment(
	"array_replace(?,?,?)",
	u.following,
	^old_follower_address,
	^user.follower_address
	)
	]
	]
	)

	Repo.update_all(q, [])

	maybe_retire_websub(user.ap_id)

	# Only do this for recent activties, don't go through the whole db.
	# 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,
	update: [
	set: [
	recipients:
	fragment(
	"array_replace(?,?,?)",
	a.recipients,
	^old_follower_address,
	^user.follower_address
	)
	]
	]
	)

	Repo.update_all(q, [])
	end

	def upgrade_user_from_ap_id(ap_id, async \\ true) do
	with %User{local: false} = user <- User.get_by_ap_id(ap_id),
	{:ok, data} <- ActivityPub.fetch_and_prepare_user_from_ap_id(ap_id) 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()

	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
	end

	{:ok, user}
	else
	e -> e
	end
	end

	def maybe_retire_websub(ap_id) do
	# some sanity checks
	if is_binary(ap_id) && String.length(ap_id) > 8 do
	q =
	from(
	ws in Pleroma.Web.Websub.WebsubClientSubscription,
	where: fragment("? like ?", ws.topic, ^"#{ap_id}%")
	)

	Repo.delete_all(q)
	end
	end

	def maybe_fix_user_url(data) do
	if is_map(data["url"]) do
	Map.put(data, "url", data["url"]["href"])
	else
	data
	end
	end

	def maybe_fix_user_object(data) do
	data
	\|> maybe_fix_user_url
	end
	end
	diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex
	index 8b41a3bec..7cdc1656b 100644
	--- a/lib/pleroma/web/activity_pub/utils.ex
	+++ b/lib/pleroma/web/activity_pub/utils.ex
	@@ -1,445 +1,455 @@
	defmodule Pleroma.Web.ActivityPub.Utils do
	alias Pleroma.{Repo, Web, Object, Activity, User}
	alias Pleroma.Web.Router.Helpers
	alias Pleroma.Web.Endpoint
	alias Ecto.{Changeset, UUID}
	import Ecto.Query
	require Logger

	# Some implementations send the actor URI as the actor field, others send the entire actor object,
	# so figure out what the actor's URI is based on what we have.
	def get_ap_id(object) do
	case object do
	%{"id" => id} -> id
	id -> id
	end
	end

	def normalize_params(params) do
	Map.put(params, "actor", get_ap_id(params["actor"]))
	end

	def make_json_ld_header do
	%{
	"@context" => [
	"https://www.w3.org/ns/activitystreams",
	"https://w3id.org/security/v1",
	%{
	"manuallyApprovesFollowers" => "as:manuallyApprovesFollowers",
	"sensitive" => "as:sensitive",
	"Hashtag" => "as:Hashtag",
	"ostatus" => "http://ostatus.org#",
	"atomUri" => "ostatus:atomUri",
	"inReplyToAtomUri" => "ostatus:inReplyToAtomUri",
	"conversation" => "ostatus:conversation",
	"toot" => "http://joinmastodon.org/ns#",
	"Emoji" => "toot:Emoji"
	}
	]
	}
	end

	def make_date do
	DateTime.utc_now() \|> DateTime.to_iso8601()
	end

	def generate_activity_id do
	generate_id("activities")
	end

	def generate_context_id do
	generate_id("contexts")
	end

	def generate_object_id do
	Helpers.o_status_url(Endpoint, :object, UUID.generate())
	end

	def generate_id(type) do
	"#{Web.base_url()}/#{type}/#{UUID.generate()}"
	end

	def create_context(context) do
	context = context \|\| generate_id("contexts")
	changeset = Object.context_mapping(context)

	case Repo.insert(changeset) do
	{:ok, object} ->
	object

	# This should be solved by an upsert, but it seems ecto
	# has problems accessing the constraint inside the jsonb.
	{:error, _} ->
	Object.get_cached_by_ap_id(context)
	end
	end

	@doc """
	Enqueues an activity for federation if it's local
	"""
	def maybe_federate(%Activity{local: true} = activity) do
	priority =
	case activity.data["type"] do
	"Delete" -> 10
	"Create" -> 1
	_ -> 5
	end

	Pleroma.Web.Federator.enqueue(:publish, activity, priority)
	:ok
	end

	def maybe_federate(_), do: :ok

	@doc """
	Adds an id and a published data if they aren't there,
	also adds it to an included object
	"""
	def lazy_put_activity_defaults(map) do
	%{data: %{"id" => context}, id: context_id} = create_context(map["context"])

	map =
	map
	\|> Map.put_new_lazy("id", &generate_activity_id/0)
	\|> Map.put_new_lazy("published", &make_date/0)
	\|> Map.put_new("context", context)
	\|> Map.put_new("context_id", context_id)

	if is_map(map["object"]) do
	object = lazy_put_object_defaults(map["object"], map)
	%{map \| "object" => object}
	else
	map
	end
	end

	@doc """
	Adds an id and published date if they aren't there.
	"""
	def lazy_put_object_defaults(map, activity \\ %{}) do
	map
	\|> Map.put_new_lazy("id", &generate_object_id/0)
	\|> Map.put_new_lazy("published", &make_date/0)
	\|> Map.put_new("context", activity["context"])
	\|> Map.put_new("context_id", activity["context_id"])
	end

	@doc """
	Inserts a full object if it is contained in an activity.
	"""
	def insert_full_object(%{"object" => %{"type" => type} = object_data})
	- when is_map(object_data) and type in ["Article", "Note"] do
	+ when is_map(object_data) and type in ["Article", "Note", "Video"] do
	with {:ok, _} <- Object.create(object_data) do
	:ok
	end
	end

	def insert_full_object(_), do: :ok

	def update_object_in_activities(%{data: %{"id" => id}} = object) do
	# TODO
	# Update activities that already had this. Could be done in a seperate process.
	# Alternatively, just don't do this and fetch the current object each time. Most
	# could probably be taken from cache.
	relevant_activities = Activity.all_by_object_ap_id(id)

	Enum.map(relevant_activities, fn activity ->
	new_activity_data = activity.data \|> Map.put("object", object.data)
	changeset = Changeset.change(activity, data: new_activity_data)
	Repo.update(changeset)
	end)
	end

	#### Like-related helpers

	@doc """
	Returns an existing like if a user already liked an object
	"""
	def get_existing_like(actor, %{data: %{"id" => id}}) do
	query =
	from(
	activity in Activity,
	where: fragment("(?)->>'actor' = ?", activity.data, ^actor),
	# this is to use the index
	where:
	fragment(
	"coalesce((?)->'object'->>'id', (?)->>'object') = ?",
	activity.data,
	activity.data,
	^id
	),
	where: fragment("(?)->>'type' = 'Like'", activity.data)
	)

	Repo.one(query)
	end

	def make_like_data(%User{ap_id: ap_id} = actor, %{data: %{"id" => id}} = object, activity_id) do
	data = %{
	"type" => "Like",
	"actor" => ap_id,
	"object" => id,
	"to" => [actor.follower_address, object.data["actor"]],
	"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
	"context" => object.data["context"]
	}

	if activity_id, do: Map.put(data, "id", activity_id), else: data
	end

	def update_element_in_object(property, element, object) do
	with new_data <-
	object.data
	\|> Map.put("#{property}_count", length(element))
	\|> Map.put("#{property}s", element),
	changeset <- Changeset.change(object, data: new_data),
	{:ok, object} <- Repo.update(changeset),
	_ <- update_object_in_activities(object) do
	{:ok, object}
	end
	end

	def update_likes_in_object(likes, object) do
	update_element_in_object("like", likes, object)
	end

	def add_like_to_object(%Activity{data: %{"actor" => actor}}, object) do
	- with likes <- [actor \| object.data["likes"] \|\| []] \|> Enum.uniq() do
	+ likes = if is_list(object.data["likes"]), do: object.data["likes"], else: []
	+
	+ with likes <- [actor \| likes] \|> Enum.uniq() do
	update_likes_in_object(likes, object)
	end
	end

	def remove_like_from_object(%Activity{data: %{"actor" => actor}}, object) do
	- with likes <- (object.data["likes"] \|\| []) \|> List.delete(actor) do
	+ likes = if is_list(object.data["likes"]), do: object.data["likes"], else: []
	+
	+ with likes <- likes \|> List.delete(actor) do
	update_likes_in_object(likes, object)
	end
	end

	#### Follow-related helpers

	@doc """
	Updates a follow activity's state (for locked accounts).
	"""
	def update_follow_state(%Activity{} = activity, state) do
	with new_data <-
	activity.data
	\|> Map.put("state", state),
	changeset <- Changeset.change(activity, data: new_data),
	{:ok, activity} <- Repo.update(changeset) do
	{:ok, activity}
	end
	end

	@doc """
	Makes a follow activity data for the given follower and followed
	"""
	def make_follow_data(
	%User{ap_id: follower_id},
	%User{ap_id: followed_id} = followed,
	activity_id
	) do
	data = %{
	"type" => "Follow",
	"actor" => follower_id,
	"to" => [followed_id],
	"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
	"object" => followed_id
	}

	data = if activity_id, do: Map.put(data, "id", activity_id), else: data
	data = if User.locked?(followed), do: Map.put(data, "state", "pending"), else: data

	data
	end

	def fetch_latest_follow(%User{ap_id: follower_id}, %User{ap_id: followed_id}) do
	query =
	from(
	activity in Activity,
	where:
	fragment(
	"? ->> 'type' = 'Follow'",
	activity.data
	),
	where: activity.actor == ^follower_id,
	where:
	fragment(
	"? @> ?",
	activity.data,
	^%{object: followed_id}
	),
	order_by: [desc: :id],
	limit: 1
	)

	Repo.one(query)
	end

	#### Announce-related helpers

	@doc """
	Retruns an existing announce activity if the notice has already been announced
	"""
	def get_existing_announce(actor, %{data: %{"id" => id}}) do
	query =
	from(
	activity in Activity,
	where: activity.actor == ^actor,
	# this is to use the index
	where:
	fragment(
	"coalesce((?)->'object'->>'id', (?)->>'object') = ?",
	activity.data,
	activity.data,
	^id
	),
	where: fragment("(?)->>'type' = 'Announce'", activity.data)
	)

	Repo.one(query)
	end

	@doc """
	Make announce activity data for the given actor and object
	"""
	def make_announce_data(
	%User{ap_id: ap_id} = user,
	%Object{data: %{"id" => id}} = object,
	activity_id
	) do
	data = %{
	"type" => "Announce",
	"actor" => ap_id,
	"object" => id,
	"to" => [user.follower_address, object.data["actor"]],
	"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
	"context" => object.data["context"]
	}

	if activity_id, do: Map.put(data, "id", activity_id), else: data
	end

	@doc """
	Make unannounce activity data for the given actor and object
	"""
	def make_unannounce_data(
	%User{ap_id: ap_id} = user,
	%Activity{data: %{"context" => context}} = activity,
	activity_id
	) do
	data = %{
	"type" => "Undo",
	"actor" => ap_id,
	"object" => activity.data,
	"to" => [user.follower_address, activity.data["actor"]],
	"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
	"context" => context
	}

	if activity_id, do: Map.put(data, "id", activity_id), else: data
	end

	def make_unlike_data(
	%User{ap_id: ap_id} = user,
	%Activity{data: %{"context" => context}} = activity,
	activity_id
	) do
	data = %{
	"type" => "Undo",
	"actor" => ap_id,
	"object" => activity.data,
	"to" => [user.follower_address, activity.data["actor"]],
	"cc" => ["https://www.w3.org/ns/activitystreams#Public"],
	"context" => context
	}

	if activity_id, do: Map.put(data, "id", activity_id), else: data
	end

	def add_announce_to_object(%Activity{data: %{"actor" => actor}}, object) do
	- with announcements <- [actor \| object.data["announcements"] \|\| []] \|> Enum.uniq() do
	+ announcements =
	+ if is_list(object.data["announcements"]), do: object.data["announcements"], else: []
	+
	+ with announcements <- [actor \| announcements] \|> Enum.uniq() do
	update_element_in_object("announcement", announcements, object)
	end
	end

	def remove_announce_from_object(%Activity{data: %{"actor" => actor}}, object) do
	- with announcements <- (object.data["announcements"] \|\| []) \|> List.delete(actor) do
	+ announcements =
	+ if is_list(object.data["announcements"]), do: object.data["announcements"], else: []
	+
	+ with announcements <- announcements \|> List.delete(actor) do
	update_element_in_object("announcement", announcements, object)
	end
	end

	#### Unfollow-related helpers

	def make_unfollow_data(follower, followed, follow_activity, activity_id) do
	data = %{
	"type" => "Undo",
	"actor" => follower.ap_id,
	"to" => [followed.ap_id],
	"object" => follow_activity.data
	}

	if activity_id, do: Map.put(data, "id", activity_id), else: data
	end

	#### Block-related helpers
	def fetch_latest_block(%User{ap_id: blocker_id}, %User{ap_id: blocked_id}) do
	query =
	from(
	activity in Activity,
	where:
	fragment(
	"? ->> 'type' = 'Block'",
	activity.data
	),
	where: activity.actor == ^blocker_id,
	where:
	fragment(
	"? @> ?",
	activity.data,
	^%{object: blocked_id}
	),
	order_by: [desc: :id],
	limit: 1
	)

	Repo.one(query)
	end

	def make_block_data(blocker, blocked, activity_id) do
	data = %{
	"type" => "Block",
	"actor" => blocker.ap_id,
	"to" => [blocked.ap_id],
	"object" => blocked.ap_id
	}

	if activity_id, do: Map.put(data, "id", activity_id), else: data
	end

	def make_unblock_data(blocker, blocked, block_activity, activity_id) do
	data = %{
	"type" => "Undo",
	"actor" => blocker.ap_id,
	"to" => [blocked.ap_id],
	"object" => block_activity.data
	}

	if activity_id, do: Map.put(data, "id", activity_id), else: data
	end

	#### Create-related helpers

	def make_create_data(params, additional) do
	published = params.published \|\| make_date()

	%{
	"type" => "Create",
	"to" => params.to \|> Enum.uniq(),
	"actor" => params.actor.ap_id,
	"object" => params.object,
	"published" => published,
	"context" => params.context
	}
	\|> Map.merge(additional)
	end
	end
	diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
	index 26bfb79af..9abea59a7 100644
	--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
	+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
	@@ -1,218 +1,227 @@
	# THIS MODULE IS DEPRECATED! DON'T USE IT!
	# USE THE Pleroma.Web.TwitterAPI.Views.ActivityView MODULE!
	defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
	use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
	alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
	alias Pleroma.{Activity, User}
	alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView, ActivityView}
	alias Pleroma.Web.CommonAPI.Utils
	alias Pleroma.Formatter

	defp user_by_ap_id(user_list, ap_id) do
	Enum.find(user_list, fn %{ap_id: user_id} -> ap_id == user_id end)
	end

	def to_map(
	%Activity{data: %{"type" => "Announce", "actor" => actor, "published" => created_at}} =
	activity,
	%{users: users, announced_activity: announced_activity} = opts
	) do
	user = user_by_ap_id(users, actor)
	created_at = created_at \|> Utils.date_to_asctime()

	text = "#{user.nickname} retweeted a status."

	announced_user = user_by_ap_id(users, announced_activity.data["actor"])
	retweeted_status = to_map(announced_activity, Map.merge(%{user: announced_user}, opts))

	%{
	"id" => activity.id,
	"user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
	"statusnet_html" => text,
	"text" => text,
	"is_local" => activity.local,
	"is_post_verb" => false,
	"uri" => "tag:#{activity.data["id"]}:objectType=note",
	"created_at" => created_at,
	"retweeted_status" => retweeted_status,
	"statusnet_conversation_id" => conversation_id(announced_activity),
	"external_url" => activity.data["id"],
	"activity_type" => "repeat"
	}
	end

	def to_map(
	%Activity{data: %{"type" => "Like", "published" => created_at}} = activity,
	%{user: user, liked_activity: liked_activity} = opts
	) do
	created_at = created_at \|> Utils.date_to_asctime()

	text = "#{user.nickname} favorited a status."

	%{
	"id" => activity.id,
	"user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
	"statusnet_html" => text,
	"text" => text,
	"is_local" => activity.local,
	"is_post_verb" => false,
	"uri" => "tag:#{activity.data["id"]}:objectType=Favourite",
	"created_at" => created_at,
	"in_reply_to_status_id" => liked_activity.id,
	"external_url" => activity.data["id"],
	"activity_type" => "like"
	}
	end

	def to_map(
	%Activity{data: %{"type" => "Follow", "object" => followed_id}} = activity,
	%{user: user} = opts
	) do
	created_at = activity.data["published"] \|\| DateTime.to_iso8601(activity.inserted_at)
	created_at = created_at \|> Utils.date_to_asctime()

	followed = User.get_cached_by_ap_id(followed_id)
	text = "#{user.nickname} started following #{followed.nickname}"

	%{
	"id" => activity.id,
	"user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
	"attentions" => [],
	"statusnet_html" => text,
	"text" => text,
	"is_local" => activity.local,
	"is_post_verb" => false,
	"created_at" => created_at,
	"in_reply_to_status_id" => nil,
	"external_url" => activity.data["id"],
	"activity_type" => "follow"
	}
	end

	# TODO:
	# Make this more proper. Just a placeholder to not break the frontend.
	def to_map(
	%Activity{
	data: %{"type" => "Undo", "published" => created_at, "object" => undid_activity}
	} = activity,
	%{user: user} = opts
	) do
	created_at = created_at \|> Utils.date_to_asctime()

	text = "#{user.nickname} undid the action at #{undid_activity["id"]}"

	%{
	"id" => activity.id,
	"user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
	"attentions" => [],
	"statusnet_html" => text,
	"text" => text,
	"is_local" => activity.local,
	"is_post_verb" => false,
	"created_at" => created_at,
	"in_reply_to_status_id" => nil,
	"external_url" => activity.data["id"],
	"activity_type" => "undo"
	}
	end

	def to_map(
	%Activity{data: %{"type" => "Delete", "published" => created_at, "object" => _}} =
	activity,
	%{user: user} = opts
	) do
	created_at = created_at \|> Utils.date_to_asctime()

	%{
	"id" => activity.id,
	"uri" => activity.data["object"],
	"user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
	"attentions" => [],
	"statusnet_html" => "deleted notice {{tag",
	"text" => "deleted notice {{tag",
	"is_local" => activity.local,
	"is_post_verb" => false,
	"created_at" => created_at,
	"in_reply_to_status_id" => nil,
	"external_url" => activity.data["id"],
	"activity_type" => "delete"
	}
	end

	def to_map(
	%Activity{data: %{"object" => %{"content" => content} = object}} = activity,
	%{user: user} = opts
	) do
	created_at = object["published"] \|> Utils.date_to_asctime()
	like_count = object["like_count"] \|\| 0
	announcement_count = object["announcement_count"] \|\| 0
	favorited = opts[:for] && opts[:for].ap_id in (object["likes"] \|\| [])
	repeated = opts[:for] && opts[:for].ap_id in (object["announcements"] \|\| [])

	mentions = opts[:mentioned] \|\| []

	attentions =
	activity.recipients
	\|> Enum.map(fn ap_id -> Enum.find(mentions, fn user -> ap_id == user.ap_id end) end)
	\|> Enum.filter(& &1)
	\|> Enum.map(fn user -> UserView.render("show.json", %{user: user, for: opts[:for]}) end)

	conversation_id = conversation_id(activity)

	tags = activity.data["object"]["tag"] \|\| []
	possibly_sensitive = activity.data["object"]["sensitive"] \|\| Enum.member?(tags, "nsfw")

	tags = if possibly_sensitive, do: Enum.uniq(["nsfw" \| tags]), else: tags

	{summary, content} = ActivityView.render_content(object)

	html =
	HtmlSanitizeEx.basic_html(content)
	\|> Formatter.emojify(object["emoji"])

	+ video =
	+ if object["type"] == "Video" do
	+ vid = [object]
	+ else
	+ []
	+ end
	+
	+ attachments = (object["attachment"] \|\| []) ++ video
	+
	%{
	"id" => activity.id,
	"uri" => activity.data["object"]["id"],
	"user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
	"statusnet_html" => html,
	"text" => HtmlSanitizeEx.strip_tags(content),
	"is_local" => activity.local,
	"is_post_verb" => true,
	"created_at" => created_at,
	"in_reply_to_status_id" => object["inReplyToStatusId"],
	"statusnet_conversation_id" => conversation_id,
	- "attachments" => (object["attachment"] \|\| []) \|> ObjectRepresenter.enum_to_list(opts),
	+ "attachments" => attachments \|> ObjectRepresenter.enum_to_list(opts),
	"attentions" => attentions,
	"fave_num" => like_count,
	"repeat_num" => announcement_count,
	"favorited" => to_boolean(favorited),
	"repeated" => to_boolean(repeated),
	"external_url" => object["external_url"] \|\| object["id"],
	"tags" => tags,
	"activity_type" => "post",
	"possibly_sensitive" => possibly_sensitive,
	"visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object),
	"summary" => object["summary"]
	}
	end

	def conversation_id(activity) do
	with context when not is_nil(context) <- activity.data["context"] do
	TwitterAPI.context_to_conversation_id(context)
	else
	_e -> nil
	end
	end

	defp to_boolean(false) do
	false
	end

	defp to_boolean(nil) do
	false
	end

	defp to_boolean(_) do
	true
	end
	end
	diff --git a/lib/pleroma/web/twitter_api/representers/object_representer.ex b/lib/pleroma/web/twitter_api/representers/object_representer.ex
	index 9af8a1691..60e30191f 100644
	--- a/lib/pleroma/web/twitter_api/representers/object_representer.ex
	+++ b/lib/pleroma/web/twitter_api/representers/object_representer.ex
	@@ -1,33 +1,33 @@
	defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
	use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
	alias Pleroma.Object

	def to_map(%Object{data: %{"url" => [url \| _]}} = object, _opts) do
	data = object.data

	%{
	url: url["href"] \|> Pleroma.Web.MediaProxy.url(),
	- mimetype: url["mediaType"],
	+ mimetype: url["mediaType"] \|\| url["mimeType"],
	id: data["uuid"],
	oembed: false
	}
	end

	def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do
	%{
	url: url \|> Pleroma.Web.MediaProxy.url(),
	- mimetype: data["mediaType"],
	+ mimetype: data["mediaType"] \|\| url["mimeType"],
	id: data["uuid"],
	oembed: false
	}
	end

	def to_map(%Object{}, _opts) do
	%{}
	end

	# If we only get the naked data, wrap in an object
	def to_map(%{} = data, opts) do
	to_map(%Object{data: data}, opts)
	end
	end
	diff --git a/test/fixtures/httpoison_mock/7even.json b/test/fixtures/httpoison_mock/7even.json
	new file mode 100644
	index 000000000..eb3bab14e
	--- /dev/null
	+++ b/test/fixtures/httpoison_mock/7even.json
	@@ -0,0 +1 @@
	+{"type":"Person","id":"https://peertube.moe/accounts/7even","following":"https://peertube.moe/accounts/7even/following","followers":"https://peertube.moe/accounts/7even/followers","inbox":"https://peertube.moe/accounts/7even/inbox","outbox":"https://peertube.moe/accounts/7even/outbox","preferredUsername":"7even","url":"https://peertube.moe/accounts/7even","name":"7even","endpoints":{"sharedInbox":"https://peertube.moe/inbox"},"uuid":"fd6a914d-0383-4aca-b740-65ed96a0dd63","publicKey":{"id":"https://peertube.moe/accounts/7even#main-key","owner":"https://peertube.moe/accounts/7even","publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3vQ2uvYbDprVrq9Ti2wB\nn2J0WkewrzR/+NF4+KVl9s+FMyE4jlmnz+9WEnacKhV1x8a3SrsjLgND55WxNaPj\nabrh6lWmI0SNmHBLi1BejIVAR7CZElF3yCxG0xtNna0Hg6bhtL6I61QxnClhFunu\nDO4i6uyrUu2iXWGQDPzpWkGFrmZdyHOCNIr5PekphR/wcCluwbndO51Ku2RJAblW\nI+QlDG7ailpXyTZGUEO5yfJZX7dkCET1AsNxeBo41aPYzUN5rgRCDB/AdJXxrgZb\nsmtiObB9u+KYk9DuegPpHP3y+dapCSCvStBdPyTaPzsi1y/pOiTVfaxw0NYEJ/Cs\n0QIDAQAB\n-----END PUBLIC KEY-----"},"icon":{"type":"Image","mediaType":"image/png","url":"https://peertube.moe/static/avatars/0815978b-dd71-4797-ae3f-493a3445882a.png"},"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1",{"RsaSignature2017":"https://w3id.org/security#RsaSignature2017","Hashtag":"as:Hashtag","uuid":"http://schema.org/identifier","category":"http://schema.org/category","licence":"http://schema.org/license","sensitive":"as:sensitive","language":"http://schema.org/inLanguage","views":"http://schema.org/Number","size":"http://schema.org/Number","commentsEnabled":"http://schema.org/Boolean","support":"http://schema.org/Text"},{"likes":{"@id":"as:likes","@type":"@id"},"dislikes":{"@id":"as:dislikes","@type":"@id"},"shares":{"@id":"as:shares","@type":"@id"},"comments":{"@id":"as:comments","@type":"@id"}}],"summary":null}
	\ No newline at end of file
	diff --git a/test/fixtures/httpoison_mock/peertube.moe-vid.json b/test/fixtures/httpoison_mock/peertube.moe-vid.json
	new file mode 100644
	index 000000000..76296eb7d
	--- /dev/null
	+++ b/test/fixtures/httpoison_mock/peertube.moe-vid.json
	@@ -0,0 +1 @@
	+{"type":"Video","id":"https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3","name":"Friday Night","duration":"PT29S","uuid":"df5f464b-be8d-46fb-ad81-2d4c2d1630e3","tag":[{"type":"Hashtag","name":"feels"}],"views":12,"sensitive":false,"commentsEnabled":true,"published":"2018-03-23T16:43:22.988Z","updated":"2018-03-24T16:28:46.002Z","mediaType":"text/markdown","content":"tfw\r\n\r\n\r\nsong is 'my old piano' by diana ross","support":null,"icon":{"type":"Image","url":"https://peertube.moe/static/thumbnails/df5f464b-be8d-46fb-ad81-2d4c2d1630e3.jpg","mediaType":"image/jpeg","width":200,"height":110},"url":[{"type":"Link","mimeType":"video/mp4","href":"https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.mp4","width":480,"size":5015880},{"type":"Link","mimeType":"application/x-bittorrent","href":"https://peertube.moe/static/torrents/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.torrent","width":480},{"type":"Link","mimeType":"application/x-bittorrent;x-scheme-handler/magnet","href":"magnet:?xs=https%3A%2F%2Fpeertube.moe%2Fstatic%2Ftorrents%2Fdf5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.torrent&xt=urn:btih:11d3af6b5c812a376c2b29cdbd46e5fb42ee730e&dn=Friday+Night&tr=wss%3A%2F%2Fpeertube.moe%3A443%2Ftracker%2Fsocket&tr=https%3A%2F%2Fpeertube.moe%2Ftracker%2Fannounce&ws=https%3A%2F%2Fpeertube.moe%2Fstatic%2Fwebseed%2Fdf5f464b-be8d-46fb-ad81-2d4c2d1630e3-480.mp4","width":480},{"type":"Link","mimeType":"video/mp4","href":"https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-360.mp4","width":360,"size":3620040},{"type":"Link","mimeType":"application/x-bittorrent","href":"https://peertube.moe/static/torrents/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-360.torrent","width":360},{"type":"Link","mimeType":"application/x-bittorrent;x-scheme-handler/magnet","href":"magnet:?xs=https%3A%2F%2Fpeertube.moe%2Fstatic%2Ftorrents%2Fdf5f464b-be8d-46fb-ad81-2d4c2d1630e3-360.torrent&xt=urn:btih:1c3885b4d7cdb46193b62b9b76e72b1409cfb297&dn=Friday+Night&tr=wss%3A%2F%2Fpeertube.moe%3A443%2Ftracker%2Fsocket&tr=https%3A%2F%2Fpeertube.moe%2Ftracker%2Fannounce&ws=https%3A%2F%2Fpeertube.moe%2Fstatic%2Fwebseed%2Fdf5f464b-be8d-46fb-ad81-2d4c2d1630e3-360.mp4","width":360},{"type":"Link","mimeType":"video/mp4","href":"https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-240.mp4","width":240,"size":2305488},{"type":"Link","mimeType":"application/x-bittorrent","href":"https://peertube.moe/static/torrents/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-240.torrent","width":240},{"type":"Link","mimeType":"application/x-bittorrent;x-scheme-handler/magnet","href":"magnet:?xs=https%3A%2F%2Fpeertube.moe%2Fstatic%2Ftorrents%2Fdf5f464b-be8d-46fb-ad81-2d4c2d1630e3-240.torrent&xt=urn:btih:ac5773352d9e26f982d2da63acfb244f01ccafa4&dn=Friday+Night&tr=wss%3A%2F%2Fpeertube.moe%3A443%2Ftracker%2Fsocket&tr=https%3A%2F%2Fpeertube.moe%2Ftracker%2Fannounce&ws=https%3A%2F%2Fpeertube.moe%2Fstatic%2Fwebseed%2Fdf5f464b-be8d-46fb-ad81-2d4c2d1630e3-240.mp4","width":240},{"type":"Link","mimeType":"video/mp4","href":"https://peertube.moe/static/webseed/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-720.mp4","width":720,"size":7928231},{"type":"Link","mimeType":"application/x-bittorrent","href":"https://peertube.moe/static/torrents/df5f464b-be8d-46fb-ad81-2d4c2d1630e3-720.torrent","width":720},{"type":"Link","mimeType":"application/x-bittorrent;x-scheme-handler/magnet","href":"magnet:?xs=https%3A%2F%2Fpeertube.moe%2Fstatic%2Ftorrents%2Fdf5f464b-be8d-46fb-ad81-2d4c2d1630e3-720.torrent&xt=urn:btih:b591068f4533c4e2865bb4cbb89887aecccdc523&dn=Friday+Night&tr=wss%3A%2F%2Fpeertube.moe%3A443%2Ftracker%2Fsocket&tr=https%3A%2F%2Fpeertube.moe%2Ftracker%2Fannounce&ws=https%3A%2F%2Fpeertube.moe%2Fstatic%2Fwebseed%2Fdf5f464b-be8d-46fb-ad81-2d4c2d1630e3-720.mp4","width":720},{"type":"Link","mimeType":"text/html","href":"https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3"}],"likes":{"id":"https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3/likes","type":"OrderedCollection","totalItems":0,"orderedItems":[]},"dislikes":{"id":"https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3/dislikes","type":"OrderedCollection","totalItems":0,"orderedItems":[]},"shares":{"id":"https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3/announces","type":"OrderedCollection","totalItems":2,"orderedItems":["https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3/announces/465","https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3/announces/1"]},"comments":{"id":"https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3/comments","type":"OrderedCollection","totalItems":0,"orderedItems":[]},"attributedTo":[{"type":"Group","id":"https://peertube.moe/video-channels/5224869f-aa63-4c83-ab3a-87c3a5ac440e"},{"type":"Person","id":"https://peertube.moe/accounts/7even"}],"to":["https://www.w3.org/ns/activitystreams#Public"],"cc":[],"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1",{"RsaSignature2017":"https://w3id.org/security#RsaSignature2017","Hashtag":"as:Hashtag","uuid":"http://schema.org/identifier","category":"http://schema.org/category","licence":"http://schema.org/license","sensitive":"as:sensitive","language":"http://schema.org/inLanguage","views":"http://schema.org/Number","size":"http://schema.org/Number","commentsEnabled":"http://schema.org/Boolean","support":"http://schema.org/Text"},{"likes":{"@id":"as:likes","@type":"@id"},"dislikes":{"@id":"as:dislikes","@type":"@id"},"shares":{"@id":"as:shares","@type":"@id"},"comments":{"@id":"as:comments","@type":"@id"}}]}
	\ No newline at end of file
	diff --git a/test/support/httpoison_mock.ex b/test/support/httpoison_mock.ex
	index 527c2e1f7..4ee2feb95 100644
	--- a/test/support/httpoison_mock.ex
	+++ b/test/support/httpoison_mock.ex
	@@ -1,777 +1,793 @@
	defmodule HTTPoisonMock do
	alias HTTPoison.Response

	def get(url, body \\ [], headers \\ [])

	def get("https://puckipedia.com/", [Accept: "application/activity+json"], _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/puckipedia.com.json")
	}}
	end

	def get(
	"https://gerzilla.de/.well-known/webfinger?resource=acct:kaniini@gerzilla.de",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/kaniini@gerzilla.de.json")
	}}
	end

	def get(
	"https://framatube.org/.well-known/webfinger?resource=acct:framasoft@framatube.org",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/framasoft@framatube.org.json")
	}}
	end

	def get(
	"https://gnusocial.de/.well-known/webfinger?resource=acct:winterdienst@gnusocial.de",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/winterdienst_webfinger.json")
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "nonexistant@social.heldscal.la"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 500,
	body: File.read!("test/fixtures/httpoison_mock/nonexistant@social.heldscal.la.xml")
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger?resource=shp@social.heldscal.la",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/shp@social.heldscal.la.xml")
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "shp@social.heldscal.la"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/shp@social.heldscal.la.xml")
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "https://social.heldscal.la/user/23211"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___social.heldscal.la_user_23211.xml")
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger?resource=https://social.heldscal.la/user/23211",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___social.heldscal.la_user_23211.xml")
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "https://social.heldscal.la/user/29191"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___social.heldscal.la_user_29191.xml")
	}}
	end

	def get(
	"https://social.heldscal.la/.well-known/webfinger?resource=https://social.heldscal.la/user/29191",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___social.heldscal.la_user_29191.xml")
	}}
	end

	def get(
	"https://mastodon.social/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "https://mastodon.social/users/lambadalambda"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/https___mastodon.social_users_lambadalambda.xml"
	)
	}}
	end

	def get(
	"https://mastodon.social/.well-known/webfinger?resource=https://mastodon.social/users/lambadalambda",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/https___mastodon.social_users_lambadalambda.xml"
	)
	}}
	end

	def get(
	"https://shitposter.club/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "https://shitposter.club/user/1"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___shitposter.club_user_1.xml")
	}}
	end

	def get(
	"https://shitposter.club/.well-known/webfinger?resource=https://shitposter.club/user/1",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___shitposter.club_user_1.xml")
	}}
	end

	def get(
	"https://shitposter.club/.well-known/webfinger?resource=https://shitposter.club/user/5381",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/spc_5381_xrd.xml")
	}}
	end

	def get(
	"http://gs.example.org/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "http://gs.example.org:4040/index.php/user/1"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/http___gs.example.org_4040_index.php_user_1.xml"
	)
	}}
	end

	def get(
	"http://gs.example.org/.well-known/webfinger?resource=http://gs.example.org:4040/index.php/user/1",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/http___gs.example.org_4040_index.php_user_1.xml"
	)
	}}
	end

	def get(
	"https://social.stopwatchingus-heidelberg.de/.well-known/webfinger?resource=https://social.stopwatchingus-heidelberg.de/user/18330",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/atarifrosch_webfinger.xml")
	}}
	end

	def get(
	"https://pleroma.soykaf.com/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "https://pleroma.soykaf.com/users/lain"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___pleroma.soykaf.com_users_lain.xml")
	}}
	end

	def get(
	"https://pleroma.soykaf.com/.well-known/webfinger?resource=https://pleroma.soykaf.com/users/lain",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___pleroma.soykaf.com_users_lain.xml")
	}}
	end

	def get("https://social.heldscal.la/api/statuses/user_timeline/29191.atom", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/https___social.heldscal.la_api_statuses_user_timeline_29191.atom.xml"
	)
	}}
	end

	def get("https://shitposter.club/api/statuses/user_timeline/5381.atom", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/spc_5381.atom")
	}}
	end

	def get("https://social.heldscal.la/api/statuses/user_timeline/23211.atom", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/https___social.heldscal.la_api_statuses_user_timeline_23211.atom.xml"
	)
	}}
	end

	def get("https://mastodon.social/users/lambadalambda.atom", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/https___mastodon.social_users_lambadalambda.atom"
	)
	}}
	end

	def get(
	"https://social.stopwatchingus-heidelberg.de/api/statuses/user_timeline/18330.atom",
	_body,
	_headers
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/atarifrosch_feed.xml")
	}}
	end

	def get("https://pleroma.soykaf.com/users/lain/feed.atom", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/https___pleroma.soykaf.com_users_lain_feed.atom.xml"
	)
	}}
	end

	def get("https://social.sakamoto.gq/users/eal/feed.atom", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/sakamoto_eal_feed.atom")
	}}
	end

	def get("http://gs.example.org/index.php/api/statuses/user_timeline/1.atom", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/http__gs.example.org_index.php_api_statuses_user_timeline_1.atom.xml"
	)
	}}
	end

	def get("https://shitposter.club/notice/2827873", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!("test/fixtures/httpoison_mock/https___shitposter.club_notice_2827873.html")
	}}
	end

	def get("https://shitposter.club/api/statuses/show/2827873.atom", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/https___shitposter.club_api_statuses_show_2827873.atom.xml"
	)
	}}
	end

	def get("https://shitposter.club/api/statuses/user_timeline/1.atom", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/https___shitposter.club_api_statuses_user_timeline_1.atom.xml"
	)
	}}
	end

	def post(
	"https://social.heldscal.la/main/push/hub",
	{:form, _data},
	"Content-type": "application/x-www-form-urlencoded"
	) do
	{:ok,
	%Response{
	status_code: 202
	}}
	end

	def get(
	"https://pawoo.net/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "https://pawoo.net/users/pekorino"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.xml")
	}}
	end

	def get(
	"https://pawoo.net/.well-known/webfinger?resource=https://pawoo.net/users/pekorino",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.xml")
	}}
	end

	def get("https://pawoo.net/users/pekorino.atom", _, _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___pawoo.net_users_pekorino.atom")
	}}
	end

	def get(
	"https://mamot.fr/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "https://mamot.fr/users/Skruyb"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/skruyb@mamot.fr.atom")
	}}
	end

	def get(
	"https://mamot.fr/.well-known/webfinger?resource=https://mamot.fr/users/Skruyb",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/skruyb@mamot.fr.atom")
	}}
	end

	def get(
	"https://social.sakamoto.gq/.well-known/webfinger",
	[Accept: "application/xrd+xml,application/jrd+json"],
	params: [resource: "https://social.sakamoto.gq/users/eal"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/eal_sakamoto.xml")
	}}
	end

	def get(
	"https://social.sakamoto.gq/.well-known/webfinger?resource=https://social.sakamoto.gq/users/eal",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/eal_sakamoto.xml")
	}}
	end

	def get(
	"https://pleroma.soykaf.com/.well-known/webfinger?resource=https://pleroma.soykaf.com/users/shp",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/shp@pleroma.soykaf.com.webfigner")
	}}
	end

	def get(
	"https://squeet.me/xrd/?uri=lain@squeet.me",
	[Accept: "application/xrd+xml,application/jrd+json"],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/lain_squeet.me_webfinger.xml")
	}}
	end

	def get("https://mamot.fr/users/Skruyb.atom", _, _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___mamot.fr_users_Skruyb.atom")
	}}
	end

	def get(
	"https://social.sakamoto.gq/objects/0ccc1a2c-66b0-4305-b23a-7f7f2b040056",
	[Accept: "application/atom+xml"],
	_
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/sakamoto.atom")
	}}
	end

	def get("https://pleroma.soykaf.com/users/shp/feed.atom", _, _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/shp@pleroma.soykaf.com.feed")
	}}
	end

	def get("http://social.heldscal.la/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/social.heldscal.la_host_meta")
	}}
	end

	def get("http://status.alpicola.com/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/status.alpicola.com_host_meta")
	}}
	end

	def get("http://macgirvin.com/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/macgirvin.com_host_meta")
	}}
	end

	def get("http://mastodon.social/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/mastodon.social_host_meta")
	}}
	end

	def get("http://shitposter.club/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/shitposter.club_host_meta")
	}}
	end

	def get("http://pleroma.soykaf.com/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/pleroma.soykaf.com_host_meta")
	}}
	end

	def get("http://social.sakamoto.gq/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/social.sakamoto.gq_host_meta")
	}}
	end

	def get("http://gs.example.org/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/gs.example.org_host_meta")
	}}
	end

	def get("http://pawoo.net/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/pawoo.net_host_meta")
	}}
	end

	def get("http://mamot.fr/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/mamot.fr_host_meta")
	}}
	end

	def get("http://mastodon.xyz/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/mastodon.xyz_host_meta")
	}}
	end

	def get("http://social.wxcafe.net/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/social.wxcafe.net_host_meta")
	}}
	end

	def get("http://squeet.me/.well-known/host-meta", [], follow_redirect: true) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/squeet.me_host_meta")
	}}
	end

	def get(
	"http://social.stopwatchingus-heidelberg.de/.well-known/host-meta",
	[],
	follow_redirect: true
	) do
	{:ok,
	%Response{
	status_code: 200,
	body:
	File.read!("test/fixtures/httpoison_mock/social.stopwatchingus-heidelberg.de_host_meta")
	}}
	end

	def get("http://mastodon.example.org/users/admin", [Accept: "application/activity+json"], _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/admin@mastdon.example.org.json")
	}}
	end

	def get(
	"https://hubzilla.example.org/channel/kaniini",
	[Accept: "application/activity+json"],
	_
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/kaniini@hubzilla.example.org.json")
	}}
	end

	def get("https://masto.quad.moe/users/_HellPie", [Accept: "application/activity+json"], _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/hellpie.json")
	}}
	end

	def get("https://niu.moe/users/rye", [Accept: "application/activity+json"], _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/rye.json")
	}}
	end

	def get(
	"https://mst3k.interlinked.me/users/luciferMysticus",
	[Accept: "application/activity+json"],
	_
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/lucifermysticus.json")
	}}
	end

	def get("https://mstdn.io/users/mayuutann", [Accept: "application/activity+json"], _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/mayumayu.json")
	}}
	end

	def get(
	"http://mastodon.example.org/@admin/99541947525187367",
	[Accept: "application/activity+json"],
	_
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/mastodon-note-object.json")
	}}
	end

	def get(
	"https://mstdn.io/users/mayuutann/statuses/99568293732299394",
	[Accept: "application/activity+json"],
	_
	) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/mayumayupost.json")
	}}
	end

	def get("https://shitposter.club/notice/7369654", _, _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/7369654.html")
	}}
	end

	def get("https://shitposter.club/api/statuses/show/7369654.atom", _body, _headers) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/7369654.atom")
	}}
	end

	def get("https://baptiste.gelez.xyz/~/PlumeDevelopment/this-month-in-plume-june-2018/", _, _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/baptiste.gelex.xyz-article.json")
	}}
	end

	def get("https://baptiste.gelez.xyz/@/BaptisteGelez", _, _) do
	{:ok,
	%Response{
	status_code: 200,
	body: File.read!("test/fixtures/httpoison_mock/baptiste.gelex.xyz-user.json")
	}}
	end

	+ def get("https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3", _, _) do
	+ {:ok,
	+ %Response{
	+ status_code: 200,
	+ body: File.read!("test/fixtures/httpoison_mock/peertube.moe-vid.json")
	+ }}
	+ end
	+
	+ def get("https://peertube.moe/accounts/7even", _, _) do
	+ {:ok,
	+ %Response{
	+ status_code: 200,
	+ body: File.read!("test/fixtures/httpoison_mock/7even.json")
	+ }}
	+ end
	+
	def get(url, body, headers) do
	{:error,
	"Not implemented the mock response for get #{inspect(url)}, #{inspect(body)}, #{
	inspect(headers)
	}"}
	end

	def post(url, _body, _headers) do
	{:error, "Not implemented the mock response for post #{inspect(url)}"}
	end

	def post(url, _body, _headers, _options) do
	{:error, "Not implemented the mock response for post #{inspect(url)}"}
	end
	end
	diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
	index 90c0bd768..1cf7d6bbc 100644
	--- a/test/web/activity_pub/activity_pub_test.exs
	+++ b/test/web/activity_pub/activity_pub_test.exs
	@@ -1,512 +1,521 @@
	defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
	use Pleroma.DataCase
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.ActivityPub.Utils
	alias Pleroma.Web.CommonAPI
	alias Pleroma.{Activity, Object, User}
	alias Pleroma.Builders.ActivityBuilder

	import Pleroma.Factory

	describe "building a user from his ap id" do
	test "it returns a user" do
	user_id = "http://mastodon.example.org/users/admin"
	{:ok, user} = ActivityPub.make_user_from_ap_id(user_id)
	assert user.ap_id == user_id
	assert user.nickname == "admin@mastodon.example.org"
	assert user.info["source_data"]
	assert user.info["ap_enabled"]
	assert user.follower_address == "http://mastodon.example.org/users/admin/followers"
	end
	end

	describe "insertion" do
	test "returns the activity if one with the same id is already in" do
	activity = insert(:note_activity)
	{:ok, new_activity} = ActivityPub.insert(activity.data)

	assert activity == new_activity
	end

	test "inserts a given map into the activity database, giving it an id if it has none." do
	data = %{
	"ok" => true
	}

	{:ok, %Activity{} = activity} = ActivityPub.insert(data)
	assert activity.data["ok"] == data["ok"]
	assert is_binary(activity.data["id"])

	given_id = "bla"

	data = %{
	"ok" => true,
	"id" => given_id,
	"context" => "blabla"
	}

	{:ok, %Activity{} = activity} = ActivityPub.insert(data)
	assert activity.data["ok"] == data["ok"]
	assert activity.data["id"] == given_id
	assert activity.data["context"] == "blabla"
	assert activity.data["context_id"]
	end

	test "adds a context when none is there" do
	data = %{
	"id" => "some_id",
	"object" => %{
	"id" => "object_id"
	}
	}

	{:ok, %Activity{} = activity} = ActivityPub.insert(data)

	assert is_binary(activity.data["context"])
	assert is_binary(activity.data["object"]["context"])
	assert activity.data["context_id"]
	assert activity.data["object"]["context_id"]
	end

	test "adds an id to a given object if it lacks one and is a note and inserts it to the object database" do
	data = %{
	"object" => %{
	"type" => "Note",
	"ok" => true
	}
	}

	{:ok, %Activity{} = activity} = ActivityPub.insert(data)
	assert is_binary(activity.data["object"]["id"])
	assert %Object{} = Object.get_by_ap_id(activity.data["object"]["id"])
	end
	end

	describe "create activities" do
	test "removes doubled 'to' recipients" do
	user = insert(:user)

	{:ok, activity} =
	ActivityPub.create(%{
	to: ["user1", "user1", "user2"],
	actor: user,
	context: "",
	object: %{}
	})

	assert activity.data["to"] == ["user1", "user2"]
	assert activity.actor == user.ap_id
	assert activity.recipients == ["user1", "user2"]
	end
	end

	describe "fetch activities for recipients" do
	test "retrieve the activities for certain recipients" do
	{:ok, activity_one} = ActivityBuilder.insert(%{"to" => ["someone"]})
	{:ok, activity_two} = ActivityBuilder.insert(%{"to" => ["someone_else"]})
	{:ok, _activity_three} = ActivityBuilder.insert(%{"to" => ["noone"]})

	activities = ActivityPub.fetch_activities(["someone", "someone_else"])
	assert length(activities) == 2
	assert activities == [activity_one, activity_two]
	end
	end

	describe "fetch activities in context" do
	test "retrieves activities that have a given context" do
	{:ok, activity} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
	{:ok, activity_two} = ActivityBuilder.insert(%{"type" => "Create", "context" => "2hu"})
	{:ok, _activity_three} = ActivityBuilder.insert(%{"type" => "Create", "context" => "3hu"})
	{:ok, _activity_four} = ActivityBuilder.insert(%{"type" => "Announce", "context" => "2hu"})
	activity_five = insert(:note_activity)
	user = insert(:user)

	{:ok, user} = User.block(user, %{ap_id: activity_five.data["actor"]})

	activities = ActivityPub.fetch_activities_for_context("2hu", %{"blocking_user" => user})
	assert activities == [activity_two, activity]
	end
	end

	test "doesn't return blocked activities" do
	activity_one = insert(:note_activity)
	activity_two = insert(:note_activity)
	activity_three = insert(:note_activity)
	user = insert(:user)
	booster = insert(:user)
	{:ok, user} = User.block(user, %{ap_id: activity_one.data["actor"]})

	activities = ActivityPub.fetch_activities([], %{"blocking_user" => user})

	assert Enum.member?(activities, activity_two)
	assert Enum.member?(activities, activity_three)
	refute Enum.member?(activities, activity_one)

	{:ok, user} = User.unblock(user, %{ap_id: activity_one.data["actor"]})

	activities = ActivityPub.fetch_activities([], %{"blocking_user" => user})

	assert Enum.member?(activities, activity_two)
	assert Enum.member?(activities, activity_three)
	assert Enum.member?(activities, activity_one)

	{:ok, user} = User.block(user, %{ap_id: activity_three.data["actor"]})
	{:ok, _announce, %{data: %{"id" => id}}} = CommonAPI.repeat(activity_three.id, booster)
	%Activity{} = boost_activity = Activity.get_create_activity_by_object_ap_id(id)
	activity_three = Repo.get(Activity, activity_three.id)

	activities = ActivityPub.fetch_activities([], %{"blocking_user" => user})

	assert Enum.member?(activities, activity_two)
	refute Enum.member?(activities, activity_three)
	refute Enum.member?(activities, boost_activity)
	assert Enum.member?(activities, activity_one)

	activities = ActivityPub.fetch_activities([], %{"blocking_user" => nil})

	assert Enum.member?(activities, activity_two)
	assert Enum.member?(activities, activity_three)
	assert Enum.member?(activities, boost_activity)
	assert Enum.member?(activities, activity_one)
	end

	describe "public fetch activities" do
	test "doesn't retrieve unlisted activities" do
	user = insert(:user)

	{:ok, unlisted_activity} =
	CommonAPI.post(user, %{"status" => "yeah", "visibility" => "unlisted"})

	{:ok, listed_activity} = CommonAPI.post(user, %{"status" => "yeah"})

	[activity] = ActivityPub.fetch_public_activities()

	assert activity == listed_activity
	end

	test "retrieves public activities" do
	_activities = ActivityPub.fetch_public_activities()

	%{public: public} = ActivityBuilder.public_and_non_public()

	activities = ActivityPub.fetch_public_activities()
	assert length(activities) == 1
	assert Enum.at(activities, 0) == public
	end

	test "retrieves a maximum of 20 activities" do
	activities = ActivityBuilder.insert_list(30)
	last_expected = List.last(activities)

	activities = ActivityPub.fetch_public_activities()
	last = List.last(activities)

	assert length(activities) == 20
	assert last == last_expected
	end

	test "retrieves ids starting from a since_id" do
	activities = ActivityBuilder.insert_list(30)
	later_activities = ActivityBuilder.insert_list(10)
	since_id = List.last(activities).id
	last_expected = List.last(later_activities)

	activities = ActivityPub.fetch_public_activities(%{"since_id" => since_id})
	last = List.last(activities)

	assert length(activities) == 10
	assert last == last_expected
	end

	test "retrieves ids up to max_id" do
	_first_activities = ActivityBuilder.insert_list(10)
	activities = ActivityBuilder.insert_list(20)
	later_activities = ActivityBuilder.insert_list(10)
	max_id = List.first(later_activities).id
	last_expected = List.last(activities)

	activities = ActivityPub.fetch_public_activities(%{"max_id" => max_id})
	last = List.last(activities)

	assert length(activities) == 20
	assert last == last_expected
	end
	end

	describe "like an object" do
	test "adds a like activity to the db" do
	note_activity = insert(:note_activity)
	object = Object.get_by_ap_id(note_activity.data["object"]["id"])
	user = insert(:user)
	user_two = insert(:user)

	{:ok, like_activity, object} = ActivityPub.like(user, object)

	assert like_activity.data["actor"] == user.ap_id
	assert like_activity.data["type"] == "Like"
	assert like_activity.data["object"] == object.data["id"]
	assert like_activity.data["to"] == [User.ap_followers(user), note_activity.data["actor"]]
	assert like_activity.data["context"] == object.data["context"]
	assert object.data["like_count"] == 1
	assert object.data["likes"] == [user.ap_id]

	# Just return the original activity if the user already liked it.
	{:ok, same_like_activity, object} = ActivityPub.like(user, object)

	assert like_activity == same_like_activity
	assert object.data["likes"] == [user.ap_id]

	[note_activity] = Activity.all_by_object_ap_id(object.data["id"])
	assert note_activity.data["object"]["like_count"] == 1

	{:ok, _like_activity, object} = ActivityPub.like(user_two, object)
	assert object.data["like_count"] == 2
	end
	end

	describe "unliking" do
	test "unliking a previously liked object" do
	note_activity = insert(:note_activity)
	object = Object.get_by_ap_id(note_activity.data["object"]["id"])
	user = insert(:user)

	# Unliking something that hasn't been liked does nothing
	{:ok, object} = ActivityPub.unlike(user, object)
	assert object.data["like_count"] == 0

	{:ok, like_activity, object} = ActivityPub.like(user, object)
	assert object.data["like_count"] == 1

	{:ok, _, _, object} = ActivityPub.unlike(user, object)
	assert object.data["like_count"] == 0

	assert Repo.get(Activity, like_activity.id) == nil
	end
	end

	describe "announcing an object" do
	test "adds an announce activity to the db" do
	note_activity = insert(:note_activity)
	object = Object.get_by_ap_id(note_activity.data["object"]["id"])
	user = insert(:user)

	{:ok, announce_activity, object} = ActivityPub.announce(user, object)
	assert object.data["announcement_count"] == 1
	assert object.data["announcements"] == [user.ap_id]

	assert announce_activity.data["to"] == [
	User.ap_followers(user),
	note_activity.data["actor"]
	]

	assert announce_activity.data["object"] == object.data["id"]
	assert announce_activity.data["actor"] == user.ap_id
	assert announce_activity.data["context"] == object.data["context"]
	end
	end

	describe "unannouncing an object" do
	test "unannouncing a previously announced object" do
	note_activity = insert(:note_activity)
	object = Object.get_by_ap_id(note_activity.data["object"]["id"])
	user = insert(:user)

	# Unannouncing an object that is not announced does nothing
	# {:ok, object} = ActivityPub.unannounce(user, object)
	# assert object.data["announcement_count"] == 0

	{:ok, announce_activity, object} = ActivityPub.announce(user, object)
	assert object.data["announcement_count"] == 1

	{:ok, unannounce_activity, object} = ActivityPub.unannounce(user, object)
	assert object.data["announcement_count"] == 0

	assert unannounce_activity.data["to"] == [
	User.ap_followers(user),
	announce_activity.data["actor"]
	]

	assert unannounce_activity.data["type"] == "Undo"
	assert unannounce_activity.data["object"] == announce_activity.data
	assert unannounce_activity.data["actor"] == user.ap_id
	assert unannounce_activity.data["context"] == announce_activity.data["context"]

	assert Repo.get(Activity, announce_activity.id) == nil
	end
	end

	describe "uploading files" do
	test "copies the file to the configured folder" do
	file = %Plug.Upload{
	content_type: "image/jpg",
	path: Path.absname("test/fixtures/image.jpg"),
	filename: "an_image.jpg"
	}

	{:ok, %Object{} = object} = ActivityPub.upload(file)
	assert object.data["name"] == "an_image.jpg"
	end

	test "works with base64 encoded images" do
	file = %{
	"img" => data_uri()
	}

	{:ok, %Object{}} = ActivityPub.upload(file)
	end
	end

	describe "fetch the latest Follow" do
	test "fetches the latest Follow activity" do
	%Activity{data: %{"type" => "Follow"}} = activity = insert(:follow_activity)
	follower = Repo.get_by(User, ap_id: activity.data["actor"])
	followed = Repo.get_by(User, ap_id: activity.data["object"])

	assert activity == Utils.fetch_latest_follow(follower, followed)
	end
	end

	describe "fetching an object" do
	test "it fetches an object" do
	{:ok, object} =
	ActivityPub.fetch_object_from_id("http://mastodon.example.org/@admin/99541947525187367")

	assert activity = Activity.get_create_activity_by_object_ap_id(object.data["id"])
	assert activity.data["id"]

	{:ok, object_again} =
	ActivityPub.fetch_object_from_id("http://mastodon.example.org/@admin/99541947525187367")

	assert [attachment] = object.data["attachment"]
	assert is_list(attachment["url"])

	assert object == object_again
	end

	test "it works with objects only available via Ostatus" do
	{:ok, object} = ActivityPub.fetch_object_from_id("https://shitposter.club/notice/2827873")
	assert activity = Activity.get_create_activity_by_object_ap_id(object.data["id"])
	assert activity.data["id"]

	{:ok, object_again} =
	ActivityPub.fetch_object_from_id("https://shitposter.club/notice/2827873")

	assert object == object_again
	end

	test "it correctly stitches up conversations between ostatus and ap" do
	last = "https://mstdn.io/users/mayuutann/statuses/99568293732299394"
	{:ok, object} = ActivityPub.fetch_object_from_id(last)

	object = Object.get_by_ap_id(object.data["inReplyTo"])
	assert object
	end
	end

	describe "following / unfollowing" do
	test "creates a follow activity" do
	follower = insert(:user)
	followed = insert(:user)

	{:ok, activity} = ActivityPub.follow(follower, followed)
	assert activity.data["type"] == "Follow"
	assert activity.data["actor"] == follower.ap_id
	assert activity.data["object"] == followed.ap_id
	end

	test "creates an undo activity for the last follow" do
	follower = insert(:user)
	followed = insert(:user)

	{:ok, follow_activity} = ActivityPub.follow(follower, followed)
	{:ok, activity} = ActivityPub.unfollow(follower, followed)

	assert activity.data["type"] == "Undo"
	assert activity.data["actor"] == follower.ap_id

	assert is_map(activity.data["object"])
	assert activity.data["object"]["type"] == "Follow"
	assert activity.data["object"]["object"] == followed.ap_id
	assert activity.data["object"]["id"] == follow_activity.data["id"]
	end
	end

	describe "blocking / unblocking" do
	test "creates a block activity" do
	blocker = insert(:user)
	blocked = insert(:user)

	{:ok, activity} = ActivityPub.block(blocker, blocked)

	assert activity.data["type"] == "Block"
	assert activity.data["actor"] == blocker.ap_id
	assert activity.data["object"] == blocked.ap_id
	end

	test "creates an undo activity for the last block" do
	blocker = insert(:user)
	blocked = insert(:user)

	{:ok, block_activity} = ActivityPub.block(blocker, blocked)
	{:ok, activity} = ActivityPub.unblock(blocker, blocked)

	assert activity.data["type"] == "Undo"
	assert activity.data["actor"] == blocker.ap_id

	assert is_map(activity.data["object"])
	assert activity.data["object"]["type"] == "Block"
	assert activity.data["object"]["object"] == blocked.ap_id
	assert activity.data["object"]["id"] == block_activity.data["id"]
	end
	end

	describe "deletion" do
	test "it creates a delete activity and deletes the original object" do
	note = insert(:note_activity)
	object = Object.get_by_ap_id(note.data["object"]["id"])
	{:ok, delete} = ActivityPub.delete(object)

	assert delete.data["type"] == "Delete"
	assert delete.data["actor"] == note.data["actor"]
	assert delete.data["object"] == note.data["object"]["id"]

	assert Repo.get(Activity, delete.id) != nil

	assert Repo.get(Object, object.id) == nil
	end
	end

	test "it can fetch plume articles" do
	{:ok, object} =
	ActivityPub.fetch_object_from_id(
	"https://baptiste.gelez.xyz/~/PlumeDevelopment/this-month-in-plume-june-2018/"
	)

	assert object
	end

	describe "update" do
	test "it creates an update activity with the new user data" do
	user = insert(:user)
	{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
	user_data = Pleroma.Web.ActivityPub.UserView.render("user.json", %{user: user})

	{:ok, update} =
	ActivityPub.update(%{
	actor: user_data["id"],
	to: [user.follower_address],
	cc: [],
	object: user_data
	})

	assert update.data["actor"] == user.ap_id
	assert update.data["to"] == [user.follower_address]
	assert update.data["object"]["id"] == user_data["id"]
	assert update.data["object"]["type"] == user_data["type"]
	end
	end

	+ test "it can fetch peertube videos" do
	+ {:ok, object} =
	+ ActivityPub.fetch_object_from_id(
	+ "https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3"
	+ )
	+
	+ assert object
	+ end
	+
	def data_uri do
	File.read!("test/fixtures/avatar_data_uri")
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Fri, Oct 30, 5:09 AM (1 d, 2 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1799520
Default Alt Text: (93 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions