Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
pounced-on.me
mastodon
Commits
4faaa5b2
Commit
4faaa5b2
authored
5 years ago
by
ThibG
Committed by
Eugen Rochko
5 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Add updated relationship to follow request API responses (#11800)
Fixes #11747
parent
17389c63
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/controllers/api/v1/follow_requests_controller.rb
+6
-2
app/controllers/api/v1/follow_requests_controller.rb
spec/controllers/api/v1/follow_requests_controller_spec.rb
+12
-0
spec/controllers/api/v1/follow_requests_controller_spec.rb
with
18 additions
and
2 deletions
+18
-2
app/controllers/api/v1/follow_requests_controller.rb
+
6
-
2
View file @
4faaa5b2
...
...
@@ -14,12 +14,12 @@ class Api::V1::FollowRequestsController < Api::BaseController
def
authorize
AuthorizeFollowService
.
new
.
call
(
account
,
current_account
)
NotifyService
.
new
.
call
(
current_account
,
Follow
.
find_by
(
account:
account
,
target_account:
current_account
))
render
_empty
render
json:
account
,
serializer:
REST
::
RelationshipSerializer
,
relationships:
relationships
end
def
reject
RejectFollowService
.
new
.
call
(
account
,
current_account
)
render
_empty
render
json:
account
,
serializer:
REST
::
RelationshipSerializer
,
relationships:
relationships
end
private
...
...
@@ -28,6 +28,10 @@ class Api::V1::FollowRequestsController < Api::BaseController
Account
.
find
(
params
[
:id
])
end
def
relationships
(
**
options
)
AccountRelationshipsPresenter
.
new
([
params
[
:id
]],
current_user
.
account_id
,
options
)
end
def
load_accounts
default_accounts
.
merge
(
paginated_follow_requests
).
to_a
end
...
...
This diff is collapsed.
Click to expand it.
spec/controllers/api/v1/follow_requests_controller_spec.rb
+
12
-
0
View file @
4faaa5b2
...
...
@@ -38,6 +38,12 @@ RSpec.describe Api::V1::FollowRequestsController, type: :controller do
it
'allows follower to follow'
do
expect
(
follower
.
following?
(
user
.
account
)).
to
be
true
end
it
'returns JSON with followed_by=true'
do
json
=
body_as_json
expect
(
json
[
:followed_by
]).
to
be
true
end
end
describe
'POST #reject'
do
...
...
@@ -54,5 +60,11 @@ RSpec.describe Api::V1::FollowRequestsController, type: :controller do
it
'removes follow request'
do
expect
(
FollowRequest
.
where
(
target_account:
user
.
account
,
account:
follower
).
count
).
to
eq
0
end
it
'returns JSON with followed_by=false'
do
json
=
body_as_json
expect
(
json
[
:followed_by
]).
to
be
false
end
end
end
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
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
Menu
Projects
Groups
Snippets
Help