No OneTemporary
Actions

Authored By

Unknown

Size

42 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
	index bfd3a3ad7..bf63a22b3 100644
	--- a/lib/pleroma/user.ex
	+++ b/lib/pleroma/user.ex
	@@ -1,277 +1,287 @@
	defmodule Pleroma.User do
	use Ecto.Schema

	import Ecto.{Changeset, Query}
	alias Pleroma.{Repo, User, Object, Web, Activity, Notification}
	alias Comeonin.Pbkdf2
	alias Pleroma.Web.{OStatus, Websub}
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.ActivityPub.Utils

	schema "users" do
	field :bio, :string
	field :email, :string
	field :name, :string
	field :nickname, :string
	field :password_hash, :string
	field :password, :string, virtual: true
	field :password_confirmation, :string, virtual: true
	field :following, {:array, :string}, default: []
	field :ap_id, :string
	field :avatar, :map
	field :local, :boolean, default: true
	field :info, :map, default: %{}
	field :follower_address, :string
	has_many :notifications, Notification

	timestamps()
	end

	def avatar_url(user) do
	case user.avatar do
	%{"url" => [%{"href" => href} \| _]} -> href
	_ -> "https://placehold.it/48x48"
	end
	end

	def banner_url(user) do
	case user.info["banner"] do
	%{"url" => [%{"href" => href} \| _]} -> href
	_ -> nil
	end
	end

	def ap_id(%User{nickname: nickname}) do
	"#{Web.base_url}/users/#{nickname}"
	end

	def ap_followers(%User{} = user) do
	"#{ap_id(user)}/followers"
	end

	def follow_changeset(struct, params \\ %{}) do
	struct
	\|> cast(params, [:following])
	\|> validate_required([:following])
	end

	def info_changeset(struct, params \\ %{}) do
	struct
	\|> cast(params, [:info])
	\|> validate_required([:info])
	end

	def user_info(%User{} = user) do
	%{
	following_count: length(user.following),
	note_count: user.info["note_count"] \|\| 0,
	follower_count: user.info["follower_count"] \|\| 0
	}
	end

	@email_regex ~r/^[a-zA-Z0-9.!#$%&'+\/=?^_`{\|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)$/
	def remote_user_creation(params) do
	changes = %User{}
	\|> cast(params, [:bio, :name, :ap_id, :nickname, :info, :avatar])
	\|> validate_required([:name, :ap_id, :nickname])
	\|> unique_constraint(:nickname)
	\|> validate_format(:nickname, @email_regex)
	\|> validate_length(:bio, max: 5000)
	\|> validate_length(:name, max: 100)
	\|> put_change(:local, false)
	if changes.valid? do
	followers = User.ap_followers(%User{nickname: changes.changes[:nickname]})
	changes
	\|> put_change(:follower_address, followers)
	else
	changes
	end
	end

	def update_changeset(struct, params \\ %{}) do
	changeset = struct
	\|> cast(params, [:bio, :name])
	\|> unique_constraint(:nickname)
	\|> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
	\|> validate_length(:bio, min: 1, max: 1000)
	\|> validate_length(:name, min: 1, max: 100)
	end

	def password_update_changeset(struct, params) do
	changeset = struct
	\|> cast(params, [:password, :password_confirmation])
	\|> validate_required([:password, :password_confirmation])
	\|> validate_confirmation(:password)

	if changeset.valid? do
	hashed = Pbkdf2.hashpwsalt(changeset.changes[:password])
	changeset
	\|> put_change(:password_hash, hashed)
	else
	changeset
	end
	end

	def reset_password(user, data) do
	Repo.update(password_update_changeset(user, data))
	end

	def register_changeset(struct, params \\ %{}) do
	changeset = struct
	\|> cast(params, [:bio, :email, :name, :nickname, :password, :password_confirmation])
	\|> validate_required([:bio, :email, :name, :nickname, :password, :password_confirmation])
	\|> validate_confirmation(:password)
	\|> unique_constraint(:email)
	\|> unique_constraint(:nickname)
	\|> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
	\|> validate_format(:email, @email_regex)
	\|> validate_length(:bio, min: 1, max: 1000)
	\|> validate_length(:name, min: 1, max: 100)

	if changeset.valid? do
	hashed = Pbkdf2.hashpwsalt(changeset.changes[:password])
	ap_id = User.ap_id(%User{nickname: changeset.changes[:nickname]})
	followers = User.ap_followers(%User{nickname: changeset.changes[:nickname]})
	changeset
	\|> put_change(:password_hash, hashed)
	\|> put_change(:ap_id, ap_id)
	\|> put_change(:following, [followers])
	\|> put_change(:follower_address, followers)
	else
	changeset
	end
	end

	def follow(%User{} = follower, %User{} = followed) do
	ap_followers = followed.follower_address
	if following?(follower, followed) do
	{:error,
	"Could not follow user: #{followed.nickname} is already on your list."}
	else
	if !followed.local && follower.local do
	Websub.subscribe(follower, followed)
	end

	following = [ap_followers \| follower.following]
	\|> Enum.uniq

	follower = follower
	\|> follow_changeset(%{following: following})
	\|> Repo.update

	{:ok, followed} = update_follower_count(followed)

	follower
	end
	end

	def unfollow(%User{} = follower, %User{} = followed) do
	ap_followers = followed.follower_address
	if following?(follower, followed) do
	following = follower.following
	\|> List.delete(ap_followers)

	{ :ok, follower } = follower
	\|> follow_changeset(%{following: following})
	\|> Repo.update

	{:ok, followed} = update_follower_count(followed)

	{:ok, follower, Utils.fetch_latest_follow(follower, followed)}
	else
	{:error, "Not subscribed!"}
	end
	end

	def following?(%User{} = follower, %User{} = followed) do
	Enum.member?(follower.following, followed.follower_address)
	end

	def get_by_ap_id(ap_id) do
	Repo.get_by(User, ap_id: ap_id)
	end

	def get_cached_by_ap_id(ap_id) do
	key = "ap_id:#{ap_id}"
	Cachex.get!(:user_cache, key, fallback: fn(_) -> get_by_ap_id(ap_id) end)
	end

	def get_cached_by_nickname(nickname) do
	key = "nickname:#{nickname}"
	Cachex.get!(:user_cache, key, fallback: fn(_) -> get_or_fetch_by_nickname(nickname) end)
	end

	def get_by_nickname(nickname) do
	Repo.get_by(User, nickname: nickname)
	end

	def get_cached_user_info(user) do
	key = "user_info:#{user.id}"
	Cachex.get!(:user_cache, key, fallback: fn(_) -> user_info(user) end)
	end

	def get_or_fetch_by_nickname(nickname) do
	with %User{} = user <- get_by_nickname(nickname) do
	user
	else _e ->
	with [nick, domain] <- String.split(nickname, "@"),
	{:ok, user} <- OStatus.make_user(nickname) do
	user
	else _e -> nil
	end
	end
	end

	# TODO: these queries could be more efficient if the type in postgresql wasn't map, but array.
	def get_followers(%User{id: id, follower_address: follower_address}) do
	q = from u in User,
	where: fragment("? @> ?", u.following, ^follower_address ),
	where: u.id != ^id

	{:ok, Repo.all(q)}
	end

	def get_friends(%User{id: id, following: following}) do
	q = from u in User,
	where: u.follower_address in ^following,
	where: u.id != ^id

	{:ok, Repo.all(q)}
	end

	def update_note_count(%User{} = user) do
	note_count_query = from a in Object,
	where: fragment("?->>'actor' = ? and ?->>'type' = 'Note'", a.data, ^user.ap_id, a.data),
	select: count(a.id)

	note_count = Repo.one(note_count_query)

	new_info = Map.put(user.info, "note_count", note_count)

	cs = info_changeset(user, %{info: new_info})

	Repo.update(cs)
	end

	def update_follower_count(%User{} = user) do
	follower_count_query = from u in User,
	where: fragment("? @> ?", u.following, ^user.follower_address),
	select: count(u.id)

	follower_count = Repo.one(follower_count_query)

	new_info = Map.put(user.info, "follower_count", follower_count)

	cs = info_changeset(user, %{info: new_info})

	Repo.update(cs)
	end

	def get_notified_from_activity(%Activity{data: %{"to" => to}} = activity) do
	query = from u in User,
	where: u.ap_id in ^to,
	where: u.local == true

	Repo.all(query)
	end
	+
	+ def search(query, resolve) do
	+ if resolve do
	+ User.get_or_fetch_by_nickname(query)
	+ end
	+ q = from u in User,
	+ where: fragment("(to_tsvector('english', ?) \|\| to_tsvector('english', ?)) @@ plainto_tsquery('english', ?)", u.nickname, u.name, ^query),
	+ limit: 20
	+ Repo.all(q)
	+ end
	end
	diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
	index dacb0ebe3..9399dee86 100644
	--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
	+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
	@@ -1,371 +1,360 @@
	defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
	use Pleroma.Web, :controller
	alias Pleroma.{Repo, Activity, User, Notification}
	alias Pleroma.Web.OAuth.App
	alias Pleroma.Web
	alias Pleroma.Web.MastodonAPI.{StatusView, AccountView}
	alias Pleroma.Web.ActivityPub.ActivityPub
	alias Pleroma.Web.TwitterAPI.TwitterAPI
	alias Pleroma.Web.CommonAPI
	import Ecto.Query
	import Logger

	def create_app(conn, params) do
	with cs <- App.register_changeset(%App{}, params) \|> IO.inspect,
	{:ok, app} <- Repo.insert(cs) \|> IO.inspect do
	res = %{
	id: app.id,
	client_id: app.client_id,
	client_secret: app.client_secret
	}

	json(conn, res)
	end
	end

	def verify_credentials(%{assigns: %{user: user}} = conn, params) do
	account = AccountView.render("account.json", %{user: user})
	json(conn, account)
	end

	def user(conn, %{"id" => id}) do
	with %User{} = user <- Repo.get(User, id) do
	account = AccountView.render("account.json", %{user: user})
	json(conn, account)
	else
	_e -> conn
	\|> put_status(404)
	\|> json(%{error: "Can't find user"})
	end
	end

	@instance Application.get_env(:pleroma, :instance)

	def masto_instance(conn, _params) do
	response = %{
	uri: Web.base_url,
	title: Keyword.get(@instance, :name),
	description: "A Pleroma instance, an alternative fediverse server",
	version: Keyword.get(@instance, :version),
	email: Keyword.get(@instance, :email),
	urls: %{
	streaming_api: String.replace(Web.base_url, ["http","https"], "wss")
	},
	stats: %{
	user_count: 1,
	status_count: 2,
	domain_count: 3
	}
	}

	json(conn, response)
	end

	defp add_link_headers(conn, method, activities) do
	last = List.last(activities)
	first = List.first(activities)
	if last do
	min = last.id
	max = first.id
	next_url = mastodon_api_url(Pleroma.Web.Endpoint, method, max_id: min)
	prev_url = mastodon_api_url(Pleroma.Web.Endpoint, method, since_id: max)
	conn
	\|> put_resp_header("link", "<#{next_url}>; rel=\"next\", <#{prev_url}>; rel=\"prev\"")
	else
	conn
	end
	end

	def home_timeline(%{assigns: %{user: user}} = conn, params) do
	params = params
	\|> Map.put("type", ["Create", "Announce"])

	activities = ActivityPub.fetch_activities([user.ap_id \| user.following], params)
	\|> Enum.reverse

	conn
	\|> add_link_headers(:home_timeline, activities)
	\|> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
	end

	def public_timeline(%{assigns: %{user: user}} = conn, params) do
	params = params
	\|> Map.put("type", ["Create", "Announce"])
	\|> Map.put("local_only", !!params["local"])

	activities = ActivityPub.fetch_public_activities(params)
	\|> Enum.reverse

	conn
	\|> add_link_headers(:public_timeline, activities)
	\|> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
	end

	# TODO: Link headers
	def user_statuses(%{assigns: %{user: user}} = conn, params) do
	with %User{ap_id: ap_id} <- Repo.get(User, params["id"]) do
	params = params
	\|> Map.put("type", ["Create", "Announce"])
	\|> Map.put("actor_id", ap_id)

	activities = ActivityPub.fetch_activities([], params)
	\|> Enum.reverse

	render conn, StatusView, "index.json", %{activities: activities, for: user, as: :activity}
	end
	end

	def get_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with %Activity{} = activity <- Repo.get(Activity, id) do
	render conn, StatusView, "status.json", %{activity: activity, for: user}
	end
	end

	def get_context(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with %Activity{} = activity <- Repo.get(Activity, id),
	activities <- ActivityPub.fetch_activities_for_context(activity.data["object"]["context"]),
	activities <- activities \|> Enum.filter(fn (%{id: aid}) -> to_string(aid) != to_string(id) end),
	grouped_activities <- Enum.group_by(activities, fn (%{id: id}) -> id < activity.id end) do
	result = %{
	ancestors: StatusView.render("index.json", for: user, activities: grouped_activities[true] \|\| [], as: :activity) \|> Enum.reverse,
	descendants: StatusView.render("index.json", for: user, activities: grouped_activities[false] \|\| [], as: :activity) \|> Enum.reverse,
	}

	json(conn, result)
	end
	end

	def post_status(%{assigns: %{user: user}} = conn, %{"status" => status} = params) do
	params = params
	\|> Map.put("in_reply_to_status_id", params["in_reply_to_id"])

	{:ok, activity} = CommonAPI.post(user, params)
	render conn, StatusView, "status.json", %{activity: activity, for: user, as: :activity}
	end

	def delete_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	with {:ok, %Activity{}} <- CommonAPI.delete(id, user) do
	json(conn, %{})
	else
	_e ->
	conn
	\|> put_status(403)
	\|> json(%{error: "Can't delete this post"})
	end
	end

	def reblog_status(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
	with {:ok, _announce, %{data: %{"id" => id}}} = CommonAPI.repeat(ap_id_or_id, user),
	%Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
	render conn, StatusView, "status.json", %{activity: activity, for: user, as: :activity}
	end
	end

	def fav_status(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
	with {:ok, _fav, %{data: %{"id" => id}}} = CommonAPI.favorite(ap_id_or_id, user),
	%Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
	render conn, StatusView, "status.json", %{activity: activity, for: user, as: :activity}
	end
	end

	def unfav_status(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
	with {:ok, %{data: %{"id" => id}}} = CommonAPI.unfavorite(ap_id_or_id, user),
	%Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do
	render conn, StatusView, "status.json", %{activity: activity, for: user, as: :activity}
	end
	end

	def notifications(%{assigns: %{user: user}} = conn, params) do
	notifications = Notification.for_user(user, params)
	result = Enum.map(notifications, fn (%{id: id, activity: activity, inserted_at: created_at}) ->
	actor = User.get_cached_by_ap_id(activity.data["actor"])
	created_at = NaiveDateTime.to_iso8601(created_at)
	\|> String.replace(~r/(\.\d+)?$/, ".000Z", global: false)
	case activity.data["type"] do
	"Create" ->
	%{id: id, type: "mention", created_at: created_at, account: AccountView.render("account.json", %{user: actor}), status: StatusView.render("status.json", %{activity: activity})}
	"Like" ->
	liked_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"])
	%{id: id, type: "favourite", created_at: created_at, account: AccountView.render("account.json", %{user: actor}), status: StatusView.render("status.json", %{activity: liked_activity})}
	"Announce" ->
	announced_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"])
	%{id: id, type: "reblog", created_at: created_at, account: AccountView.render("account.json", %{user: actor}), status: StatusView.render("status.json", %{activity: announced_activity})}
	"Follow" ->
	%{id: id, type: "follow", created_at: created_at, account: AccountView.render("account.json", %{user: actor})}
	_ -> nil
	end
	end)
	\|> Enum.filter(&(&1))

	conn
	\|> add_link_headers(:notifications, notifications)
	\|> json(result)
	end

	def relationships(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	id = List.wrap(id)
	q = from u in User,
	where: u.id in ^id
	targets = Repo.all(q)
	render conn, AccountView, "relationships.json", %{user: user, targets: targets}
	end

	def upload(%{assigns: %{user: user}} = conn, %{"file" => file}) do
	with {:ok, object} <- ActivityPub.upload(file) do
	data = object.data
	\|> Map.put("id", object.id)

	render conn, StatusView, "attachment.json", %{attachment: data}
	end
	end

	def favourited_by(conn, %{"id" => id}) do
	with %Activity{data: %{"object" => %{"likes" => likes} = data}} <- Repo.get(Activity, id) do
	q = from u in User,
	where: u.ap_id in ^likes
	users = Repo.all(q)
	render conn, AccountView, "accounts.json", %{users: users, as: :user}
	else
	_ -> json(conn, [])
	end
	end

	def reblogged_by(conn, %{"id" => id}) do
	with %Activity{data: %{"object" => %{"announcements" => announces}}} <- Repo.get(Activity, id) do
	q = from u in User,
	where: u.ap_id in ^announces
	users = Repo.all(q)
	render conn, AccountView, "accounts.json", %{users: users, as: :user}
	else
	_ -> json(conn, [])
	end
	end

	# TODO: Link headers
	def hashtag_timeline(%{assigns: %{user: user}} = conn, params) do
	params = params
	\|> Map.put("type", "Create")
	\|> Map.put("local_only", !!params["local"])

	activities = ActivityPub.fetch_public_activities(params)
	\|> Enum.reverse

	conn
	\|> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
	end

	# TODO: Pagination
	def followers(conn, %{"id" => id}) do
	with %User{} = user <- Repo.get(User, id),
	{:ok, followers} <- User.get_followers(user) do
	render conn, AccountView, "accounts.json", %{users: followers, as: :user}
	end
	end

	def following(conn, %{"id" => id}) do
	with %User{} = user <- Repo.get(User, id),
	{:ok, followers} <- User.get_friends(user) do
	render conn, AccountView, "accounts.json", %{users: followers, as: :user}
	end
	end

	def follow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
	with %User{} = followed <- Repo.get(User, id),
	{:ok, follower} <- User.follow(follower, followed),
	{:ok, activity} <- ActivityPub.follow(follower, followed) do
	render conn, AccountView, "relationship.json", %{user: follower, target: followed}
	else
	{:error, message} = err ->
	conn
	\|> put_resp_content_type("application/json")
	\|> send_resp(403, Poison.encode!(%{"error" => message}))
	end
	end

	def follow(%{assigns: %{user: follower}} = conn, %{"uri" => uri}) do
	with %User{} = followed <- Repo.get_by(User, nickname: uri),
	{:ok, follower} <- User.follow(follower, followed),
	{:ok, activity} <- ActivityPub.follow(follower, followed) do
	render conn, AccountView, "account.json", %{user: followed}
	else
	{:error, message} = err ->
	conn
	\|> put_resp_content_type("application/json")
	\|> send_resp(403, Poison.encode!(%{"error" => message}))
	end
	end

	# TODO: Clean up and unify
	def unfollow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
	with %User{} = followed <- Repo.get(User, id),
	{ :ok, follower, follow_activity } <- User.unfollow(follower, followed),
	{ :ok, _activity } <- ActivityPub.insert(%{
	"type" => "Undo",
	"actor" => follower.ap_id,
	"object" => follow_activity.data["id"] # get latest Follow for these users
	}) do
	render conn, AccountView, "relationship.json", %{user: follower, target: followed}
	end
	end

	- def dousersearch(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
	- if params["resolve"] == "true" do
	- User.get_or_fetch_by_nickname(query)
	- end
	-
	- q = from u in User,
	- where: fragment("(to_tsvector('english', ?) \|\| to_tsvector('english', ?)) @@ plainto_tsquery('english', ?)", u.nickname, u.name, ^query),
	- limit: 20
	- accounts = Repo.all(q)
	- end
	-
	def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
	- accounts = Pleroma.Web.MastodonAPI.MastodonAPIController.dousersearch(conn, params)
	+ accounts = User.search(query, params["resolve"] == "true")

	q = from a in Activity,
	where: fragment("?->>'type' = 'Create'", a.data),
	where: fragment("to_tsvector('english', ?->'object'->>'content') @@ plainto_tsquery('english', ?)", a.data, ^query),
	limit: 20
	statuses = Repo.all(q)

	res = %{
	"accounts" => AccountView.render("accounts.json", users: accounts, for: user, as: :user),
	"statuses" => StatusView.render("index.json", activities: statuses, for: user, as: :activity),
	"hashtags" => []
	}

	json(conn, res)
	end

	- def accountsearch(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
	- accounts = Pleroma.Web.MastodonAPI.MastodonAPIController.dousersearch(conn, params)
	+ def account_search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
	+ accounts = User.search(query, params["resolve"] == "true")

	res = AccountView.render("accounts.json", users: accounts, for: user, as: :user)

	json(conn, res)
	end

	def favourites(%{assigns: %{user: user}} = conn, params) do
	params = conn
	\|> Map.put("type", "Create")
	\|> Map.put("favorited_by", user.ap_id)

	activities = ActivityPub.fetch_activities([], params)
	\|> Enum.reverse

	conn
	\|> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
	end

	def relationship_noop(%{assigns: %{user: user}} = conn, %{"id" => id}) do
	Logger.debug("Unimplemented, returning unmodified relationship")
	with %User{} = target <- Repo.get(User, id) do
	render conn, AccountView, "relationship.json", %{user: user, target: target}
	end
	end

	def empty_array(conn, _) do
	Logger.debug("Unimplemented, returning an empty array")
	json(conn, [])
	end
	end
	diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
	index 53f4a45e3..1fb5eadf6 100644
	--- a/lib/pleroma/web/router.ex
	+++ b/lib/pleroma/web/router.ex
	@@ -1,219 +1,219 @@
	defmodule Pleroma.Web.Router do
	use Pleroma.Web, :router

	alias Pleroma.{Repo, User, Web.Router}

	def user_fetcher(username) do
	{:ok, Repo.get_by(User, %{nickname: username})}
	end

	pipeline :api do
	plug :accepts, ["json"]
	plug :fetch_session
	plug Pleroma.Plugs.OAuthPlug
	plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1, optional: true}
	end

	pipeline :authenticated_api do
	plug :accepts, ["json"]
	plug :fetch_session
	plug Pleroma.Plugs.OAuthPlug
	plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1}
	end

	pipeline :well_known do
	plug :accepts, ["xml", "xrd+xml"]
	end

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

	pipeline :oauth do
	plug :accepts, ["html", "json"]
	end

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

	scope "/api/pleroma", Pleroma.Web.TwitterAPI do
	pipe_through :pleroma_api
	get "/password_reset/:token", UtilController, :show_password_reset
	post "/password_reset", UtilController, :password_reset
	get "/emoji", UtilController, :emoji
	end

	scope "/oauth", Pleroma.Web.OAuth do
	get "/authorize", OAuthController, :authorize
	post "/authorize", OAuthController, :create_authorization
	post "/token", OAuthController, :token_exchange
	end

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

	get "/accounts/verify_credentials", MastodonAPIController, :verify_credentials
	get "/accounts/relationships", MastodonAPIController, :relationships
	- get "/accounts/search", MastodonAPIController, :accountsearch
	+ get "/accounts/search", MastodonAPIController, :account_search
	post "/accounts/:id/follow", MastodonAPIController, :follow
	post "/accounts/:id/unfollow", MastodonAPIController, :unfollow
	post "/accounts/:id/block", MastodonAPIController, :relationship_noop
	post "/accounts/:id/unblock", MastodonAPIController, :relationship_noop
	post "/accounts/:id/mute", MastodonAPIController, :relationship_noop
	post "/accounts/:id/unmute", MastodonAPIController, :relationship_noop

	post "/follows", MastodonAPIController, :follow

	get "/blocks", MastodonAPIController, :empty_array
	get "/domain_blocks", MastodonAPIController, :empty_array
	get "/follow_requests", MastodonAPIController, :empty_array
	get "/mutes", MastodonAPIController, :empty_array

	get "/timelines/home", MastodonAPIController, :home_timeline

	get "/favourites", MastodonAPIController, :favourites

	post "/statuses", MastodonAPIController, :post_status
	delete "/statuses/:id", MastodonAPIController, :delete_status

	post "/statuses/:id/reblog", MastodonAPIController, :reblog_status
	post "/statuses/:id/favourite", MastodonAPIController, :fav_status
	post "/statuses/:id/unfavourite", MastodonAPIController, :unfav_status

	get "/notifications", MastodonAPIController, :notifications

	post "/media", MastodonAPIController, :upload
	end

	scope "/api/v1", Pleroma.Web.MastodonAPI do
	pipe_through :api
	get "/instance", MastodonAPIController, :masto_instance
	post "/apps", MastodonAPIController, :create_app

	get "/timelines/public", MastodonAPIController, :public_timeline
	get "/timelines/tag/:tag", MastodonAPIController, :hashtag_timeline

	get "/statuses/:id", MastodonAPIController, :get_status
	get "/statuses/:id/context", MastodonAPIController, :get_context
	get "/statuses/:id/favourited_by", MastodonAPIController, :favourited_by
	get "/statuses/:id/reblogged_by", MastodonAPIController, :reblogged_by

	get "/accounts/:id/statuses", MastodonAPIController, :user_statuses
	get "/accounts/:id/followers", MastodonAPIController, :followers
	get "/accounts/:id/following", MastodonAPIController, :following
	get "/accounts/:id", MastodonAPIController, :user

	get "/search", MastodonAPIController, :search
	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
	end

	@instance Application.get_env(:pleroma, :instance)
	@registrations_open Keyword.get(@instance, :registrations_open)

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

	get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline
	get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_and_external_timeline
	get "/statuses/networkpublic_timeline", TwitterAPI.Controller, :public_and_external_timeline
	get "/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
	get "/qvitter/statuses/user_timeline", TwitterAPI.Controller, :user_timeline

	get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
	get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation

	if @registrations_open do
	post "/account/register", TwitterAPI.Controller, :register
	end

	get "/search", TwitterAPI.Controller, :search
	get "/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline
	get "/externalprofile/show", TwitterAPI.Controller, :external_profile
	end

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

	get "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
	post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials

	post "/account/update_profile", TwitterAPI.Controller, :update_profile
	post "/account/update_profile_banner", TwitterAPI.Controller, :update_banner
	post "/qvitter/update_background_image", TwitterAPI.Controller, :update_background

	post "/account/most_recent_notification", TwitterAPI.Controller, :update_most_recent_notification

	get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline
	get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
	get "/statuses/mentions", TwitterAPI.Controller, :mentions_timeline
	get "/statuses/mentions_timeline", TwitterAPI.Controller, :mentions_timeline

	post "/statuses/update", TwitterAPI.Controller, :status_update
	post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
	post "/statuses/destroy/:id", TwitterAPI.Controller, :delete_post

	post "/friendships/create", TwitterAPI.Controller, :follow
	post "/friendships/destroy", TwitterAPI.Controller, :unfollow

	post "/statusnet/media/upload", TwitterAPI.Controller, :upload
	post "/media/upload", TwitterAPI.Controller, :upload_json

	post "/favorites/create/:id", TwitterAPI.Controller, :favorite
	post "/favorites/create", TwitterAPI.Controller, :favorite
	post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite

	post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar

	get "/statuses/followers", TwitterAPI.Controller, :followers
	get "/statuses/friends", TwitterAPI.Controller, :friends
	end

	pipeline :ostatus do
	plug :accepts, ["xml", "atom", "html"]
	end

	scope "/", Pleroma.Web do
	pipe_through :ostatus

	get "/objects/:uuid", OStatus.OStatusController, :object
	get "/activities/:uuid", OStatus.OStatusController, :activity

	get "/users/:nickname/feed", OStatus.OStatusController, :feed
	get "/users/:nickname", OStatus.OStatusController, :feed_redirect
	post "/users/:nickname/salmon", OStatus.OStatusController, :salmon_incoming
	post "/push/hub/:nickname", Websub.WebsubController, :websub_subscription_request
	get "/push/subscriptions/:id", Websub.WebsubController, :websub_subscription_confirmation
	post "/push/subscriptions/:id", Websub.WebsubController, :websub_incoming
	end

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

	get "/host-meta", WebFinger.WebFingerController, :host_meta
	get "/webfinger", WebFinger.WebFingerController, :webfinger
	end

	scope "/", Fallback do
	get "/*path", RedirectController, :redirector
	end
	end

	defmodule Fallback.RedirectController do
	use Pleroma.Web, :controller
	def redirector(conn, _params) do
	if Mix.env != :test do
	conn
	\|> put_resp_content_type("text/html")
	\|> send_file(200, "priv/static/index.html")
	end
	end
	end
	diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
	index acdb08ac2..485a0d029 100644
	--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
	+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
	@@ -1,369 +1,382 @@
	defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
	use Pleroma.Web.ConnCase

	alias Pleroma.Web.TwitterAPI.TwitterAPI
	alias Pleroma.{Repo, User, Activity}
	alias Pleroma.Web.{OStatus, CommonAPI}

	import Pleroma.Factory

	test "the home timeline", %{conn: conn} do
	user = insert(:user)
	following = insert(:user)

	{:ok, _activity} = TwitterAPI.create_status(following, %{"status" => "test"})

	conn = conn
	\|> assign(:user, user)
	\|> get("/api/v1/timelines/home")

	assert length(json_response(conn, 200)) == 0

	{:ok, user} = User.follow(user, following)

	conn = build_conn()
	\|> assign(:user, user)
	\|> get("/api/v1/timelines/home")

	assert [%{"content" => "test"}] = json_response(conn, 200)
	end

	test "the public timeline", %{conn: conn} do
	following = insert(:user)

	{:ok, _activity} = TwitterAPI.create_status(following, %{"status" => "test"})
	{:ok, [_activity]} = OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873")

	conn = conn
	\|> get("/api/v1/timelines/public")

	assert length(json_response(conn, 200)) == 2

	conn = build_conn()
	\|> get("/api/v1/timelines/public", %{"local" => "True"})

	assert [%{"content" => "test"}] = json_response(conn, 200)
	end

	test "posting a status", %{conn: conn} do
	user = insert(:user)

	conn = conn
	\|> assign(:user, user)
	\|> post("/api/v1/statuses", %{"status" => "cofe"})

	assert %{"content" => "cofe", "id" => id} = json_response(conn, 200)
	assert Repo.get(Activity, id)
	end

	test "replying to a status", %{conn: conn} do
	user = insert(:user)

	{:ok, replied_to} = TwitterAPI.create_status(user, %{"status" => "cofe"})

	conn = conn
	\|> assign(:user, user)
	\|> post("/api/v1/statuses", %{"status" => "xD", "in_reply_to_id" => replied_to.id})

	assert %{"content" => "xD", "id" => id} = json_response(conn, 200)

	activity = Repo.get(Activity, id)

	assert activity.data["context"] == replied_to.data["context"]
	assert activity.data["object"]["inReplyToStatusId"] == replied_to.id
	end

	test "verify_credentials", %{conn: conn} do
	user = insert(:user)

	conn = conn
	\|> assign(:user, user)
	\|> get("/api/v1/accounts/verify_credentials")

	assert %{"id" => id} = json_response(conn, 200)
	assert id == user.id
	end

	test "get a status", %{conn: conn} do
	activity = insert(:note_activity)

	conn = conn
	\|> get("/api/v1/statuses/#{activity.id}")

	assert %{"id" => id} = json_response(conn, 200)
	assert id == activity.id
	end

	describe "deleting a status" do
	test "when you created it", %{conn: conn} do
	activity = insert(:note_activity)
	author = User.get_by_ap_id(activity.data["actor"])

	conn = conn
	\|> assign(:user, author)
	\|> delete("/api/v1/statuses/#{activity.id}")

	assert %{} = json_response(conn, 200)

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

	test "when you didn't create it", %{conn: conn} do
	activity = insert(:note_activity)
	user = insert(:user)

	conn = conn
	\|> assign(:user, user)
	\|> delete("/api/v1/statuses/#{activity.id}")

	assert %{"error" => _} = json_response(conn, 403)

	assert Repo.get(Activity, activity.id) == activity
	end
	end

	describe "reblogging" do
	test "reblogs and returns the reblogged status", %{conn: conn} do
	activity = insert(:note_activity)
	user = insert(:user)

	conn = conn
	\|> assign(:user, user)
	\|> post("/api/v1/statuses/#{activity.id}/reblog")

	assert %{"id" => id, "reblogged" => true, "reblogs_count" => 1} = json_response(conn, 200)
	assert activity.id == id
	end
	end

	describe "favoriting" do
	test "favs a status and returns it", %{conn: conn} do
	activity = insert(:note_activity)
	user = insert(:user)

	conn = conn
	\|> assign(:user, user)
	\|> post("/api/v1/statuses/#{activity.id}/favourite")

	assert %{"id" => id, "favourites_count" => 1, "favourited" => true} = json_response(conn, 200)
	assert activity.id == id
	end
	end

	describe "unfavoriting" do
	test "unfavorites a status and returns it", %{conn: conn} do
	activity = insert(:note_activity)
	user = insert(:user)

	{:ok, _, _} = CommonAPI.favorite(activity.id, user)

	conn = conn
	\|> assign(:user, user)
	\|> post("/api/v1/statuses/#{activity.id}/unfavourite")

	assert %{"id" => id, "favourites_count" => 0, "favourited" => false} = json_response(conn, 200)
	assert activity.id == id
	end
	end

	describe "user timelines" do
	test "gets a users statuses", %{conn: conn} do
	_note = insert(:note_activity)
	note_two = insert(:note_activity)

	user = User.get_by_ap_id(note_two.data["actor"])

	conn = conn
	\|> get("/api/v1/accounts/#{user.id}/statuses")

	assert [%{"id" => id}] = json_response(conn, 200)

	assert id == note_two.id
	end
	end

	describe "user relationships" do
	test "returns the relationships for the current user", %{conn: conn} do
	user = insert(:user)
	other_user = insert(:user)
	{:ok, user} = User.follow(user, other_user)

	conn = conn
	\|> assign(:user, user)
	\|> get("/api/v1/accounts/relationships", %{"id" => [other_user.id]})

	assert [relationship] = json_response(conn, 200)

	assert other_user.id == relationship["id"]
	end
	end

	test "account fetching", %{conn: conn} do
	user = insert(:user)

	conn = conn
	\|> get("/api/v1/accounts/#{user.id}")

	assert %{"id" => id} = json_response(conn, 200)
	assert id == user.id

	conn = build_conn()
	\|> get("/api/v1/accounts/-1")

	assert %{"error" => "Can't find user"} = json_response(conn, 404)
	end

	test "media upload", %{conn: conn} do
	file = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg"}

	user = insert(:user)

	conn = conn
	\|> assign(:user, user)
	\|> post("/api/v1/media", %{"file" => file})

	assert media = json_response(conn, 200)

	assert media["type"] == "image"
	end

	test "hashtag timeline", %{conn: conn} do
	following = insert(:user)

	{:ok, activity} = TwitterAPI.create_status(following, %{"status" => "test #2hu"})
	{:ok, [_activity]} = OStatus.fetch_activity_from_url("https://shitposter.club/notice/2827873")

	conn = conn
	\|> get("/api/v1/timelines/tag/2hu")

	assert [%{"id" => id}] = json_response(conn, 200)

	assert id == activity.id
	end

	test "getting followers", %{conn: conn} do
	user = insert(:user)
	other_user = insert(:user)
	{:ok, user} = User.follow(user, other_user)

	conn = conn
	\|> get("/api/v1/accounts/#{other_user.id}/followers")

	assert [%{"id" => id}] = json_response(conn, 200)
	assert id = user.id
	end

	test "getting following", %{conn: conn} do
	user = insert(:user)
	other_user = insert(:user)
	{:ok, user} = User.follow(user, other_user)

	conn = conn
	\|> get("/api/v1/accounts/#{user.id}/following")

	assert [%{"id" => id}] = json_response(conn, 200)
	assert id = other_user.id
	end

	test "following / unfollowing a user", %{conn: conn} do
	user = insert(:user)
	other_user = insert(:user)

	conn = conn
	\|> assign(:user, user)
	\|> post("/api/v1/accounts/#{other_user.id}/follow")

	assert %{"id" => id, "following" => true} = json_response(conn, 200)

	user = Repo.get(User, user.id)
	conn = build_conn()
	\|> assign(:user, user)
	\|> post("/api/v1/accounts/#{other_user.id}/unfollow")

	assert %{"id" => id, "following" => false} = json_response(conn, 200)

	user = Repo.get(User, user.id)
	conn = build_conn()
	\|> assign(:user, user)
	\|> post("/api/v1/follows", %{"uri" => other_user.nickname})

	assert %{"id" => id} = json_response(conn, 200)
	assert id == other_user.id
	end

	test "unimplemented block/mute endpoints" do
	user = insert(:user)
	other_user = insert(:user)

	["block", "unblock", "mute", "unmute"]
	\|> Enum.each(fn(endpoint) ->
	conn = build_conn()
	\|> assign(:user, user)
	\|> post("/api/v1/accounts/#{other_user.id}/#{endpoint}")

	assert %{"id" => id} = json_response(conn, 200)
	assert id == other_user.id
	end)
	end

	test "unimplemented mutes, follow_requests, blocks, domain blocks" do
	user = insert(:user)

	["blocks", "domain_blocks", "mutes", "follow_requests"]
	\|> Enum.each(fn(endpoint) ->
	conn = build_conn()
	\|> assign(:user, user)
	\|> get("/api/v1/#{endpoint}")

	assert [] = json_response(conn, 200)
	end)
	end

	+ test "account seach", %{conn: conn} do
	+ user = insert(:user)
	+ user_two = insert(:user, %{nickname: "shp@shitposter.club"})
	+ user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})
	+
	+ conn = conn
	+ \|> assign(:user, user)
	+ \|> get("/api/v1/accounts/search", %{"q" => "2hu"})
	+
	+ assert [account] = json_response(conn, 200)
	+ assert account["id"] == user_three.id
	+ end
	+
	test "search", %{conn: conn} do
	user = insert(:user)
	user_two = insert(:user, %{nickname: "shp@shitposter.club"})
	user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})

	{:ok, activity} = CommonAPI.post(user, %{"status" => "This is about 2hu"})
	{:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"})

	conn = conn
	\|> get("/api/v1/search", %{"q" => "2hu"})

	assert results = json_response(conn, 200)

	[account] = results["accounts"]
	assert account["id"] == user_three.id

	assert results["hashtags"] == []

	[status] = results["statuses"]
	assert status["id"] == activity.id
	end

	test "search fetches remote accounts", %{conn: conn} do
	conn = conn
	\|> get("/api/v1/search", %{"q" => "shp@social.heldscal.la", "resolve" => "true"})

	assert results = json_response(conn, 200)
	[account] = results["accounts"]
	assert account["acct"] == "shp@social.heldscal.la"
	end

	test "returns the favorites of a user", %{conn: conn} do
	user = insert(:user)
	other_user = insert(:user)

	{:ok, _} = CommonAPI.post(other_user, %{"status" => "bla"})
	{:ok, activity} = CommonAPI.post(other_user, %{"status" => "traps are happy"})

	{:ok, _, _} = CommonAPI.favorite(activity.id, user)

	conn = conn
	\|> assign(:user, user)
	\|> get("/api/v1/favourites")

	assert [status] = json_response(conn, 200)
	assert status["id"] == activity.id
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Fri, Oct 30, 2:38 AM (1 d, 10 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1799231
Default Alt Text: (42 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions