No OneTemporary
Actions

Authored By

Unknown

Size

73 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
	index 7f301a518..2a1c73111 100644
	--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
	+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
	@@ -1,345 +1,347 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.TwitterAPI.UtilController do
	use Pleroma.Web, :controller

	require Logger

	alias Comeonin.Pbkdf2
	alias Pleroma.Activity
	alias Pleroma.Emoji
	alias Pleroma.Notification
	alias Pleroma.PasswordResetToken
	alias Pleroma.Repo
	alias Pleroma.User
	alias Pleroma.Web
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.CommonAPI
	alias Pleroma.Web.OStatus
	alias Pleroma.Web.WebFinger

	def show_password_reset(conn, %{"token" => token}) do
	with %{used: false} = token <- Repo.get_by(PasswordResetToken, %{token: token}),
	%User{} = user <- Repo.get(User, token.user_id) do
	render(conn, "password_reset.html", %{
	token: token,
	user: user
	})
	else
	_e -> render(conn, "invalid_token.html")
	end
	end

	def password_reset(conn, %{"data" => data}) do
	with {:ok, _} <- PasswordResetToken.reset_password(data["token"], data) do
	render(conn, "password_reset_success.html")
	else
	_e -> render(conn, "password_reset_failed.html")
	end
	end

	def help_test(conn, _params) do
	json(conn, "ok")
	end

	def remote_subscribe(conn, %{"nickname" => nick, "profile" => _}) do
	with %User{} = user <- User.get_cached_by_nickname(nick), avatar = User.avatar_url(user) do
	conn
	\|> render("subscribe.html", %{nickname: nick, avatar: avatar, error: false})
	else
	_e ->
	render(conn, "subscribe.html", %{
	nickname: nick,
	avatar: nil,
	error: "Could not find user"
	})
	end
	end

	def remote_subscribe(conn, %{"user" => %{"nickname" => nick, "profile" => profile}}) do
	with {:ok, %{"subscribe_address" => template}} <- WebFinger.finger(profile),
	%User{ap_id: ap_id} <- User.get_cached_by_nickname(nick) do
	conn
	\|> Phoenix.Controller.redirect(external: String.replace(template, "{uri}", ap_id))
	else
	_e ->
	render(conn, "subscribe.html", %{
	nickname: nick,
	avatar: nil,
	error: "Something went wrong."
	})
	end
	end

	def remote_follow(%{assigns: %{user: user}} = conn, %{"acct" => acct}) do
	case is_status?(acct) do
	true ->
	{:ok, object} = ActivityPub.fetch_object_from_id(acct)
	%Activity{id: activity_id} = Activity.get_create_by_object_ap_id(object.data["id"])
	redirect(conn, to: "/notice/#{activity_id}")

	false ->
	{err, followee} = OStatus.find_or_make_user(acct)
	avatar = User.avatar_url(followee)
	name = followee.nickname
	id = followee.id

	if !!user do
	conn
	\|> render("follow.html", %{error: err, acct: acct, avatar: avatar, name: name, id: id})
	else
	conn
	\|> render("follow_login.html", %{
	error: false,
	acct: acct,
	avatar: avatar,
	name: name,
	id: id
	})
	end
	end
	end

	defp is_status?(acct) do
	- %URI{path: path} = URI.parse(acct)
	- Regex.match?(~r/\/users\/[^\/]+\/statuses\/([0-9]+)$/, path)
	+ case ActivityPub.fetch_and_contain_remote_object_from_id(acct) do
	+ {:ok, %{"type" => "Note"}} -> true
	+ _ -> false
	+ end
	end

	def do_remote_follow(conn, %{
	"authorization" => %{"name" => username, "password" => password, "id" => id}
	}) do
	followee = Repo.get(User, id)
	avatar = User.avatar_url(followee)
	name = followee.nickname

	with %User{} = user <- User.get_cached_by_nickname(username),
	true <- Pbkdf2.checkpw(password, user.password_hash),
	%User{} = _followed <- Repo.get(User, id),
	{:ok, follower} <- User.follow(user, followee),
	{:ok, _activity} <- ActivityPub.follow(follower, followee) do
	conn
	\|> render("followed.html", %{error: false})
	else
	# Was already following user
	{:error, "Could not follow user:" <> _rest} ->
	render(conn, "followed.html", %{error: false})

	_e ->
	conn
	\|> render("follow_login.html", %{
	error: "Wrong username or password",
	id: id,
	name: name,
	avatar: avatar
	})
	end
	end

	def do_remote_follow(%{assigns: %{user: user}} = conn, %{"user" => %{"id" => id}}) do
	with %User{} = followee <- Repo.get(User, id),
	{:ok, follower} <- User.follow(user, followee),
	{:ok, _activity} <- ActivityPub.follow(follower, followee) do
	conn
	\|> render("followed.html", %{error: false})
	else
	# Was already following user
	{:error, "Could not follow user:" <> _rest} ->
	conn
	\|> render("followed.html", %{error: false})

	e ->
	Logger.debug("Remote follow failed with error #{inspect(e)}")

	conn
	\|> render("followed.html", %{error: inspect(e)})
	end
	end

	def notifications_read(%{assigns: %{user: user}} = conn, %{"id" => notification_id}) do
	with {:ok, _} <- Notification.read_one(user, notification_id) do
	json(conn, %{status: "success"})
	else
	{:error, message} ->
	conn
	\|> put_resp_content_type("application/json")
	\|> send_resp(403, Jason.encode!(%{"error" => message}))
	end
	end

	def config(conn, _params) do
	instance = Pleroma.Config.get(:instance)
	instance_fe = Pleroma.Config.get(:fe)
	instance_chat = Pleroma.Config.get(:chat)

	case get_format(conn) do
	"xml" ->
	response = """
	<config>
	<site>
	<name>#{Keyword.get(instance, :name)}</name>
	<site>#{Web.base_url()}</site>
	<textlimit>#{Keyword.get(instance, :limit)}</textlimit>
	<closed>#{!Keyword.get(instance, :registrations_open)}</closed>
	</site>
	</config>
	"""

	conn
	\|> put_resp_content_type("application/xml")
	\|> send_resp(200, response)

	_ ->
	vapid_public_key = Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)

	uploadlimit = %{
	uploadlimit: to_string(Keyword.get(instance, :upload_limit)),
	avatarlimit: to_string(Keyword.get(instance, :avatar_upload_limit)),
	backgroundlimit: to_string(Keyword.get(instance, :background_upload_limit)),
	bannerlimit: to_string(Keyword.get(instance, :banner_upload_limit))
	}

	data = %{
	name: Keyword.get(instance, :name),
	description: Keyword.get(instance, :description),
	server: Web.base_url(),
	textlimit: to_string(Keyword.get(instance, :limit)),
	uploadlimit: uploadlimit,
	closed: if(Keyword.get(instance, :registrations_open), do: "0", else: "1"),
	private: if(Keyword.get(instance, :public, true), do: "0", else: "1"),
	vapidPublicKey: vapid_public_key,
	accountActivationRequired:
	if(Keyword.get(instance, :account_activation_required, false), do: "1", else: "0"),
	invitesEnabled: if(Keyword.get(instance, :invites_enabled, false), do: "1", else: "0"),
	safeDMMentionsEnabled:
	if(Pleroma.Config.get([:instance, :safe_dm_mentions]), do: "1", else: "0")
	}

	pleroma_fe =
	if instance_fe do
	%{
	theme: Keyword.get(instance_fe, :theme),
	background: Keyword.get(instance_fe, :background),
	logo: Keyword.get(instance_fe, :logo),
	logoMask: Keyword.get(instance_fe, :logo_mask),
	logoMargin: Keyword.get(instance_fe, :logo_margin),
	redirectRootNoLogin: Keyword.get(instance_fe, :redirect_root_no_login),
	redirectRootLogin: Keyword.get(instance_fe, :redirect_root_login),
	chatDisabled: !Keyword.get(instance_chat, :enabled),
	showInstanceSpecificPanel: Keyword.get(instance_fe, :show_instance_panel),
	scopeOptionsEnabled: Keyword.get(instance_fe, :scope_options_enabled),
	formattingOptionsEnabled: Keyword.get(instance_fe, :formatting_options_enabled),
	collapseMessageWithSubject:
	Keyword.get(instance_fe, :collapse_message_with_subject),
	hidePostStats: Keyword.get(instance_fe, :hide_post_stats),
	hideUserStats: Keyword.get(instance_fe, :hide_user_stats),
	scopeCopy: Keyword.get(instance_fe, :scope_copy),
	subjectLineBehavior: Keyword.get(instance_fe, :subject_line_behavior),
	alwaysShowSubjectInput: Keyword.get(instance_fe, :always_show_subject_input)
	}
	else
	Pleroma.Config.get([:frontend_configurations, :pleroma_fe])
	end

	managed_config = Keyword.get(instance, :managed_config)

	data =
	if managed_config do
	data \|> Map.put("pleromafe", pleroma_fe)
	else
	data
	end

	json(conn, %{site: data})
	end
	end

	def frontend_configurations(conn, _params) do
	config =
	Pleroma.Config.get(:frontend_configurations, %{})
	\|> Enum.into(%{})

	json(conn, config)
	end

	def version(conn, _params) do
	version = Pleroma.Application.named_version()

	case get_format(conn) do
	"xml" ->
	response = "<version>#{version}</version>"

	conn
	\|> put_resp_content_type("application/xml")
	\|> send_resp(200, response)

	_ ->
	json(conn, version)
	end
	end

	def emoji(conn, _params) do
	json(conn, Enum.into(Emoji.get_all(), %{}))
	end

	def follow_import(conn, %{"list" => %Plug.Upload{} = listfile}) do
	follow_import(conn, %{"list" => File.read!(listfile.path)})
	end

	def follow_import(%{assigns: %{user: follower}} = conn, %{"list" => list}) do
	with followed_identifiers <- String.split(list),
	{:ok, _} = Task.start(fn -> User.follow_import(follower, followed_identifiers) end) do
	json(conn, "job started")
	end
	end

	def blocks_import(conn, %{"list" => %Plug.Upload{} = listfile}) do
	blocks_import(conn, %{"list" => File.read!(listfile.path)})
	end

	def blocks_import(%{assigns: %{user: blocker}} = conn, %{"list" => list}) do
	with blocked_identifiers <- String.split(list),
	{:ok, _} = Task.start(fn -> User.blocks_import(blocker, blocked_identifiers) end) do
	json(conn, "job started")
	end
	end

	def change_password(%{assigns: %{user: user}} = conn, params) do
	case CommonAPI.Utils.confirm_current_password(user, params["password"]) do
	{:ok, user} ->
	with {:ok, _user} <-
	User.reset_password(user, %{
	password: params["new_password"],
	password_confirmation: params["new_password_confirmation"]
	}) do
	json(conn, %{status: "success"})
	else
	{:error, changeset} ->
	{_, {error, _}} = Enum.at(changeset.errors, 0)
	json(conn, %{error: "New password #{error}."})

	_ ->
	json(conn, %{error: "Unable to change password."})
	end

	{:error, msg} ->
	json(conn, %{error: msg})
	end
	end

	def delete_account(%{assigns: %{user: user}} = conn, params) do
	case CommonAPI.Utils.confirm_current_password(user, params["password"]) do
	{:ok, user} ->
	Task.start(fn -> User.delete(user) end)
	json(conn, %{status: "success"})

	{:error, msg} ->
	json(conn, %{error: msg})
	end
	end

	def captcha(conn, _params) do
	json(conn, Pleroma.Captcha.new())
	end
	end
	diff --git a/test/fixtures/httpoison_mock/emelie.atom b/test/fixtures/httpoison_mock/emelie.atom
	new file mode 100644
	index 000000000..ddaa1c6ca
	--- /dev/null
	+++ b/test/fixtures/httpoison_mock/emelie.atom
	@@ -0,0 +1,306 @@
	+<?xml version="1.0"?>
	+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:mastodon="http://mastodon.social/schema/1.0">
	+ <id>https://mastodon.social/users/emelie.atom</id>
	+ <title>emelie 🎨</title>
	+ <subtitle>23 / #Sweden / #Artist / #Equestrian / #GameDev
	+
	+If I ain't spending time with my pets, I'm probably drawing. 🐴 🐱 🐰</subtitle>
	+ <updated>2019-02-04T20:22:19Z</updated>
	+ <logo>https://files.mastodon.social/accounts/avatars/000/015/657/original/e7163f98280da1a4.png</logo>
	+ <author>
	+ <id>https://mastodon.social/users/emelie</id>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
	+ <uri>https://mastodon.social/users/emelie</uri>
	+ <name>emelie</name>
	+ <email>emelie@mastodon.social</email>
	+ <summary type="html"><p>23 / <a href="https://mastodon.social/tags/sweden" class="mention hashtag" rel="tag">#<span>Sweden</span></a> / <a href="https://mastodon.social/tags/artist" class="mention hashtag" rel="tag">#<span>Artist</span></a> / <a href="https://mastodon.social/tags/equestrian" class="mention hashtag" rel="tag">#<span>Equestrian</span></a> / <a href="https://mastodon.social/tags/gamedev" class="mention hashtag" rel="tag">#<span>GameDev</span></a></p><p>If I ain&apos;t spending time with my pets, I&apos;m probably drawing. 🐴 🐱 🐰</p></summary>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie"/>
	+ <link rel="avatar" type="image/png" media:width="120" media:height="120" href="https://files.mastodon.social/accounts/avatars/000/015/657/original/e7163f98280da1a4.png"/>
	+ <link rel="header" type="image/png" media:width="700" media:height="335" href="https://files.mastodon.social/accounts/headers/000/015/657/original/847f331f3dd9e38b.png"/>
	+ <poco:preferredUsername>emelie</poco:preferredUsername>
	+ <poco:displayName>emelie 🎨</poco:displayName>
	+ <poco:note>23 / #Sweden / #Artist / #Equestrian / #GameDev
	+
	+If I ain't spending time with my pets, I'm probably drawing. 🐴 🐱 🐰</poco:note>
	+ <mastodon:scope>public</mastodon:scope>
	+ </author>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie.atom"/>
	+ <link rel="hub" href="https://mastodon.social/api/push"/>
	+ <link rel="salmon" href="https://mastodon.social/api/salmon/15657"/>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101850331907006641</id>
	+ <published>2019-04-01T09:58:50Z</published>
	+ <updated>2019-04-01T09:58:50Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101850331907006641"/>
	+ <content type="html" xml:lang="en"><p>Me: I&apos;m going to make this vital change to my world building in the morning, no way I&apos;ll forget this, it&apos;s too big of a deal<br />Also me: forgets</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101850331907006641"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17854598.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-04-01:objectId=94383214:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101849626603073336</id>
	+ <published>2019-04-01T06:59:28Z</published>
	+ <updated>2019-04-01T06:59:28Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/comment</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101849626603073336"/>
	+ <content type="html" xml:lang="sv"><p><span class="h-card"><a href="https://mastodon.social/@Fergant" class="u-url mention">@<span>Fergant</span></a></span> Dom är i stort sett religiös skrift vid det här laget 👏👏</p><p>har dock bara läst svenska översättningen, kanske är dags att jag läser dom på engelska</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="https://mastodon.social/users/Fergant"/>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101849626603073336"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17852590.atom"/>
	+ <thr:in-reply-to ref="https://mastodon.social/users/Fergant/statuses/101849606513357387" href="https://mastodon.social/@Fergant/101849606513357387"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-04-01:objectId=94362529:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101849580030237068</id>
	+ <published>2019-04-01T06:47:37Z</published>
	+ <updated>2019-04-01T06:47:37Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101849580030237068"/>
	+ <content type="html" xml:lang="en"><p>What&apos;s you people&apos;s favourite fantasy books? Give me some hot tips 🌞</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101849580030237068"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17852464.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-04-01:objectId=94362529:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101849550599949363</id>
	+ <published>2019-04-01T06:40:08Z</published>
	+ <updated>2019-04-01T06:40:08Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101849550599949363"/>
	+ <content type="html" xml:lang="en"><p>Stick them legs out 💃 <a href="https://mastodon.social/tags/mastocats" class="mention hashtag" rel="tag">#<span>mastocats</span></a></p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <category term="mastocats"/>
	+ <link rel="enclosure" type="image/jpeg" length="516384" href="https://files.mastodon.social/media_attachments/files/013/051/707/original/125a310abe9a34aa.jpeg"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101849550599949363"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17852407.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-04-01:objectId=94361580:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101849191533152720</id>
	+ <published>2019-04-01T05:08:49Z</published>
	+ <updated>2019-04-01T05:08:49Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101849191533152720"/>
	+ <content type="html" xml:lang="en"><p>long 🐱 <a href="https://mastodon.social/tags/mastocats" class="mention hashtag" rel="tag">#<span>mastocats</span></a></p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <category term="mastocats"/>
	+ <link rel="enclosure" type="image/jpeg" length="305208" href="https://files.mastodon.social/media_attachments/files/013/049/940/original/f2dbbfe7de3a17d2.jpeg"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101849191533152720"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17851663.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-04-01:objectId=94351141:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101849165031453009</id>
	+ <published>2019-04-01T05:02:05Z</published>
	+ <updated>2019-04-01T05:02:05Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101849165031453009"/>
	+ <content type="html" xml:lang="en"><p>You gotta take whatever bellyrubbing opportunity you can get before she changes her mind 🦁 <a href="https://mastodon.social/tags/mastocats" class="mention hashtag" rel="tag">#<span>mastocats</span></a></p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <category term="mastocats"/>
	+ <link rel="enclosure" type="video/mp4" length="9838915" href="https://files.mastodon.social/media_attachments/files/013/049/816/original/e7831178a5e0d6d4.mp4"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101849165031453009"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17851558.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-04-01:objectId=94350309:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101846512530748693</id>
	+ <published>2019-03-31T17:47:31Z</published>
	+ <updated>2019-03-31T17:47:31Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101846512530748693"/>
	+ <content type="html" xml:lang="en"><p>Hello look at this boy having a decent haircut for once <a href="https://mastodon.social/tags/mastohorses" class="mention hashtag" rel="tag">#<span>mastohorses</span></a> <a href="https://mastodon.social/tags/equestrian" class="mention hashtag" rel="tag">#<span>equestrian</span></a></p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <category term="equestrian"/>
	+ <category term="mastohorses"/>
	+ <link rel="enclosure" type="image/jpeg" length="461632" href="https://files.mastodon.social/media_attachments/files/013/033/387/original/301e8ab668cd61d2.jpeg"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101846512530748693"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17842424.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-03-31:objectId=94256415:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101846181093805500</id>
	+ <published>2019-03-31T16:23:14Z</published>
	+ <updated>2019-03-31T16:23:14Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101846181093805500"/>
	+ <content type="html" xml:lang="en"><p>Sorry did I disturb the who-is-the-longest-cat competition ? <a href="https://mastodon.social/tags/mastocats" class="mention hashtag" rel="tag">#<span>mastocats</span></a></p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <category term="mastocats"/>
	+ <link rel="enclosure" type="image/jpeg" length="211384" href="https://files.mastodon.social/media_attachments/files/013/030/725/original/5b4886730cbbd25c.jpeg"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101846181093805500"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17841108.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-03-31:objectId=94245239:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101845897513133849</id>
	+ <published>2019-03-31T15:11:07Z</published>
	+ <updated>2019-03-31T15:11:07Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101845897513133849"/>
	+ <summary xml:lang="en">more earthsea ramblings</summary>
	+ <content type="html" xml:lang="en"><p>I&apos;m re-watching Tales from Earthsea for the first time since I read the books, and that Therru doesn&apos;t squash Cob like a spider, as Orm Embar did is a wasted opportunity tbh</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101845897513133849"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17840088.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-03-31:objectId=94232455:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101841219051533307</id>
	+ <published>2019-03-30T19:21:19Z</published>
	+ <updated>2019-03-30T19:21:19Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101841219051533307"/>
	+ <content type="html" xml:lang="en"><p>I gave my cats some mackerel and they ate it all in 0.3 seconds, and now they won&apos;t stop meowing for more, and I&apos;m tired plz shut up</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101841219051533307"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17826587.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-03-30:objectId=94075000:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101839949762341381</id>
	+ <published>2019-03-30T13:58:31Z</published>
	+ <updated>2019-03-30T13:58:31Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/comment</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101839949762341381"/>
	+ <content type="html" xml:lang="en"><p>yet I&apos;m confused about this american dude with a gun, like the heck r ya doin in mah ghibli</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101839949762341381"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17821757.atom"/>
	+ <thr:in-reply-to ref="https://mastodon.social/users/emelie/statuses/101839928677863590" href="https://mastodon.social/@emelie/101839928677863590"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-03-30:objectId=94026360:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101839928677863590</id>
	+ <published>2019-03-30T13:53:09Z</published>
	+ <updated>2019-03-30T13:53:09Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101839928677863590"/>
	+ <content type="html" xml:lang="en"><p>2 hours into Ni no Kuni 2 and I&apos;ve already sold my soul to this game</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101839928677863590"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17821713.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-03-30:objectId=94026360:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101836329521599438</id>
	+ <published>2019-03-29T22:37:51Z</published>
	+ <updated>2019-03-29T22:37:51Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101836329521599438"/>
	+ <content type="html" xml:lang="en"><p>Pippi Longstocking the original one-punch /man</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101836329521599438"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17811608.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-03-29:objectId=93907854:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101835905282948341</id>
	+ <published>2019-03-29T20:49:57Z</published>
	+ <updated>2019-03-29T20:49:57Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101835905282948341"/>
	+ <content type="html" xml:lang="en"><p>I&apos;ve had so much wine I thought I had a 3rd brother</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101835905282948341"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17809862.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-03-29:objectId=93892966:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101835878059204660</id>
	+ <published>2019-03-29T20:43:02Z</published>
	+ <updated>2019-03-29T20:43:02Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101835878059204660"/>
	+ <content type="html" xml:lang="en"><p>ååååhhh booi</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101835878059204660"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17809734.atom"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-03-29:objectId=93892010:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101835848050598939</id>
	+ <published>2019-03-29T20:35:24Z</published>
	+ <updated>2019-03-29T20:35:24Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/comment</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101835848050598939"/>
	+ <content type="html" xml:lang="en"><p><span class="h-card"><a href="https://thraeryn.net/@thraeryn" class="u-url mention">@<span>thraeryn</span></a></span> if I spent 1 hour and a half watching this monstrosity, I need to</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="https://thraeryn.net/users/thraeryn"/>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101835848050598939"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17809591.atom"/>
	+ <thr:in-reply-to ref="https://thraeryn.net/users/thraeryn/statuses/101835839202826007" href="https://thraeryn.net/@thraeryn/101835839202826007"/>
	+ <ostatus:conversation ref="tag:mastodon.social,2019-03-29:objectId=93888827:objectType=Conversation"/>
	+ </entry>
	+ <entry>
	+ <id>https://mastodon.social/users/emelie/statuses/101835823138262290</id>
	+ <published>2019-03-29T20:29:04Z</published>
	+ <updated>2019-03-29T20:29:04Z</updated>
	+ <title>New status by emelie</title>
	+ <activity:object-type>http://activitystrea.ms/schema/1.0/comment</activity:object-type>
	+ <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
	+ <link rel="alternate" type="application/activity+json" href="https://mastodon.social/users/emelie/statuses/101835823138262290"/>
	+ <summary xml:lang="en">medical, fluids mention</summary>
	+ <content type="html" xml:lang="en"><p><span class="h-card"><a href="https://icosahedron.website/@Trev" class="u-url mention">@<span>Trev</span></a></span> hugs ✨</p></content>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="https://icosahedron.website/users/Trev"/>
	+ <link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection" href="http://activityschema.org/collection/public"/>
	+ <mastodon:scope>public</mastodon:scope>
	+ <link rel="alternate" type="text/html" href="https://mastodon.social/@emelie/101835823138262290"/>
	+ <link rel="self" type="application/atom+xml" href="https://mastodon.social/users/emelie/updates/17809468.atom"/>
	+ <thr:in-reply-to ref="https://icosahedron.website/users/Trev/statuses/101835812250051801" href="https://icosahedron.website/@Trev/101835812250051801"/>
	+ <ostatus:conversation ref="tag:icosahedron.website,2019-03-29:objectId=12220882:objectType=Conversation"/>
	+ </entry>
	+</feed>
	diff --git a/test/fixtures/httpoison_mock/emelie.json b/test/fixtures/httpoison_mock/emelie.json
	deleted file mode 100644
	index 2e164ffdf..000000000
	--- a/test/fixtures/httpoison_mock/emelie.json
	+++ /dev/null
	@@ -1,106 +0,0 @@
	-{
	- "@context": [
	- "https://www.w3.org/ns/activitystreams",
	- "https://w3id.org/security/v1",
	- {
	- "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
	- "toot": "http://joinmastodon.org/ns#",
	- "featured": {
	- "@id": "toot:featured",
	- "@type": "@id"
	- },
	- "alsoKnownAs": {
	- "@id": "as:alsoKnownAs",
	- "@type": "@id"
	- },
	- "movedTo": {
	- "@id": "as:movedTo",
	- "@type": "@id"
	- },
	- "schema": "http://schema.org#",
	- "PropertyValue": "schema:PropertyValue",
	- "value": "schema:value",
	- "Hashtag": "as:Hashtag",
	- "Emoji": "toot:Emoji",
	- "IdentityProof": "toot:IdentityProof",
	- "focalPoint": {
	- "@container": "@list",
	- "@id": "toot:focalPoint"
	- }
	- }
	- ],
	- "id": "https://mastodon.social/users/emelie",
	- "type": "Person",
	- "following": "https://mastodon.social/users/emelie/following",
	- "followers": "https://mastodon.social/users/emelie/followers",
	- "inbox": "https://mastodon.social/users/emelie/inbox",
	- "outbox": "https://mastodon.social/users/emelie/outbox",
	- "featured": "https://mastodon.social/users/emelie/collections/featured",
	- "preferredUsername": "emelie",
	- "name": "emelie 🎨",
	- "summary": "<p>23 / <a href=\"https://mastodon.social/tags/sweden\" class=\"mention hashtag\" rel=\"tag\">#<span>Sweden</span></a> / <a href=\"https://mastodon.social/tags/artist\" class=\"mention hashtag\" rel=\"tag\">#<span>Artist</span></a> / <a href=\"https://mastodon.social/tags/equestrian\" class=\"mention hashtag\" rel=\"tag\">#<span>Equestrian</span></a> / <a href=\"https://mastodon.social/tags/gamedev\" class=\"mention hashtag\" rel=\"tag\">#<span>GameDev</span></a></p><p>If I ain't spending time with my pets, I'm probably drawing. 🐴 🐱 🐰</p>",
	- "url": "https://mastodon.social/@emelie",
	- "manuallyApprovesFollowers": false,
	- "publicKey": {
	- "id": "https://mastodon.social/users/emelie#main-key",
	- "owner": "https://mastodon.social/users/emelie",
	- "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu3CWs1oAJPE3ZJ9sj6Ut\n/Mu+mTE7MOijsQc8/6c73XVVuhIEomiozJIH7l8a7S1n5SYL4UuiwcubSOi7u1bb\nGpYnp5TYhN+Cxvq/P80V4/ncNIPSQzS49it7nSLeG5pA21lGPDA44huquES1un6p\n9gSmbTwngVX9oe4MYuUeh0Z7vijjU13Llz1cRq/ZgPQPgfz+2NJf+VeXnvyDZDYx\nZPVBBlrMl3VoGbu0M5L8SjY35559KCZ3woIvqRolcoHXfgvJMdPcJgSZVYxlCw3d\nA95q9jQcn6s87CPSUs7bmYEQCrDVn5m5NER5TzwBmP4cgJl9AaDVWQtRd4jFZNTx\nlQIDAQAB\n-----END PUBLIC KEY-----\n"
	- },
	- "tag": [
	- {
	- "type": "Hashtag",
	- "href": "https://mastodon.social/explore/sweden",
	- "name": "#sweden"
	- },
	- {
	- "type": "Hashtag",
	- "href": "https://mastodon.social/explore/gamedev",
	- "name": "#gamedev"
	- },
	- {
	- "type": "Hashtag",
	- "href": "https://mastodon.social/explore/artist",
	- "name": "#artist"
	- },
	- {
	- "type": "Hashtag",
	- "href": "https://mastodon.social/explore/equestrian",
	- "name": "#equestrian"
	- }
	- ],
	- "attachment": [
	- {
	- "type": "PropertyValue",
	- "name": "Ko-fi",
	- "value": "<a href=\"https://ko-fi.com/emeliepng\" rel=\"me nofollow noopener\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">ko-fi.com/emeliepng</span><span class=\"invisible\"></span></a>"
	- },
	- {
	- "type": "PropertyValue",
	- "name": "Instagram",
	- "value": "<a href=\"https://www.instagram.com/emelie_png/\" rel=\"me nofollow noopener\" target=\"_blank\"><span class=\"invisible\">https://www.</span><span class=\"\">instagram.com/emelie_png/</span><span class=\"invisible\"></span></a>"
	- },
	- {
	- "type": "PropertyValue",
	- "name": "Carrd",
	- "value": "<a href=\"https://emelie.carrd.co/\" rel=\"me nofollow noopener\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">emelie.carrd.co/</span><span class=\"invisible\"></span></a>"
	- },
	- {
	- "type": "PropertyValue",
	- "name": "Artstation",
	- "value": "<a href=\"https://emiri.artstation.com\" rel=\"me nofollow noopener\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">emiri.artstation.com</span><span class=\"invisible\"></span></a>"
	- }
	- ],
	- "endpoints": {
	- "sharedInbox": "https://mastodon.social/inbox"
	- },
	- "icon": {
	- "type": "Image",
	- "mediaType": "image/png",
	- "url": "https://files.mastodon.social/accounts/avatars/000/015/657/original/e7163f98280da1a4.png"
	- },
	- "image": {
	- "type": "Image",
	- "mediaType": "image/png",
	- "url": "https://files.mastodon.social/accounts/headers/000/015/657/original/847f331f3dd9e38b.png"
	- }
	-}
	diff --git a/test/fixtures/httpoison_mock/webfinger_emelie.json b/test/fixtures/httpoison_mock/webfinger_emelie.json
	new file mode 100644
	index 000000000..0b61cb618
	--- /dev/null
	+++ b/test/fixtures/httpoison_mock/webfinger_emelie.json
	@@ -0,0 +1,36 @@
	+{
	+ "aliases": [
	+ "https://mastodon.social/@emelie",
	+ "https://mastodon.social/users/emelie"
	+ ],
	+ "links": [
	+ {
	+ "href": "https://mastodon.social/@emelie",
	+ "rel": "http://webfinger.net/rel/profile-page",
	+ "type": "text/html"
	+ },
	+ {
	+ "href": "https://mastodon.social/users/emelie.atom",
	+ "rel": "http://schemas.google.com/g/2010#updates-from",
	+ "type": "application/atom+xml"
	+ },
	+ {
	+ "href": "https://mastodon.social/users/emelie",
	+ "rel": "self",
	+ "type": "application/activity+json"
	+ },
	+ {
	+ "href": "https://mastodon.social/api/salmon/15657",
	+ "rel": "salmon"
	+ },
	+ {
	+ "href": "data:application/magic-public-key,RSA.u3CWs1oAJPE3ZJ9sj6Ut_Mu-mTE7MOijsQc8_6c73XVVuhIEomiozJIH7l8a7S1n5SYL4UuiwcubSOi7u1bbGpYnp5TYhN-Cxvq_P80V4_ncNIPSQzS49it7nSLeG5pA21lGPDA44huquES1un6p9gSmbTwngVX9oe4MYuUeh0Z7vijjU13Llz1cRq_ZgPQPgfz-2NJf-VeXnvyDZDYxZPVBBlrMl3VoGbu0M5L8SjY35559KCZ3woIvqRolcoHXfgvJMdPcJgSZVYxlCw3dA95q9jQcn6s87CPSUs7bmYEQCrDVn5m5NER5TzwBmP4cgJl9AaDVWQtRd4jFZNTxlQ==.AQAB",
	+ "rel": "magic-public-key"
	+ },
	+ {
	+ "rel": "http://ostatus.org/schema/1.0/subscribe",
	+ "template": "https://mastodon.social/authorize_interaction?uri={uri}"
	+ }
	+ ],
	+ "subject": "acct:emelie@mastodon.social"
	+}
	diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
	index 2148bd4e7..d3b547d91 100644
	--- a/test/support/http_request_mock.ex
	+++ b/test/support/http_request_mock.ex
	@@ -1,766 +1,787 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule HttpRequestMock do
	require Logger

	def request(
	%Tesla.Env{
	url: url,
	method: method,
	headers: headers,
	query: query,
	body: body
	} = _env
	) do
	with {:ok, res} <- apply(__MODULE__, method, [url, query, body, headers]) do
	res
	else
	{_, _r} = error ->
	# Logger.warn(r)
	error
	end
	end

	# GET Requests
	#
	def get(url, query \\ [], body \\ [], headers \\ [])

	def get("https://osada.macgirvin.com/channel/mike", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!("test/fixtures/httpoison_mock/https___osada.macgirvin.com_channel_mike.json")
	}}
	end

	def get("https://mastodon.social/users/emelie/statuses/101849165031453009", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/status.emelie.json")
	}}
	end

	def get("https://mastodon.social/users/emelie", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/emelie.json")
	}}
	end

	+ def get(
	+ "https://mastodon.social/.well-known/webfinger?resource=https://mastodon.social/users/emelie",
	+ _,
	+ _,
	+ _
	+ ) do
	+ {:ok,
	+ %Tesla.Env{
	+ status: 200,
	+ body: File.read!("test/fixtures/httpoison_mock/webfinger_emelie.json")
	+ }}
	+ end
	+
	+ def get("https://mastodon.social/users/emelie.atom", _, _, _) do
	+ {:ok,
	+ %Tesla.Env{
	+ status: 200,
	+ body: File.read!("test/fixtures/httpoison_mock/emelie.atom")
	+ }}
	+ end
	+
	def get(
	"https://osada.macgirvin.com/.well-known/webfinger?resource=acct:mike@osada.macgirvin.com",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/mike@osada.macgirvin.com.json")
	}}
	end

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

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

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

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

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

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

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

	def get(
	"https://social.heldscal.la/.well-known/webfinger?resource=nonexistant@social.heldscal.la",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/nonexistant@social.heldscal.la.xml")
	}}
	end

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

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

	def get("https://prismo.news/@mxb", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___prismo.news__mxb.json")
	}}
	end

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

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

	def get("http://mastodon.example.org/users/admin/statuses/100787282858396771", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/http___mastodon.example.org_users_admin_status_1234.json"
	)
	}}
	end

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

	def get("https://peertube.moe/accounts/7even", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/7even.json")
	}}
	end

	def get("https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/peertube.moe-vid.json")
	}}
	end

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

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

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

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

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

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

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

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

	def get(url, _, _, Accept: "application/xrd+xml,application/jrd+json")
	when url in [
	"https://pleroma.soykaf.com/.well-known/webfinger?resource=acct:https://pleroma.soykaf.com/users/lain",
	"https://pleroma.soykaf.com/.well-known/webfinger?resource=https://pleroma.soykaf.com/users/lain"
	] do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___pleroma.soykaf.com_users_lain.xml")
	}}
	end

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

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

	def get("https://shitposter.club/notice/2827873", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 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", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/https___shitposter.club_api_statuses_show_2827873.atom.xml"
	)
	}}
	end

	def get("https://testing.pleroma.lol/objects/b319022a-4946-44c5-9de9-34801f95507b", _, _, _) do
	{:ok, %Tesla.Env{status: 200}}
	end

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

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

	def get("http://shitposter.club/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/shitposter.club_host_meta")
	}}
	end

	def get("https://shitposter.club/api/statuses/show/7369654.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/7369654.atom")
	}}
	end

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

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

	def get("http://social.sakamoto.gq/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/social.sakamoto.gq_host_meta")
	}}
	end

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

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

	def get("http://mastodon.social/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/mastodon.social_host_meta")
	}}
	end

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

	def get("http://gs.example.org/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/gs.example.org_host_meta")
	}}
	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"
	) do
	{:ok,
	%Tesla.Env{
	status: 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/index.php/api/statuses/user_timeline/1.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 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://social.heldscal.la/api/statuses/user_timeline/29191.atom", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body:
	File.read!(
	"test/fixtures/httpoison_mock/https___social.heldscal.la_api_statuses_user_timeline_29191.atom.xml"
	)
	}}
	end

	def get("http://squeet.me/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{status: 200, body: File.read!("test/fixtures/httpoison_mock/squeet.me_host_meta")}}
	end

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

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

	def get("http://framatube.org/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/framatube.org_host_meta")
	}}
	end

	def get(
	"http://framatube.org/main/xrd?uri=framasoft@framatube.org",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	headers: [{"content-type", "application/json"}],
	body: File.read!("test/fixtures/httpoison_mock/framasoft@framatube.org.json")
	}}
	end

	def get("http://gnusocial.de/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/gnusocial.de_host_meta")
	}}
	end

	def get(
	"http://gnusocial.de/main/xrd?uri=winterdienst@gnusocial.de",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/winterdienst_webfinger.json")
	}}
	end

	def get("http://status.alpicola.com/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/status.alpicola.com_host_meta")
	}}
	end

	def get("http://macgirvin.com/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/macgirvin.com_host_meta")
	}}
	end

	def get("http://gerzilla.de/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/gerzilla.de_host_meta")
	}}
	end

	def get(
	"https://gerzilla.de/xrd/?uri=kaniini@gerzilla.de",
	_,
	_,
	Accept: "application/xrd+xml,application/jrd+json"
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	headers: [{"content-type", "application/json"}],
	body: File.read!("test/fixtures/httpoison_mock/kaniini@gerzilla.de.json")
	}}
	end

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

	def get(
	"https://social.heldscal.la/.well-known/webfinger?resource=https://social.heldscal.la/user/23211",
	_,
	_,
	_
	) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/https___social.heldscal.la_user_23211.xml")
	}}
	end

	def get("http://social.heldscal.la/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/social.heldscal.la_host_meta")
	}}
	end

	def get("https://social.heldscal.la/.well-known/host-meta", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: File.read!("test/fixtures/httpoison_mock/social.heldscal.la_host_meta")
	}}
	end

	def get("https://mastodon.social/users/lambadalambda.atom", _, _, _) do
	{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/lambadalambda.atom")}}
	end

	def get("https://social.heldscal.la/user/23211", _, _, Accept: "application/activity+json") do
	{:ok, Tesla.Mock.json(%{"id" => "https://social.heldscal.la/user/23211"}, status: 200)}
	end

	def get("http://example.com/ogp", _, _, _) do
	{:ok, %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")}}
	end

	def get("http://example.com/malformed", _, _, _) do
	{:ok,
	%Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/malformed-data.html")}}
	end

	def get("http://example.com/empty", _, _, _) do
	{:ok, %Tesla.Env{status: 200, body: "hello"}}
	end

	def get("http://404.site" <> _, _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 404,
	body: ""
	}}
	end

	def get(url, query, body, headers) do
	{:error,
	"Not implemented the mock response for get #{inspect(url)}, #{query}, #{inspect(body)}, #{
	inspect(headers)
	}"}
	end

	# POST Requests
	#

	def post(url, query \\ [], body \\ [], headers \\ [])

	def post("http://example.org/needs_refresh", _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: ""
	}}
	end

	def post("http://200.site" <> _, _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 200,
	body: ""
	}}
	end

	def post("http://connrefused.site" <> _, _, _, _) do
	{:error, :connrefused}
	end

	def post("http://404.site" <> _, _, _, _) do
	{:ok,
	%Tesla.Env{
	status: 404,
	body: ""
	}}
	end

	def post(url, _query, _body, _headers) do
	{:error, "Not implemented the mock response for post #{inspect(url)}"}
	end
	end
	diff --git a/test/web/twitter_api/util_controller_test.exs b/test/web/twitter_api/util_controller_test.exs
	index f4a3ce501..e4dd97d46 100644
	--- a/test/web/twitter_api/util_controller_test.exs
	+++ b/test/web/twitter_api/util_controller_test.exs
	@@ -1,184 +1,194 @@
	defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
	use Pleroma.Web.ConnCase

	alias Pleroma.Notification
	alias Pleroma.Repo
	alias Pleroma.Web.CommonAPI
	import Pleroma.Factory

	setup do
	Tesla.Mock.mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
	:ok
	end

	describe "POST /api/pleroma/follow_import" do
	test "it returns HTTP 200", %{conn: conn} do
	user1 = insert(:user)
	user2 = insert(:user)

	response =
	conn
	\|> assign(:user, user1)
	\|> post("/api/pleroma/follow_import", %{"list" => "#{user2.ap_id}"})
	\|> json_response(:ok)

	assert response == "job started"
	end

	test "requires 'follow' permission", %{conn: conn} do
	token1 = insert(:oauth_token, scopes: ["read", "write"])
	token2 = insert(:oauth_token, scopes: ["follow"])
	another_user = insert(:user)

	for token <- [token1, token2] do
	conn =
	conn
	\|> put_req_header("authorization", "Bearer #{token.token}")
	\|> post("/api/pleroma/follow_import", %{"list" => "#{another_user.ap_id}"})

	if token == token1 do
	assert %{"error" => "Insufficient permissions: follow."} == json_response(conn, 403)
	else
	assert json_response(conn, 200)
	end
	end
	end
	end

	describe "POST /api/pleroma/blocks_import" do
	test "it returns HTTP 200", %{conn: conn} do
	user1 = insert(:user)
	user2 = insert(:user)

	response =
	conn
	\|> assign(:user, user1)
	\|> post("/api/pleroma/blocks_import", %{"list" => "#{user2.ap_id}"})
	\|> json_response(:ok)

	assert response == "job started"
	end
	end

	describe "POST /api/pleroma/notifications/read" do
	test "it marks a single notification as read", %{conn: conn} do
	user1 = insert(:user)
	user2 = insert(:user)
	{:ok, activity1} = CommonAPI.post(user2, %{"status" => "hi @#{user1.nickname}"})
	{:ok, activity2} = CommonAPI.post(user2, %{"status" => "hi @#{user1.nickname}"})
	{:ok, [notification1]} = Notification.create_notifications(activity1)
	{:ok, [notification2]} = Notification.create_notifications(activity2)

	conn
	\|> assign(:user, user1)
	\|> post("/api/pleroma/notifications/read", %{"id" => "#{notification1.id}"})
	\|> json_response(:ok)

	assert Repo.get(Notification, notification1.id).seen
	refute Repo.get(Notification, notification2.id).seen
	end
	end

	describe "GET /api/statusnet/config.json" do
	test "returns the state of safe_dm_mentions flag", %{conn: conn} do
	option = Pleroma.Config.get([:instance, :safe_dm_mentions])
	Pleroma.Config.put([:instance, :safe_dm_mentions], true)

	response =
	conn
	\|> get("/api/statusnet/config.json")
	\|> json_response(:ok)

	assert response["site"]["safeDMMentionsEnabled"] == "1"

	Pleroma.Config.put([:instance, :safe_dm_mentions], false)

	response =
	conn
	\|> get("/api/statusnet/config.json")
	\|> json_response(:ok)

	assert response["site"]["safeDMMentionsEnabled"] == "0"

	Pleroma.Config.put([:instance, :safe_dm_mentions], option)
	end

	test "it returns the managed config", %{conn: conn} do
	Pleroma.Config.put([:instance, :managed_config], false)
	Pleroma.Config.put([:fe], theme: "rei-ayanami-towel")

	response =
	conn
	\|> get("/api/statusnet/config.json")
	\|> json_response(:ok)

	refute response["site"]["pleromafe"]

	Pleroma.Config.put([:instance, :managed_config], true)

	response =
	conn
	\|> get("/api/statusnet/config.json")
	\|> json_response(:ok)

	assert response["site"]["pleromafe"]
	end

	test "if :pleroma, :fe is false, it returns the new style config settings", %{conn: conn} do
	Pleroma.Config.put([:instance, :managed_config], true)
	Pleroma.Config.put([:fe, :theme], "rei-ayanami-towel")
	Pleroma.Config.put([:frontend_configurations, :pleroma_fe], %{theme: "asuka-hospital"})

	response =
	conn
	\|> get("/api/statusnet/config.json")
	\|> json_response(:ok)

	assert response["site"]["pleromafe"]["theme"] == "rei-ayanami-towel"

	Pleroma.Config.put([:fe], false)

	response =
	conn
	\|> get("/api/statusnet/config.json")
	\|> json_response(:ok)

	assert response["site"]["pleromafe"]["theme"] == "asuka-hospital"
	end
	end

	describe "GET /api/pleroma/frontend_configurations" do
	test "returns everything in :pleroma, :frontend_configurations", %{conn: conn} do
	config = [
	frontend_a: %{
	x: 1,
	y: 2
	},
	frontend_b: %{
	z: 3
	}
	]

	Pleroma.Config.put(:frontend_configurations, config)

	response =
	conn
	\|> get("/api/pleroma/frontend_configurations")
	\|> json_response(:ok)

	assert response == Jason.encode!(config \|> Enum.into(%{})) \|> Jason.decode!()
	end
	end

	describe "GET /ostatus_subscribe?acct=...." do
	test "adds status to pleroma instance if the `acct` is a status", %{conn: conn} do
	conn =
	get(
	conn,
	"/ostatus_subscribe?acct=https://mastodon.social/users/emelie/statuses/101849165031453009"
	)

	assert redirected_to(conn) =~ "/notice/"
	end
	+
	+ test "show follow account page if the `acct` is a account link", %{conn: conn} do
	+ response =
	+ get(
	+ conn,
	+ "/ostatus_subscribe?acct=https://mastodon.social/users/emelie"
	+ )
	+
	+ assert html_response(response, 200) =~ "Log in to follow"
	+ end
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Mon, Nov 2, 9:06 AM (7 h, 33 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1804087
Default Alt Text: (73 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions