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

fix small commenting email bug #oops

Browse source
This commit is contained in:
Maxwell Salzberg 2011-11-04 19:24:48 -07:00
parent 2c12b94e67
commit a552fc80c0
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/comment.rb
View file

@ -59,7 +59,7 @@ class Comment < ActiveRecord::Base
end end
def notification_type(user, person) def notification_type(user, person)
if self.post.author == user.person if (self.post.author == user.person) && (self.author != user.person)
return Notifications::CommentOnPost return Notifications::CommentOnPost
elsif self.post.comments.where(:author_id => user.person.id) != [] && self.author_id != user.person.id elsif self.post.comments.where(:author_id => user.person.id) != [] && self.author_id != user.person.id
return Notifications::AlsoCommented return Notifications::AlsoCommented

6
spec/models/comment_spec.rb
View file

@ -36,6 +36,12 @@ describe Comment do
@comment.notification_type(alice, alice.person).should == Notifications::AlsoCommented @comment.notification_type(alice, alice.person).should == Notifications::AlsoCommented
end end
end end
it 'should not return if you are author of the object being commented on' do
p = Factory(:status_message, :author => bob.person)
c = bob.comment("dfs", :post => p)
c.notification_type(bob, bob.person).should be_false
end
end end
describe 'User#comment' do describe 'User#comment' do