diff options
| author | ThibG <thib@sitedethib.com> | 2020-10-22 22:38:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-22 22:38:11 +0200 |
| commit | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (patch) | |
| tree | 3f5e2b47d242c4044f0cd69433501834399879d5 /app/models/account_alias.rb | |
| parent | 29870d2be6c0e78132416b5561aba20d6ca3c746 (diff) | |
| parent | 5c60f7eaedbc2dc6184f8b2a4d99f58fdbd5b26b (diff) | |
Merge pull request #1441 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/account_alias.rb')
| -rw-r--r-- | app/models/account_alias.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/account_alias.rb b/app/models/account_alias.rb index 792e9e8d4..3d659142a 100644 --- a/app/models/account_alias.rb +++ b/app/models/account_alias.rb @@ -33,7 +33,7 @@ class AccountAlias < ApplicationRecord def set_uri target_account = ResolveAccountService.new.call(acct) self.uri = ActivityPub::TagManager.instance.uri_for(target_account) unless target_account.nil? - rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error + rescue Webfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError, Mastodon::Error # Validation will take care of it end |