projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/expire-mutes
[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 b0b1bd559ae235e0cbf2479f90d20c04306b2274..9d7b24eb295cfbc43f3d409e0746e26c047efaa8 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(
@@
-102,7
+102,8
@@
defmodule Pleroma.Web.CommonAPI.Utils do
end
def get_to_and_cc(_user, mentioned_users, inReplyTo, "direct", _) do
end
def get_to_and_cc(_user, mentioned_users, inReplyTo, "direct", _) do
- if inReplyTo do
+ # If the OP is a DM already, add the implicit actor.
+ if inReplyTo && Visibility.is_direct?(inReplyTo) do
{Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
else
{mentioned_users, []}
{Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
else
{mentioned_users, []}
@@
-140,9
+141,9
@@
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
when is_list(options) do
- limits =
Pleroma.
Config.get([:instance, :poll_limits])
+ limits = Config.get([:instance, :poll_limits])
with :ok <- validate_poll_expiration(expires_in, limits),
:ok <- validate_poll_options_amount(options, limits),
with :ok <- validate_poll_expiration(expires_in, limits),
:ok <- validate_poll_options_amount(options, limits),
@@
-163,7
+164,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
+214,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
@@
-395,13
+396,16
@@
defmodule Pleroma.Web.CommonAPI.Utils do
def to_masto_date(_), do: ""
defp shortname(name) do
def to_masto_date(_), do: ""
defp shortname(name) do
- if String.length(name) < 30 do
- name
+ with max_length when max_length > 0 <-
+ Config.get([Pleroma.Upload, :filename_display_max_length], 30),
+ true <- String.length(name) > max_length do
+ String.slice(name, 0..max_length) <> "…"
else
else
- String.slice(name, 0..30) <> "…"
+ _ -> name
end
end
end
end
+ @spec confirm_current_password(User.t(), String.t()) :: {:ok, User.t()} | {:error, String.t()}
def confirm_current_password(user, password) do
with %User{local: true} = db_user <- User.get_cached_by_id(user.id),
true <- AuthenticationPlug.checkpw(password, db_user.password_hash) do
def confirm_current_password(user, password) do
with %User{local: true} = db_user <- User.get_cached_by_id(user.id),
true <- AuthenticationPlug.checkpw(password, db_user.password_hash) do
@@
-466,6
+470,8
@@
defmodule Pleroma.Web.CommonAPI.Utils do
|> Enum.map(& &1.ap_id)
recipients ++ subscriber_ids
|> Enum.map(& &1.ap_id)
recipients ++ subscriber_ids
+ else
+ _e -> recipients
end
end
end
end
@@
-477,6
+483,8
@@
defmodule Pleroma.Web.CommonAPI.Utils do
|> User.get_followers()
|> Enum.map(& &1.ap_id)
|> Enum.concat(recipients)
|> User.get_followers()
|> Enum.map(& &1.ap_id)
|> Enum.concat(recipients)
+ else
+ _e -> recipients
end
end
end
end
@@
-494,7
+502,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
def make_report_content_html(nil), do: {:ok, {nil, [], []}}
def make_report_content_html(comment) do
def make_report_content_html(nil), do: {:ok, {nil, [], []}}
def make_report_content_html(comment) do
- max_size =
Pleroma.
Config.get([:instance, :max_report_comment_size], 1000)
+ max_size = Config.get([:instance, :max_report_comment_size], 1000)
if String.length(comment) <= max_size do
{:ok, format_input(comment, "text/plain")}
if String.length(comment) <= max_size do
{:ok, format_input(comment, "text/plain")}
@@
-540,23
+548,12
@@
defmodule Pleroma.Web.CommonAPI.Utils do
end
end
end
end
- def make_answer_data(%User{ap_id: ap_id}, object, name) do
- %{
- "type" => "Answer",
- "actor" => ap_id,
- "cc" => [object.data["actor"]],
- "to" => [],
- "name" => name,
- "inReplyTo" => object.data["id"]
- }
- end
-
def validate_character_limit("" = _full_payload, [] = _attachments) do
{:error, dgettext("errors", "Cannot post an empty status without attachments")}
end
def validate_character_limit(full_payload, _attachments) do
def validate_character_limit("" = _full_payload, [] = _attachments) do
{:error, dgettext("errors", "Cannot post an empty status without attachments")}
end
def validate_character_limit(full_payload, _attachments) do
- limit =
Pleroma.
Config.get([:instance, :limit])
+ limit = Config.get([:instance, :limit])
length = String.length(full_payload)
if length <= limit do
length = String.length(full_payload)
if length <= limit do