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

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

1 files changed, 18 insertions, 0 deletions

diff --git a/app/services/unsubscribe_service.rb b/app/services/unsubscribe_service.rb
new file mode 100644
index 000000000..1a951d1b4
--- /dev/null
+++ b/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