diff options
author | ThibG <thib@sitedethib.com> | 2019-08-31 19:44:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-31 19:44:47 +0200 |
commit | 147e90f35d9aadfbe15d044f3ce48be77e26968a (patch) | |
tree | b8aad6a1a34cd897bdb187cdf1fb1cacf7ac721c /app/models/remote_follow.rb | |
parent | 2848c08953a8555e06791170dbf1090575e05d8a (diff) | |
parent | ef270ed0df5a247b77853610f2f108206828a67a (diff) |
Merge pull request #1209 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/remote_follow.rb')
-rw-r--r-- | app/models/remote_follow.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb index 93df11724..52dd3f67b 100644 --- a/app/models/remote_follow.rb +++ b/app/models/remote_follow.rb @@ -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! |