projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'deps/update-crypt' 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 793f2e7f8e6356e3dab3e9725c505b78fa1e5652..e8deee223657ffa788c007757d75ebe6fa8a5b42 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.ex
@@
-22,11
+22,11
@@
defmodule Pleroma.Web.CommonAPI.Utils do
require Logger
require Pleroma.Constants
require Logger
require Pleroma.Constants
- def attachments_from_ids(%{
"media_ids" => ids, "descriptions" => desc} = _
) do
+ def attachments_from_ids(%{
media_ids: ids, descriptions: desc}
) do
attachments_from_ids_descs(ids, desc)
end
attachments_from_ids_descs(ids, desc)
end
- def attachments_from_ids(%{
"media_ids" => ids} = _
) do
+ def attachments_from_ids(%{
media_ids: ids}
) do
attachments_from_ids_no_descs(ids)
end
attachments_from_ids_no_descs(ids)
end
@@
-37,11
+37,11
@@
defmodule Pleroma.Web.CommonAPI.Utils do
def attachments_from_ids_no_descs(ids) do
Enum.map(ids, fn media_id ->
case Repo.get(Object, media_id) do
def attachments_from_ids_no_descs(ids) do
Enum.map(ids, fn media_id ->
case Repo.get(Object, media_id) do
- %Object{data: data}
= _
-> data
+ %Object{data: data} -> data
_ -> nil
end
end)
_ -> nil
end
end)
- |> Enum.
filter(& &
1)
+ |> Enum.
reject(&is_nil/
1)
end
def attachments_from_ids_descs([], _), do: []
end
def attachments_from_ids_descs([], _), do: []
@@
-51,14
+51,14
@@
defmodule Pleroma.Web.CommonAPI.Utils do
Enum.map(ids, fn media_id ->
case Repo.get(Object, media_id) do
Enum.map(ids, fn media_id ->
case Repo.get(Object, media_id) do
- %Object{data: data}
= _
->
+ %Object{data: data} ->
Map.put(data, "name", descs[media_id])
_ ->
nil
end
end)
Map.put(data, "name", descs[media_id])
_ ->
nil
end
end)
- |> Enum.
filter(& &
1)
+ |> Enum.
reject(&is_nil/
1)
end
@spec get_to_and_cc(
end
@spec get_to_and_cc(
@@
-140,7
+140,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
|> make_poll_data()
end
|> make_poll_data()
end
- def make_poll_data(%{
"poll" => %{"options" => options, "expires_in" =>
expires_in}} = data)
+ def make_poll_data(%{
poll: %{options: options, expires_in:
expires_in}} = data)
when is_list(options) do
limits = Pleroma.Config.get([:instance, :poll_limits])
when is_list(options) do
limits = Pleroma.Config.get([:instance, :poll_limits])
@@
-163,7
+163,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
|> DateTime.add(expires_in)
|> DateTime.to_iso8601()
|> DateTime.add(expires_in)
|> DateTime.to_iso8601()
- key = if truthy_param?(data
["poll"]["multiple"
]), do: "anyOf", else: "oneOf"
+ key = if truthy_param?(data
.poll[:multiple
]), do: "anyOf", else: "oneOf"
poll = %{"type" => "Question", key => option_notes, "closed" => end_time}
{:ok, {poll, emoji}}
poll = %{"type" => "Question", key => option_notes, "closed" => end_time}
{:ok, {poll, emoji}}
@@
-213,7
+213,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
|> Map.get("attachment_links", Config.get([:instance, :attachment_links]))
|> truthy_param?()
|> Map.get("attachment_links", Config.get([:instance, :attachment_links]))
|> truthy_param?()
- content_type = get_content_type(data[
"content_type"
])
+ content_type = get_content_type(data[
:content_type
])
options =
if visibility == "direct" && Config.get([:instance, :safe_dm_mentions]) do
options =
if visibility == "direct" && Config.get([:instance, :safe_dm_mentions]) do