Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Follow call on locked account creates follow request instead

Browse source 
Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts
This commit is contained in:
Eugen Rochko 2016-12-22 23:03:57 +01:00
parent 2d2154ba75
commit b891a81008
24 changed files with 145 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/api/v1/accounts_controller.rb
View file

@ -84,10 +84,12 @@ class Api::V1::AccountsController < ApiController
def relationships
ids = params[:id].is_a?(Enumerable) ? params[:id].map(&:to_i) : [params[:id].to_i]
@accounts = Account.where(id: ids).select('id')
@following = Account.following_map(ids, current_user.account_id)
@followed_by = Account.followed_by_map(ids, current_user.account_id)
@blocking = Account.blocking_map(ids, current_user.account_id)
@requested = Account.requested_map(ids, current_user.account_id)
end
def search
@ -109,5 +111,6 @@ class Api::V1::AccountsController < ApiController
@following = Account.following_map([@account.id], current_user.account_id)
@followed_by = Account.followed_by_map([@account.id], current_user.account_id)
@blocking = Account.blocking_map([@account.id], current_user.account_id)
@requested = Account.requested_map([@account.id], current_user.account_id)
end
end