Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix uncaught domain normalization error in remote follow (#11703)

Browse source
This commit is contained in:
Eugen Rochko 2019-08-30 02:19:17 +02:00 • committed by GitHub
parent 6914482d0a
commit b54b725d6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/remote_follow.rb
View file

@ -6,7 +6,7 @@ class RemoteFollow
attr_accessor :acct, :addressable_template
validates :acct, presence: true
validates :acct, presence: true, domain: { acct: true }
def initialize(attrs = {})
@acct = normalize_acct(attrs[:acct])
@ -21,7 +21,7 @@ class RemoteFollow
end
def subscribe_address_for(account)
addressable_template.expand(uri: account.local_username_and_domain).to_s
addressable_template.expand(uri: ActivityPub::TagManager.instance.uri_for(account)).to_s
end
def interact_address_for(status)
@ -44,6 +44,8 @@ class RemoteFollow
end
[username, domain].compact.join('@')
rescue Addressable::URI::InvalidURIError
value
end
def fetch_template!