diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 9c8d2f711a76243250b027b9b3b8745ebecb0ba2..44bdaf63ff33eae8850066f362c94e527b29e335 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -13,7 +13,7 @@ class PeopleController < ApplicationController def destroy current_user.unfriend(params[:id]) - flash[:notice] = "Successfully destroyed person." + flash[:notice] = "unfriended person." redirect_to people_url end diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index d96dc354c1d04b261bfb46a67a5908a5096f6773..c37a86ca7ebd7312f087bc17e13e1ce41e6340e9 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -8,13 +8,15 @@ class RequestsController < ApplicationController def destroy if params[:accept] - current_user.accept_friend_request params[:id] + @friend = current_user.accept_friend_request params[:id] + flash[:notice] = "you are now friends" + redirect_to root_url else current_user.ignore_friend_request params[:id] flash[:notice] = "ignored friend request" + redirect_to requests_url end - redirect_to requests_url end diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb index daea6466a830b524f6fb4ae584c71c2614e6997f..05150f785feb93495bd91c70b38840834d143a6a 100644 --- a/app/controllers/sockets_controller.rb +++ b/app/controllers/sockets_controller.rb @@ -20,6 +20,11 @@ class SocketsController < ApplicationController def outgoing(object) @_request = ActionDispatch::Request.new({}) + + puts action_hash(object) + + + WebSocket.push_to_clients(action_hash(object)) end diff --git a/app/models/retraction.rb b/app/models/retraction.rb index 1ccfa33f9d80e1cbc4bc5b8bf9b2409d22e3e6de..c799df5fd6549898869207d9a2317cd7577d9710 100644 --- a/app/models/retraction.rb +++ b/app/models/retraction.rb @@ -6,7 +6,7 @@ class Retraction retraction = self.new retraction.post_id= object.id retraction.person_id = person_id_from(object) - retraction.type = object.class + retraction.type = self.type_name(object) retraction end @@ -19,7 +19,8 @@ class Retraction attr_accessor :type def perform - self.type.constantize.delete(self.post_id) + puts('GO GO GO') + self.type.constantize.destroy(self.post_id) end def self.person_id_from(object) @@ -30,4 +31,15 @@ class Retraction end end + + def self.type_name(object) + if object.is_a? Post + object.class + elsif object.is_a? User + 'Person' + else + 'Clowntown' + end + end + end diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml index 84284151af5c92bcda891961d2c9c2dcff344c39..39a4114b380548bffe12f064cd93c725fc2478c8 100644 --- a/app/views/requests/_request.html.haml +++ b/app/views/requests/_request.html.haml @@ -4,6 +4,6 @@ = "#{request.destination_url}" .destroy_link - = link_to 'Accept', request_path(request, :accept => true), :confirm => 'Are you sure?', :method => :delete + = link_to 'Accept', request_path(request, :accept => true), :method => :delete | = link_to 'Ignore', request_path(request), :confirm => 'Are you sure?', :method => :delete