|
|
@ -17,7 +17,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
|
|
|
|
|
|
|
|
def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
|
|
|
|
def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
|
|
|
|
token = Phoenix.Token.sign(conn, "user socket", user.id)
|
|
|
|
token = Phoenix.Token.sign(conn, "user socket", user.id)
|
|
|
|
render(conn, UserView, "show.json", %{user: user, token: token})
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("show.json", %{user: user, token: token})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def status_update(%{assigns: %{user: user}} = conn, %{"status" => _} = status_data) do
|
|
|
|
def status_update(%{assigns: %{user: user}} = conn, %{"status" => _} = status_data) do
|
|
|
@ -58,7 +61,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
activities = ActivityPub.fetch_public_activities(params)
|
|
|
|
activities = ActivityPub.fetch_public_activities(params)
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(ActivityView, "index.json", %{activities: activities, for: user})
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("index.json", %{activities: activities, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def public_timeline(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
def public_timeline(%{assigns: %{user: user}} = conn, params) do
|
|
|
@ -71,7 +75,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
activities = ActivityPub.fetch_public_activities(params)
|
|
|
|
activities = ActivityPub.fetch_public_activities(params)
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(ActivityView, "index.json", %{activities: activities, for: user})
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("index.json", %{activities: activities, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def friends_timeline(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
def friends_timeline(%{assigns: %{user: user}} = conn, params) do
|
|
|
@ -86,16 +91,22 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
|> ActivityPub.contain_timeline(user)
|
|
|
|
|> ActivityPub.contain_timeline(user)
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(ActivityView, "index.json", %{activities: activities, for: user})
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("index.json", %{activities: activities, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def show_user(conn, params) do
|
|
|
|
def show_user(conn, params) do
|
|
|
|
with {:ok, shown} <- TwitterAPI.get_user(params) do
|
|
|
|
with {:ok, shown} <- TwitterAPI.get_user(params) do
|
|
|
|
|
|
|
|
params =
|
|
|
|
if user = conn.assigns.user do
|
|
|
|
if user = conn.assigns.user do
|
|
|
|
render(conn, UserView, "show.json", %{user: shown, for: user})
|
|
|
|
%{user: shown, for: user}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
render(conn, UserView, "show.json", %{user: shown})
|
|
|
|
%{user: shown}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("show.json", params)
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{:error, msg} ->
|
|
|
|
{:error, msg} ->
|
|
|
|
bad_request_reply(conn, msg)
|
|
|
|
bad_request_reply(conn, msg)
|
|
|
@ -108,7 +119,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
activities = ActivityPub.fetch_user_activities(target_user, user, params)
|
|
|
|
activities = ActivityPub.fetch_user_activities(target_user, user, params)
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(ActivityView, "index.json", %{activities: activities, for: user})
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("index.json", %{activities: activities, for: user})
|
|
|
|
|
|
|
|
|
|
|
|
{:error, msg} ->
|
|
|
|
{:error, msg} ->
|
|
|
|
bad_request_reply(conn, msg)
|
|
|
|
bad_request_reply(conn, msg)
|
|
|
@ -124,7 +136,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
activities = ActivityPub.fetch_activities([user.ap_id], params)
|
|
|
|
activities = ActivityPub.fetch_activities([user.ap_id], params)
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(ActivityView, "index.json", %{activities: activities, for: user})
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("index.json", %{activities: activities, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def dm_timeline(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
def dm_timeline(%{assigns: %{user: user}} = conn, params) do
|
|
|
@ -137,14 +150,16 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
activities = Repo.all(query)
|
|
|
|
activities = Repo.all(query)
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(ActivityView, "index.json", %{activities: activities, for: user})
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("index.json", %{activities: activities, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def notifications(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
def notifications(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
notifications = Notification.for_user(user, params)
|
|
|
|
notifications = Notification.for_user(user, params)
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(NotificationView, "notification.json", %{notifications: notifications, for: user})
|
|
|
|
|> put_view(NotificationView)
|
|
|
|
|
|
|
|
|> render("notification.json", %{notifications: notifications, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def notifications_read(%{assigns: %{user: user}} = conn, %{"latest_id" => latest_id} = params) do
|
|
|
|
def notifications_read(%{assigns: %{user: user}} = conn, %{"latest_id" => latest_id} = params) do
|
|
|
@ -153,7 +168,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
notifications = Notification.for_user(user, params)
|
|
|
|
notifications = Notification.for_user(user, params)
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(NotificationView, "notification.json", %{notifications: notifications, for: user})
|
|
|
|
|> put_view(NotificationView)
|
|
|
|
|
|
|
|
|> render("notification.json", %{notifications: notifications, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def notifications_read(%{assigns: %{user: _user}} = conn, _) do
|
|
|
|
def notifications_read(%{assigns: %{user: _user}} = conn, _) do
|
|
|
@ -163,7 +179,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
def follow(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
def follow(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
case TwitterAPI.follow(user, params) do
|
|
|
|
case TwitterAPI.follow(user, params) do
|
|
|
|
{:ok, user, followed, _activity} ->
|
|
|
|
{:ok, user, followed, _activity} ->
|
|
|
|
render(conn, UserView, "show.json", %{user: followed, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("show.json", %{user: followed, for: user})
|
|
|
|
|
|
|
|
|
|
|
|
{:error, msg} ->
|
|
|
|
{:error, msg} ->
|
|
|
|
forbidden_json_reply(conn, msg)
|
|
|
|
forbidden_json_reply(conn, msg)
|
|
|
@ -173,7 +191,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
def block(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
def block(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
case TwitterAPI.block(user, params) do
|
|
|
|
case TwitterAPI.block(user, params) do
|
|
|
|
{:ok, user, blocked} ->
|
|
|
|
{:ok, user, blocked} ->
|
|
|
|
render(conn, UserView, "show.json", %{user: blocked, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("show.json", %{user: blocked, for: user})
|
|
|
|
|
|
|
|
|
|
|
|
{:error, msg} ->
|
|
|
|
{:error, msg} ->
|
|
|
|
forbidden_json_reply(conn, msg)
|
|
|
|
forbidden_json_reply(conn, msg)
|
|
|
@ -183,7 +203,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
def unblock(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
def unblock(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
case TwitterAPI.unblock(user, params) do
|
|
|
|
case TwitterAPI.unblock(user, params) do
|
|
|
|
{:ok, user, blocked} ->
|
|
|
|
{:ok, user, blocked} ->
|
|
|
|
render(conn, UserView, "show.json", %{user: blocked, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("show.json", %{user: blocked, for: user})
|
|
|
|
|
|
|
|
|
|
|
|
{:error, msg} ->
|
|
|
|
{:error, msg} ->
|
|
|
|
forbidden_json_reply(conn, msg)
|
|
|
|
forbidden_json_reply(conn, msg)
|
|
|
@ -192,14 +214,18 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
|
|
|
|
|
|
|
|
def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
with {:ok, activity} <- TwitterAPI.delete(user, id) do
|
|
|
|
with {:ok, activity} <- TwitterAPI.delete(user, id) do
|
|
|
|
render(conn, ActivityView, "activity.json", %{activity: activity, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("activity.json", %{activity: activity, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def unfollow(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
def unfollow(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
case TwitterAPI.unfollow(user, params) do
|
|
|
|
case TwitterAPI.unfollow(user, params) do
|
|
|
|
{:ok, user, unfollowed} ->
|
|
|
|
{:ok, user, unfollowed} ->
|
|
|
|
render(conn, UserView, "show.json", %{user: unfollowed, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("show.json", %{user: unfollowed, for: user})
|
|
|
|
|
|
|
|
|
|
|
|
{:error, msg} ->
|
|
|
|
{:error, msg} ->
|
|
|
|
forbidden_json_reply(conn, msg)
|
|
|
|
forbidden_json_reply(conn, msg)
|
|
|
@ -209,7 +235,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
with %Activity{} = activity <- Repo.get(Activity, id),
|
|
|
|
with %Activity{} = activity <- Repo.get(Activity, id),
|
|
|
|
true <- ActivityPub.visible_for_user?(activity, user) do
|
|
|
|
true <- ActivityPub.visible_for_user?(activity, user) do
|
|
|
|
render(conn, ActivityView, "activity.json", %{activity: activity, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("activity.json", %{activity: activity, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
@ -223,7 +251,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
"user" => user
|
|
|
|
"user" => user
|
|
|
|
}) do
|
|
|
|
}) do
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(ActivityView, "index.json", %{activities: activities, for: user})
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("index.json", %{activities: activities, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
@ -290,34 +319,44 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
with {_, {:ok, id}} <- {:param_cast, Ecto.Type.cast(:integer, id)},
|
|
|
|
with {_, {:ok, id}} <- {:param_cast, Ecto.Type.cast(:integer, id)},
|
|
|
|
{:ok, activity} <- TwitterAPI.fav(user, id) do
|
|
|
|
{:ok, activity} <- TwitterAPI.fav(user, id) do
|
|
|
|
render(conn, ActivityView, "activity.json", %{activity: activity, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("activity.json", %{activity: activity, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
with {_, {:ok, id}} <- {:param_cast, Ecto.Type.cast(:integer, id)},
|
|
|
|
with {_, {:ok, id}} <- {:param_cast, Ecto.Type.cast(:integer, id)},
|
|
|
|
{:ok, activity} <- TwitterAPI.unfav(user, id) do
|
|
|
|
{:ok, activity} <- TwitterAPI.unfav(user, id) do
|
|
|
|
render(conn, ActivityView, "activity.json", %{activity: activity, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("activity.json", %{activity: activity, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
with {_, {:ok, id}} <- {:param_cast, Ecto.Type.cast(:integer, id)},
|
|
|
|
with {_, {:ok, id}} <- {:param_cast, Ecto.Type.cast(:integer, id)},
|
|
|
|
{:ok, activity} <- TwitterAPI.repeat(user, id) do
|
|
|
|
{:ok, activity} <- TwitterAPI.repeat(user, id) do
|
|
|
|
render(conn, ActivityView, "activity.json", %{activity: activity, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("activity.json", %{activity: activity, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def unretweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
def unretweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
|
|
|
|
with {_, {:ok, id}} <- {:param_cast, Ecto.Type.cast(:integer, id)},
|
|
|
|
with {_, {:ok, id}} <- {:param_cast, Ecto.Type.cast(:integer, id)},
|
|
|
|
{:ok, activity} <- TwitterAPI.unrepeat(user, id) do
|
|
|
|
{:ok, activity} <- TwitterAPI.unrepeat(user, id) do
|
|
|
|
render(conn, ActivityView, "activity.json", %{activity: activity, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("activity.json", %{activity: activity, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def register(conn, params) do
|
|
|
|
def register(conn, params) do
|
|
|
|
with {:ok, user} <- TwitterAPI.register_user(params) do
|
|
|
|
with {:ok, user} <- TwitterAPI.register_user(params) do
|
|
|
|
render(conn, UserView, "show.json", %{user: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("show.json", %{user: user})
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{:error, errors} ->
|
|
|
|
{:error, errors} ->
|
|
|
|
conn
|
|
|
|
conn
|
|
|
@ -339,7 +378,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
{:ok, user} = User.update_and_set_cache(change)
|
|
|
|
{:ok, user} = User.update_and_set_cache(change)
|
|
|
|
CommonAPI.update(user)
|
|
|
|
CommonAPI.update(user)
|
|
|
|
|
|
|
|
|
|
|
|
render(conn, UserView, "show.json", %{user: user, for: user})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("show.json", %{user: user, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def update_banner(%{assigns: %{user: user}} = conn, params) do
|
|
|
|
def update_banner(%{assigns: %{user: user}} = conn, params) do
|
|
|
@ -394,7 +435,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
true -> followers
|
|
|
|
true -> followers
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
render(conn, UserView, "index.json", %{users: followers, for: conn.assigns[:user]})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("index.json", %{users: followers, for: conn.assigns[:user]})
|
|
|
|
else
|
|
|
|
else
|
|
|
|
_e -> bad_request_reply(conn, "Can't get followers")
|
|
|
|
_e -> bad_request_reply(conn, "Can't get followers")
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -410,7 +453,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
true -> friends
|
|
|
|
true -> friends
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
render(conn, UserView, "index.json", %{users: friends, for: conn.assigns[:user]})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("index.json", %{users: friends, for: conn.assigns[:user]})
|
|
|
|
else
|
|
|
|
else
|
|
|
|
_e -> bad_request_reply(conn, "Can't get friends")
|
|
|
|
_e -> bad_request_reply(conn, "Can't get friends")
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -419,7 +464,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
def friend_requests(conn, params) do
|
|
|
|
def friend_requests(conn, params) do
|
|
|
|
with {:ok, user} <- TwitterAPI.get_user(conn.assigns[:user], params),
|
|
|
|
with {:ok, user} <- TwitterAPI.get_user(conn.assigns[:user], params),
|
|
|
|
{:ok, friend_requests} <- User.get_follow_requests(user) do
|
|
|
|
{:ok, friend_requests} <- User.get_follow_requests(user) do
|
|
|
|
render(conn, UserView, "index.json", %{users: friend_requests, for: conn.assigns[:user]})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("index.json", %{users: friend_requests, for: conn.assigns[:user]})
|
|
|
|
else
|
|
|
|
else
|
|
|
|
_e -> bad_request_reply(conn, "Can't get friend requests")
|
|
|
|
_e -> bad_request_reply(conn, "Can't get friend requests")
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -439,7 +486,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
object: follow_activity.data["id"],
|
|
|
|
object: follow_activity.data["id"],
|
|
|
|
type: "Accept"
|
|
|
|
type: "Accept"
|
|
|
|
}) do
|
|
|
|
}) do
|
|
|
|
render(conn, UserView, "show.json", %{user: follower, for: followed})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("show.json", %{user: follower, for: followed})
|
|
|
|
else
|
|
|
|
else
|
|
|
|
e -> bad_request_reply(conn, "Can't approve user: #{inspect(e)}")
|
|
|
|
e -> bad_request_reply(conn, "Can't approve user: #{inspect(e)}")
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -458,7 +507,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
object: follow_activity.data["id"],
|
|
|
|
object: follow_activity.data["id"],
|
|
|
|
type: "Reject"
|
|
|
|
type: "Reject"
|
|
|
|
}) do
|
|
|
|
}) do
|
|
|
|
render(conn, UserView, "show.json", %{user: follower, for: followed})
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("show.json", %{user: follower, for: followed})
|
|
|
|
else
|
|
|
|
else
|
|
|
|
e -> bad_request_reply(conn, "Can't deny user: #{inspect(e)}")
|
|
|
|
e -> bad_request_reply(conn, "Can't deny user: #{inspect(e)}")
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -522,7 +573,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
changeset <- Ecto.Changeset.put_embed(changeset, :info, info_cng),
|
|
|
|
changeset <- Ecto.Changeset.put_embed(changeset, :info, info_cng),
|
|
|
|
{:ok, user} <- User.update_and_set_cache(changeset) do
|
|
|
|
{:ok, user} <- User.update_and_set_cache(changeset) do
|
|
|
|
CommonAPI.update(user)
|
|
|
|
CommonAPI.update(user)
|
|
|
|
render(conn, UserView, "user.json", %{user: user, for: user})
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("user.json", %{user: user, for: user})
|
|
|
|
else
|
|
|
|
else
|
|
|
|
error ->
|
|
|
|
error ->
|
|
|
|
Logger.debug("Can't update user: #{inspect(error)}")
|
|
|
|
Logger.debug("Can't update user: #{inspect(error)}")
|
|
|
@ -534,14 +588,16 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|
|
|
activities = TwitterAPI.search(user, params)
|
|
|
|
activities = TwitterAPI.search(user, params)
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(ActivityView, "index.json", %{activities: activities, for: user})
|
|
|
|
|> put_view(ActivityView)
|
|
|
|
|
|
|
|
|> render("index.json", %{activities: activities, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
def search_user(%{assigns: %{user: user}} = conn, %{"query" => query}) do
|
|
|
|
def search_user(%{assigns: %{user: user}} = conn, %{"query" => query}) do
|
|
|
|
users = User.search(query, true)
|
|
|
|
users = User.search(query, true)
|
|
|
|
|
|
|
|
|
|
|
|
conn
|
|
|
|
conn
|
|
|
|
|> render(UserView, "index.json", %{users: users, for: user})
|
|
|
|
|> put_view(UserView)
|
|
|
|
|
|
|
|
|> render("index.json", %{users: users, for: user})
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
defp bad_request_reply(conn, error_message) do
|
|
|
|
defp bad_request_reply(conn, error_message) do
|
|
|
|