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/bulk-confirmation
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
common_api.ex
diff --git
a/lib/pleroma/web/common_api/common_api.ex
b/lib/pleroma/web/common_api/common_api.ex
index d6e9d3d679e1ee658f3612f8974b15b891f5ffb8..60a50b027f5c5981adc3406c0b086bdcff49e039 100644
(file)
--- a/
lib/pleroma/web/common_api/common_api.ex
+++ b/
lib/pleroma/web/common_api/common_api.ex
@@
-4,7
+4,6
@@
defmodule Pleroma.Web.CommonAPI do
alias Pleroma.Activity
defmodule Pleroma.Web.CommonAPI do
alias Pleroma.Activity
- alias Pleroma.ActivityExpiration
alias Pleroma.Conversation.Participation
alias Pleroma.Formatter
alias Pleroma.Object
alias Pleroma.Conversation.Participation
alias Pleroma.Formatter
alias Pleroma.Object
@@
-49,6
+48,9
@@
defmodule Pleroma.Web.CommonAPI do
local: true
)} do
{:ok, activity}
local: true
)} do
{:ok, activity}
+ else
+ {:common_pipeline, {:reject, _} = e} -> e
+ e -> e
end
end
end
end
@@
-381,9
+383,9
@@
defmodule Pleroma.Web.CommonAPI do
def check_expiry_date({:ok, nil} = res), do: res
def check_expiry_date({:ok, in_seconds}) do
def check_expiry_date({:ok, nil} = res), do: res
def check_expiry_date({:ok, in_seconds}) do
- expiry =
NaiveDateTime.utc_now() |> NaiveDateTime.add(
in_seconds)
+ expiry =
DateTime.add(DateTime.utc_now(),
in_seconds)
- if
ActivityExpiration
.expires_late_enough?(expiry) do
+ if
Pleroma.Workers.PurgeExpiredActivity
.expires_late_enough?(expiry) do
{:ok, expiry}
else
{:error, "Expiry date is too soon"}
{:ok, expiry}
else
{:error, "Expiry date is too soon"}
@@
-452,7
+454,8
@@
defmodule Pleroma.Web.CommonAPI do
end
def add_mute(user, activity) do
end
def add_mute(user, activity) do
- with {:ok, _} <- ThreadMute.add_mute(user.id, activity.data["context"]) do
+ with {:ok, _} <- ThreadMute.add_mute(user.id, activity.data["context"]),
+ _ <- Pleroma.Notification.mark_context_as_read(user, activity.data["context"]) do
{:ok, activity}
else
{:error, _} -> {:error, dgettext("errors", "conversation is already muted")}
{:ok, activity}
else
{:error, _} -> {:error, dgettext("errors", "conversation is already muted")}