From dc1dd07720982a35a5827ad39d48bfaa517527e2 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Mon, 23 Aug 2010 11:04:57 -0700
Subject: [PATCH] Don't crash on requesting a non-existent email address

---
 app/controllers/groups_controller.rb   |  1 -
 app/controllers/requests_controller.rb | 12 ++++++++----
 app/helpers/requests_helper.rb         |  1 -
 app/views/requests/_form.haml          |  6 ------
 app/views/requests/new.html.haml       |  5 -----
 5 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 app/views/requests/_form.haml
 delete mode 100644 app/views/requests/new.html.haml

diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 88b8235f2..d8790a861 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -33,7 +33,6 @@ class GroupsController < ApplicationController
     @group = Group.first(:id => params[:id])
 
     @posts = current_user.visible_posts( :by_members_of => @group ).paginate :order => 'created_at DESC'
-    #@posts = Post.paginate :person_id => @people_ids, :order => 'created_at DESC'
   end
 
   def edit
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index 24c4634b8..77f433121 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -31,8 +31,13 @@ class RequestsController < ApplicationController
   end
   
   def create
-    puts params.inspect
-    rel_hash = relationship_flow(params[:request][:destination_url])
+    begin 
+      rel_hash = relationship_flow(params[:request][:destination_url])
+    rescue Exception => e
+      flash[:error] = "no diaspora seed found with this email!"
+      redirect_to current_user.group_by_id(params[:request][:group_id])
+      return
+    end
     Rails.logger.debug("Sending request: #{rel_hash}")
     @request = current_user.send_request(rel_hash, params[:request][:group_id])
 
@@ -45,8 +50,7 @@ class RequestsController < ApplicationController
       else
         flash[:error] = "you have already friended this person"
       end
-      @request = Request.new
-      render :action => 'new'
+      redirect_to current_user.group_by_id(params[:request][:group_id])
     end
   end
 
diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb
index c0320c0b8..37a5485c4 100644
--- a/app/helpers/requests_helper.rb
+++ b/app/helpers/requests_helper.rb
@@ -29,7 +29,6 @@ module RequestsHelper
     action = :none
     url = nil
     local_person = Person.by_webfinger identifier
-    puts local_person.inspect
     if local_person
       action = (local_person == current_user.person ? :none : :friend)
       url = local_person.receive_url
diff --git a/app/views/requests/_form.haml b/app/views/requests/_form.haml
deleted file mode 100644
index de088d363..000000000
--- a/app/views/requests/_form.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-= form_for @request do |f|
-  = f.error_messages
-
-  .field_with_submit
-    = f.text_field :destination_url
-    = f.submit
diff --git a/app/views/requests/new.html.haml b/app/views/requests/new.html.haml
deleted file mode 100644
index 8a5276998..000000000
--- a/app/views/requests/new.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%h1 requests
-
-= render 'form'
-
-%p= link_to "Back to List", requests_path