Fixing link to profile for local users in feed.

Hopefully nobody is doing remote feeds yet!

models/author.rb

@@ -12,7 +12,7 @@ class Author
   one :user
 
  # The url of their profile page
-  key :url, String
+  key :remote_url, String
 
   def self.create_from_hash!(hsh)
     create!(
@@ -21,10 +21,18 @@ def self.create_from_hash!(hsh)
       :website => hsh['user_info']['urls']['Website'],
       :bio => hsh['user_info']['description'],
       :image_url => hsh['user_info']['image'],
-      :url => hsh['user_info']['url']
+      :remote_url => hsh['user_info']['url']
     )
   end
 
+  def url
+    if remote_url.nil?
+      "/users/#{username}"
+    else
+      remote_url
+    end
+  end
+
   def avatar_url
     if image_url.nil?
       if email.nil?

models/user.rb

@@ -6,13 +6,14 @@ class User
 
   # Make the username required
   # However, this will break it when email authorization is used
-  key :username, String, :unique => true
+  key :username, String #, :unique => true
   key :perishable_token, String
 
   key :email, String #, :unique => true, :allow_nil => true
+
   # eff you mongo_mapper.
-  validates_uniqueness_of :name, :allow_nil => :true 
-
+  validates_uniqueness_of :email, :allow_nil => :true 
+  validates_uniqueness_of :username, :allow_nil => :true 
 
   belongs_to :author
   belongs_to :feed