projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
mastodon_api_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 18e4ddb88fcbd824d46716db8b3e2c8740964e32..bcc79b08a03152bf60670dbd5a0834bc7f62f1c4 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@
-285,7
+285,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do
end
def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do
- with %User{} = user <-
Repo.get(User,
params["id"]) do
+ with %User{} = user <-
User.get_by_id(
params["id"]) do
activities = ActivityPub.fetch_user_activities(user, reading_user, params)
conn
activities = ActivityPub.fetch_user_activities(user, reading_user, params)
conn
@@
-657,7
+657,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def followers(%{assigns: %{user: for_user}} = conn, %{"id" => id} = params) do
end
def followers(%{assigns: %{user: for_user}} = conn, %{"id" => id} = params) do
- with %User{} = user <-
Repo.get(User,
id),
+ with %User{} = user <-
User.get_by_id(
id),
followers <- MastodonAPI.get_followers(user, params) do
followers =
cond do
followers <- MastodonAPI.get_followers(user, params) do
followers =
cond do
@@
-674,7
+674,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def following(%{assigns: %{user: for_user}} = conn, %{"id" => id} = params) do
end
def following(%{assigns: %{user: for_user}} = conn, %{"id" => id} = params) do
- with %User{} = user <-
Repo.get(User,
id),
+ with %User{} = user <-
User.get_by_id(
id),
followers <- MastodonAPI.get_friends(user, params) do
followers =
cond do
followers <- MastodonAPI.get_friends(user, params) do
followers =
cond do
@@
-699,7
+699,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def authorize_follow_request(%{assigns: %{user: followed}} = conn, %{"id" => id}) do
end
def authorize_follow_request(%{assigns: %{user: followed}} = conn, %{"id" => id}) do
- with %User{} = follower <-
Repo.get(User,
id),
+ with %User{} = follower <-
User.get_by_id(
id),
{:ok, follower} <- CommonAPI.accept_follow_request(follower, followed) do
conn
|> put_view(AccountView)
{:ok, follower} <- CommonAPI.accept_follow_request(follower, followed) do
conn
|> put_view(AccountView)
@@
-713,7
+713,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def reject_follow_request(%{assigns: %{user: followed}} = conn, %{"id" => id}) do
end
def reject_follow_request(%{assigns: %{user: followed}} = conn, %{"id" => id}) do
- with %User{} = follower <-
Repo.get(User,
id),
+ with %User{} = follower <-
User.get_by_id(
id),
{:ok, follower} <- CommonAPI.reject_follow_request(follower, followed) do
conn
|> put_view(AccountView)
{:ok, follower} <- CommonAPI.reject_follow_request(follower, followed) do
conn
|> put_view(AccountView)
@@
-727,7
+727,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def follow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
end
def follow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
- with %User{} = followed <-
Repo.get(User,
id),
+ with %User{} = followed <-
User.get_by_id(
id),
false <- User.following?(follower, followed),
{:ok, follower, followed, _} <- CommonAPI.follow(follower, followed) do
conn
false <- User.following?(follower, followed),
{:ok, follower, followed, _} <- CommonAPI.follow(follower, followed) do
conn
@@
-755,7
+755,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def follow(%{assigns: %{user: follower}} = conn, %{"uri" => uri}) do
end
def follow(%{assigns: %{user: follower}} = conn, %{"uri" => uri}) do
- with %User{} = followed <-
Repo.get_by(User, nickname:
uri),
+ with %User{} = followed <-
User.get_by_nickname(
uri),
{:ok, follower, followed, _} <- CommonAPI.follow(follower, followed) do
conn
|> put_view(AccountView)
{:ok, follower, followed, _} <- CommonAPI.follow(follower, followed) do
conn
|> put_view(AccountView)
@@
-769,7
+769,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def unfollow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
end
def unfollow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
- with %User{} = followed <-
Repo.get(User,
id),
+ with %User{} = followed <-
User.get_by_id(
id),
{:ok, follower} <- CommonAPI.unfollow(follower, followed) do
conn
|> put_view(AccountView)
{:ok, follower} <- CommonAPI.unfollow(follower, followed) do
conn
|> put_view(AccountView)
@@
-778,7
+778,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def mute(%{assigns: %{user: muter}} = conn, %{"id" => id}) do
end
def mute(%{assigns: %{user: muter}} = conn, %{"id" => id}) do
- with %User{} = muted <-
Repo.get(User,
id),
+ with %User{} = muted <-
User.get_by_id(
id),
{:ok, muter} <- User.mute(muter, muted) do
conn
|> put_view(AccountView)
{:ok, muter} <- User.mute(muter, muted) do
conn
|> put_view(AccountView)
@@
-792,7
+792,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def unmute(%{assigns: %{user: muter}} = conn, %{"id" => id}) do
end
def unmute(%{assigns: %{user: muter}} = conn, %{"id" => id}) do
- with %User{} = muted <-
Repo.get(User,
id),
+ with %User{} = muted <-
User.get_by_id(
id),
{:ok, muter} <- User.unmute(muter, muted) do
conn
|> put_view(AccountView)
{:ok, muter} <- User.unmute(muter, muted) do
conn
|> put_view(AccountView)
@@
-813,7
+813,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def block(%{assigns: %{user: blocker}} = conn, %{"id" => id}) do
end
def block(%{assigns: %{user: blocker}} = conn, %{"id" => id}) do
- with %User{} = blocked <-
Repo.get(User,
id),
+ with %User{} = blocked <-
User.get_by_id(
id),
{:ok, blocker} <- User.block(blocker, blocked),
{:ok, _activity} <- ActivityPub.block(blocker, blocked) do
conn
{:ok, blocker} <- User.block(blocker, blocked),
{:ok, _activity} <- ActivityPub.block(blocker, blocked) do
conn
@@
-828,7
+828,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def unblock(%{assigns: %{user: blocker}} = conn, %{"id" => id}) do
end
def unblock(%{assigns: %{user: blocker}} = conn, %{"id" => id}) do
- with %User{} = blocked <-
Repo.get(User,
id),
+ with %User{} = blocked <-
User.get_by_id(
id),
{:ok, blocker} <- User.unblock(blocker, blocked),
{:ok, _activity} <- ActivityPub.unblock(blocker, blocked) do
conn
{:ok, blocker} <- User.unblock(blocker, blocked),
{:ok, _activity} <- ActivityPub.unblock(blocker, blocked) do
conn
@@
-966,7
+966,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def bookmarks(%{assigns: %{user: user}} = conn, _) do
end
def bookmarks(%{assigns: %{user: user}} = conn, _) do
- user =
Repo.get(User,
user.id)
+ user =
User.get_by_id(
user.id)
activities =
user.bookmarks
activities =
user.bookmarks
@@
-1023,7
+1023,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
accounts
|> Enum.each(fn account_id ->
with %Pleroma.List{} = list <- Pleroma.List.get(id, user),
accounts
|> Enum.each(fn account_id ->
with %Pleroma.List{} = list <- Pleroma.List.get(id, user),
- %User{} = followed <-
Repo.get(User,
account_id) do
+ %User{} = followed <-
User.get_by_id(
account_id) do
Pleroma.List.follow(list, followed)
end
end)
Pleroma.List.follow(list, followed)
end
end)
@@
-1035,7
+1035,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
accounts
|> Enum.each(fn account_id ->
with %Pleroma.List{} = list <- Pleroma.List.get(id, user),
accounts
|> Enum.each(fn account_id ->
with %Pleroma.List{} = list <- Pleroma.List.get(id, user),
- %User{} = followed <-
Repo.get(Pleroma.User,
account_id) do
+ %User{} = followed <-
Pleroma.User.get_by_id(
account_id) do
Pleroma.List.unfollow(list, followed)
end
end)
Pleroma.List.unfollow(list, followed)
end
end)
@@
-1091,9
+1091,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def index(%{assigns: %{user: user}} = conn, _params) do
end
def index(%{assigns: %{user: user}} = conn, _params) do
- token =
- conn
- |> get_session(:oauth_token)
+ token = get_session(conn, :oauth_token)
if user && token do
mastodon_emoji = mastodonized_emoji()
if user && token do
mastodon_emoji = mastodonized_emoji()
@@
-1121,7
+1119,8
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
auto_play_gif: false,
display_sensitive_media: false,
reduce_motion: false,
auto_play_gif: false,
display_sensitive_media: false,
reduce_motion: false,
- max_toot_chars: limit
+ max_toot_chars: limit,
+ mascot: "/images/pleroma-fox-tan-smol.png"
},
rights: %{
delete_others_notice: present?(user.info.is_moderator),
},
rights: %{
delete_others_notice: present?(user.info.is_moderator),
@@
-1193,6
+1192,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|> render("index.html", %{initial_state: initial_state, flavour: flavour})
else
conn
|> render("index.html", %{initial_state: initial_state, flavour: flavour})
else
conn
+ |> put_session(:return_to, conn.request_path)
|> redirect(to: "/web/login")
end
end
|> redirect(to: "/web/login")
end
end
@@
-1249,16
+1249,22
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
"glitch"
end
"glitch"
end
- def login(conn, %{"code" => code}) do
+ def login(%{assigns: %{user: %User{}}} = conn, _params) do
+ redirect(conn, to: local_mastodon_root_path(conn))
+ end
+
+ @doc "Local Mastodon FE login init action"
+ def login(conn, %{"code" => auth_token}) do
with {:ok, app} <- get_or_make_app(),
with {:ok, app} <- get_or_make_app(),
- %Authorization{} = auth <- Repo.get_by(Authorization, token:
code
, app_id: app.id),
+ %Authorization{} = auth <- Repo.get_by(Authorization, token:
auth_token
, app_id: app.id),
{:ok, token} <- Token.exchange_token(app, auth) do
conn
|> put_session(:oauth_token, token.token)
{:ok, token} <- Token.exchange_token(app, auth) do
conn
|> put_session(:oauth_token, token.token)
- |> redirect(to:
"/web/getting-started"
)
+ |> redirect(to:
local_mastodon_root_path(conn)
)
end
end
end
end
+ @doc "Local Mastodon FE callback action"
def login(conn, _) do
with {:ok, app} <- get_or_make_app() do
path =
def login(conn, _) do
with {:ok, app} <- get_or_make_app() do
path =
@@
-1271,8
+1277,18
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
scope: Enum.join(app.scopes, " ")
)
scope: Enum.join(app.scopes, " ")
)
- conn
- |> redirect(to: path)
+ redirect(conn, to: path)
+ end
+ end
+
+ defp local_mastodon_root_path(conn) do
+ case get_session(conn, :return_to) do
+ nil ->
+ mastodon_api_path(conn, :index, ["getting-started"])
+
+ return_to ->
+ delete_session(conn, :return_to)
+ return_to
end
end
end
end
@@
-1312,7
+1328,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
def relationship_noop(%{assigns: %{user: user}} = conn, %{"id" => id}) do
Logger.debug("Unimplemented, returning unmodified relationship")
def relationship_noop(%{assigns: %{user: user}} = conn, %{"id" => id}) do
Logger.debug("Unimplemented, returning unmodified relationship")
- with %User{} = target <-
Repo.get(User,
id) do
+ with %User{} = target <-
User.get_by_id(
id) do
conn
|> put_view(AccountView)
|> render("relationship.json", %{user: user, target: target})
conn
|> put_view(AccountView)
|> render("relationship.json", %{user: user, target: target})