aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2021-01-18 11:56:40 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2021-01-18 11:56:40 +0300
commit2289a1d58777b8ed129e322c3ce4119bc129366c (patch)
tree693af643bfd94af28c29ec519ef8df0f208d7424 /lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
parentdbaa15232bfe4c2bc3e2b1a17cfc7503e7036d77 (diff)
parent732cc0ce46e8044909dd5205858c43f75fe3e937 (diff)
downloadpleroma-2289a1d58777b8ed129e322c3ce4119bc129366c.tar.gz
Merge branch 'develop' into refactor/uploads
Diffstat (limited to 'lib/pleroma/web/pleroma_api/controllers/chat_controller.ex')
-rw-r--r--lib/pleroma/web/pleroma_api/controllers/chat_controller.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
index bfc0a1f19..f3cd1fbf6 100644
--- a/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
+++ b/lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.PleromaAPI.ChatController do
use Pleroma.Web, :controller
@@ -82,7 +82,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
media_id: params[:media_id],
idempotency_key: idempotency_key(conn)
),
- message <- Object.normalize(activity, false),
+ message <- Object.normalize(activity, fetch: false),
cm_ref <- MessageReference.for_chat_and_object(chat, message) do
conn
|> put_view(MessageReferenceView)