Merge branch 'master' of github.com:diaspora/diaspora

app/controllers/publics_controller.rb

@@ -15,7 +15,7 @@ class PublicsController < ApplicationController
   caches_page :host_meta
 
   def hcard
-    @person = Person.find_by_id params[:id]
+    @person = Person.where(:guid => params[:guid])
     unless @person.nil? || @person.owner.nil?
       render 'publics/hcard'
     else
@@ -48,10 +48,10 @@ class PublicsController < ApplicationController
       return
     end
 
-    person = Person.find(params[:id])
+    person = Person.where(:guid => params[:guid]).first
 
     if person.owner_id.nil?
-      Rails.logger.error("Received post for nonexistent person #{params[:id]}")
+      Rails.logger.error("Received post for nonexistent person #{params[:guid]}")
       render :nothing => true, :status => 404
       return
     end

app/models/person.rb

@@ -80,7 +80,7 @@ class Person < ActiveRecord::Base
   end
 
   def receive_url
-    "#{self.url}receive/users/#{self.id}/"
+    "#{self.url}receive/users/#{self.guid}/"
   end
 
   def public_url

config/routes.rb

@@ -45,9 +45,9 @@ Diaspora::Application.routes.draw do
 
   #public routes
   match 'webfinger',            :to => 'publics#webfinger'
-  match 'hcard/users/:id',      :to => 'publics#hcard'
+  match 'hcard/users/:guid',      :to => 'publics#hcard'
   match '.well-known/host-meta',:to => 'publics#host_meta'
-  match 'receive/users/:id',    :to => 'publics#receive'
+  match 'receive/users/:guid',    :to => 'publics#receive'
   match 'hub',                  :to => 'publics#hub'
 
   #root