projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'chore/fix-mix-env' into 'develop'
[akkoma]
/
lib
/
pleroma
/
emails
/
user_email.ex
diff --git
a/lib/pleroma/emails/user_email.ex
b/lib/pleroma/emails/user_email.ex
index d3625dbf2bb7bc54f3f27a901261460570eff0a8..dbd89f1c7d3feec5a0ebc73784a7a0b4df7b7a0f 100644
(file)
--- a/
lib/pleroma/emails/user_email.ex
+++ b/
lib/pleroma/emails/user_email.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Emails.UserEmail do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Emails.UserEmail do
@@
-119,7
+119,7
@@
defmodule Pleroma.Emails.UserEmail do
notifications
|> Enum.filter(&(&1.activity.data["type"] == "Create"))
|> Enum.map(fn notification ->
notifications
|> Enum.filter(&(&1.activity.data["type"] == "Create"))
|> Enum.map(fn notification ->
- object = Pleroma.Object.normalize(notification.activity)
+ object = Pleroma.Object.normalize(notification.activity
, fetch: false
)
if not is_nil(object) do
object = update_in(object.data["content"], &format_links/1)
if not is_nil(object) do
object = update_in(object.data["content"], &format_links/1)
@@
-142,7
+142,7
@@
defmodule Pleroma.Emails.UserEmail do
if not is_nil(from) do
%{
data: notification,
if not is_nil(from) do
%{
data: notification,
- object: Pleroma.Object.normalize(notification.activity),
+ object: Pleroma.Object.normalize(notification.activity
, fetch: false
),
from: User.get_by_ap_id(notification.activity.actor)
}
end
from: User.get_by_ap_id(notification.activity.actor)
}
end