techhub/mastodon
2
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/helpers/atom_builder_helper.rb
View File

@@ -160,7 +160,7 @@ module AtomBuilderHelper
object_type xml, :person
uri xml, TagManager.instance.uri_for(account)
name xml, account.username
email xml, account.local? ? "#{account.acct}@#{Rails.configuration.x.local_domain}" : account.acct
email xml, account.local? ? account.local_username_and_domain : account.acct
summary xml, account.note
link_alternate xml, TagManager.instance.url_for(account)
link_avatar xml, account