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

moved the nailer to the end so setup of mailer doesnt mess with the communitcation

Browse source
This commit is contained in:
ilya 2010-10-22 12:00:14 -07:00
parent d1a2ebd236
commit cbd3487705
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/diaspora/user/friending.rb
View file

@ -71,15 +71,15 @@ module Diaspora
activate_friend(friend_request.person, aspect)
Rails.logger.info("#{self.real_name}'s friend request has been accepted")
Notifier.request_accepted(self, friend_request.person, aspect).deliver
friend_request.destroy
Notifier.request_accepted(self, friend_request.person, aspect).deliver
#this is a new friend request
else
self.pending_requests << friend_request
self.save
Notifier.new_request(self, friend_request.person).deliver
Rails.logger.info("#{self.real_name} has received a friend request")
friend_request.save
Notifier.new_request(self, friend_request.person).deliver
end
end