projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6744710
)
Never update local users from foreign sources.
author
lain
<lain@soykaf.club>
Sat, 24 Feb 2018 11:05:40 +0000
(12:05 +0100)
committer
lain
<lain@soykaf.club>
Sat, 24 Feb 2018 11:05:40 +0000
(12:05 +0100)
lib/pleroma/web/activity_pub/transmogrifier.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/activity_pub/transmogrifier.ex
b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 25c6bad06e5e04731ed22583f476ee5fb66a9cb7..b64b69565457095baabc39741b1b0a5766d9a1ab 100644
(file)
--- a/
lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/
lib/pleroma/web/activity_pub/transmogrifier.ex
@@
-214,7
+214,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
end
def upgrade_user_from_ap_id(ap_id, async \\ true) do
- with %User{} = user <- User.get_by_ap_id(ap_id),
+ with %User{
local: false
} = user <- User.get_by_ap_id(ap_id),
{:ok, data} <- ActivityPub.fetch_and_prepare_user_from_ap_id(ap_id) do
data = data
|> Map.put(:info, Map.merge(user.info, data[:info]))