nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added terse_pod_url to the APP_CONFIG hash

Browse source
This commit is contained in:
ilya 2010-09-21 20:01:56 -07:00
parent d60dc03d35
commit 6d6ca3d8bc
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/user.rb
View file

@ -239,11 +239,8 @@ class User
###Helpers############
def self.instantiate!( opts = {} )
terse_url = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '')
terse_url.chop! if terse_url[-1, 1] == '/'
opts[:person][:diaspora_handle] = "#{opts[:username]}@#{terse_url}"
opts[:person][:url] = APP_CONFIG[:pod_url]
opts[:person][:diaspora_handle] = "#{opts[:username]}@#{APP_CONFIG[:terse_pod_url]}"
pts[:person][:url] = APP_CONFIG[:pod_url]
opts[:person][:serialized_key] = generate_key
User.create(opts)
end

5
config/initializers/_load_app_config.rb
View file

@ -20,4 +20,7 @@ else
APP_CONFIG = all_envs['default'].symbolize_keys
end
puts "WARNING: Please modify your app_config.yml to have a proper pod_url!" if APP_CONFIG[:pod_url] == "http://example.org/" && Rails.env != :test
APP_CONFIG[:terse_pod_url] = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '')
APP_CONFIG[:terse_pod_url].chop! if APP_CONFIG[:terse_pod_url][-1, 1] == '/'
puts "WARNING: Please modify your app_config.yml to have a proper pod_url!" if APP_CONFIG[:terse_pod_url] == "example.org" && Rails.env != :test