Fix admin UI not loading JS, make sure to strip "acct:" out of remote account's usernames when authorizing follow

rebase/4.0.0rc2
Eugen Rochko 2017-01-02 22:31:10 +01:00
parent 136e18b875
commit f79ba2de83
2 changed files with 11 additions and 4 deletions

View File

@ -6,7 +6,7 @@ class AuthorizeFollowController < ApplicationController
before_action :authenticate_user! before_action :authenticate_user!
def new def new
uri = Addressable::URI.parse(params[:acct]) uri = Addressable::URI.parse(acct_param)
if uri.path && %w(http https).include?(uri.scheme) if uri.path && %w(http https).include?(uri.scheme)
set_account_from_url set_account_from_url
@ -18,7 +18,7 @@ class AuthorizeFollowController < ApplicationController
end end
def create def create
@account = FollowService.new.call(current_account, params[:acct]).try(:target_account) @account = FollowService.new.call(current_account, acct_param).try(:target_account)
if @account.nil? if @account.nil?
render :error render :error
@ -32,10 +32,14 @@ class AuthorizeFollowController < ApplicationController
private private
def set_account_from_url def set_account_from_url
@account = FetchRemoteAccountService.new.call(params[:acct]) @account = FetchRemoteAccountService.new.call(acct_param)
end end
def set_account_from_acct def set_account_from_acct
@account = FollowRemoteAccountService.new.call(params[:acct]) @account = FollowRemoteAccountService.new.call(acct_param)
end
def acct_param
params[:acct].gsub(/\Aacct:/, '')
end end
end end

View File

@ -1,3 +1,6 @@
- content_for :header_tags do
= javascript_include_tag 'application_public'
- content_for :content do - content_for :content do
.admin-wrapper .admin-wrapper
.sidebar .sidebar