projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into issue/1276-2
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
pleroma_api_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
index fe1b97a208c9738b81bbc75d7e2c07cf91b5169a..4aa5c1dd866c0906414eedbd8bb8a06510571d34 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
@@
-26,6
+26,12
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
when action in [:conversation, :conversation_statuses]
)
when action in [:conversation, :conversation_statuses]
)
+ plug(
+ OAuthScopesPlug,
+ %{scopes: ["read:statuses"], fallback: :proceed_unauthenticated}
+ when action == :emoji_reactions_by
+ )
+
plug(
OAuthScopesPlug,
%{scopes: ["write:statuses"]}
plug(
OAuthScopesPlug,
%{scopes: ["write:statuses"]}
@@
-34,12
+40,14
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
plug(
OAuthScopesPlug,
plug(
OAuthScopesPlug,
- %{scopes: ["write:conversations"]} when action in [:update_conversation, :read_conversations]
+ %{scopes: ["write:conversations"]}
+ when action in [:update_conversation, :mark_conversations_as_read]
)
)
- plug(OAuthScopesPlug, %{scopes: ["write:notifications"]} when action == :read_notification)
-
- plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug)
+ plug(
+ OAuthScopesPlug,
+ %{scopes: ["write:notifications"]} when action == :mark_notifications_as_read
+ )
def emoji_reactions_by(%{assigns: %{user: user}} = conn, %{"id" => activity_id} = params) do
with %Activity{} = activity <- Activity.get_by_id_with_object(activity_id),
def emoji_reactions_by(%{assigns: %{user: user}} = conn, %{"id" => activity_id} = params) do
with %Activity{} = activity <- Activity.get_by_id_with_object(activity_id),
@@
-53,7
+61,10
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
else
users =
Enum.map(user_ap_ids, &User.get_cached_by_ap_id/1)
else
users =
Enum.map(user_ap_ids, &User.get_cached_by_ap_id/1)
- |> Enum.filter(& &1)
+ |> Enum.filter(fn
+ %{deactivated: false} -> true
+ _ -> false
+ end)
%{
name: emoji,
%{
name: emoji,
@@
-87,7
+98,8
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
"id" => activity_id,
"emoji" => emoji
}) do
"id" => activity_id,
"emoji" => emoji
}) do
- with {:ok, _activity, _object} <- CommonAPI.unreact_with_emoji(activity_id, user, emoji),
+ with {:ok, _activity} <-
+ CommonAPI.unreact_with_emoji(activity_id, user, emoji),
activity <- Activity.get_by_id(activity_id) do
conn
|> put_view(StatusView)
activity <- Activity.get_by_id(activity_id) do
conn
|> put_view(StatusView)
@@
-167,7
+179,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
end
end
end
end
- def
read_conversations
(%{assigns: %{user: user}} = conn, _params) do
+ def
mark_conversations_as_read
(%{assigns: %{user: user}} = conn, _params) do
with {:ok, _, participations} <- Participation.mark_all_as_read(user) do
conn
|> add_link_headers(participations)
with {:ok, _, participations} <- Participation.mark_all_as_read(user) do
conn
|> add_link_headers(participations)
@@
-176,7
+188,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
end
end
end
end
- def
read_notification
(%{assigns: %{user: user}} = conn, %{"id" => notification_id}) do
+ def
mark_notifications_as_read
(%{assigns: %{user: user}} = conn, %{"id" => notification_id}) do
with {:ok, notification} <- Notification.read_one(user, notification_id) do
conn
|> put_view(NotificationView)
with {:ok, notification} <- Notification.read_one(user, notification_id) do
conn
|> put_view(NotificationView)
@@
-189,7
+201,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
end
end
end
end
- def
read_notification
(%{assigns: %{user: user}} = conn, %{"max_id" => max_id} = params) do
+ def
mark_notifications_as_read
(%{assigns: %{user: user}} = conn, %{"max_id" => max_id} = params) do
with notifications <- Notification.set_read_up_to(user, max_id) do
notifications = Enum.take(notifications, 80)
with notifications <- Notification.set_read_up_to(user, max_id) do
notifications = Enum.take(notifications, 80)