scottk/chatwoot
1
0
Fork 0
mirror of https://github.com/lingble/chatwoot.git synced 2025-11-03 12:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Force account_id in message filters (#7705)

Browse Source
This commit is contained in:
Pranav Raj S
2023-08-10 21:58:25 -07:00
committed by GitHub
parent 1cac2e86c3
commit 1a06bfd69c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/conversation.rb
View File

@@ -170,7 +170,7 @@ class Conversation < ApplicationRecord
end end
def unread_incoming_messages def unread_incoming_messages
unread_messages.incoming.last(10) unread_messages.where(account_id: account_id).incoming.last(10)
end end
def push_event_data def push_event_data

7
app/views/api/v1/conversations/partials/_conversation.json.jbuilder
View File

@@ -20,7 +20,10 @@ json.id conversation.display_id
if conversation.messages.first.blank? if conversation.messages.first.blank?
json.messages [] json.messages []
else else
json.messages [conversation.messages.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last.try(:push_event_data)] json.messages [
conversation.messages.where(account_id: conversation.account_id)
.includes([{ attachments: [{ file_attachment: [:blob] }] }]).last.try(:push_event_data)
]
end end
json.account_id conversation.account_id json.account_id conversation.account_id
@@ -40,7 +43,7 @@ json.created_at conversation.created_at.to_i
json.timestamp conversation.last_activity_at.to_i json.timestamp conversation.last_activity_at.to_i
json.first_reply_created_at conversation.first_reply_created_at.to_i json.first_reply_created_at conversation.first_reply_created_at.to_i
json.unread_count conversation.unread_incoming_messages.count json.unread_count conversation.unread_incoming_messages.count
json.last_non_activity_message conversation.messages.non_activity_messages.first.try(:push_event_data) json.last_non_activity_message conversation.messages.where(account_id: conversation.account_id).non_activity_messages.first.try(:push_event_data)
json.last_activity_at conversation.last_activity_at.to_i json.last_activity_at conversation.last_activity_at.to_i
json.priority conversation.priority json.priority conversation.priority
json.waiting_since conversation.waiting_since.to_i.to_i json.waiting_since conversation.waiting_since.to_i.to_i