diff --git a/app/models/user.rb b/app/models/user.rb index 8f74e2233a711d51780da54381d8786b25434e47..2b74f437b6cbeeaa24f9d4a4b09ec734b4f4165a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -259,14 +259,9 @@ class User aspect(:name => "Work") end - def terse_url - terse = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '') - terse = terse.chop! if terse[-1, 1] == '/' - terse - end def diaspora_handle - "#{self.username}@#{self.terse_url}" + "#{self.username}@#{APP_CONFIG[:terse_pod_url]}" end def downcase_username diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index 3275d9245223017007c6352ff2d084b9d1b43bed..721310409c5400070181718d338ca4bcb590ebab 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -24,7 +24,7 @@ describe Person do context 'remote people' do it 'stores the diaspora_handle in the database' do - @person.diaspora_handle.include?(@user.terse_url).should be false + @person.diaspora_handle.include?(APP_CONFIG[:terse_pod_url]).should be false end end end