projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'need-reboot-flag' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
utils.ex
diff --git
a/lib/pleroma/web/common_api/utils.ex
b/lib/pleroma/web/common_api/utils.ex
index cbb64f8d24f1c3cd2b2d4e4d8e96791504247a57..4445894b0d82337bbdace5cacc3b17b5fd94a7c3 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-179,9
+179,9
@@
defmodule Pleroma.Web.CommonAPI.Utils do
end)
end_time =
end)
end_time =
-
Naive
DateTime.utc_now()
- |>
Naive
DateTime.add(expires_in)
- |>
Naive
DateTime.to_iso8601()
+ DateTime.utc_now()
+ |> DateTime.add(expires_in)
+ |> DateTime.to_iso8601()
key = if truthy_param?(data["poll"]["multiple"]), do: "anyOf", else: "oneOf"
poll = %{"type" => "Question", key => option_notes, "closed" => end_time}
key = if truthy_param?(data["poll"]["multiple"]), do: "anyOf", else: "oneOf"
poll = %{"type" => "Question", key => option_notes, "closed" => end_time}
@@
-228,9
+228,9
@@
defmodule Pleroma.Web.CommonAPI.Utils do
data,
visibility
) do
data,
visibility
) do
-
no_
attachment_links =
+ attachment_links =
data
data
- |> Map.get("
no_attachment_links", Config.get([:instance, :no_
attachment_links]))
+ |> Map.get("
attachment_links", Config.get([:instance, :
attachment_links]))
|> truthy_param?()
content_type = get_content_type(data["content_type"])
|> truthy_param?()
content_type = get_content_type(data["content_type"])
@@
-244,7
+244,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
status
|> format_input(content_type, options)
status
|> format_input(content_type, options)
- |> maybe_add_attachments(attachments,
no_
attachment_links)
+ |> maybe_add_attachments(attachments, attachment_links)
|> maybe_add_nsfw_tag(data)
end
|> maybe_add_nsfw_tag(data)
end
@@
-270,7
+270,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
def make_context(%Activity{data: %{"context" => context}}, _), do: context
def make_context(_, _), do: Utils.generate_context_id()
def make_context(%Activity{data: %{"context" => context}}, _), do: context
def make_context(_, _), do: Utils.generate_context_id()
- def maybe_add_attachments(parsed, _attachments,
tru
e = _no_links), do: parsed
+ def maybe_add_attachments(parsed, _attachments,
fals
e = _no_links), do: parsed
def maybe_add_attachments({text, mentions, tags}, attachments, _no_links) do
text = add_attachments(text, attachments)
def maybe_add_attachments({text, mentions, tags}, attachments, _no_links) do
text = add_attachments(text, attachments)
@@
-494,7
+494,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
with %User{} = user <- User.get_cached_by_ap_id(actor) do
subscriber_ids =
user
with %User{} = user <- User.get_cached_by_ap_id(actor) do
subscriber_ids =
user
- |> User.subscribers()
+ |> User.subscriber
_user
s()
|> Enum.filter(&Visibility.visible_for_user?(activity, &1))
|> Enum.map(& &1.ap_id)
|> Enum.filter(&Visibility.visible_for_user?(activity, &1))
|> Enum.map(& &1.ap_id)