Extend lazier user refresh patch
This commit is contained in:
parent
f515c31462
commit
e335bbdef5
1 changed files with 16 additions and 2 deletions
|
@ -1,4 +1,4 @@
|
||||||
From 08972cec35195133f6d8e0c496a60abc17ae3951 Mon Sep 17 00:00:00 2001
|
From 95223da3d82f02ff904fcba8e0ba620491bb6c17 Mon Sep 17 00:00:00 2001
|
||||||
From: Oneric <oneric@oneric.stub>
|
From: Oneric <oneric@oneric.stub>
|
||||||
Date: Sat, 28 Dec 2024 04:46:10 +0100
|
Date: Sat, 28 Dec 2024 04:46:10 +0100
|
||||||
Subject: [PATCH] Be less aggressive about user refreshes
|
Subject: [PATCH] Be less aggressive about user refreshes
|
||||||
|
@ -10,7 +10,8 @@ signing key migration (only user/inbox endpoints still do)
|
||||||
lib/pleroma/user.ex | 15 ++++++++-------
|
lib/pleroma/user.ex | 15 ++++++++-------
|
||||||
lib/pleroma/web/activity_pub/object_validator.ex | 2 +-
|
lib/pleroma/web/activity_pub/object_validator.ex | 2 +-
|
||||||
.../article_note_page_validator.ex | 3 ++-
|
.../article_note_page_validator.ex | 3 ++-
|
||||||
3 files changed, 11 insertions(+), 9 deletions(-)
|
lib/pleroma/web/activity_pub/transmogrifier.ex | 2 +-
|
||||||
|
4 files changed, 12 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
|
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
|
||||||
index 697597e1b..41530871d 100644
|
index 697597e1b..41530871d 100644
|
||||||
|
@ -68,6 +69,19 @@ index d1cd496db..b8ea6acd9 100644
|
||||||
link = Pleroma.Formatter.mention_tag(user, nickname, opts)
|
link = Pleroma.Formatter.mention_tag(user, nickname, opts)
|
||||||
{link, %{acc | mentions: MapSet.put(acc.mentions, {"@" <> nickname, user})}}
|
{link, %{acc | mentions: MapSet.put(acc.mentions, {"@" <> nickname, user})}}
|
||||||
else
|
else
|
||||||
|
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
|
||||||
|
index 142073fc6..9d82b1b73 100644
|
||||||
|
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
|
||||||
|
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
|
||||||
|
@@ -130,7 +130,7 @@ def fix_addressing(object) do
|
||||||
|
{:ok, %User{follower_address: follower_collection}} =
|
||||||
|
object
|
||||||
|
|> Containment.get_actor()
|
||||||
|
- |> User.get_or_fetch_by_ap_id()
|
||||||
|
+ |> User.get_or_fetch_by_ap_id(update_existing: false)
|
||||||
|
|
||||||
|
object
|
||||||
|
|> fix_addressing_list_key("to")
|
||||||
--
|
--
|
||||||
2.39.5
|
2.39.5
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue