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

Merge branch 'global-status-expiration' into 'develop'

Browse source 
Global status expiration

See merge request pleroma/pleroma!2208
This commit is contained in:
lain 2020-06-12 14:14:09 +00:00
commit e557265a03
12 changed files with 218 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/pleroma/web/common_api/common_api.ex
View file

@ -423,20 +423,10 @@ defmodule Pleroma.Web.CommonAPI do
def post(user, %{status: _} = data) do
with {:ok, draft} <- Pleroma.Web.CommonAPI.ActivityDraft.create(user, data) do
draft.changes
|> ActivityPub.create(draft.preview?)
|> maybe_create_activity_expiration(draft.expires_at)
ActivityPub.create(draft.changes, draft.preview?)
end
end
defp maybe_create_activity_expiration({:ok, activity}, %NaiveDateTime{} = expires_at) do
with {:ok, _} <- ActivityExpiration.create(activity, expires_at) do
{:ok, activity}
end
end
defp maybe_create_activity_expiration(result, _), do: result
def pin(id, %{ap_id: user_ap_id} = user) do
with %Activity{
actor: ^user_ap_id,