diff options
author | Roman Chvanikov <chvanikoff@pm.me> | 2021-01-18 11:56:40 +0300 |
---|---|---|
committer | Roman Chvanikov <chvanikoff@pm.me> | 2021-01-18 11:56:40 +0300 |
commit | 2289a1d58777b8ed129e322c3ce4119bc129366c (patch) | |
tree | 693af643bfd94af28c29ec519ef8df0f208d7424 /lib/pleroma/web/push/impl.ex | |
parent | dbaa15232bfe4c2bc3e2b1a17cfc7503e7036d77 (diff) | |
parent | 732cc0ce46e8044909dd5205858c43f75fe3e937 (diff) | |
download | pleroma-2289a1d58777b8ed129e322c3ce4119bc129366c.tar.gz |
Merge branch 'develop' into refactor/uploads
Diffstat (limited to 'lib/pleroma/web/push/impl.ex')
-rw-r--r-- | lib/pleroma/web/push/impl.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex index 82152dffa..83cbdc870 100644 --- a/lib/pleroma/web/push/impl.ex +++ b/lib/pleroma/web/push/impl.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.Push.Impl do @@ -32,7 +32,7 @@ defmodule Pleroma.Web.Push.Impl do mastodon_type = notification.type gcm_api_key = Application.get_env(:web_push_encryption, :gcm_api_key) avatar_url = User.avatar_url(actor) - object = Object.normalize(activity, false) + object = Object.normalize(activity, fetch: false) user = User.get_cached_by_id(user_id) direct_conversation_id = Activity.direct_conversation_id(activity, user) |