projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix emoji tests
[akkoma]
/
lib
/
pleroma
/
web
/
common_api.ex
diff --git
a/lib/pleroma/web/common_api.ex
b/lib/pleroma/web/common_api.ex
index 6f685cb7ba570b117d768f34f79a1d1be8441e6c..4a7c9178dd76efa06080ff50ab0a9e062c0a7157 100644
(file)
--- a/
lib/pleroma/web/common_api.ex
+++ b/
lib/pleroma/web/common_api.ex
@@
-261,8
+261,7
@@
defmodule Pleroma.Web.CommonAPI do
{:ok, activity, _} <- Pipeline.common_pipeline(emoji_react, local: true) do
{:ok, activity}
else
{:ok, activity, _} <- Pipeline.common_pipeline(emoji_react, local: true) do
{:ok, activity}
else
- _ ->
- {:error, dgettext("errors", "Could not add reaction emoji")}
+ _ -> {:error, dgettext("errors", "Could not add reaction emoji")}
end
end
end
end
@@
-272,7
+271,7
@@
defmodule Pleroma.Web.CommonAPI do
{:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do
{:ok, activity}
else
{:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do
{:ok, activity}
else
-
_
->
+
e
->
{:error, dgettext("errors", "Could not remove reaction emoji")}
end
end
{:error, dgettext("errors", "Could not remove reaction emoji")}
end
end
@@
-397,7
+396,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