Merge branch 'main' into glitch-soc/merge-upstream

2021-05-09 10:41:28 +02:00
parent 5233e99106 9b18914c35
commit 87c3a0d0b3
187 changed files with 5853 additions and 2364 deletions
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@@ -122,7 +122,7 @@ class ResolveAccountService < BaseService
    return false if @options[:check_delivery_availability] && !DeliveryFailureTracker.available?(@domain)
    return false if @options[:skip_webfinger]

-    @account.nil? || (@account.ostatus? && @account.possibly_stale?)
+    @account.nil? || @account.possibly_stale?
  end

  def activitypub_ready?