projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocke...
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
activity_draft.ex
diff --git
a/lib/pleroma/web/common_api/activity_draft.ex
b/lib/pleroma/web/common_api/activity_draft.ex
index aa7c8c3812bd36aea8ce98d444a8acdfd1569c6a..c1cd15bb2a37ba98e923f50ab50dc7083995fc9c 100644
(file)
--- a/
lib/pleroma/web/common_api/activity_draft.ex
+++ b/
lib/pleroma/web/common_api/activity_draft.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
@@
-40,11
+40,11
@@
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
|> put_params(params)
|> status()
|> summary()
|> put_params(params)
|> status()
|> summary()
+ |> with_valid(&attachments/1)
|> full_payload()
|> expires_at()
|> poll()
|> with_valid(&in_reply_to/1)
|> full_payload()
|> expires_at()
|> poll()
|> with_valid(&in_reply_to/1)
- |> with_valid(&attachments/1)
|> with_valid(&in_reply_to_conversation/1)
|> with_valid(&visibility/1)
|> content()
|> with_valid(&in_reply_to_conversation/1)
|> with_valid(&visibility/1)
|> content()
@@
-187,7
+187,7
@@
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
end
defp preview?(draft) do
end
defp preview?(draft) do
- preview? = Pleroma.Web.ControllerHelper.truthy_param?(draft.params["preview"])
|| false
+ preview? = Pleroma.Web.ControllerHelper.truthy_param?(draft.params["preview"])
%__MODULE__{draft | preview?: preview?}
end
%__MODULE__{draft | preview?: preview?}
end