Make attachment links configurable

Thanks @href!
This commit is contained in:
Mark Felder 2019-01-17 15:48:14 +00:00
parent ce2efd1ee2
commit 8c368d42a2
3 changed files with 2 additions and 2 deletions

View file

@ -95,6 +95,7 @@ config :pleroma, Pleroma.Mailer,
older software for theses nicknames.
* `max_pinned_statuses`: The maximum number of pinned statuses. `0` will disable the feature.
* `autofollowed_nicknames`: Set to nicknames of (local) users that every new user should automatically follow.
* `no_attachment_links`: Set to true to disable automatically adding attachment link text to statuses
## :logger
* `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog

View file

@ -103,7 +103,7 @@ defmodule Pleroma.Web.CommonAPI do
attachments,
tags,
get_content_type(data["content_type"]),
Enum.member?([true, "true"], data["no_attachment_links"])
Enum.member?([true, "true"], Map.get(data, "no_attachment_links", Pleroma.Config.get([:instance, :no_attachment_links], true)))
),
context <- make_context(inReplyTo),
cw <- data["spoiler_text"],

View file

@ -341,7 +341,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
params =
params
|> Map.put("in_reply_to_status_id", params["in_reply_to_id"])
|> Map.put("no_attachment_links", true)
idempotency_key =
case get_req_header(conn, "idempotency-key") do