Fix #329 - avatar errors no longer prevent remote accounts from being saved

(without avatar). Also improved search position of exact matches

app/services/search_service.rb

@@ -6,13 +6,16 @@ class SearchService < BaseService
 
     username, domain = query.gsub(/\A@/, '').split('@')
 
-    results = if domain.nil?
-                Account.search_for(username)
-              else
-                Account.search_for("#{username} #{domain}")
-              end
+    if domain.nil?
+      exact_match = Account.find_local(username)
+      results     = Account.search_for(username)
+    else
+      exact_match = Account.find_remote(username, domain)
+      results     = Account.search_for("#{username} #{domain}")
+    end
 
-    results = results.limit(limit)
+    results = results.limit(limit).to_a
+    results = [exact_match] + results.reject { |a| a.id == exact_match.id } if exact_match
 
     if resolve && results.empty? && !domain.nil?
       results = [FollowRemoteAccountService.new.call("#{username}@#{domain}")]

app/services/unsubscribe_service.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class UnsubscribeService < BaseService
+  def call(account)
+    subscription = account.subscription(api_subscription_url(account.id))
+    response = subscription.unsubscribe
+
+    unless response.successful?
+      Rails.logger.debug "PuSH unsubscribe for #{account.acct} failed: #{response.message}"
+    end
+
+    account.secret = ''
+    account.subscription_expires_at = nil
+    account.save!
+  rescue HTTP::Error, OpenSSL::SSL::SSLError
+    Rails.logger.debug "PuSH subscription request for #{account.acct} could not be made due to HTTP or SSL error"
+  end
+end

app/services/update_remote_profile_service.rb

@@ -15,7 +15,8 @@ class UpdateRemoteProfileService < BaseService
 
     old_hub_url     = account.hub_url
     account.hub_url = hub_link['href'] if !hub_link.nil? && !hub_link['href'].blank? && (hub_link['href'] != old_hub_url)
-    account.save!
+
+    account.save_with_optional_avatar!
 
     SubscribeService.new.call(account) if resubscribe && (account.hub_url != old_hub_url)
   end