From 65f9db73b01012fd4944be9a56ba4a85407590aa Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 11 May 2017 21:54:30 +0200 Subject: Fix #2027 - Accept own ID for remote follow with and without preceding @ (#2991) * 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 --- app/models/remote_follow.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/models/remote_follow.rb') diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb index c226cdb14..3da3ba0ae 100644 --- a/app/models/remote_follow.rb +++ b/app/models/remote_follow.rb @@ -6,7 +6,7 @@ class RemoteFollow attr_accessor :acct, :addressable_template def initialize(attrs = {}) - @acct = attrs[:acct].strip unless attrs[:acct].nil? + @acct = attrs[:acct].gsub(/\A@/, '').strip unless attrs[:acct].nil? end def valid? @@ -15,7 +15,7 @@ class RemoteFollow end 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 private -- cgit