No OneTemporary
Actions

Size

98 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/web/activity_pub/publisher.ex b/lib/pleroma/web/activity_pub/publisher.ex
	index db072bad2..e4e3ab44a 100644
	--- a/lib/pleroma/web/activity_pub/publisher.ex
	+++ b/lib/pleroma/web/activity_pub/publisher.ex
	@@ -1,272 +1,276 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ActivityPub.Publisher do
	alias Pleroma.Activity
	alias Pleroma.Config
	alias Pleroma.Delivery
	alias Pleroma.HTTP
	alias Pleroma.Instances
	alias Pleroma.Object
	alias Pleroma.Repo
	alias Pleroma.User
	alias Pleroma.Web.ActivityPub.Relay
	alias Pleroma.Web.ActivityPub.Transmogrifier

	require Pleroma.Constants

	import Pleroma.Web.ActivityPub.Visibility

	@behaviour Pleroma.Web.Federator.Publisher

	require Logger

	@moduledoc """
	ActivityPub outgoing federation module.
	"""

	@doc """
	Determine if an activity can be represented by running it through Transmogrifier.
	"""
	def is_representable?(%Activity{} = activity) do
	with {:ok, _data} <- Transmogrifier.prepare_outgoing(activity.data) do
	true
	else
	_e ->
	false
	end
	end

	@doc """
	Publish a single message to a peer. Takes a struct with the following
	parameters set:

	* `inbox`: the inbox to publish to
	* `json`: the JSON message body representing the ActivityPub message
	* `actor`: the actor which is signing the message
	* `id`: the ActivityStreams URI of the message
	"""
	def publish_one(%{inbox: inbox, json: json, actor: %User{} = actor, id: id} = params) do
	Logger.debug("Federating #{id} to #{inbox}")
	%{host: host, path: path} = URI.parse(inbox)

	digest = "SHA-256=" <> (:crypto.hash(:sha256, json) \|> Base.encode64())

	date = Pleroma.Signature.signed_date()

	signature =
	Pleroma.Signature.sign(actor, %{
	"(request-target)": "post #{path}",
	host: host,
	"content-length": byte_size(json),
	digest: digest,
	date: date
	})

	with {:ok, %{status: code}} when code in 200..299 <-
	result =
	HTTP.post(
	inbox,
	json,
	[
	{"Content-Type", "application/activity+json"},
	{"Date", date},
	{"signature", signature},
	{"digest", digest}
	]
	) do
	if !Map.has_key?(params, :unreachable_since) \|\| params[:unreachable_since],
	do: Instances.set_reachable(inbox)

	result
	else
	{_post_result, response} ->
	unless params[:unreachable_since], do: Instances.set_unreachable(inbox)
	{:error, response}
	end
	end

	def publish_one(%{actor_id: actor_id} = params) do
	actor = User.get_cached_by_id(actor_id)

	params
	\|> Map.delete(:actor_id)
	\|> Map.put(:actor, actor)
	\|> publish_one()
	end

	defp should_federate?(inbox, public) do
	if public do
	true
	else
	%{host: host} = URI.parse(inbox)

	quarantined_instances =
	Config.get([:instance, :quarantined_instances], [])
	\|> Pleroma.Web.ActivityPub.MRF.subdomains_regex()

	!Pleroma.Web.ActivityPub.MRF.subdomain_match?(quarantined_instances, host)
	end
	end

	@spec recipients(User.t(), Activity.t()) :: list(User.t()) \| []
	defp recipients(actor, activity) do
	followers =
	if actor.follower_address in activity.recipients do
	User.get_external_followers(actor)
	else
	[]
	end

	fetchers =
	with %Activity{data: %{"type" => "Delete"}} <- activity,
	%Object{id: object_id} <- Object.normalize(activity),
	fetchers <- User.get_delivered_users_by_object_id(object_id),
	_ <- Delivery.delete_all_by_object_id(object_id) do
	fetchers
	else
	_ ->
	[]
	end

	Pleroma.Web.Federator.Publisher.remote_users(actor, activity) ++ followers ++ fetchers
	end

	defp get_cc_ap_ids(ap_id, recipients) do
	host = Map.get(URI.parse(ap_id), :host)

	recipients
	\|> Enum.filter(fn %User{ap_id: ap_id} -> Map.get(URI.parse(ap_id), :host) == host end)
	\|> Enum.map(& &1.ap_id)
	end

	defp maybe_use_sharedinbox(%User{source_data: data}),
	do: (is_map(data["endpoints"]) && Map.get(data["endpoints"], "sharedInbox")) \|\| data["inbox"]

	@doc """
	Determine a user inbox to use based on heuristics. These heuristics
	are based on an approximation of the ``sharedInbox`` rules in the
	[ActivityPub specification][ap-sharedinbox].

	Please do not edit this function (or its children) without reading
	the spec, as editing the code is likely to introduce some breakage
	without some familiarity.

	[ap-sharedinbox]: https://www.w3.org/TR/activitypub/#shared-inbox-delivery
	"""
	def determine_inbox(
	%Activity{data: activity_data},
	%User{source_data: data} = user
	) do
	to = activity_data["to"] \|\| []
	cc = activity_data["cc"] \|\| []
	type = activity_data["type"]

	cond do
	type == "Delete" ->
	maybe_use_sharedinbox(user)

	Pleroma.Constants.as_public() in to \|\| Pleroma.Constants.as_public() in cc ->
	maybe_use_sharedinbox(user)

	length(to) + length(cc) > 1 ->
	maybe_use_sharedinbox(user)

	true ->
	data["inbox"]
	end
	end

	@doc """
	Publishes an activity with BCC to all relevant peers.
	"""

	def publish(%User{} = actor, %{data: %{"bcc" => bcc}} = activity)
	when is_list(bcc) and bcc != [] do
	public = is_public?(activity)
	{:ok, data} = Transmogrifier.prepare_outgoing(activity.data)

	recipients = recipients(actor, activity)

	inboxes =
	recipients
	\|> Enum.filter(&User.ap_enabled?/1)
	\|> Enum.map(fn %{source_data: data} -> data["inbox"] end)
	\|> Enum.filter(fn inbox -> should_federate?(inbox, public) end)
	\|> Instances.filter_reachable()

	Repo.checkout(fn ->
	Enum.each(inboxes, fn {inbox, unreachable_since} ->
	%User{ap_id: ap_id} =
	Enum.find(recipients, fn %{source_data: data} -> data["inbox"] == inbox end)

	# Get all the recipients on the same host and add them to cc. Otherwise, a remote
	# instance would only accept a first message for the first recipient and ignore the rest.
	cc = get_cc_ap_ids(ap_id, recipients)

	json =
	data
	\|> Map.put("cc", cc)
	\|> Jason.encode!()

	Pleroma.Web.Federator.Publisher.enqueue_one(__MODULE__, %{
	inbox: inbox,
	json: json,
	actor_id: actor.id,
	id: activity.data["id"],
	unreachable_since: unreachable_since
	})
	end)
	end)
	end

	@doc """
	Publishes an activity to all relevant peers.
	"""
	def publish(%User{} = actor, %Activity{} = activity) do
	public = is_public?(activity)

	if public && Config.get([:instance, :allow_relay]) do
	Logger.debug(fn -> "Relaying #{activity.data["id"]} out" end)
	Relay.publish(activity)
	end

	{:ok, data} = Transmogrifier.prepare_outgoing(activity.data)
	json = Jason.encode!(data)

	recipients(actor, activity)
	\|> Enum.filter(fn user -> User.ap_enabled?(user) end)
	\|> Enum.map(fn %User{} = user ->
	determine_inbox(activity, user)
	end)
	\|> Enum.uniq()
	\|> Enum.filter(fn inbox -> should_federate?(inbox, public) end)
	\|> Instances.filter_reachable()
	\|> Enum.each(fn {inbox, unreachable_since} ->
	Pleroma.Web.Federator.Publisher.enqueue_one(
	__MODULE__,
	%{
	inbox: inbox,
	json: json,
	actor_id: actor.id,
	id: activity.data["id"],
	unreachable_since: unreachable_since
	}
	)
	end)
	end

	def gather_webfinger_links(%User{} = user) do
	[
	%{"rel" => "self", "type" => "application/activity+json", "href" => user.ap_id},
	%{
	"rel" => "self",
	"type" => "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"",
	"href" => user.ap_id
	+ },
	+ %{
	+ "rel" => "http://ostatus.org/schema/1.0/subscribe",
	+ "template" => "#{Pleroma.Web.base_url()}/ostatus_subscribe?acct={uri}"
	}
	]
	end

	def gather_nodeinfo_protocol_names, do: ["activitypub"]
	end
	diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
	index f6c128283..9654ab8a3 100644
	--- a/lib/pleroma/web/router.ex
	+++ b/lib/pleroma/web/router.ex
	@@ -1,666 +1,666 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.Router do
	use Pleroma.Web, :router

	pipeline :browser do
	plug(:accepts, ["html"])
	plug(:fetch_session)
	end

	pipeline :oauth do
	plug(:fetch_session)
	plug(Pleroma.Plugs.OAuthPlug)
	plug(Pleroma.Plugs.UserEnabledPlug)
	end

	pipeline :api do
	plug(:accepts, ["json"])
	plug(:fetch_session)
	plug(Pleroma.Plugs.OAuthPlug)
	plug(Pleroma.Plugs.BasicAuthDecoderPlug)
	plug(Pleroma.Plugs.UserFetcherPlug)
	plug(Pleroma.Plugs.SessionAuthenticationPlug)
	plug(Pleroma.Plugs.LegacyAuthenticationPlug)
	plug(Pleroma.Plugs.AuthenticationPlug)
	plug(Pleroma.Plugs.UserEnabledPlug)
	plug(Pleroma.Plugs.SetUserSessionIdPlug)
	plug(Pleroma.Plugs.EnsureUserKeyPlug)
	plug(Pleroma.Plugs.IdempotencyPlug)
	end

	pipeline :authenticated_api do
	plug(:accepts, ["json"])
	plug(:fetch_session)
	plug(Pleroma.Plugs.OAuthPlug)
	plug(Pleroma.Plugs.BasicAuthDecoderPlug)
	plug(Pleroma.Plugs.UserFetcherPlug)
	plug(Pleroma.Plugs.SessionAuthenticationPlug)
	plug(Pleroma.Plugs.LegacyAuthenticationPlug)
	plug(Pleroma.Plugs.AuthenticationPlug)
	plug(Pleroma.Plugs.UserEnabledPlug)
	plug(Pleroma.Plugs.SetUserSessionIdPlug)
	plug(Pleroma.Plugs.EnsureAuthenticatedPlug)
	plug(Pleroma.Plugs.IdempotencyPlug)
	end

	pipeline :admin_api do
	plug(:accepts, ["json"])
	plug(:fetch_session)
	plug(Pleroma.Plugs.OAuthPlug)
	plug(Pleroma.Plugs.BasicAuthDecoderPlug)
	plug(Pleroma.Plugs.UserFetcherPlug)
	plug(Pleroma.Plugs.SessionAuthenticationPlug)
	plug(Pleroma.Plugs.LegacyAuthenticationPlug)
	plug(Pleroma.Plugs.AuthenticationPlug)
	plug(Pleroma.Plugs.AdminSecretAuthenticationPlug)
	plug(Pleroma.Plugs.UserEnabledPlug)
	plug(Pleroma.Plugs.SetUserSessionIdPlug)
	plug(Pleroma.Plugs.EnsureAuthenticatedPlug)
	plug(Pleroma.Plugs.UserIsAdminPlug)
	plug(Pleroma.Plugs.IdempotencyPlug)
	end

	pipeline :mastodon_html do
	plug(:accepts, ["html"])
	plug(:fetch_session)
	plug(Pleroma.Plugs.OAuthPlug)
	plug(Pleroma.Plugs.BasicAuthDecoderPlug)
	plug(Pleroma.Plugs.UserFetcherPlug)
	plug(Pleroma.Plugs.SessionAuthenticationPlug)
	plug(Pleroma.Plugs.LegacyAuthenticationPlug)
	plug(Pleroma.Plugs.AuthenticationPlug)
	plug(Pleroma.Plugs.UserEnabledPlug)
	plug(Pleroma.Plugs.SetUserSessionIdPlug)
	plug(Pleroma.Plugs.EnsureUserKeyPlug)
	end

	pipeline :pleroma_html do
	plug(:accepts, ["html"])
	plug(:fetch_session)
	plug(Pleroma.Plugs.OAuthPlug)
	plug(Pleroma.Plugs.BasicAuthDecoderPlug)
	plug(Pleroma.Plugs.UserFetcherPlug)
	plug(Pleroma.Plugs.SessionAuthenticationPlug)
	plug(Pleroma.Plugs.AuthenticationPlug)
	plug(Pleroma.Plugs.EnsureUserKeyPlug)
	end

	pipeline :well_known do
	plug(:accepts, ["json", "jrd+json", "xml", "xrd+xml"])
	end

	pipeline :config do
	plug(:accepts, ["json", "xml"])
	end

	pipeline :pleroma_api do
	plug(:accepts, ["html", "json"])
	end

	pipeline :mailbox_preview do
	plug(:accepts, ["html"])

	plug(:put_secure_browser_headers, %{
	"content-security-policy" =>
	"default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline' 'unsafe-eval'"
	})
	end

	pipeline :http_signature do
	plug(Pleroma.Web.Plugs.HTTPSignaturePlug)
	plug(Pleroma.Web.Plugs.MappedSignatureToIdentityPlug)
	end

	scope "/api/pleroma", Pleroma.Web.TwitterAPI do
	pipe_through(:pleroma_api)

	get("/password_reset/:token", PasswordController, :reset, as: :reset_password)
	post("/password_reset", PasswordController, :do_reset, as: :reset_password)
	get("/emoji", UtilController, :emoji)
	get("/captcha", UtilController, :captcha)
	get("/healthcheck", UtilController, :healthcheck)
	end

	scope "/api/pleroma", Pleroma.Web do
	pipe_through(:pleroma_api)
	post("/uploader_callback/:upload_path", UploaderController, :callback)
	end

	scope "/api/pleroma/admin", Pleroma.Web.AdminAPI do
	pipe_through(:admin_api)

	post("/users/follow", AdminAPIController, :user_follow)
	post("/users/unfollow", AdminAPIController, :user_unfollow)

	delete("/users", AdminAPIController, :user_delete)
	post("/users", AdminAPIController, :users_create)
	patch("/users/:nickname/toggle_activation", AdminAPIController, :user_toggle_activation)
	patch("/users/activate", AdminAPIController, :user_activate)
	patch("/users/deactivate", AdminAPIController, :user_deactivate)
	put("/users/tag", AdminAPIController, :tag_users)
	delete("/users/tag", AdminAPIController, :untag_users)

	get("/users/:nickname/permission_group", AdminAPIController, :right_get)
	get("/users/:nickname/permission_group/:permission_group", AdminAPIController, :right_get)

	post("/users/:nickname/permission_group/:permission_group", AdminAPIController, :right_add)

	delete(
	"/users/:nickname/permission_group/:permission_group",
	AdminAPIController,
	:right_delete
	)

	post("/users/permission_group/:permission_group", AdminAPIController, :right_add_multiple)

	delete(
	"/users/permission_group/:permission_group",
	AdminAPIController,
	:right_delete_multiple
	)

	get("/relay", AdminAPIController, :relay_list)
	post("/relay", AdminAPIController, :relay_follow)
	delete("/relay", AdminAPIController, :relay_unfollow)

	post("/users/invite_token", AdminAPIController, :create_invite_token)
	get("/users/invites", AdminAPIController, :invites)
	post("/users/revoke_invite", AdminAPIController, :revoke_invite)
	post("/users/email_invite", AdminAPIController, :email_invite)

	get("/users/:nickname/password_reset", AdminAPIController, :get_password_reset)
	patch("/users/force_password_reset", AdminAPIController, :force_password_reset)

	get("/users", AdminAPIController, :list_users)
	get("/users/:nickname", AdminAPIController, :user_show)
	get("/users/:nickname/statuses", AdminAPIController, :list_user_statuses)

	get("/instances/:instance/statuses", AdminAPIController, :list_instance_statuses)

	patch("/users/confirm_email", AdminAPIController, :confirm_email)
	patch("/users/resend_confirmation_email", AdminAPIController, :resend_confirmation_email)

	get("/reports", AdminAPIController, :list_reports)
	get("/grouped_reports", AdminAPIController, :list_grouped_reports)
	get("/reports/:id", AdminAPIController, :report_show)
	patch("/reports", AdminAPIController, :reports_update)
	post("/reports/:id/notes", AdminAPIController, :report_notes_create)
	delete("/reports/:report_id/notes/:id", AdminAPIController, :report_notes_delete)

	put("/statuses/:id", AdminAPIController, :status_update)
	delete("/statuses/:id", AdminAPIController, :status_delete)

	get("/config", AdminAPIController, :config_show)
	post("/config", AdminAPIController, :config_update)
	get("/config/migrate_to_db", AdminAPIController, :migrate_to_db)
	get("/config/migrate_from_db", AdminAPIController, :migrate_from_db)

	get("/moderation_log", AdminAPIController, :list_log)

	post("/reload_emoji", AdminAPIController, :reload_emoji)
	end

	scope "/api/pleroma/emoji", Pleroma.Web.PleromaAPI do
	scope "/packs" do
	# Modifying packs
	pipe_through(:admin_api)

	post("/import_from_fs", EmojiAPIController, :import_from_fs)

	post("/:pack_name/update_file", EmojiAPIController, :update_file)
	post("/:pack_name/update_metadata", EmojiAPIController, :update_metadata)
	put("/:name", EmojiAPIController, :create)
	delete("/:name", EmojiAPIController, :delete)
	post("/download_from", EmojiAPIController, :download_from)
	post("/list_from", EmojiAPIController, :list_from)
	end

	scope "/packs" do
	# Pack info / downloading
	get("/", EmojiAPIController, :list_packs)
	get("/:name/download_shared/", EmojiAPIController, :download_shared)
	end
	end

	scope "/", Pleroma.Web.TwitterAPI do
	pipe_through(:pleroma_html)

	post("/main/ostatus", UtilController, :remote_subscribe)
	- get("/ostatus_subscribe", UtilController, :remote_follow)
	+ get("/ostatus_subscribe", RemoteFollowController, :follow)

	- post("/ostatus_subscribe", UtilController, :do_remote_follow)
	+ post("/ostatus_subscribe", RemoteFollowController, :do_follow)
	end

	scope "/api/pleroma", Pleroma.Web.TwitterAPI do
	pipe_through(:authenticated_api)

	post("/change_email", UtilController, :change_email)
	post("/change_password", UtilController, :change_password)
	post("/delete_account", UtilController, :delete_account)
	put("/notification_settings", UtilController, :update_notificaton_settings)
	post("/disable_account", UtilController, :disable_account)

	post("/blocks_import", UtilController, :blocks_import)
	post("/follow_import", UtilController, :follow_import)
	end

	scope "/oauth", Pleroma.Web.OAuth do
	scope [] do
	pipe_through(:oauth)
	get("/authorize", OAuthController, :authorize)
	end

	post("/authorize", OAuthController, :create_authorization)
	post("/token", OAuthController, :token_exchange)
	post("/revoke", OAuthController, :token_revoke)
	get("/registration_details", OAuthController, :registration_details)

	scope [] do
	pipe_through(:browser)

	get("/prepare_request", OAuthController, :prepare_request)
	get("/:provider", OAuthController, :request)
	get("/:provider/callback", OAuthController, :callback)
	post("/register", OAuthController, :register)
	end
	end

	scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
	pipe_through(:api)

	get("/statuses/:id/emoji_reactions_by", PleromaAPIController, :emoji_reactions_by)
	end

	scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
	scope [] do
	pipe_through(:authenticated_api)

	get("/conversations/:id/statuses", PleromaAPIController, :conversation_statuses)
	get("/conversations/:id", PleromaAPIController, :conversation)
	post("/conversations/read", PleromaAPIController, :read_conversations)
	end

	scope [] do
	pipe_through(:authenticated_api)

	patch("/conversations/:id", PleromaAPIController, :update_conversation)
	post("/statuses/:id/react_with_emoji", PleromaAPIController, :react_with_emoji)
	post("/statuses/:id/unreact_with_emoji", PleromaAPIController, :unreact_with_emoji)
	post("/notifications/read", PleromaAPIController, :read_notification)

	patch("/accounts/update_avatar", AccountController, :update_avatar)
	patch("/accounts/update_banner", AccountController, :update_banner)
	patch("/accounts/update_background", AccountController, :update_background)

	get("/mascot", MascotController, :show)
	put("/mascot", MascotController, :update)

	post("/scrobble", ScrobbleController, :new_scrobble)
	end

	scope [] do
	pipe_through(:api)
	get("/accounts/:id/favourites", AccountController, :favourites)
	end

	scope [] do
	pipe_through(:authenticated_api)

	post("/accounts/:id/subscribe", AccountController, :subscribe)
	post("/accounts/:id/unsubscribe", AccountController, :unsubscribe)
	end

	post("/accounts/confirmation_resend", AccountController, :confirmation_resend)
	end

	scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
	pipe_through(:api)
	get("/accounts/:id/scrobbles", ScrobbleController, :user_scrobbles)
	end

	scope "/api/v1", Pleroma.Web.MastodonAPI do
	pipe_through(:authenticated_api)

	get("/accounts/verify_credentials", AccountController, :verify_credentials)

	get("/accounts/relationships", AccountController, :relationships)

	get("/accounts/:id/lists", AccountController, :lists)
	get("/accounts/:id/identity_proofs", MastodonAPIController, :empty_array)

	get("/follow_requests", FollowRequestController, :index)
	get("/blocks", AccountController, :blocks)
	get("/mutes", AccountController, :mutes)

	get("/timelines/home", TimelineController, :home)
	get("/timelines/direct", TimelineController, :direct)

	get("/favourites", StatusController, :favourites)
	get("/bookmarks", StatusController, :bookmarks)

	get("/notifications", NotificationController, :index)
	get("/notifications/:id", NotificationController, :show)
	post("/notifications/clear", NotificationController, :clear)
	post("/notifications/dismiss", NotificationController, :dismiss)
	delete("/notifications/destroy_multiple", NotificationController, :destroy_multiple)

	get("/scheduled_statuses", ScheduledActivityController, :index)
	get("/scheduled_statuses/:id", ScheduledActivityController, :show)

	get("/lists", ListController, :index)
	get("/lists/:id", ListController, :show)
	get("/lists/:id/accounts", ListController, :list_accounts)

	get("/domain_blocks", DomainBlockController, :index)

	get("/filters", FilterController, :index)

	get("/suggestions", SuggestionController, :index)

	get("/conversations", ConversationController, :index)
	post("/conversations/:id/read", ConversationController, :read)

	get("/endorsements", AccountController, :endorsements)

	patch("/accounts/update_credentials", AccountController, :update_credentials)

	post("/statuses", StatusController, :create)
	delete("/statuses/:id", StatusController, :delete)

	post("/statuses/:id/reblog", StatusController, :reblog)
	post("/statuses/:id/unreblog", StatusController, :unreblog)
	post("/statuses/:id/favourite", StatusController, :favourite)
	post("/statuses/:id/unfavourite", StatusController, :unfavourite)
	post("/statuses/:id/pin", StatusController, :pin)
	post("/statuses/:id/unpin", StatusController, :unpin)
	post("/statuses/:id/bookmark", StatusController, :bookmark)
	post("/statuses/:id/unbookmark", StatusController, :unbookmark)
	post("/statuses/:id/mute", StatusController, :mute_conversation)
	post("/statuses/:id/unmute", StatusController, :unmute_conversation)

	put("/scheduled_statuses/:id", ScheduledActivityController, :update)
	delete("/scheduled_statuses/:id", ScheduledActivityController, :delete)

	post("/polls/:id/votes", PollController, :vote)

	post("/media", MediaController, :create)
	put("/media/:id", MediaController, :update)

	delete("/lists/:id", ListController, :delete)
	post("/lists", ListController, :create)
	put("/lists/:id", ListController, :update)

	post("/lists/:id/accounts", ListController, :add_to_list)
	delete("/lists/:id/accounts", ListController, :remove_from_list)

	post("/filters", FilterController, :create)
	get("/filters/:id", FilterController, :show)
	put("/filters/:id", FilterController, :update)
	delete("/filters/:id", FilterController, :delete)

	post("/reports", ReportController, :create)

	post("/follows", AccountController, :follows)
	post("/accounts/:id/follow", AccountController, :follow)
	post("/accounts/:id/unfollow", AccountController, :unfollow)
	post("/accounts/:id/block", AccountController, :block)
	post("/accounts/:id/unblock", AccountController, :unblock)
	post("/accounts/:id/mute", AccountController, :mute)
	post("/accounts/:id/unmute", AccountController, :unmute)

	post("/follow_requests/:id/authorize", FollowRequestController, :authorize)
	post("/follow_requests/:id/reject", FollowRequestController, :reject)

	post("/domain_blocks", DomainBlockController, :create)
	delete("/domain_blocks", DomainBlockController, :delete)

	post("/push/subscription", SubscriptionController, :create)
	get("/push/subscription", SubscriptionController, :get)
	put("/push/subscription", SubscriptionController, :update)
	delete("/push/subscription", SubscriptionController, :delete)

	get("/markers", MarkerController, :index)
	post("/markers", MarkerController, :upsert)
	end

	scope "/api/web", Pleroma.Web do
	pipe_through(:authenticated_api)

	put("/settings", MastoFEController, :put_settings)
	end

	scope "/api/v1", Pleroma.Web.MastodonAPI do
	pipe_through(:api)

	post("/accounts", AccountController, :create)
	get("/accounts/search", SearchController, :account_search)

	get("/instance", InstanceController, :show)
	get("/instance/peers", InstanceController, :peers)

	post("/apps", AppController, :create)
	get("/apps/verify_credentials", AppController, :verify_credentials)

	get("/statuses/:id/card", StatusController, :card)
	get("/statuses/:id/favourited_by", StatusController, :favourited_by)
	get("/statuses/:id/reblogged_by", StatusController, :reblogged_by)

	get("/custom_emojis", CustomEmojiController, :index)

	get("/trends", MastodonAPIController, :empty_array)

	get("/timelines/public", TimelineController, :public)
	get("/timelines/tag/:tag", TimelineController, :hashtag)
	get("/timelines/list/:list_id", TimelineController, :list)

	get("/statuses", StatusController, :index)
	get("/statuses/:id", StatusController, :show)
	get("/statuses/:id/context", StatusController, :context)

	get("/polls/:id", PollController, :show)

	get("/accounts/:id/statuses", AccountController, :statuses)
	get("/accounts/:id/followers", AccountController, :followers)
	get("/accounts/:id/following", AccountController, :following)
	get("/accounts/:id", AccountController, :show)

	get("/search", SearchController, :search)
	end

	scope "/api/v2", Pleroma.Web.MastodonAPI do
	pipe_through(:api)
	get("/search", SearchController, :search2)
	end

	scope "/api", Pleroma.Web do
	pipe_through(:config)

	get("/help/test", TwitterAPI.UtilController, :help_test)
	post("/help/test", TwitterAPI.UtilController, :help_test)
	get("/statusnet/config", TwitterAPI.UtilController, :config)
	get("/statusnet/version", TwitterAPI.UtilController, :version)
	get("/pleroma/frontend_configurations", TwitterAPI.UtilController, :frontend_configurations)
	end

	scope "/api", Pleroma.Web do
	pipe_through(:api)

	get(
	"/account/confirm_email/:user_id/:token",
	TwitterAPI.Controller,
	:confirm_email,
	as: :confirm_email
	)
	end

	scope "/api", Pleroma.Web, as: :authenticated_twitter_api do
	pipe_through(:authenticated_api)

	get("/oauth_tokens", TwitterAPI.Controller, :oauth_tokens)
	delete("/oauth_tokens/:id", TwitterAPI.Controller, :revoke_token)

	post("/qvitter/statuses/notifications/read", TwitterAPI.Controller, :notifications_read)
	end

	pipeline :ap_service_actor do
	plug(:accepts, ["activity+json", "json"])
	end

	pipeline :ostatus do
	plug(:accepts, ["html", "xml", "atom", "activity+json", "json"])
	plug(Pleroma.Plugs.StaticFEPlug)
	end

	pipeline :oembed do
	plug(:accepts, ["json", "xml"])
	end

	scope "/", Pleroma.Web do
	pipe_through(:ostatus)
	pipe_through(:http_signature)

	get("/objects/:uuid", OStatus.OStatusController, :object)
	get("/activities/:uuid", OStatus.OStatusController, :activity)
	get("/notice/:id", OStatus.OStatusController, :notice)
	get("/notice/:id/embed_player", OStatus.OStatusController, :notice_player)

	get("/users/:nickname/feed", Feed.FeedController, :feed)
	get("/users/:nickname", Feed.FeedController, :feed_redirect)
	end

	scope "/", Pleroma.Web do
	pipe_through(:browser)
	get("/mailer/unsubscribe/:token", Mailer.SubscriptionController, :unsubscribe)
	end

	pipeline :activitypub do
	plug(:accepts, ["activity+json", "json"])
	plug(Pleroma.Web.Plugs.HTTPSignaturePlug)
	plug(Pleroma.Web.Plugs.MappedSignatureToIdentityPlug)
	end

	scope "/", Pleroma.Web.ActivityPub do
	# XXX: not really ostatus
	pipe_through(:ostatus)

	get("/users/:nickname/outbox", ActivityPubController, :outbox)
	end

	pipeline :activitypub_client do
	plug(:accepts, ["activity+json", "json"])
	plug(:fetch_session)
	plug(Pleroma.Plugs.OAuthPlug)
	plug(Pleroma.Plugs.BasicAuthDecoderPlug)
	plug(Pleroma.Plugs.UserFetcherPlug)
	plug(Pleroma.Plugs.SessionAuthenticationPlug)
	plug(Pleroma.Plugs.LegacyAuthenticationPlug)
	plug(Pleroma.Plugs.AuthenticationPlug)
	plug(Pleroma.Plugs.UserEnabledPlug)
	plug(Pleroma.Plugs.SetUserSessionIdPlug)
	plug(Pleroma.Plugs.EnsureUserKeyPlug)
	end

	scope "/", Pleroma.Web.ActivityPub do
	pipe_through([:activitypub_client])

	get("/api/ap/whoami", ActivityPubController, :whoami)
	get("/users/:nickname/inbox", ActivityPubController, :read_inbox)

	post("/users/:nickname/outbox", ActivityPubController, :update_outbox)
	post("/api/ap/upload_media", ActivityPubController, :upload_media)

	get("/users/:nickname/followers", ActivityPubController, :followers)
	get("/users/:nickname/following", ActivityPubController, :following)
	end

	scope "/", Pleroma.Web.ActivityPub do
	pipe_through(:activitypub)
	post("/inbox", ActivityPubController, :inbox)
	post("/users/:nickname/inbox", ActivityPubController, :inbox)
	end

	scope "/relay", Pleroma.Web.ActivityPub do
	pipe_through(:ap_service_actor)

	get("/", ActivityPubController, :relay)

	scope [] do
	pipe_through(:http_signature)
	post("/inbox", ActivityPubController, :inbox)
	end

	get("/following", ActivityPubController, :following, assigns: %{relay: true})
	get("/followers", ActivityPubController, :followers, assigns: %{relay: true})
	end

	scope "/internal/fetch", Pleroma.Web.ActivityPub do
	pipe_through(:ap_service_actor)

	get("/", ActivityPubController, :internal_fetch)
	post("/inbox", ActivityPubController, :inbox)
	end

	scope "/.well-known", Pleroma.Web do
	pipe_through(:well_known)

	get("/host-meta", WebFinger.WebFingerController, :host_meta)
	get("/webfinger", WebFinger.WebFingerController, :webfinger)
	get("/nodeinfo", Nodeinfo.NodeinfoController, :schemas)
	end

	scope "/nodeinfo", Pleroma.Web do
	get("/:version", Nodeinfo.NodeinfoController, :nodeinfo)
	end

	scope "/", Pleroma.Web do
	pipe_through(:api)

	get("/web/manifest.json", MastoFEController, :manifest)
	end

	scope "/", Pleroma.Web do
	pipe_through(:mastodon_html)

	get("/web/login", MastodonAPI.AuthController, :login)
	delete("/auth/sign_out", MastodonAPI.AuthController, :logout)

	post("/auth/password", MastodonAPI.AuthController, :password_reset)

	get("/web/*path", MastoFEController, :index)
	end

	pipeline :remote_media do
	end

	scope "/proxy/", Pleroma.Web.MediaProxy do
	pipe_through(:remote_media)

	get("/:sig/:url", MediaProxyController, :remote)
	get("/:sig/:url/:filename", MediaProxyController, :remote)
	end

	if Pleroma.Config.get(:env) == :dev do
	scope "/dev" do
	pipe_through([:mailbox_preview])

	forward("/mailbox", Plug.Swoosh.MailboxPreview, base_path: "/dev/mailbox")
	end
	end

	scope "/", Pleroma.Web.MongooseIM do
	get("/user_exists", MongooseIMController, :user_exists)
	get("/check_password", MongooseIMController, :check_password)
	end

	scope "/", Fallback do
	get("/registration/:token", RedirectController, :registration_page)
	get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta)
	get("/api*path", RedirectController, :api_not_implemented)
	get("/*path", RedirectController, :redirector)

	options("/*path", RedirectController, :empty)
	end
	end
	diff --git a/lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex b/lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex
	new file mode 100644
	index 000000000..5ba192cd7
	--- /dev/null
	+++ b/lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex
	@@ -0,0 +1,11 @@
	+<%= if @error == :error do %>
	+ <h2>Error fetching user</h2>
	+<% else %>
	+ <h2>Remote follow</h2>
	+ <img height="128" width="128" src="<%= avatar_url(@followee) %>">
	+ <p><%= @followee.nickname %></p>
	+ <%= form_for @conn, remote_follow_path(@conn, :do_follow), [as: "user"], fn f -> %>
	+ <%= hidden_input f, :id, value: @followee.id %>
	+ <%= submit "Authorize" %>
	+ <% end %>
	+<% end %>
	diff --git a/lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex b/lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex
	new file mode 100644
	index 000000000..df44988ee
	--- /dev/null
	+++ b/lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex
	@@ -0,0 +1,14 @@
	+<%= if @error do %>
	+<h2><%= @error %></h2>
	+<% end %>
	+<h2>Log in to follow</h2>
	+<p><%= @followee.nickname %></p>
	+<img height="128" width="128" src="<%= avatar_url(@followee) %>">
	+<%= form_for @conn, remote_follow_path(@conn, :do_follow), [as: "authorization"], fn f -> %>
	+<%= text_input f, :name, placeholder: "Username", required: true %>
	+<br>
	+<%= password_input f, :password, placeholder: "Password", required: true %>
	+<br>
	+<%= hidden_input f, :id, value: @followee.id %>
	+<%= submit "Authorize" %>
	+<% end %>
	diff --git a/lib/pleroma/web/templates/twitter_api/util/followed.html.eex b/lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex
	similarity index 100%
	rename from lib/pleroma/web/templates/twitter_api/util/followed.html.eex
	rename to lib/pleroma/web/templates/twitter_api/remote_follow/followed.html.eex
	diff --git a/lib/pleroma/web/templates/twitter_api/util/follow.html.eex b/lib/pleroma/web/templates/twitter_api/util/follow.html.eex
	deleted file mode 100644
	index 06359fa6c..000000000
	--- a/lib/pleroma/web/templates/twitter_api/util/follow.html.eex
	+++ /dev/null
	@@ -1,11 +0,0 @@
	-<%= if @error == :error do %>
	- <h2>Error fetching user</h2>
	-<% else %>
	- <h2>Remote follow</h2>
	- <img width="128" height="128" src="<%= @avatar %>">
	- <p><%= @name %></p>
	- <%= form_for @conn, util_path(@conn, :do_remote_follow), [as: "user"], fn f -> %>
	- <%= hidden_input f, :id, value: @id %>
	- <%= submit "Authorize" %>
	- <% end %>
	-<% end %>
	diff --git a/lib/pleroma/web/templates/twitter_api/util/follow_login.html.eex b/lib/pleroma/web/templates/twitter_api/util/follow_login.html.eex
	deleted file mode 100644
	index 4e3a2be67..000000000
	--- a/lib/pleroma/web/templates/twitter_api/util/follow_login.html.eex
	+++ /dev/null
	@@ -1,14 +0,0 @@
	-<%= if @error do %>
	- <h2><%= @error %></h2>
	-<% end %>
	-<h2>Log in to follow</h2>
	-<p><%= @name %></p>
	-<img height="128" width="128" src="<%= @avatar %>">
	-<%= form_for @conn, util_path(@conn, :do_remote_follow), [as: "authorization"], fn f -> %>
	-<%= text_input f, :name, placeholder: "Username" %>
	-<br>
	-<%= password_input f, :password, placeholder: "Password" %>
	-<br>
	-<%= hidden_input f, :id, value: @id %>
	-<%= submit "Authorize" %>
	-<% end %>
	diff --git a/lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex b/lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
	new file mode 100644
	index 000000000..e0d4d5632
	--- /dev/null
	+++ b/lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
	@@ -0,0 +1,112 @@
	+# 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.RemoteFollowController do
	+ use Pleroma.Web, :controller
	+
	+ require Logger
	+
	+ alias Pleroma.Activity
	+ alias Pleroma.Object.Fetcher
	+ alias Pleroma.Plugs.OAuthScopesPlug
	+ alias Pleroma.User
	+ alias Pleroma.Web.Auth.Authenticator
	+ alias Pleroma.Web.CommonAPI
	+
	+ @status_types ["Article", "Event", "Note", "Video", "Page", "Question"]
	+
	+ # Note: follower can submit the form (with password auth) not being signed in (having no token)
	+ plug(
	+ OAuthScopesPlug,
	+ %{fallback: :proceed_unauthenticated, scopes: ["follow", "write:follows"]}
	+ when action in [:do_follow]
	+ )
	+
	+ # GET /ostatus_subscribe
	+ #
	+ def follow(%{assigns: %{user: user}} = conn, %{"acct" => acct}) do
	+ case is_status?(acct) do
	+ true -> follow_status(conn, user, acct)
	+ _ -> follow_account(conn, user, acct)
	+ end
	+ end
	+
	+ defp follow_status(conn, _user, acct) do
	+ with {:ok, object} <- Fetcher.fetch_object_from_id(acct),
	+ %Activity{id: activity_id} <- Activity.get_create_by_object_ap_id(object.data["id"]) do
	+ redirect(conn, to: o_status_path(conn, :notice, activity_id))
	+ else
	+ error ->
	+ handle_follow_error(conn, error)
	+ end
	+ end
	+
	+ defp follow_account(conn, user, acct) do
	+ with {:ok, followee} <- User.get_or_fetch(acct) do
	+ render(conn, follow_template(user), %{error: false, followee: followee, acct: acct})
	+ else
	+ {:error, _reason} ->
	+ render(conn, follow_template(user), %{error: :error})
	+ end
	+ end
	+
	+ defp follow_template(%User{} = _user), do: "follow.html"
	+ defp follow_template(_), do: "follow_login.html"
	+
	+ defp is_status?(acct) do
	+ case Fetcher.fetch_and_contain_remote_object_from_id(acct) do
	+ {:ok, %{"type" => type}} when type in @status_types ->
	+ true
	+
	+ _ ->
	+ false
	+ end
	+ end
	+
	+ # POST /ostatus_subscribe
	+ #
	+ def do_follow(%{assigns: %{user: %User{} = user}} = conn, %{"user" => %{"id" => id}}) do
	+ with {:fetch_user, %User{} = followee} <- {:fetch_user, User.get_cached_by_id(id)},
	+ {:ok, _, _, _} <- CommonAPI.follow(user, followee) do
	+ render(conn, "followed.html", %{error: false})
	+ else
	+ error ->
	+ handle_follow_error(conn, error)
	+ end
	+ end
	+
	+ def do_follow(conn, %{"authorization" => %{"name" => _, "password" => _, "id" => id}}) do
	+ with {:fetch_user, %User{} = followee} <- {:fetch_user, User.get_cached_by_id(id)},
	+ {_, {:ok, user}, _} <- {:auth, Authenticator.get_user(conn), followee},
	+ {:ok, _, _, _} <- CommonAPI.follow(user, followee) do
	+ render(conn, "followed.html", %{error: false})
	+ else
	+ error ->
	+ handle_follow_error(conn, error)
	+ end
	+ end
	+
	+ def do_follow(%{assigns: %{user: nil}} = conn, _) do
	+ Logger.debug("Insufficient permissions: follow \| write:follows.")
	+ render(conn, "followed.html", %{error: "Insufficient permissions: follow \| write:follows."})
	+ end
	+
	+ defp handle_follow_error(conn, {:auth, _, followee} = _) do
	+ render(conn, "follow_login.html", %{error: "Wrong username or password", followee: followee})
	+ end
	+
	+ defp handle_follow_error(conn, {:fetch_user, error} = _) do
	+ Logger.debug("Remote follow failed with error #{inspect(error)}")
	+ render(conn, "followed.html", %{error: "Could not find user"})
	+ end
	+
	+ defp handle_follow_error(conn, {:error, "Could not follow user:" <> _} = _) do
	+ render(conn, "followed.html", %{error: "Error following account"})
	+ end
	+
	+ defp handle_follow_error(conn, error) do
	+ Logger.debug("Remote follow failed with error #{inspect(error)}")
	+ render(conn, "followed.html", %{error: "Something went wrong."})
	+ end
	+end
	diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
	index c35e393c0..f08b9d28c 100644
	--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
	+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
	@@ -1,411 +1,310 @@
	# 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 Pleroma.Activity
	alias Pleroma.Config
	alias Pleroma.Emoji
	alias Pleroma.Healthcheck
	alias Pleroma.Notification
	- alias Pleroma.Plugs.AuthenticationPlug
	alias Pleroma.Plugs.OAuthScopesPlug
	alias Pleroma.User
	alias Pleroma.Web
	alias Pleroma.Web.CommonAPI
	alias Pleroma.Web.WebFinger

	plug(
	OAuthScopesPlug,
	%{scopes: ["follow", "write:follows"]}
	when action == :follow_import
	)

	# Note: follower can submit the form (with password auth) not being signed in (having no token)
	plug(
	OAuthScopesPlug,
	%{fallback: :proceed_unauthenticated, scopes: ["follow", "write:follows"]}
	when action == :do_remote_follow
	)

	plug(OAuthScopesPlug, %{scopes: ["follow", "write:blocks"]} when action == :blocks_import)

	plug(
	OAuthScopesPlug,
	%{scopes: ["write:accounts"]}
	when action in [
	:change_email,
	:change_password,
	:delete_account,
	:update_notificaton_settings,
	:disable_account
	]
	)

	plug(OAuthScopesPlug, %{scopes: ["write:notifications"]} when action == :notifications_read)

	plug(Pleroma.Plugs.SetFormatPlug when action in [:config, :version])

	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
	- if is_status?(acct) do
	- {:ok, object} = Pleroma.Object.Fetcher.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}")
	- else
	- with {:ok, followee} <- User.get_or_fetch(acct) do
	- conn
	- \|> render(follow_template(user), %{
	- error: false,
	- acct: acct,
	- avatar: User.avatar_url(followee),
	- name: followee.nickname,
	- id: followee.id
	- })
	- else
	- {:error, _reason} ->
	- render(conn, follow_template(user), %{error: :error})
	- end
	- end
	- end
	-
	- defp follow_template(%User{} = _user), do: "follow.html"
	- defp follow_template(_), do: "follow_login.html"
	-
	- defp is_status?(acct) do
	- case Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id(acct) do
	- {:ok, %{"type" => type}}
	- when type in ["Article", "Event", "Note", "Video", "Page", "Question"] ->
	- true
	-
	- _ ->
	- false
	- end
	- end
	-
	- def do_remote_follow(%{assigns: %{user: user}} = conn, %{"user" => %{"id" => id}})
	- when not is_nil(user) do
	- with {:fetch_user, %User{} = followee} <- {:fetch_user, User.get_cached_by_id(id)},
	- {:ok, _follower, _followee, _activity} <- CommonAPI.follow(user, followee) do
	- conn
	- \|> render("followed.html", %{error: false})
	- else
	- # Was already following user
	- {:error, "Could not follow user:" <> _rest} ->
	- render(conn, "followed.html", %{error: "Error following account"})
	-
	- {:fetch_user, error} ->
	- Logger.debug("Remote follow failed with error #{inspect(error)}")
	- render(conn, "followed.html", %{error: "Could not find user"})
	-
	- e ->
	- Logger.debug("Remote follow failed with error #{inspect(e)}")
	- render(conn, "followed.html", %{error: "Something went wrong."})
	- end
	- end
	-
	- # Note: "id" is the id of followee user, disregard incorrect placing under "authorization"
	- def do_remote_follow(conn, %{
	- "authorization" => %{"name" => username, "password" => password, "id" => id}
	- }) do
	- with %User{} = followee <- User.get_cached_by_id(id),
	- {_, %User{} = user, _} <- {:auth, User.get_cached_by_nickname(username), followee},
	- {_, true, _} <- {
	- :auth,
	- AuthenticationPlug.checkpw(password, user.password_hash),
	- followee
	- },
	- {:ok, _follower, _followee, _activity} <- CommonAPI.follow(user, followee) do
	- conn
	- \|> render("followed.html", %{error: false})
	- else
	- # Was already following user
	- {:error, "Could not follow user:" <> _rest} ->
	- render(conn, "followed.html", %{error: "Error following account"})
	-
	- {:auth, _, followee} ->
	- conn
	- \|> render("follow_login.html", %{
	- error: "Wrong username or password",
	- id: id,
	- name: followee.nickname,
	- avatar: User.avatar_url(followee)
	- })
	-
	- e ->
	- Logger.debug("Remote follow failed with error #{inspect(e)}")
	- render(conn, "followed.html", %{error: "Something went wrong."})
	- end
	- end
	-
	- def do_remote_follow(%{assigns: %{user: nil}} = conn, _) do
	- render(conn, "followed.html", %{error: "Insufficient permissions: follow \| write:follows."})
	- end
	-
	- def do_remote_follow(conn, _) do
	- render(conn, "followed.html", %{error: "Something went wrong."})
	- 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(%{assigns: %{format: "xml"}} = conn, _params) do
	instance = Pleroma.Config.get(:instance)

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

	def config(conn, _params) do
	instance = Pleroma.Config.get(:instance)

	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: bool_to_val(Keyword.get(instance, :registrations_open), "0", "1"),
	private: bool_to_val(Keyword.get(instance, :public, true), "0", "1"),
	vapidPublicKey: vapid_public_key,
	accountActivationRequired:
	bool_to_val(Keyword.get(instance, :account_activation_required, false)),
	invitesEnabled: bool_to_val(Keyword.get(instance, :invites_enabled, false)),
	safeDMMentionsEnabled: bool_to_val(Pleroma.Config.get([:instance, :safe_dm_mentions]))
	}

	managed_config = Keyword.get(instance, :managed_config)

	data =
	if managed_config do
	pleroma_fe = Pleroma.Config.get([:frontend_configurations, :pleroma_fe])
	Map.put(data, "pleromafe", pleroma_fe)
	else
	data
	end

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

	defp bool_to_val(true), do: "1"
	defp bool_to_val(_), do: "0"
	defp bool_to_val(true, val, _), do: val
	defp bool_to_val(_, _, val), do: val

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

	json(conn, config)
	end

	def version(%{assigns: %{format: "xml"}} = conn, _params) do
	version = Pleroma.Application.named_version()

	conn
	\|> put_resp_content_type("application/xml")
	\|> send_resp(200, "<version>#{version}</version>")
	end

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

	def emoji(conn, _params) do
	emoji =
	Enum.reduce(Emoji.get_all(), %{}, fn {code, %Emoji{file: file, tags: tags}}, acc ->
	Map.put(acc, code, %{image_url: file, tags: tags})
	end)

	json(conn, emoji)
	end

	def update_notificaton_settings(%{assigns: %{user: user}} = conn, params) do
	with {:ok, _} <- User.update_notification_settings(user, params) do
	json(conn, %{status: "success"})
	end
	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 lines <- String.split(list, "\n"),
	followed_identifiers <-
	Enum.map(lines, fn line ->
	String.split(line, ",") \|> List.first()
	end)
	\|> List.delete("Account address") do
	User.follow_import(follower, followed_identifiers)
	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) do
	User.blocks_import(blocker, blocked_identifiers)
	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 change_email(%{assigns: %{user: user}} = conn, params) do
	case CommonAPI.Utils.confirm_current_password(user, params["password"]) do
	{:ok, user} ->
	with {:ok, _user} <- User.change_email(user, params["email"]) do
	json(conn, %{status: "success"})
	else
	{:error, changeset} ->
	{_, {error, _}} = Enum.at(changeset.errors, 0)
	json(conn, %{error: "Email #{error}."})

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

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

	def delete_account(%{assigns: %{user: user}} = conn, params) do
	password = params["password"] \|\| ""

	case CommonAPI.Utils.confirm_current_password(user, password) do
	{:ok, user} ->
	User.delete(user)
	json(conn, %{status: "success"})

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

	def disable_account(%{assigns: %{user: user}} = conn, params) do
	case CommonAPI.Utils.confirm_current_password(user, params["password"]) do
	{:ok, user} ->
	User.deactivate_async(user)
	json(conn, %{status: "success"})

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

	def captcha(conn, _params) do
	json(conn, Pleroma.Captcha.new())
	end

	def healthcheck(conn, _params) do
	with true <- Config.get([:instance, :healthcheck]),
	%{healthy: true} = info <- Healthcheck.system_info() do
	json(conn, info)
	else
	%{healthy: false} = info ->
	service_unavailable(conn, info)

	_ ->
	service_unavailable(conn, %{})
	end
	end

	defp service_unavailable(conn, info) do
	conn
	\|> put_status(:service_unavailable)
	\|> json(info)
	end
	end
	diff --git a/lib/pleroma/web/twitter_api/views/remote_follow_view.ex b/lib/pleroma/web/twitter_api/views/remote_follow_view.ex
	new file mode 100644
	index 000000000..d469c4726
	--- /dev/null
	+++ b/lib/pleroma/web/twitter_api/views/remote_follow_view.ex
	@@ -0,0 +1,10 @@
	+# 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.RemoteFollowView do
	+ use Pleroma.Web, :view
	+ import Phoenix.HTML.Form
	+
	+ defdelegate avatar_url(user), to: Pleroma.User
	+end
	diff --git a/test/web/activity_pub/publisher_test.exs b/test/web/activity_pub/publisher_test.exs
	index e885e5a5a..015af19ab 100644
	--- a/test/web/activity_pub/publisher_test.exs
	+++ b/test/web/activity_pub/publisher_test.exs
	@@ -1,328 +1,349 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2019 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ActivityPub.PublisherTest do
	use Pleroma.Web.ConnCase

	import ExUnit.CaptureLog
	import Pleroma.Factory
	import Tesla.Mock
	import Mock

	alias Pleroma.Activity
	alias Pleroma.Instances
	alias Pleroma.Object
	alias Pleroma.Web.ActivityPub.Publisher
	alias Pleroma.Web.CommonAPI

	@as_public "https://www.w3.org/ns/activitystreams#Public"

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

	+ describe "gather_webfinger_links/1" do
	+ test "it returns links" do
	+ user = insert(:user)
	+
	+ expected_links = [
	+ %{"href" => user.ap_id, "rel" => "self", "type" => "application/activity+json"},
	+ %{
	+ "href" => user.ap_id,
	+ "rel" => "self",
	+ "type" => "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\""
	+ },
	+ %{
	+ "rel" => "http://ostatus.org/schema/1.0/subscribe",
	+ "template" => "#{Pleroma.Web.base_url()}/ostatus_subscribe?acct={uri}"
	+ }
	+ ]
	+
	+ assert expected_links == Publisher.gather_webfinger_links(user)
	+ end
	+ end
	+
	describe "determine_inbox/2" do
	test "it returns sharedInbox for messages involving as:Public in to" do
	user =
	insert(:user, %{
	source_data: %{"endpoints" => %{"sharedInbox" => "http://example.com/inbox"}}
	})

	activity = %Activity{
	data: %{"to" => [@as_public], "cc" => [user.follower_address]}
	}

	assert Publisher.determine_inbox(activity, user) == "http://example.com/inbox"
	end

	test "it returns sharedInbox for messages involving as:Public in cc" do
	user =
	insert(:user, %{
	source_data: %{"endpoints" => %{"sharedInbox" => "http://example.com/inbox"}}
	})

	activity = %Activity{
	data: %{"cc" => [@as_public], "to" => [user.follower_address]}
	}

	assert Publisher.determine_inbox(activity, user) == "http://example.com/inbox"
	end

	test "it returns sharedInbox for messages involving multiple recipients in to" do
	user =
	insert(:user, %{
	source_data: %{"endpoints" => %{"sharedInbox" => "http://example.com/inbox"}}
	})

	user_two = insert(:user)
	user_three = insert(:user)

	activity = %Activity{
	data: %{"cc" => [], "to" => [user.ap_id, user_two.ap_id, user_three.ap_id]}
	}

	assert Publisher.determine_inbox(activity, user) == "http://example.com/inbox"
	end

	test "it returns sharedInbox for messages involving multiple recipients in cc" do
	user =
	insert(:user, %{
	source_data: %{"endpoints" => %{"sharedInbox" => "http://example.com/inbox"}}
	})

	user_two = insert(:user)
	user_three = insert(:user)

	activity = %Activity{
	data: %{"to" => [], "cc" => [user.ap_id, user_two.ap_id, user_three.ap_id]}
	}

	assert Publisher.determine_inbox(activity, user) == "http://example.com/inbox"
	end

	test "it returns sharedInbox for messages involving multiple recipients in total" do
	user =
	insert(:user,
	source_data: %{
	"inbox" => "http://example.com/personal-inbox",
	"endpoints" => %{"sharedInbox" => "http://example.com/inbox"}
	}
	)

	user_two = insert(:user)

	activity = %Activity{
	data: %{"to" => [user_two.ap_id], "cc" => [user.ap_id]}
	}

	assert Publisher.determine_inbox(activity, user) == "http://example.com/inbox"
	end

	test "it returns inbox for messages involving single recipients in total" do
	user =
	insert(:user,
	source_data: %{
	"inbox" => "http://example.com/personal-inbox",
	"endpoints" => %{"sharedInbox" => "http://example.com/inbox"}
	}
	)

	activity = %Activity{
	data: %{"to" => [user.ap_id], "cc" => []}
	}

	assert Publisher.determine_inbox(activity, user) == "http://example.com/personal-inbox"
	end
	end

	describe "publish_one/1" do
	test_with_mock "calls `Instances.set_reachable` on successful federation if `unreachable_since` is not specified",
	Instances,
	[:passthrough],
	[] do
	actor = insert(:user)
	inbox = "http://200.site/users/nick1/inbox"

	assert {:ok, _} = Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})

	assert called(Instances.set_reachable(inbox))
	end

	test_with_mock "calls `Instances.set_reachable` on successful federation if `unreachable_since` is set",
	Instances,
	[:passthrough],
	[] do
	actor = insert(:user)
	inbox = "http://200.site/users/nick1/inbox"

	assert {:ok, _} =
	Publisher.publish_one(%{
	inbox: inbox,
	json: "{}",
	actor: actor,
	id: 1,
	unreachable_since: NaiveDateTime.utc_now()
	})

	assert called(Instances.set_reachable(inbox))
	end

	test_with_mock "does NOT call `Instances.set_reachable` on successful federation if `unreachable_since` is nil",
	Instances,
	[:passthrough],
	[] do
	actor = insert(:user)
	inbox = "http://200.site/users/nick1/inbox"

	assert {:ok, _} =
	Publisher.publish_one(%{
	inbox: inbox,
	json: "{}",
	actor: actor,
	id: 1,
	unreachable_since: nil
	})

	refute called(Instances.set_reachable(inbox))
	end

	test_with_mock "calls `Instances.set_unreachable` on target inbox on non-2xx HTTP response code",
	Instances,
	[:passthrough],
	[] do
	actor = insert(:user)
	inbox = "http://404.site/users/nick1/inbox"

	assert {:error, _} = Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})

	assert called(Instances.set_unreachable(inbox))
	end

	test_with_mock "it calls `Instances.set_unreachable` on target inbox on request error of any kind",
	Instances,
	[:passthrough],
	[] do
	actor = insert(:user)
	inbox = "http://connrefused.site/users/nick1/inbox"

	assert capture_log(fn ->
	assert {:error, _} =
	Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})
	end) =~ "connrefused"

	assert called(Instances.set_unreachable(inbox))
	end

	test_with_mock "does NOT call `Instances.set_unreachable` if target is reachable",
	Instances,
	[:passthrough],
	[] do
	actor = insert(:user)
	inbox = "http://200.site/users/nick1/inbox"

	assert {:ok, _} = Publisher.publish_one(%{inbox: inbox, json: "{}", actor: actor, id: 1})

	refute called(Instances.set_unreachable(inbox))
	end

	test_with_mock "does NOT call `Instances.set_unreachable` if target instance has non-nil `unreachable_since`",
	Instances,
	[:passthrough],
	[] do
	actor = insert(:user)
	inbox = "http://connrefused.site/users/nick1/inbox"

	assert capture_log(fn ->
	assert {:error, _} =
	Publisher.publish_one(%{
	inbox: inbox,
	json: "{}",
	actor: actor,
	id: 1,
	unreachable_since: NaiveDateTime.utc_now()
	})
	end) =~ "connrefused"

	refute called(Instances.set_unreachable(inbox))
	end
	end

	describe "publish/2" do
	test_with_mock "publishes an activity with BCC to all relevant peers.",
	Pleroma.Web.Federator.Publisher,
	[:passthrough],
	[] do
	follower =
	insert(:user,
	local: false,
	source_data: %{"inbox" => "https://domain.com/users/nick1/inbox"},
	ap_enabled: true
	)

	actor = insert(:user, follower_address: follower.ap_id)
	user = insert(:user)

	{:ok, _follower_one} = Pleroma.User.follow(follower, actor)
	actor = refresh_record(actor)

	note_activity =
	insert(:note_activity,
	recipients: [follower.ap_id],
	data_attrs: %{"bcc" => [user.ap_id]}
	)

	res = Publisher.publish(actor, note_activity)
	assert res == :ok

	assert called(
	Pleroma.Web.Federator.Publisher.enqueue_one(Publisher, %{
	inbox: "https://domain.com/users/nick1/inbox",
	actor_id: actor.id,
	id: note_activity.data["id"]
	})
	)
	end

	test_with_mock "publishes a delete activity to peers who signed fetch requests to the create acitvity/object.",
	Pleroma.Web.Federator.Publisher,
	[:passthrough],
	[] do
	fetcher =
	insert(:user,
	local: false,
	source_data: %{"inbox" => "https://domain.com/users/nick1/inbox"},
	ap_enabled: true
	)

	another_fetcher =
	insert(:user,
	local: false,
	source_data: %{"inbox" => "https://domain2.com/users/nick1/inbox"},
	ap_enabled: true
	)

	actor = insert(:user)

	note_activity = insert(:note_activity, user: actor)
	object = Object.normalize(note_activity)

	activity_path = String.trim_leading(note_activity.data["id"], Pleroma.Web.Endpoint.url())
	object_path = String.trim_leading(object.data["id"], Pleroma.Web.Endpoint.url())

	build_conn()
	\|> put_req_header("accept", "application/activity+json")
	\|> assign(:user, fetcher)
	\|> get(object_path)
	\|> json_response(200)

	build_conn()
	\|> put_req_header("accept", "application/activity+json")
	\|> assign(:user, another_fetcher)
	\|> get(activity_path)
	\|> json_response(200)

	{:ok, delete} = CommonAPI.delete(note_activity.id, actor)

	res = Publisher.publish(actor, delete)
	assert res == :ok

	assert called(
	Pleroma.Web.Federator.Publisher.enqueue_one(Publisher, %{
	inbox: "https://domain.com/users/nick1/inbox",
	actor_id: actor.id,
	id: delete.data["id"]
	})
	)

	assert called(
	Pleroma.Web.Federator.Publisher.enqueue_one(Publisher, %{
	inbox: "https://domain2.com/users/nick1/inbox",
	actor_id: actor.id,
	id: delete.data["id"]
	})
	)
	end
	end
	end
	diff --git a/test/web/twitter_api/remote_follow_controller_test.exs b/test/web/twitter_api/remote_follow_controller_test.exs
	new file mode 100644
	index 000000000..444949375
	--- /dev/null
	+++ b/test/web/twitter_api/remote_follow_controller_test.exs
	@@ -0,0 +1,235 @@
	+# 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.RemoteFollowControllerTest do
	+ use Pleroma.Web.ConnCase
	+
	+ alias Pleroma.User
	+ alias Pleroma.Web.CommonAPI
	+ import ExUnit.CaptureLog
	+ import Pleroma.Factory
	+
	+ setup do
	+ Tesla.Mock.mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
	+ :ok
	+ end
	+
	+ clear_config([:instance])
	+ clear_config([:frontend_configurations, :pleroma_fe])
	+ clear_config([:user, :deny_follow_blocked])
	+
	+ describe "GET /ostatus_subscribe - remote_follow/2" do
	+ test "adds status to pleroma instance if the `acct` is a status", %{conn: conn} do
	+ assert conn
	+ \|> get(
	+ remote_follow_path(conn, :follow, %{
	+ acct: "https://mastodon.social/users/emelie/statuses/101849165031453009"
	+ })
	+ )
	+ \|> redirected_to() =~ "/notice/"
	+ end
	+
	+ test "show follow account page if the `acct` is a account link", %{conn: conn} do
	+ response =
	+ conn
	+ \|> get(remote_follow_path(conn, :follow, %{acct: "https://mastodon.social/users/emelie"}))
	+ \|> html_response(200)
	+
	+ assert response =~ "Log in to follow"
	+ end
	+
	+ test "show follow page if the `acct` is a account link", %{conn: conn} do
	+ user = insert(:user)
	+
	+ response =
	+ conn
	+ \|> assign(:user, user)
	+ \|> get(remote_follow_path(conn, :follow, %{acct: "https://mastodon.social/users/emelie"}))
	+ \|> html_response(200)
	+
	+ assert response =~ "Remote follow"
	+ end
	+
	+ test "show follow page with error when user cannot fecth by `acct` link", %{conn: conn} do
	+ user = insert(:user)
	+
	+ assert capture_log(fn ->
	+ response =
	+ conn
	+ \|> assign(:user, user)
	+ \|> get(
	+ remote_follow_path(conn, :follow, %{
	+ acct: "https://mastodon.social/users/not_found"
	+ })
	+ )
	+ \|> html_response(200)
	+
	+ assert response =~ "Error fetching user"
	+ end) =~ "Object has been deleted"
	+ end
	+ end
	+
	+ describe "POST /ostatus_subscribe - do_follow/2 with assigned user " do
	+ test "required `follow \| write:follows` scope", %{conn: conn} do
	+ user = insert(:user)
	+ user2 = insert(:user)
	+ read_token = insert(:oauth_token, user: user, scopes: ["read"])
	+
	+ assert capture_log(fn ->
	+ response =
	+ conn
	+ \|> assign(:user, user)
	+ \|> assign(:token, read_token)
	+ \|> post(remote_follow_path(conn, :do_follow), %{"user" => %{"id" => user2.id}})
	+ \|> response(200)
	+
	+ assert response =~ "Error following account"
	+ end) =~ "Insufficient permissions: follow \| write:follows."
	+ end
	+
	+ test "follows user", %{conn: conn} do
	+ user = insert(:user)
	+ user2 = insert(:user)
	+
	+ response =
	+ conn
	+ \|> assign(:user, user)
	+ \|> assign(:token, insert(:oauth_token, user: user, scopes: ["write:follows"]))
	+ \|> post(remote_follow_path(conn, :do_follow), %{"user" => %{"id" => user2.id}})
	+ \|> response(200)
	+
	+ assert response =~ "Account followed!"
	+ assert user2.follower_address in User.following(user)
	+ end
	+
	+ test "returns error when user is deactivated", %{conn: conn} do
	+ user = insert(:user, deactivated: true)
	+ user2 = insert(:user)
	+
	+ response =
	+ conn
	+ \|> assign(:user, user)
	+ \|> post(remote_follow_path(conn, :do_follow), %{"user" => %{"id" => user2.id}})
	+ \|> response(200)
	+
	+ assert response =~ "Error following account"
	+ end
	+
	+ test "returns error when user is blocked", %{conn: conn} do
	+ Pleroma.Config.put([:user, :deny_follow_blocked], true)
	+ user = insert(:user)
	+ user2 = insert(:user)
	+
	+ {:ok, _user_block} = Pleroma.User.block(user2, user)
	+
	+ response =
	+ conn
	+ \|> assign(:user, user)
	+ \|> post(remote_follow_path(conn, :do_follow), %{"user" => %{"id" => user2.id}})
	+ \|> response(200)
	+
	+ assert response =~ "Error following account"
	+ end
	+
	+ test "returns error when followee not found", %{conn: conn} do
	+ user = insert(:user)
	+
	+ response =
	+ conn
	+ \|> assign(:user, user)
	+ \|> post(remote_follow_path(conn, :do_follow), %{"user" => %{"id" => "jimm"}})
	+ \|> response(200)
	+
	+ assert response =~ "Error following account"
	+ end
	+
	+ test "returns success result when user already in followers", %{conn: conn} do
	+ user = insert(:user)
	+ user2 = insert(:user)
	+ {:ok, _, _, _} = CommonAPI.follow(user, user2)
	+
	+ response =
	+ conn
	+ \|> assign(:user, refresh_record(user))
	+ \|> assign(:token, insert(:oauth_token, user: user, scopes: ["write:follows"]))
	+ \|> post(remote_follow_path(conn, :do_follow), %{"user" => %{"id" => user2.id}})
	+ \|> response(200)
	+
	+ assert response =~ "Account followed!"
	+ end
	+ end
	+
	+ describe "POST /ostatus_subscribe - follow/2 without assigned user " do
	+ test "follows", %{conn: conn} do
	+ user = insert(:user)
	+ user2 = insert(:user)
	+
	+ response =
	+ conn
	+ \|> post(remote_follow_path(conn, :do_follow), %{
	+ "authorization" => %{"name" => user.nickname, "password" => "test", "id" => user2.id}
	+ })
	+ \|> response(200)
	+
	+ assert response =~ "Account followed!"
	+ assert user2.follower_address in User.following(user)
	+ end
	+
	+ test "returns error when followee not found", %{conn: conn} do
	+ user = insert(:user)
	+
	+ response =
	+ conn
	+ \|> post(remote_follow_path(conn, :do_follow), %{
	+ "authorization" => %{"name" => user.nickname, "password" => "test", "id" => "jimm"}
	+ })
	+ \|> response(200)
	+
	+ assert response =~ "Error following account"
	+ end
	+
	+ test "returns error when login invalid", %{conn: conn} do
	+ user = insert(:user)
	+
	+ response =
	+ conn
	+ \|> post(remote_follow_path(conn, :do_follow), %{
	+ "authorization" => %{"name" => "jimm", "password" => "test", "id" => user.id}
	+ })
	+ \|> response(200)
	+
	+ assert response =~ "Wrong username or password"
	+ end
	+
	+ test "returns error when password invalid", %{conn: conn} do
	+ user = insert(:user)
	+ user2 = insert(:user)
	+
	+ response =
	+ conn
	+ \|> post(remote_follow_path(conn, :do_follow), %{
	+ "authorization" => %{"name" => user.nickname, "password" => "42", "id" => user2.id}
	+ })
	+ \|> response(200)
	+
	+ assert response =~ "Wrong username or password"
	+ end
	+
	+ test "returns error when user is blocked", %{conn: conn} do
	+ Pleroma.Config.put([:user, :deny_follow_blocked], true)
	+ user = insert(:user)
	+ user2 = insert(:user)
	+ {:ok, _user_block} = Pleroma.User.block(user2, user)
	+
	+ response =
	+ conn
	+ \|> post(remote_follow_path(conn, :do_follow), %{
	+ "authorization" => %{"name" => user.nickname, "password" => "test", "id" => user2.id}
	+ })
	+ \|> response(200)
	+
	+ assert response =~ "Error following account"
	+ end
	+ end
	+end
	diff --git a/test/web/twitter_api/util_controller_test.exs b/test/web/twitter_api/util_controller_test.exs
	index 9bfaba9d3..8418fd071 100644
	--- a/test/web/twitter_api/util_controller_test.exs
	+++ b/test/web/twitter_api/util_controller_test.exs
	@@ -1,873 +1,675 @@
	# 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.UtilControllerTest do
	use Pleroma.Web.ConnCase
	use Oban.Testing, repo: Pleroma.Repo

	alias Pleroma.Tests.ObanHelpers
	alias Pleroma.User
	alias Pleroma.Web.CommonAPI

	import ExUnit.CaptureLog
	import Pleroma.Factory
	import Mock

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

	clear_config([:instance])
	clear_config([:frontend_configurations, :pleroma_fe])
	clear_config([:user, :deny_follow_blocked])

	describe "POST /api/pleroma/follow_import" do
	setup do: oauth_access(["follow"])

	test "it returns HTTP 200", %{conn: conn} do
	user2 = insert(:user)

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

	assert response == "job started"
	end

	test "it imports follow lists from file", %{user: user1, conn: conn} do
	user2 = insert(:user)

	with_mocks([
	{File, [],
	read!: fn "follow_list.txt" ->
	"Account address,Show boosts\n#{user2.ap_id},true"
	end}
	]) do
	response =
	conn
	\|> post("/api/pleroma/follow_import", %{"list" => %Plug.Upload{path: "follow_list.txt"}})
	\|> json_response(:ok)

	assert response == "job started"

	assert ObanHelpers.member?(
	%{
	"op" => "follow_import",
	"follower_id" => user1.id,
	"followed_identifiers" => [user2.ap_id]
	},
	all_enqueued(worker: Pleroma.Workers.BackgroundWorker)
	)
	end
	end

	test "it imports new-style mastodon follow lists", %{conn: conn} do
	user2 = insert(:user)

	response =
	conn
	\|> post("/api/pleroma/follow_import", %{
	"list" => "Account address,Show boosts\n#{user2.ap_id},true"
	})
	\|> json_response(:ok)

	assert response == "job started"
	end

	test "requires 'follow' or 'write:follows' permissions" do
	token1 = insert(:oauth_token, scopes: ["read", "write"])
	token2 = insert(:oauth_token, scopes: ["follow"])
	token3 = insert(:oauth_token, scopes: ["something"])
	another_user = insert(:user)

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

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

	describe "POST /api/pleroma/blocks_import" do
	# Note: "follow" or "write:blocks" permission is required
	setup do: oauth_access(["write:blocks"])

	test "it returns HTTP 200", %{conn: conn} do
	user2 = insert(:user)

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

	assert response == "job started"
	end

	test "it imports blocks users from file", %{user: user1, conn: conn} do
	user2 = insert(:user)
	user3 = insert(:user)

	with_mocks([
	{File, [], read!: fn "blocks_list.txt" -> "#{user2.ap_id} #{user3.ap_id}" end}
	]) do
	response =
	conn
	\|> post("/api/pleroma/blocks_import", %{"list" => %Plug.Upload{path: "blocks_list.txt"}})
	\|> json_response(:ok)

	assert response == "job started"

	assert ObanHelpers.member?(
	%{
	"op" => "blocks_import",
	"blocker_id" => user1.id,
	"blocked_identifiers" => [user2.ap_id, user3.ap_id]
	},
	all_enqueued(worker: Pleroma.Workers.BackgroundWorker)
	)
	end
	end
	end

	describe "PUT /api/pleroma/notification_settings" do
	setup do: oauth_access(["write:accounts"])

	test "it updates notification settings", %{user: user, conn: conn} do
	conn
	\|> put("/api/pleroma/notification_settings", %{
	"followers" => false,
	"bar" => 1
	})
	\|> json_response(:ok)

	user = refresh_record(user)

	assert %Pleroma.User.NotificationSetting{
	followers: false,
	follows: true,
	non_follows: true,
	non_followers: true,
	privacy_option: false
	} == user.notification_settings
	end

	test "it updates notification privacy option", %{user: user, conn: conn} do
	conn
	\|> put("/api/pleroma/notification_settings", %{"privacy_option" => "1"})
	\|> json_response(:ok)

	user = refresh_record(user)

	assert %Pleroma.User.NotificationSetting{
	followers: true,
	follows: true,
	non_follows: true,
	non_followers: true,
	privacy_option: true
	} == user.notification_settings
	end
	end

	describe "GET /api/statusnet/config" do
	test "it returns config in xml format", %{conn: conn} do
	instance = Pleroma.Config.get(:instance)

	response =
	conn
	\|> put_req_header("accept", "application/xml")
	\|> get("/api/statusnet/config")
	\|> response(:ok)

	assert response ==
	"<config>\n<site>\n<name>#{Keyword.get(instance, :name)}</name>\n<site>#{
	Pleroma.Web.base_url()
	}</site>\n<textlimit>#{Keyword.get(instance, :limit)}</textlimit>\n<closed>#{
	!Keyword.get(instance, :registrations_open)
	}</closed>\n</site>\n</config>\n"
	end

	test "it returns config in json format", %{conn: conn} do
	instance = Pleroma.Config.get(:instance)
	Pleroma.Config.put([:instance, :managed_config], true)
	Pleroma.Config.put([:instance, :registrations_open], false)
	Pleroma.Config.put([:instance, :invites_enabled], true)
	Pleroma.Config.put([:instance, :public], false)
	Pleroma.Config.put([:frontend_configurations, :pleroma_fe], %{theme: "asuka-hospital"})

	response =
	conn
	\|> put_req_header("accept", "application/json")
	\|> get("/api/statusnet/config")
	\|> json_response(:ok)

	expected_data = %{
	"site" => %{
	"accountActivationRequired" => "0",
	"closed" => "1",
	"description" => Keyword.get(instance, :description),
	"invitesEnabled" => "1",
	"name" => Keyword.get(instance, :name),
	"pleromafe" => %{"theme" => "asuka-hospital"},
	"private" => "1",
	"safeDMMentionsEnabled" => "0",
	"server" => Pleroma.Web.base_url(),
	"textlimit" => to_string(Keyword.get(instance, :limit)),
	"uploadlimit" => %{
	"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)),
	"uploadlimit" => to_string(Keyword.get(instance, :upload_limit))
	},
	"vapidPublicKey" => Keyword.get(Pleroma.Web.Push.vapid_config(), :public_key)
	}
	}

	assert response == expected_data
	end

	test "returns the state of safe_dm_mentions flag", %{conn: conn} do
	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"
	end

	test "it returns the managed config", %{conn: conn} do
	Pleroma.Config.put([:instance, :managed_config], false)
	Pleroma.Config.put([:frontend_configurations, :pleroma_fe], %{theme: "asuka-hospital"})

	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"] == %{"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 "/api/pleroma/emoji" do
	test "returns json with custom emoji with tags", %{conn: conn} do
	emoji =
	conn
	\|> get("/api/pleroma/emoji")
	\|> json_response(200)

	assert Enum.all?(emoji, fn
	{_key,
	%{
	"image_url" => url,
	"tags" => tags
	}} ->
	is_binary(url) and is_list(tags)
	end)
	end
	end

	- describe "GET /ostatus_subscribe - remote_follow/2" 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
	-
	- test "show follow page if the `acct` is a account link", %{conn: conn} do
	- user = insert(:user)
	-
	- response =
	- conn
	- \|> assign(:user, user)
	- \|> get("/ostatus_subscribe?acct=https://mastodon.social/users/emelie")
	-
	- assert html_response(response, 200) =~ "Remote follow"
	- end
	-
	- test "show follow page with error when user cannot fecth by `acct` link", %{conn: conn} do
	- user = insert(:user)
	-
	- assert capture_log(fn ->
	- response =
	- conn
	- \|> assign(:user, user)
	- \|> get("/ostatus_subscribe?acct=https://mastodon.social/users/not_found")
	-
	- assert html_response(response, 200) =~ "Error fetching user"
	- end) =~ "Object has been deleted"
	- end
	- end
	-
	- describe "POST /ostatus_subscribe - do_remote_follow/2 with assigned user" do
	- setup do: oauth_access(["follow"])
	-
	- test "follows user", %{user: user, conn: conn} do
	- user2 = insert(:user)
	-
	- response =
	- conn
	- \|> post("/ostatus_subscribe", %{"user" => %{"id" => user2.id}})
	- \|> response(200)
	-
	- assert response =~ "Account followed!"
	- assert user2.follower_address in User.following(user)
	- end
	-
	- test "returns error when user is deactivated" do
	- user = insert(:user, deactivated: true)
	- user2 = insert(:user)
	-
	- response =
	- build_conn()
	- \|> assign(:user, user)
	- \|> assign(:token, insert(:oauth_token, user: user, scopes: ["follow"]))
	- \|> post("/ostatus_subscribe", %{"user" => %{"id" => user2.id}})
	- \|> response(200)
	-
	- assert response =~ "Error following account"
	- end
	-
	- test "returns error when user is blocked", %{user: user, conn: conn} do
	- Pleroma.Config.put([:user, :deny_follow_blocked], true)
	- user2 = insert(:user)
	-
	- {:ok, _user_block} = Pleroma.User.block(user2, user)
	-
	- response =
	- conn
	- \|> post("/ostatus_subscribe", %{"user" => %{"id" => user2.id}})
	- \|> response(200)
	-
	- assert response =~ "Error following account"
	- end
	-
	- test "returns error on insufficient permissions", %{user: user, conn: conn} do
	- user2 = insert(:user)
	-
	- for token <- [nil, insert(:oauth_token, user: user, scopes: ["read"])] do
	- response =
	- conn
	- \|> assign(:token, token)
	- \|> post("/ostatus_subscribe", %{"user" => %{"id" => user2.id}})
	- \|> response(200)
	-
	- assert response =~ "Error following account"
	- end
	- end
	-
	- test "returns error when followee not found", %{conn: conn} do
	- response =
	- conn
	- \|> post("/ostatus_subscribe", %{"user" => %{"id" => "jimm"}})
	- \|> response(200)
	-
	- assert response =~ "Error following account"
	- end
	-
	- test "returns success result when user already in followers", %{user: user, conn: conn} do
	- user2 = insert(:user)
	- {:ok, _, _, _} = CommonAPI.follow(user, user2)
	-
	- response =
	- conn
	- \|> post("/ostatus_subscribe", %{"user" => %{"id" => user2.id}})
	- \|> response(200)
	-
	- assert response =~ "Account followed!"
	- end
	- end
	-
	- describe "POST /ostatus_subscribe - do_remote_follow/2 without assigned user" do
	- test "follows", %{conn: conn} do
	- user = insert(:user)
	- user2 = insert(:user)
	-
	- response =
	- conn
	- \|> post("/ostatus_subscribe", %{
	- "authorization" => %{"name" => user.nickname, "password" => "test", "id" => user2.id}
	- })
	- \|> response(200)
	-
	- assert response =~ "Account followed!"
	- assert user2.follower_address in User.following(user)
	- end
	-
	- test "returns error when followee not found", %{conn: conn} do
	- user = insert(:user)
	-
	- response =
	- conn
	- \|> post("/ostatus_subscribe", %{
	- "authorization" => %{"name" => user.nickname, "password" => "test", "id" => "jimm"}
	- })
	- \|> response(200)
	-
	- assert response =~ "Error following account"
	- end
	-
	- test "returns error when login invalid", %{conn: conn} do
	- user = insert(:user)
	-
	- response =
	- conn
	- \|> post("/ostatus_subscribe", %{
	- "authorization" => %{"name" => "jimm", "password" => "test", "id" => user.id}
	- })
	- \|> response(200)
	-
	- assert response =~ "Wrong username or password"
	- end
	-
	- test "returns error when password invalid", %{conn: conn} do
	- user = insert(:user)
	- user2 = insert(:user)
	-
	- response =
	- conn
	- \|> post("/ostatus_subscribe", %{
	- "authorization" => %{"name" => user.nickname, "password" => "42", "id" => user2.id}
	- })
	- \|> response(200)
	-
	- assert response =~ "Wrong username or password"
	- end
	-
	- test "returns error when user is blocked", %{conn: conn} do
	- Pleroma.Config.put([:user, :deny_follow_blocked], true)
	- user = insert(:user)
	- user2 = insert(:user)
	- {:ok, _user_block} = Pleroma.User.block(user2, user)
	-
	- response =
	- conn
	- \|> post("/ostatus_subscribe", %{
	- "authorization" => %{"name" => user.nickname, "password" => "test", "id" => user2.id}
	- })
	- \|> response(200)
	-
	- assert response =~ "Error following account"
	- end
	- end
	-
	describe "GET /api/pleroma/healthcheck" do
	clear_config([:instance, :healthcheck])

	test "returns 503 when healthcheck disabled", %{conn: conn} do
	Pleroma.Config.put([:instance, :healthcheck], false)

	response =
	conn
	\|> get("/api/pleroma/healthcheck")
	\|> json_response(503)

	assert response == %{}
	end

	test "returns 200 when healthcheck enabled and all ok", %{conn: conn} do
	Pleroma.Config.put([:instance, :healthcheck], true)

	with_mock Pleroma.Healthcheck,
	system_info: fn -> %Pleroma.Healthcheck{healthy: true} end do
	response =
	conn
	\|> get("/api/pleroma/healthcheck")
	\|> json_response(200)

	assert %{
	"active" => _,
	"healthy" => true,
	"idle" => _,
	"memory_used" => _,
	"pool_size" => _
	} = response
	end
	end

	test "returns 503 when healthcheck enabled and health is false", %{conn: conn} do
	Pleroma.Config.put([:instance, :healthcheck], true)

	with_mock Pleroma.Healthcheck,
	system_info: fn -> %Pleroma.Healthcheck{healthy: false} end do
	response =
	conn
	\|> get("/api/pleroma/healthcheck")
	\|> json_response(503)

	assert %{
	"active" => _,
	"healthy" => false,
	"idle" => _,
	"memory_used" => _,
	"pool_size" => _
	} = response
	end
	end
	end

	describe "POST /api/pleroma/disable_account" do
	setup do: oauth_access(["write:accounts"])

	test "with valid permissions and password, it disables the account", %{conn: conn, user: user} do
	response =
	conn
	\|> post("/api/pleroma/disable_account", %{"password" => "test"})
	\|> json_response(:ok)

	assert response == %{"status" => "success"}
	ObanHelpers.perform_all()

	user = User.get_cached_by_id(user.id)

	assert user.deactivated == true
	end

	test "with valid permissions and invalid password, it returns an error", %{conn: conn} do
	user = insert(:user)

	response =
	conn
	\|> post("/api/pleroma/disable_account", %{"password" => "test1"})
	\|> json_response(:ok)

	assert response == %{"error" => "Invalid password."}
	user = User.get_cached_by_id(user.id)

	refute user.deactivated
	end
	end

	describe "GET /api/statusnet/version" do
	test "it returns version in xml format", %{conn: conn} do
	response =
	conn
	\|> put_req_header("accept", "application/xml")
	\|> get("/api/statusnet/version")
	\|> response(:ok)

	assert response == "<version>#{Pleroma.Application.named_version()}</version>"
	end

	test "it returns version in json format", %{conn: conn} do
	response =
	conn
	\|> put_req_header("accept", "application/json")
	\|> get("/api/statusnet/version")
	\|> json_response(:ok)

	assert response == "#{Pleroma.Application.named_version()}"
	end
	end

	describe "POST /main/ostatus - remote_subscribe/2" do
	test "renders subscribe form", %{conn: conn} do
	user = insert(:user)

	response =
	conn
	\|> post("/main/ostatus", %{"nickname" => user.nickname, "profile" => ""})
	\|> response(:ok)

	refute response =~ "Could not find user"
	assert response =~ "Remotely follow #{user.nickname}"
	end

	test "renders subscribe form with error when user not found", %{conn: conn} do
	response =
	conn
	\|> post("/main/ostatus", %{"nickname" => "nickname", "profile" => ""})
	\|> response(:ok)

	assert response =~ "Could not find user"
	refute response =~ "Remotely follow"
	end

	test "it redirect to webfinger url", %{conn: conn} do
	user = insert(:user)
	user2 = insert(:user, ap_id: "shp@social.heldscal.la")

	conn =
	conn
	\|> post("/main/ostatus", %{
	"user" => %{"nickname" => user.nickname, "profile" => user2.ap_id}
	})

	assert redirected_to(conn) ==
	"https://social.heldscal.la/main/ostatussub?profile=#{user.ap_id}"
	end

	test "it renders form with error when user not found", %{conn: conn} do
	user2 = insert(:user, ap_id: "shp@social.heldscal.la")

	response =
	conn
	\|> post("/main/ostatus", %{"user" => %{"nickname" => "jimm", "profile" => user2.ap_id}})
	\|> response(:ok)

	assert response =~ "Something went wrong."
	end
	end

	test "it returns new captcha", %{conn: conn} do
	with_mock Pleroma.Captcha,
	new: fn -> "test_captcha" end do
	resp =
	conn
	\|> get("/api/pleroma/captcha")
	\|> response(200)

	assert resp == "\"test_captcha\""
	assert called(Pleroma.Captcha.new())
	end
	end

	describe "POST /api/pleroma/change_email" do
	setup do: oauth_access(["write:accounts"])

	test "without permissions", %{conn: conn} do
	conn =
	conn
	\|> assign(:token, nil)
	\|> post("/api/pleroma/change_email")

	assert json_response(conn, 403) == %{"error" => "Insufficient permissions: write:accounts."}
	end

	test "with proper permissions and invalid password", %{conn: conn} do
	conn =
	post(conn, "/api/pleroma/change_email", %{
	"password" => "hi",
	"email" => "test@test.com"
	})

	assert json_response(conn, 200) == %{"error" => "Invalid password."}
	end

	test "with proper permissions, valid password and invalid email", %{
	conn: conn
	} do
	conn =
	post(conn, "/api/pleroma/change_email", %{
	"password" => "test",
	"email" => "foobar"
	})

	assert json_response(conn, 200) == %{"error" => "Email has invalid format."}
	end

	test "with proper permissions, valid password and no email", %{
	conn: conn
	} do
	conn =
	post(conn, "/api/pleroma/change_email", %{
	"password" => "test"
	})

	assert json_response(conn, 200) == %{"error" => "Email can't be blank."}
	end

	test "with proper permissions, valid password and blank email", %{
	conn: conn
	} do
	conn =
	post(conn, "/api/pleroma/change_email", %{
	"password" => "test",
	"email" => ""
	})

	assert json_response(conn, 200) == %{"error" => "Email can't be blank."}
	end

	test "with proper permissions, valid password and non unique email", %{
	conn: conn
	} do
	user = insert(:user)

	conn =
	post(conn, "/api/pleroma/change_email", %{
	"password" => "test",
	"email" => user.email
	})

	assert json_response(conn, 200) == %{"error" => "Email has already been taken."}
	end

	test "with proper permissions, valid password and valid email", %{
	conn: conn
	} do
	conn =
	post(conn, "/api/pleroma/change_email", %{
	"password" => "test",
	"email" => "cofe@foobar.com"
	})

	assert json_response(conn, 200) == %{"status" => "success"}
	end
	end

	describe "POST /api/pleroma/change_password" do
	setup do: oauth_access(["write:accounts"])

	test "without permissions", %{conn: conn} do
	conn =
	conn
	\|> assign(:token, nil)
	\|> post("/api/pleroma/change_password")

	assert json_response(conn, 403) == %{"error" => "Insufficient permissions: write:accounts."}
	end

	test "with proper permissions and invalid password", %{conn: conn} do
	conn =
	post(conn, "/api/pleroma/change_password", %{
	"password" => "hi",
	"new_password" => "newpass",
	"new_password_confirmation" => "newpass"
	})

	assert json_response(conn, 200) == %{"error" => "Invalid password."}
	end

	test "with proper permissions, valid password and new password and confirmation not matching",
	%{
	conn: conn
	} do
	conn =
	post(conn, "/api/pleroma/change_password", %{
	"password" => "test",
	"new_password" => "newpass",
	"new_password_confirmation" => "notnewpass"
	})

	assert json_response(conn, 200) == %{
	"error" => "New password does not match confirmation."
	}
	end

	test "with proper permissions, valid password and invalid new password", %{
	conn: conn
	} do
	conn =
	post(conn, "/api/pleroma/change_password", %{
	"password" => "test",
	"new_password" => "",
	"new_password_confirmation" => ""
	})

	assert json_response(conn, 200) == %{
	"error" => "New password can't be blank."
	}
	end

	test "with proper permissions, valid password and matching new password and confirmation", %{
	conn: conn,
	user: user
	} do
	conn =
	post(conn, "/api/pleroma/change_password", %{
	"password" => "test",
	"new_password" => "newpass",
	"new_password_confirmation" => "newpass"
	})

	assert json_response(conn, 200) == %{"status" => "success"}
	fetched_user = User.get_cached_by_id(user.id)
	assert Comeonin.Pbkdf2.checkpw("newpass", fetched_user.password_hash) == true
	end
	end

	describe "POST /api/pleroma/delete_account" do
	setup do: oauth_access(["write:accounts"])

	test "without permissions", %{conn: conn} do
	conn =
	conn
	\|> assign(:token, nil)
	\|> post("/api/pleroma/delete_account")

	assert json_response(conn, 403) ==
	%{"error" => "Insufficient permissions: write:accounts."}
	end

	test "with proper permissions and wrong or missing password", %{conn: conn} do
	for params <- [%{"password" => "hi"}, %{}] do
	ret_conn = post(conn, "/api/pleroma/delete_account", params)

	assert json_response(ret_conn, 200) == %{"error" => "Invalid password."}
	end
	end

	test "with proper permissions and valid password", %{conn: conn} do
	conn = post(conn, "/api/pleroma/delete_account", %{"password" => "test"})

	assert json_response(conn, 200) == %{"status" => "success"}
	end
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Sat, Sep 19, 6:03 AM (1 d, 13 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1768980
Default Alt Text: (98 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions