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 'remove-twitter-api'
[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 2c1874051ed833aac8336be4a58351ae30b5f41b..8bc77b75e0e6bcafa7a6cb70d8932e12c4ea5a64 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
@@
-61,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,
@@
-83,7
+86,7
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
end
def react_with_emoji(%{assigns: %{user: user}} = conn, %{"id" => activity_id, "emoji" => emoji}) do
end
def react_with_emoji(%{assigns: %{user: user}} = conn, %{"id" => activity_id, "emoji" => emoji}) do
- with {:ok, _activity
, _object
} <- CommonAPI.react_with_emoji(activity_id, user, emoji),
+ with {:ok, _activity} <- CommonAPI.react_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)
@@
-95,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)