Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
pleroma
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alexander Strizhakov
pleroma
Commits
5307c211
Commit
5307c211
authored
Feb 14, 2019
by
kaniini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
activitypub: user view: report totalItems=0 for follows/followers when hidden
parent
6542b862
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
8 deletions
+29
-8
lib/pleroma/web/activity_pub/views/user_view.ex
lib/pleroma/web/activity_pub/views/user_view.ex
+29
-8
No files found.
lib/pleroma/web/activity_pub/views/user_view.ex
View file @
5307c211
...
...
@@ -104,8 +104,14 @@ def render("following.json", %{user: user, page: page}) do
query
=
User
.
get_friends_query
(
user
)
query
=
from
(
user
in
query
,
select:
[
:ap_id
])
following
=
Repo
.
all
(
query
)
total
=
if
!user
.
info
.
hide_follows
do
length
(
following
)
else
0
end
collection
(
following
,
"
#{
user
.
ap_id
}
/following"
,
page
,
!user
.
info
.
hide_follows
)
collection
(
following
,
"
#{
user
.
ap_id
}
/following"
,
page
,
!user
.
info
.
hide_follows
,
total
)
|>
Map
.
merge
(
Utils
.
make_json_ld_header
())
end
...
...
@@ -113,11 +119,17 @@ def render("following.json", %{user: user}) do
query
=
User
.
get_friends_query
(
user
)
query
=
from
(
user
in
query
,
select:
[
:ap_id
])
following
=
Repo
.
all
(
query
)
total
=
if
!user
.
info
.
hide_follows
do
length
(
following
)
else
0
end
%{
"id"
=>
"
#{
user
.
ap_id
}
/following"
,
"type"
=>
"OrderedCollection"
,
"totalItems"
=>
length
(
following
)
,
"totalItems"
=>
total
,
"first"
=>
collection
(
following
,
"
#{
user
.
ap_id
}
/following"
,
1
,
!user
.
info
.
hide_follows
)
}
|>
Map
.
merge
(
Utils
.
make_json_ld_header
())
...
...
@@ -127,8 +139,14 @@ def render("followers.json", %{user: user, page: page}) do
query
=
User
.
get_followers_query
(
user
)
query
=
from
(
user
in
query
,
select:
[
:ap_id
])
followers
=
Repo
.
all
(
query
)
total
=
if
!user
.
info
.
hide_followers
do
length
(
followers
)
else
0
end
collection
(
followers
,
"
#{
user
.
ap_id
}
/followers"
,
page
,
!user
.
info
.
hide_followers
)
collection
(
followers
,
"
#{
user
.
ap_id
}
/followers"
,
page
,
!user
.
info
.
hide_followers
,
total
)
|>
Map
.
merge
(
Utils
.
make_json_ld_header
())
end
...
...
@@ -136,20 +154,23 @@ def render("followers.json", %{user: user}) do
query
=
User
.
get_followers_query
(
user
)
query
=
from
(
user
in
query
,
select:
[
:ap_id
])
followers
=
Repo
.
all
(
query
)
total
=
if
!user
.
info
.
hide_followers
do
length
(
followers
)
else
0
end
%{
"id"
=>
"
#{
user
.
ap_id
}
/followers"
,
"type"
=>
"OrderedCollection"
,
"totalItems"
=>
length
(
followers
)
,
"first"
=>
collection
(
followers
,
"
#{
user
.
ap_id
}
/followers"
,
1
,
!user
.
info
.
hide_followers
)
"totalItems"
=>
total
,
"first"
=>
collection
(
followers
,
"
#{
user
.
ap_id
}
/followers"
,
1
,
!user
.
info
.
hide_followers
,
total
)
}
|>
Map
.
merge
(
Utils
.
make_json_ld_header
())
end
def
render
(
"outbox.json"
,
%{
user:
user
,
max_id:
max_qid
})
do
# XXX: technically note_count is wrong for this, but it's better than nothing
info
=
User
.
user_info
(
user
)
params
=
%{
"limit"
=>
"10"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment