Merge branch 'develop' into frontend-dl-task

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index a9b164d9a..8746273c4 100644
--- 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
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.CommonAPI.Utils do
@@ -179,9 +179,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
         end)
 
       end_time =
-        NaiveDateTime.utc_now()
-        |> NaiveDateTime.add(expires_in)
-        |> NaiveDateTime.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}
@@ -228,9 +228,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do
         data,
         visibility
       ) do
-    no_attachment_links =
+    attachment_links =
       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"])
@@ -244,7 +244,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
 
     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
 
@@ -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 maybe_add_attachments(parsed, _attachments, true = _no_links), do: parsed
+  def maybe_add_attachments(parsed, _attachments, false = _no_links), do: parsed
 
   def maybe_add_attachments({text, mentions, tags}, attachments, _no_links) do
     text = add_attachments(text, attachments)