projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'outbox_pagination' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
transmogrifier.ex
diff --git
a/lib/pleroma/web/activity_pub/transmogrifier.ex
b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 2fbb1662381b2cc1503a3195dcb8edf39795f0cb..5878fb4f805625eda1a08febac7342471372de81 100644
(file)
--- a/
lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/
lib/pleroma/web/activity_pub/transmogrifier.ex
@@
-979,15
+979,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
defp strip_internal_fields(object) do
object
defp strip_internal_fields(object) do
object
- |> Map.drop([
- "likes",
- "like_count",
- "announcements",
- "announcement_count",
- "emoji",
- "context_id",
- "deleted_activity_id"
- ])
+ |> Map.drop(Pleroma.Constants.object_internal_fields())
end
defp strip_internal_tags(%{"tag" => tags} = object) do
end
defp strip_internal_tags(%{"tag" => tags} = object) do
@@
-1064,7
+1056,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
defp upgrade_user(user, data) do
user
defp upgrade_user(user, data) do
user
- |> User.upgrade_changeset(data)
+ |> User.upgrade_changeset(data
, true
)
|> User.update_and_set_cache()
end
|> User.update_and_set_cache()
end