From 90d8da2777e6c2a93a03fa3c16833c2156c46553 Mon Sep 17 00:00:00 2001 From: Kir Date: Thu, 9 Feb 2012 20:27:11 +0200 Subject: Adding unread_for? to message with tests --- app/models/discussion.rb | 1 - app/models/message.rb | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/models/discussion.rb b/app/models/discussion.rb index c52dac0..14395b9 100644 --- a/app/models/discussion.rb +++ b/app/models/discussion.rb @@ -92,7 +92,6 @@ class Discussion < ActiveRecord::Base def mark_as_read_for(user) speaker = Speaker.find_or_create_by_user_id_and_discussion_id(user.id, self.id) - # flag.update_attributes(:updat => Time.zone.now) speaker.touch end diff --git a/app/models/message.rb b/app/models/message.rb index 436775b..b57cca8 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -12,6 +12,15 @@ class Message < ActiveRecord::Base def visible_for? user self.created_at.to_i >= self.discussion.user_invited_at(user).to_i end + + def unread_for? user + speaker = self.discussion.find_speaker_by_user(user) + if speaker + self.created_at.to_i >= speaker.updated_at.to_i + else + true + end + end private -- cgit v1.2.3