mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 04:55:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2027 - Accept own ID for remote follow with and without preceding @ (#2991)

Browse Source 
* Fix #2027 - Accept own ID for remote follow with and without preceding @
Fix #2177 - Omit leading "acct:" in remote follow redirect template expansion

* Fix test
This commit is contained in:
Eugen Rochko 2017-05-11 21:54:30 +02:00 committed by GitHub
parent a822f7a05a
commit 65f9db73b0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/remote_follow.rb
View File

@ -6,7 +6,7 @@ class RemoteFollow
attr_accessor :acct, :addressable_template attr_accessor :acct, :addressable_template
def initialize(attrs = {}) def initialize(attrs = {})
@acct = attrs[:acct].strip unless attrs[:acct].nil? @acct = attrs[:acct].gsub(/\A@/, '').strip unless attrs[:acct].nil?
end end
def valid? def valid?
@ -15,7 +15,7 @@ class RemoteFollow
end end
def subscribe_address_for(account) def subscribe_address_for(account)
addressable_template.expand(uri: account.to_webfinger_s).to_s addressable_template.expand(uri: account.local_username_and_domain).to_s
end end
private private

2
spec/controllers/remote_follow_controller_spec.rb
View File

@ -66,7 +66,7 @@ describe RemoteFollowController do
end end
it 'redirects to the remote location' do it 'redirects to the remote location' do
address = "http://example.com/follow_me?acct=acct%3Atest_user%40#{Rails.configuration.x.local_domain}" address = "http://example.com/follow_me?acct=test_user%40#{Rails.configuration.x.local_domain}"
expect(response).to redirect_to(address) expect(response).to redirect_to(address)
end end