OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Fix error when looking handle with surrounding spaces (#18225)

pull/18259/head
Claire 2022-05-02 01:00:08 +02:00 committed by GitHub
parent 33f3818d66
commit 9a3be0ad68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/accounts/lookup_controller.rb
View File

@ -12,5 +12,7 @@ class Api::V1::Accounts::LookupController < Api::BaseController
def set_account def set_account
@account = ResolveAccountService.new.call(params[:acct], skip_webfinger: true) || raise(ActiveRecord::RecordNotFound) @account = ResolveAccountService.new.call(params[:acct], skip_webfinger: true) || raise(ActiveRecord::RecordNotFound)
rescue Addressable::URI::InvalidURIError
raise(ActiveRecord::RecordNotFound)
end end
end end

2
app/services/resolve_account_service.rb
View File

@ -66,7 +66,7 @@ class ResolveAccountService < BaseService
@username = @account.username @username = @account.username
@domain = @account.domain @domain = @account.domain
else else
@username, @domain = uri.split('@') @username, @domain = uri.strip.gsub(/\A@/, '').split('@')
end end
@domain = begin @domain = begin