Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Clean up generation of account webfinger string (#1477)

Browse source 
* Consolidate webfinger string creation under Account#to_webfinger_s

* Introduce Account#local_username_and_domain for consolidation
This commit is contained in:
Matt Jankowski 2017-04-10 16:58:06 -04:00 • committed by Eugen
parent 64dbde0dbf
commit 0687ab8ae3
9 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/atom_serializer.rb
View file

@ -20,7 +20,7 @@ class AtomSerializer
append_element(author, 'activity:object-type', TagManager::TYPES[:person])
append_element(author, 'uri', uri)
append_element(author, 'name', account.username)
append_element(author, 'email', account.local? ? "#{account.acct}@#{Rails.configuration.x.local_domain}" : account.acct)
append_element(author, 'email', account.local? ? account.local_username_and_domain : account.acct)
append_element(author, 'summary', account.note)
append_element(author, 'link', nil, rel: :alternate, type: 'text/html', href: TagManager.instance.url_for(account))
append_element(author, 'link', nil, rel: :avatar, type: account.avatar_content_type, 'media:width': 120, 'media:height': 120, href: full_asset_url(account.avatar.url(:original)))