330401bec0
* Eliminate extra accounts select query from FollowService * Optimistically update follow state in web UI and hide loading bar Fix #6205 * Asynchronize NotifyService in FollowService And fix failing test * Skip Webfinger resolve routine when called from FollowService if possible If an account is ActivityPub, then webfinger re-resolving is not necessary when called from FollowService. Improve options of ResolveAccountService
24 lines
749 B
Ruby
24 lines
749 B
Ruby
# frozen_string_literal: true
|
|
|
|
module AuthorExtractor
|
|
def author_from_xml(xml, update_profile = true)
|
|
return nil if xml.nil?
|
|
|
|
# Try <email> for acct
|
|
acct = xml.at_xpath('./xmlns:author/xmlns:email', xmlns: OStatus::TagManager::XMLNS)&.content
|
|
|
|
# Try <name> + <uri>
|
|
if acct.blank?
|
|
username = xml.at_xpath('./xmlns:author/xmlns:name', xmlns: OStatus::TagManager::XMLNS)&.content
|
|
uri = xml.at_xpath('./xmlns:author/xmlns:uri', xmlns: OStatus::TagManager::XMLNS)&.content
|
|
|
|
return nil if username.blank? || uri.blank?
|
|
|
|
domain = Addressable::URI.parse(uri).normalized_host
|
|
acct = "#{username}@#{domain}"
|
|
end
|
|
|
|
ResolveAccountService.new.call(acct, update_profile: update_profile)
|
|
end
|
|
end
|