0
0
Fork 0

Restful refactor of accounts/ routes (#2133)

* Add routing specs for accounts followers and following actions

* Use more restful route naming for public account follow pages

Moves two actions:
- accounts#followers to accounts/follower_accounts#index
- accounts#following to accounts/following_accounts#index

Adds routing spec to ensure prior URLs are preserved.
This commit is contained in:
Matt Jankowski 2017-04-19 07:52:37 -04:00 committed by Eugen
parent c0b30c56db
commit 8bac0350d1
18 changed files with 275 additions and 63 deletions

View file

@ -1,12 +1,7 @@
# frozen_string_literal: true
class AccountsController < ApplicationController
layout 'public'
before_action :set_account
before_action :set_link_headers
before_action :authenticate_user!, only: [:follow, :unfollow]
before_action :check_account_suspension
include AccountControllerConcern
def show
respond_to do |format|
@ -24,39 +19,9 @@ class AccountsController < ApplicationController
end
end
def follow
FollowService.new.call(current_user.account, @account.acct)
redirect_to account_path(@account)
end
def unfollow
UnfollowService.new.call(current_user.account, @account)
redirect_to account_path(@account)
end
def followers
@followers = @account.followers.order('follows.created_at desc').page(params[:page]).per(12)
end
def following
@following = @account.following.order('follows.created_at desc').page(params[:page]).per(12)
end
private
def set_account
@account = Account.find_local!(params[:username])
end
def set_link_headers
response.headers['Link'] = LinkHeader.new([[webfinger_account_url, [%w(rel lrdd), %w(type application/xrd+xml)]], [account_url(@account, format: 'atom'), [%w(rel alternate), %w(type application/atom+xml)]]])
end
def webfinger_account_url
webfinger_url(resource: @account.to_webfinger_s)
end
def check_account_suspension
gone if @account.suspended?
end
end