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 b4480bd18df32f3fc002b3f2473a0118fb128f75..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,20
+40,20
@@
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
|> put_params(params)
|> status()
|> summary()
|> put_params(params)
|> status()
|> summary()
- |>
attachments(
)
+ |>
with_valid(&attachments/1
)
|> full_payload()
|> full_payload()
- |> in_reply_to()
- |> in_reply_to_conversation()
- |> visibility()
|> expires_at()
|> poll()
|> expires_at()
|> poll()
+ |> with_valid(&in_reply_to/1)
+ |> with_valid(&in_reply_to_conversation/1)
+ |> with_valid(&visibility/1)
|> content()
|> content()
- |>
to_and_cc(
)
- |>
context(
)
+ |>
with_valid(&to_and_cc/1
)
+ |>
with_valid(&context/1
)
|> sensitive()
|> sensitive()
- |>
object(
)
+ |>
with_valid(&object/1
)
|> preview?()
|> preview?()
- |>
changes(
)
+ |>
with_valid(&changes/1
)
|> validate()
end
|> validate()
end
@@
-136,8
+136,6
@@
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
%__MODULE__{draft | content_html: content_html, mentions: mentions, tags: tags}
end
%__MODULE__{draft | content_html: content_html, mentions: mentions, tags: tags}
end
- defp to_and_cc(%{valid?: false} = draft), do: draft
-
defp to_and_cc(draft) do
addressed_users =
draft.mentions
defp to_and_cc(draft) do
addressed_users =
draft.mentions
@@
-166,8
+164,6
@@
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
%__MODULE__{draft | sensitive: sensitive}
end
%__MODULE__{draft | sensitive: sensitive}
end
- defp object(%{valid?: false} = draft), do: draft
-
defp object(draft) do
emoji = Map.merge(Pleroma.Emoji.Formatter.get_emoji_map(draft.full_payload), draft.emoji)
defp object(draft) do
emoji = Map.merge(Pleroma.Emoji.Formatter.get_emoji_map(draft.full_payload), draft.emoji)
@@
-191,12
+187,10
@@
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
- defp changes(%{valid?: false} = draft), do: draft
-
defp changes(draft) do
direct? = draft.visibility == "direct"
defp changes(draft) do
direct? = draft.visibility == "direct"
@@
-213,6
+207,9
@@
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
%__MODULE__{draft | changes: changes}
end
%__MODULE__{draft | changes: changes}
end
+ defp with_valid(%{valid?: true} = draft, func), do: func.(draft)
+ defp with_valid(draft, _func), do: draft
+
defp add_error(draft, message) do
%__MODULE__{draft | valid?: false, errors: [message | draft.errors]}
end
defp add_error(draft, message) do
%__MODULE__{draft | valid?: false, errors: [message | draft.errors]}
end