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 'origin/develop' into global-status-expiration
[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 ca6c9386276178b0eb68fa6eaafc3453c7067270..348fdedf10be2228a59b2cba6c65cf8840890b04 100644
(file)
--- a/
lib/pleroma/web/common_api/utils.ex
+++ b/
lib/pleroma/web/common_api/utils.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.Utils do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.Utils do
@@
-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)
@@
-591,7
+591,7
@@
defmodule Pleroma.Web.CommonAPI.Utils do
limit = Pleroma.Config.get([:instance, :limit])
length = String.length(full_payload)
limit = Pleroma.Config.get([:instance, :limit])
length = String.length(full_payload)
- if length < limit do
+ if length <
=
limit do
:ok
else
{:error, dgettext("errors", "The status is over the character limit")}
:ok
else
{:error, dgettext("errors", "The status is over the character limit")}