Merge commit 'c40cfc5d09' into upstream-20231129

2023-11-29 12:43:01 +09:00 · 2023-11-29 12:43:01 +09:00 · 16914f5f02
commit 16914f5f02
parent 49da93aa55 c40cfc5d09
50 changed files with 851 additions and 428 deletions
--- a/app/services/resolve_account_service.rb
+++ b/app/services/resolve_account_service.rb
@ -100,7 +100,9 @@ class ResolveAccountService < BaseService
  end

  def split_acct(acct)
-    acct.delete_prefix('acct:').split('@')
+    acct.delete_prefix('acct:').split('@').tap do |parts|
+      raise Webfinger::Error, 'Webfinger response is missing user or host value' unless parts.size == 2
+    end
  end

  def fetch_account!