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

whoops, taking out queue stuff untill i finish

Browse source
This commit is contained in:
maxwell 2010-10-29 13:05:35 -07:00
parent 242c6e4336
commit f75bd6bc2e
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,7 @@ module Diaspora
activate_friend(friend_request.person, destination_aspect) activate_friend(friend_request.person, destination_aspect)
Rails.logger.info("#{self.real_name}'s friend request has been accepted") Rails.logger.info("#{self.real_name}'s friend request has been accepted")
friend_request.destroy friend_request.destroy
Notifier.async.request_accepted(self, friend_request.person, destination_aspect).deliver.commit(1) Notifier.request_accepted(self, friend_request.person, destination_aspect)
#this is a new friend request #this is a new friend request
elsif !from_me elsif !from_me
@ -80,7 +80,7 @@ module Diaspora
self.save self.save
Rails.logger.info("#{self.real_name} has received a friend request") Rails.logger.info("#{self.real_name} has received a friend request")
friend_request.save friend_request.save
Notifier.async.new_request(self, friend_request.person).deliver.commit(1) Notifier.new_request(self, friend_request.person).deliver
else else
Rails.logger.info("unsolicited friend request: #{friend_request.to_json}") Rails.logger.info("unsolicited friend request: #{friend_request.to_json}")
end end

3
spec/models/user_spec.rb
View file

@ -132,7 +132,8 @@ describe User do
user.language.should == 'fr' user.language.should == 'fr'
end end
end end
end
end
describe ".build" do describe ".build" do
context 'with valid params' do context 'with valid params' do