diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-12 02:54:13 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-12 02:54:13 -0600 |
| commit | a057ed5cfea2c1c4fb21984cadae993740fb25e0 (patch) | |
| tree | c965f135b8c46f679eb22e80a37550c8b985b9ea /app/services | |
| parent | 04eaa1943f002865f8a0234e19c6ea4cc1d3bb6a (diff) | |
| parent | 14c4a33cd9bfc1212cb362897272e5ea7d1529e5 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/account_search_service.rb | 2 | ||||
| -rw-r--r-- | app/services/fetch_link_card_service.rb | 2 | ||||
| -rw-r--r-- | app/services/resolve_remote_account_service.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb index a289ceac4..3be110665 100644 --- a/app/services/account_search_service.rb +++ b/app/services/account_search_service.rb @@ -4,7 +4,7 @@ class AccountSearchService < BaseService attr_reader :query, :limit, :options, :account def call(query, limit, account = nil, options = {}) - @query = query + @query = query.strip @limit = limit @options = options @account = account diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb index cec96d927..7f4518ea7 100644 --- a/app/services/fetch_link_card_service.rb +++ b/app/services/fetch_link_card_service.rb @@ -38,7 +38,7 @@ class FetchLinkCardService < BaseService @card ||= PreviewCard.new(url: @url) res = Request.new(:head, @url).perform - return if res.code != 200 || res.mime_type != 'text/html' + return if res.code != 405 && (res.code != 200 || res.mime_type != 'text/html') attempt_oembed || attempt_opengraph end diff --git a/app/services/resolve_remote_account_service.rb b/app/services/resolve_remote_account_service.rb index 3293fe40f..d7d0be210 100644 --- a/app/services/resolve_remote_account_service.rb +++ b/app/services/resolve_remote_account_service.rb @@ -44,7 +44,7 @@ class ResolveRemoteAccountService < BaseService if lock.acquired? @account = Account.find_remote(@username, @domain) - if activitypub_ready? + if activitypub_ready? || @account&.activitypub? handle_activitypub else handle_ostatus |