hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4

Browse source
This commit is contained in:
Egor Kislitsyn 2020-02-12 22:51:26 +04:00
commit 4d459b0e99
No known key found for this signature in database
GPG key ID: 1B49CB15B71E7805
3 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/pleroma/web/common_api/activity_draft.ex
View file

@ -193,6 +193,13 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
defp changes(draft) do
direct? = draft.visibility == "direct"
additional = %{"cc" => draft.cc, "directMessage" => direct?}
additional =
case draft.expires_at do
%NaiveDateTime{} = expires_at -> Map.put(additional, "expires_at", expires_at)
_ -> additional
end
changes =
%{
@ -200,7 +207,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
actor: draft.user,
context: draft.context,
object: draft.object,
additional: %{"cc" => draft.cc, "directMessage" => direct?}
additional: additional
}
|> Utils.maybe_add_list_data(draft.user, draft.visibility)