projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths...
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
views
/
user_view.ex
diff --git
a/lib/pleroma/web/activity_pub/views/user_view.ex
b/lib/pleroma/web/activity_pub/views/user_view.ex
index fe82481072659c17057f5292d8ea169e32333469..43ec2010d711f131b5ae19579a97ec87d894599d 100644
(file)
--- a/
lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/
lib/pleroma/web/activity_pub/views/user_view.ex
@@
-86,7
+86,7
@@
defmodule Pleroma.Web.ActivityPub.UserView do
query = from(user in query, select: [:ap_id])
following = Repo.all(query)
query = from(user in query, select: [:ap_id])
following = Repo.all(query)
- collection(following, "#{user.ap_id}/following", page, !user.info.hide_
network
)
+ collection(following, "#{user.ap_id}/following", page, !user.info.hide_
follows
)
|> Map.merge(Utils.make_json_ld_header())
end
|> Map.merge(Utils.make_json_ld_header())
end
@@
-99,7
+99,7
@@
defmodule Pleroma.Web.ActivityPub.UserView do
"id" => "#{user.ap_id}/following",
"type" => "OrderedCollection",
"totalItems" => length(following),
"id" => "#{user.ap_id}/following",
"type" => "OrderedCollection",
"totalItems" => length(following),
- "first" => collection(following, "#{user.ap_id}/following", 1, !user.info.hide_
network
)
+ "first" => collection(following, "#{user.ap_id}/following", 1, !user.info.hide_
follows
)
}
|> Map.merge(Utils.make_json_ld_header())
end
}
|> Map.merge(Utils.make_json_ld_header())
end
@@
-109,7
+109,7
@@
defmodule Pleroma.Web.ActivityPub.UserView do
query = from(user in query, select: [:ap_id])
followers = Repo.all(query)
query = from(user in query, select: [:ap_id])
followers = Repo.all(query)
- collection(followers, "#{user.ap_id}/followers", page, !user.info.hide_
network
)
+ collection(followers, "#{user.ap_id}/followers", page, !user.info.hide_
followers
)
|> Map.merge(Utils.make_json_ld_header())
end
|> Map.merge(Utils.make_json_ld_header())
end
@@
-122,7
+122,7
@@
defmodule Pleroma.Web.ActivityPub.UserView do
"id" => "#{user.ap_id}/followers",
"type" => "OrderedCollection",
"totalItems" => length(followers),
"id" => "#{user.ap_id}/followers",
"type" => "OrderedCollection",
"totalItems" => length(followers),
- "first" => collection(followers, "#{user.ap_id}/followers", 1, !user.info.hide_
network
)
+ "first" => collection(followers, "#{user.ap_id}/followers", 1, !user.info.hide_
followers
)
}
|> Map.merge(Utils.make_json_ld_header())
end
}
|> Map.merge(Utils.make_json_ld_header())
end
@@
-160,7
+160,7
@@
defmodule Pleroma.Web.ActivityPub.UserView do
"partOf" => iri,
"totalItems" => info.note_count,
"orderedItems" => collection,
"partOf" => iri,
"totalItems" => info.note_count,
"orderedItems" => collection,
- "next" => "#{iri}?max_id=#{min_id
- 1
}"
+ "next" => "#{iri}?max_id=#{min_id}"
}
if max_qid == nil do
}
if max_qid == nil do
@@
-207,7
+207,7
@@
defmodule Pleroma.Web.ActivityPub.UserView do
"partOf" => iri,
"totalItems" => -1,
"orderedItems" => collection,
"partOf" => iri,
"totalItems" => -1,
"orderedItems" => collection,
- "next" => "#{iri}?max_id=#{min_id
- 1
}"
+ "next" => "#{iri}?max_id=#{min_id}"
}
if max_qid == nil do
}
if max_qid == nil do
@@
-239,6
+239,8
@@
defmodule Pleroma.Web.ActivityPub.UserView do
if offset < total do
Map.put(map, "next", "#{iri}?page=#{page + 1}")
if offset < total do
Map.put(map, "next", "#{iri}?page=#{page + 1}")
+ else
+ map
end
end
end
end
end
end