about summary refs log tree commit diff
path: root/app/models/account.rb
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-04-10 16:58:06 -0400
committerEugen <eugen@zeonfederated.com>2017-04-10 22:58:06 +0200
commit0687ab8ae3c2573ba2aa1d37f62e3583d0c7ab01 (patch)
tree24ea1de1856ec7f203f6f89c5b8231a5d37da2cb /app/models/account.rb
parent64dbde0dbf8c5d3ce820f780644d46a6b18e6743 (diff)
Clean up generation of account webfinger string (#1477)
* Consolidate webfinger string creation under Account#to_webfinger_s

* Introduce Account#local_username_and_domain for consolidation
Diffstat (limited to 'app/models/account.rb')
-rw-r--r--app/models/account.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb
index c59c76009..a482fc8e6 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -120,6 +120,14 @@ class Account < ApplicationRecord
     local? ? username : "#{username}@#{domain}"
   end
 
+  def local_username_and_domain
+    "#{username}@#{Rails.configuration.x.local_domain}"
+  end
+
+  def to_webfinger_s
+    "acct:#{local_username_and_domain}"
+  end
+
   def subscribed?
     !subscription_expires_at.blank?
   end