diff --git a/app/models/conversation.rb b/app/models/conversation.rb index 4207599..3776eb1 100644 --- a/app/models/conversation.rb +++ b/app/models/conversation.rb @@ -6,11 +6,11 @@ class Conversation < ActiveRecord::Base validates_uniqueness_of :sender_id, :scope => :recipient_id - scope :involving, -> (user) do + scope :involving, ->(user) do where("conversations.sender_id =? OR conversations.recipient_id =?",user.id,user.id) end - scope :between, -> (sender_id,recipient_id) do + scope :between, ->(sender_id,recipient_id) do where("(conversations.sender_id = ? AND conversations.recipient_id =?) OR (conversations.sender_id = ? AND conversations.recipient_id =?)", sender_id,recipient_id, recipient_id, sender_id) end -end \ No newline at end of file +end