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 feature/elasticsearch
[akkoma]
/
lib
/
pleroma
/
web
/
common_api.ex
diff --git
a/lib/pleroma/web/common_api.ex
b/lib/pleroma/web/common_api.ex
index b36be4d2ae81005b936d107f5cad0000232d7bee..3266b1c607017676a00dcb8dd2d45969b8e74a46 100644
(file)
--- a/
lib/pleroma/web/common_api.ex
+++ b/
lib/pleroma/web/common_api.ex
@@
-228,17
+228,7
@@
defmodule Pleroma.Web.CommonAPI do
{:find_object, _} ->
{:error, :not_found}
{:find_object, _} ->
{:error, :not_found}
- {:common_pipeline,
- {
- :error,
- {
- :validate_object,
- {
- :error,
- changeset
- }
- }
- }} = e ->
+ {:common_pipeline, {:error, {:validate, {:error, changeset}}}} = e ->
if {:object, {"already liked by this actor", []}} in changeset.errors do
{:ok, :already_liked}
else
if {:object, {"already liked by this actor", []}} in changeset.errors do
{:ok, :already_liked}
else
@@
-407,7
+397,13
@@
defmodule Pleroma.Web.CommonAPI do
def post(user, %{status: _} = data) do
with {:ok, draft} <- ActivityDraft.create(user, data) do
def post(user, %{status: _} = data) do
with {:ok, draft} <- ActivityDraft.create(user, data) do
- ActivityPub.create(draft.changes, draft.preview?)
+ activity = ActivityPub.create(draft.changes, draft.preview?)
+
+ unless draft.preview? do
+ Pleroma.Elasticsearch.maybe_put_into_elasticsearch(activity)
+ end
+
+ activity
end
end
end
end
@@
-425,7
+421,7
@@
defmodule Pleroma.Web.CommonAPI do
) do
{:ok, activity}
else
) do
{:ok, activity}
else
- {:error, {:
execute_
side_effects, error}} -> error
+ {:error, {:side_effects, error}} -> error
error -> error
end
end
error -> error
end
end
@@
-497,9
+493,7
@@
defmodule Pleroma.Web.CommonAPI do
else
{what, result} = error ->
Logger.warn(
else
{what, result} = error ->
Logger.warn(
- "CommonAPI.remove_mute/2 failed. #{what}: #{result}, user_id: #{user_id}, activity_id: #{
- activity_id
- }"
+ "CommonAPI.remove_mute/2 failed. #{what}: #{result}, user_id: #{user_id}, activity_id: #{activity_id}"
)
{:error, error}
)
{:error, error}