-
-
-
- +
Date: Mon, 4 Aug 2025 19:08:45 -0700
Subject: [PATCH 05/15] fix: Skip HookJob for inactive or irrelevant hooks
(#12093)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
On Aug 2, we had a P0 because of a sudden spike in Sidekiq jobs. The
queue went up to 100k jobs and workers scaled from 400 threads to 1000+.
Most of the jobs were HookJobs, and a large chunk of them were for
Linear but they weren’t doing anything useful.
Turns out, whenever there’s an update on a contact or conversation, we
were triggering all account-level hooks without checking if the event
was relevant. So if someone did a bulk import or ran an update, it would
enqueue a huge number of unnecessary jobs.
This PR adds two checks before enqueuing:
- Whether the hook is active
- Whether the event is relevant for that hook
---
app/listeners/hook_listener.rb | 20 ++++++-
spec/listeners/hook_listener_spec.rb | 82 +++++++++++++++++++++++++++-
2 files changed, 100 insertions(+), 2 deletions(-)
diff --git a/app/listeners/hook_listener.rb b/app/listeners/hook_listener.rb
index 3360e23da..936d104a0 100644
--- a/app/listeners/hook_listener.rb
+++ b/app/listeners/hook_listener.rb
@@ -37,10 +37,11 @@ class HookListener < BaseListener
private
def execute_hooks(event, message)
- message.account.hooks.each do |hook|
+ message.account.hooks.find_each do |hook|
# In case of dialogflow, we would have a hook for each inbox.
# Which means we will execute the same hook multiple times if the below filter isn't there
next if hook.inbox.present? && hook.inbox != message.inbox
+ next unless supported_hook_event?(hook, event.name)
HookJob.perform_later(hook, event.name, message: message)
end
@@ -48,7 +49,24 @@ class HookListener < BaseListener
def execute_account_hooks(event, account, event_data = {})
account.hooks.account_hooks.find_each do |hook|
+ next unless supported_hook_event?(hook, event.name)
+
HookJob.perform_later(hook, event.name, event_data)
end
end
+
+ def supported_hook_event?(hook, event_name)
+ return false if hook.disabled?
+
+ supported_events_map = {
+ 'slack' => ['message.created'],
+ 'dialogflow' => ['message.created', 'message.updated'],
+ 'google_translate' => ['message.created'],
+ 'leadsquared' => ['contact.updated', 'conversation.created', 'conversation.resolved']
+ }
+
+ return false unless supported_events_map.key?(hook.app_id)
+
+ supported_events_map[hook.app_id].include?(event_name)
+ end
end
diff --git a/spec/listeners/hook_listener_spec.rb b/spec/listeners/hook_listener_spec.rb
index 4caa4dafd..3ae031237 100644
--- a/spec/listeners/hook_listener_spec.rb
+++ b/spec/listeners/hook_listener_spec.rb
@@ -10,6 +10,8 @@ describe HookListener do
account: account, inbox: inbox, conversation: conversation)
end
let!(:event) { Events::Base.new(event_name, Time.zone.now, message: message) }
+ let(:contact_event) { Events::Base.new('contact.updated', Time.zone.now, contact: conversation.contact) }
+ let(:conversation_event) { Events::Base.new('conversation.created', Time.zone.now, conversation: conversation) }
describe '#message_created' do
let(:event_name) { 'message.created' }
@@ -42,10 +44,88 @@ describe HookListener do
context 'when hook is configured' do
it 'triggers hook job' do
- hook = create(:integrations_hook, account: account)
+ hook = create(:integrations_hook, :dialogflow, account: account, inbox: inbox)
expect(HookJob).to receive(:perform_later).with(hook, 'message.updated', message: message).once
listener.message_updated(event)
end
end
end
+
+ describe 'hook job enqueuing behavior' do
+ let(:event_name) { 'message.created' }
+
+ context 'when app_id is not in the allowed list' do
+ it 'does not enqueue the job' do
+ create(:integrations_hook, account: account, app_id: 'unsupported_app')
+ expect(HookJob).not_to receive(:perform_later)
+
+ listener.message_created(event)
+ end
+ end
+
+ context 'when hook is enabled and app_id is supported' do
+ it 'enqueues the job for slack' do
+ hook = create(:integrations_hook, account: account)
+ expect(HookJob).to receive(:perform_later).with(hook, event_name, message: message)
+
+ listener.message_created(event)
+ end
+
+ it 'enqueues the job for dialogflow' do
+ hook = create(:integrations_hook, :dialogflow, account: account, inbox: inbox)
+ expect(HookJob).to receive(:perform_later).with(hook, event_name, message: message)
+
+ listener.message_created(event)
+ end
+
+ it 'enqueues the job for google_translate' do
+ hook = create(:integrations_hook, :google_translate, account: account)
+ expect(HookJob).to receive(:perform_later).with(hook, event_name, message: message)
+
+ listener.message_created(event)
+ end
+ end
+
+ context 'with disabled hook' do
+ it 'does not enqueue job for disabled hooks' do
+ create(:integrations_hook, account: account, status: 'disabled', app_id: 'slack')
+ expect(HookJob).not_to receive(:perform_later)
+
+ listener.message_created(event)
+ end
+ end
+
+ context 'with unsupported app_id and event combination' do
+ it 'does not enqueue job for unsupported app_id' do
+ create(:integrations_hook, account: account, app_id: 'unsupported_app')
+ expect(HookJob).not_to receive(:perform_later)
+
+ listener.message_created(event)
+ end
+ end
+
+ context 'with leadsquared hook' do
+ let(:hook) { create(:integrations_hook, :leadsquared, account: account) }
+
+ before do
+ account.enable_features(:crm_integration)
+ end
+
+ it 'enqueues the job for conversation.created' do
+ expect(HookJob)
+ .to receive(:perform_later)
+ .with(hook, 'conversation.created', { conversation: conversation })
+
+ listener.conversation_created(conversation_event)
+ end
+
+ it 'enqueues the job for contact.updated' do
+ expect(HookJob)
+ .to receive(:perform_later)
+ .with(hook, 'contact.updated', { contact: conversation.contact })
+
+ listener.contact_updated(contact_event)
+ end
+ end
+ end
end
From 84fd7695704ce15e2447c84637fcf2a318fc6b08 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:22:29 +0530
Subject: [PATCH 06/15] fix: Overflow issue with conversation card (#12104)
# Pull Request Template
## Description
This PR fixes a minor UI overflow issue in the conversation card, where
the assignee name overflows when the inbox name is too long.
## Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
### Screenshot
**Before**
**After**
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
.../dashboard/components/widgets/InboxName.vue | 10 +++++-----
.../widgets/conversation/ConversationCard.vue | 14 +++++++++-----
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/app/javascript/dashboard/components/widgets/InboxName.vue b/app/javascript/dashboard/components/widgets/InboxName.vue
index 693162f95..cf48b0837 100644
--- a/app/javascript/dashboard/components/widgets/InboxName.vue
+++ b/app/javascript/dashboard/components/widgets/InboxName.vue
@@ -19,14 +19,14 @@ export default {
-
- +
+
+
+
- -
-
-
-
-
-
-
-
-
-
-
-
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+ + + + + +
From 661e905dbd78101acdadb57bdad16ec1f1558501 Mon Sep 17 00:00:00 2001
From: Pranav - -
-
+ + +
+ + + + + +
+
-
-
+
Date: Tue, 5 Aug 2025 00:47:06 -0700
Subject: [PATCH 07/15] fix: Disable automations on auto-reply emails (#12101)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The term "sorcerer’s apprentice mode" is defined as a bug in a protocol
where, under some circumstances, the receipt of a message causes
multiple messages to be sent, each of which, when received, triggers the
same bug. - RFC3834
Reference: https://github.com/chatwoot/chatwoot/pull/9606
This PR:
- Adds an auto_reply attribute to message.
- Adds an auto_reply attribute to conversation.
- Disable conversation_created / conversation_opened event if auto_reply
is set.
- Disable message_created event if auto_reply is set.
---------
Co-authored-by: Muhsin Keloth
Date: Tue, 5 Aug 2025 00:47:06 -0700
Subject: [PATCH 07/15] fix: Disable automations on auto-reply emails (#12101)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The term "sorcerer’s apprentice mode" is defined as a bug in a protocol
where, under some circumstances, the receipt of a message causes
multiple messages to be sent, each of which, when received, triggers the
same bug. - RFC3834
Reference: https://github.com/chatwoot/chatwoot/pull/9606
This PR:
- Adds an auto_reply attribute to message.
- Adds an auto_reply attribute to conversation.
- Disable conversation_created / conversation_opened event if auto_reply
is set.
- Disable message_created event if auto_reply is set.
---------
Co-authored-by: Muhsin Keloth
---
app/listeners/automation_rule_listener.rb | 11 +++-
app/mailboxes/imap/imap_mailbox.rb | 1 +
.../incoming_email_validity_helper.rb | 16 -----
app/mailboxes/support_mailbox.rb | 1 +
app/models/message.rb | 6 ++
app/presenters/mail_presenter.rb | 3 +-
.../hook_execution_service.rb | 1 +
.../automation_rule_listener_spec.rb | 19 ++++++
spec/mailboxes/imap/imap_mailbox_spec.rb | 5 +-
spec/mailboxes/reply_mailbox_spec.rb | 3 +-
spec/mailboxes/support_mailbox_spec.rb | 2 +-
spec/models/message_spec.rb | 65 +++++++++++++++++++
spec/presenters/mail_presenter_spec.rb | 9 ++-
.../hook_execution_service_spec.rb | 29 +++++++++
14 files changed, 147 insertions(+), 24 deletions(-)
diff --git a/app/listeners/automation_rule_listener.rb b/app/listeners/automation_rule_listener.rb
index 5dabda47e..6974e227a 100644
--- a/app/listeners/automation_rule_listener.rb
+++ b/app/listeners/automation_rule_listener.rb
@@ -17,7 +17,7 @@ class AutomationRuleListener < BaseListener
end
def conversation_created(event)
- return if performed_by_automation?(event)
+ return if performed_by_automation?(event) || ignore_auto_reply_event?(event)
conversation = event.data[:conversation]
account = conversation.account
@@ -34,7 +34,7 @@ class AutomationRuleListener < BaseListener
end
def conversation_opened(event)
- return if performed_by_automation?(event)
+ return if performed_by_automation?(event) || ignore_auto_reply_event?(event)
conversation = event.data[:conversation]
account = conversation.account
@@ -87,8 +87,13 @@ class AutomationRuleListener < BaseListener
event.data[:performed_by].present? && event.data[:performed_by].instance_of?(AutomationRule)
end
+ def ignore_auto_reply_event?(event)
+ conversation = event.data[:conversation]
+ conversation.additional_attributes['auto_reply'].present?
+ end
+
def ignore_message_created_event?(event)
message = event.data[:message]
- performed_by_automation?(event) || message.activity?
+ performed_by_automation?(event) || message.activity? || message.auto_reply_email?
end
end
diff --git a/app/mailboxes/imap/imap_mailbox.rb b/app/mailboxes/imap/imap_mailbox.rb
index 4e26756f6..bd591b05a 100644
--- a/app/mailboxes/imap/imap_mailbox.rb
+++ b/app/mailboxes/imap/imap_mailbox.rb
@@ -84,6 +84,7 @@ class Imap::ImapMailbox
additional_attributes: {
source: 'email',
in_reply_to: in_reply_to,
+ auto_reply: @processed_mail.auto_reply?,
mail_subject: @processed_mail.subject,
initiated_at: {
timestamp: Time.now.utc
diff --git a/app/mailboxes/incoming_email_validity_helper.rb b/app/mailboxes/incoming_email_validity_helper.rb
index 9483c9768..ce73a0b60 100644
--- a/app/mailboxes/incoming_email_validity_helper.rb
+++ b/app/mailboxes/incoming_email_validity_helper.rb
@@ -8,13 +8,6 @@ module IncomingEmailValidityHelper
# This can happen in cases like bounce emails for invalid contact email address
return false unless Devise.email_regexp.match?(@processed_mail.original_sender)
- # Process bounced emails, as regular emails
- return true if @processed_mail.bounced?
-
- # we skip processing auto reply emails like delivery status notifications
- # out of office replies, etc.
- return false if auto_reply_email?
-
true
end
@@ -24,13 +17,4 @@ module IncomingEmailValidityHelper
true
end
-
- def auto_reply_email?
- if @processed_mail.auto_reply?
- Rails.logger.info "is_auto_reply? : #{processed_mail.auto_reply?}"
- true
- else
- false
- end
- end
end
diff --git a/app/mailboxes/support_mailbox.rb b/app/mailboxes/support_mailbox.rb
index 5d80baef0..6279293b2 100644
--- a/app/mailboxes/support_mailbox.rb
+++ b/app/mailboxes/support_mailbox.rb
@@ -70,6 +70,7 @@ class SupportMailbox < ApplicationMailbox
additional_attributes: {
in_reply_to: in_reply_to,
source: 'email',
+ auto_reply: @processed_mail.auto_reply?,
mail_subject: @processed_mail.subject,
initiated_at: {
timestamp: Time.now.utc
diff --git a/app/models/message.rb b/app/models/message.rb
index cc04a088e..bbb25df43 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -195,6 +195,12 @@ class Message < ApplicationRecord
true
end
+ def auto_reply_email?
+ return false unless incoming_email? || inbox.email?
+
+ content_attributes.dig(:email, :auto_reply) == true
+ end
+
def valid_first_reply?
return false unless human_response? && !private?
return false if conversation.first_reply_created_at.present?
diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index e57831c96..e98d2d085 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -103,7 +103,8 @@ class MailPresenter < SimpleDelegator
references: references,
subject: subject,
text_content: text_content,
- to: to
+ to: to,
+ auto_reply: auto_reply?
}
end
diff --git a/app/services/message_templates/hook_execution_service.rb b/app/services/message_templates/hook_execution_service.rb
index 7da475af3..6205c8f3c 100644
--- a/app/services/message_templates/hook_execution_service.rb
+++ b/app/services/message_templates/hook_execution_service.rb
@@ -4,6 +4,7 @@ class MessageTemplates::HookExecutionService
def perform
return if conversation.campaign.present?
return if conversation.last_incoming_message.blank?
+ return if message.auto_reply_email?
trigger_templates
end
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index c08b6e402..e1c365f94 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -48,6 +48,13 @@ describe AutomationRuleListener do
listener.conversation_created(event)
expect(AutomationRules::ActionService).not_to have_received(:new).with(automation_rule, account, conversation)
end
+
+ it 'does not call AutomationRules::ActionService if conversation has auto_reply in additional_attributes' do
+ conversation.additional_attributes = { 'auto_reply' => true }
+ allow(condition_match).to receive(:present?).and_return(true)
+ listener.conversation_created(event)
+ expect(AutomationRules::ActionService).not_to have_received(:new).with(automation_rule, account, conversation)
+ end
end
end
@@ -165,6 +172,18 @@ describe AutomationRuleListener do
expect(AutomationRules::ActionService).not_to have_received(:new).with(automation_rule, account, conversation)
end
+ it 'does not call AutomationRules::ActionService if message is auto reply email' do
+ email_channel = create(:channel_email, account: account)
+ email_inbox = create(:inbox, channel: email_channel, account: account)
+ email_conversation = create(:conversation, inbox: email_inbox, account: account)
+ email_message = create(:message, conversation: email_conversation, account: account, content_attributes: { email: { auto_reply: true } })
+ email_event = Events::Base.new('message_created', Time.zone.now, { message: email_message })
+ allow(condition_match).to receive(:present?).and_return(true)
+
+ listener.message_created(email_event)
+ expect(AutomationRules::ActionService).not_to have_received(:new)
+ end
+
it 'does not call AutomationRules::ActionService if conditions do not match based on content' do
message.update!(processed_message_content: 'hi', content: "hi\n\nhello")
allow(condition_match).to receive(:present?).and_return(false)
diff --git a/spec/mailboxes/imap/imap_mailbox_spec.rb b/spec/mailboxes/imap/imap_mailbox_spec.rb
index fc94c98be..4535899cf 100644
--- a/spec/mailboxes/imap/imap_mailbox_spec.rb
+++ b/spec/mailboxes/imap/imap_mailbox_spec.rb
@@ -111,7 +111,8 @@ RSpec.describe Imap::ImapMailbox do
let(:auto_reply_mail) { create_inbound_email_from_fixture('auto_reply.eml') }
it 'does not create a new conversation' do
- expect { class_instance.process(auto_reply_mail.mail, channel) }.not_to change(Conversation, :count)
+ expect { class_instance.process(auto_reply_mail.mail, channel) }.to change(Conversation, :count)
+ expect(Conversation.last.additional_attributes['auto_reply']).to be true
end
end
@@ -120,6 +121,8 @@ RSpec.describe Imap::ImapMailbox do
it 'processes the bounced email' do
expect { class_instance.process(bounced_mail.mail, channel) }.to change(Message, :count)
+ expect(Message.last.content_attributes['email']['auto_reply']).to be true
+ expect(Conversation.last.additional_attributes['auto_reply']).to be true
end
end
diff --git a/spec/mailboxes/reply_mailbox_spec.rb b/spec/mailboxes/reply_mailbox_spec.rb
index 2320e3e07..167777218 100644
--- a/spec/mailboxes/reply_mailbox_spec.rb
+++ b/spec/mailboxes/reply_mailbox_spec.rb
@@ -12,7 +12,8 @@ RSpec.describe ReplyMailbox do
let(:conversation) { create(:conversation, assignee: agent, inbox: create(:inbox, account: account, greeting_enabled: false), account: account) }
let(:described_subject) { described_class.receive reply_mail }
let(:serialized_attributes) do
- %w[bcc cc content_type date from html_content in_reply_to message_id multipart number_of_attachments references subject text_content to]
+ %w[bcc cc content_type date from html_content in_reply_to message_id multipart number_of_attachments references subject text_content to
+ auto_reply]
end
context 'with reply uuid present' do
diff --git a/spec/mailboxes/support_mailbox_spec.rb b/spec/mailboxes/support_mailbox_spec.rb
index f75e3ef80..f6964285d 100644
--- a/spec/mailboxes/support_mailbox_spec.rb
+++ b/spec/mailboxes/support_mailbox_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe SupportMailbox do
let(:described_subject) { described_class.receive support_mail }
let(:serialized_attributes) do
%w[bcc cc content_type date from html_content in_reply_to message_id multipart number_of_attachments references subject
- text_content to]
+ text_content to auto_reply]
end
let(:conversation) { Conversation.where(inbox_id: channel_email.inbox).last }
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index 6de36a55e..cd4bc6bc1 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -548,4 +548,69 @@ RSpec.describe Message do
expect(presenter).to have_received(:outgoing_content)
end
end
+
+ describe '#auto_reply_email?' do
+ context 'when message is not an incoming email and inbox is not email' do
+ let(:conversation) { create(:conversation) }
+ let(:message) { create(:message, conversation: conversation, message_type: :outgoing) }
+
+ it 'returns false' do
+ expect(message.auto_reply_email?).to be false
+ end
+ end
+
+ context 'when message is an incoming email' do
+ let(:email_channel) { create(:channel_email) }
+ let(:email_inbox) { create(:inbox, channel: email_channel) }
+ let(:conversation) { create(:conversation, inbox: email_inbox) }
+
+ it 'returns false when auto_reply is not set to true' do
+ message = create(
+ :message,
+ conversation: conversation,
+ message_type: :incoming,
+ content_type: 'incoming_email',
+ content_attributes: {}
+ )
+ expect(message.auto_reply_email?).to be false
+ end
+
+ it 'returns true when auto_reply is set to true' do
+ message = create(
+ :message,
+ conversation: conversation,
+ message_type: :incoming,
+ content_type: 'incoming_email',
+ content_attributes: { email: { auto_reply: true } }
+ )
+ expect(message.auto_reply_email?).to be true
+ end
+ end
+
+ context 'when inbox is email' do
+ let(:email_channel) { create(:channel_email) }
+ let(:email_inbox) { create(:inbox, channel: email_channel) }
+ let(:conversation) { create(:conversation, inbox: email_inbox) }
+
+ it 'returns false when auto_reply is not set to true' do
+ message = create(
+ :message,
+ conversation: conversation,
+ message_type: :outgoing,
+ content_attributes: {}
+ )
+ expect(message.auto_reply_email?).to be false
+ end
+
+ it 'returns true when auto_reply is set to true' do
+ message = create(
+ :message,
+ conversation: conversation,
+ message_type: :outgoing,
+ content_attributes: { email: { auto_reply: true } }
+ )
+ expect(message.auto_reply_email?).to be true
+ end
+ end
+ end
end
diff --git a/spec/presenters/mail_presenter_spec.rb b/spec/presenters/mail_presenter_spec.rb
index af6768e41..b9b23c8ce 100644
--- a/spec/presenters/mail_presenter_spec.rb
+++ b/spec/presenters/mail_presenter_spec.rb
@@ -49,13 +49,15 @@ RSpec.describe MailPresenter do
:references,
:subject,
:text_content,
- :to
+ :to,
+ :auto_reply
])
expect(data[:content_type]).to include('multipart/alternative')
expect(data[:date].to_s).to eq('2020-04-20T04:20:20-04:00')
expect(data[:message_id]).to eq(mail.message_id)
expect(data[:multipart]).to be(true)
expect(data[:subject]).to eq(decorated_mail.subject)
+ expect(data[:auto_reply]).to eq(decorated_mail.auto_reply?)
end
it 'give email from in downcased format' do
@@ -136,6 +138,11 @@ RSpec.describe MailPresenter do
expect(decorated_auto_reply_mail.auto_reply?).to be true
expect(decorated_auto_reply_with_auto_submitted_mail.auto_reply?).to be true
end
+
+ it 'includes auto_reply status in serialized_data' do
+ expect(decorated_auto_reply_mail.serialized_data[:auto_reply]).to be true
+ expect(decorated_mail.serialized_data[:auto_reply]).to be_falsey
+ end
end
end
end
diff --git a/spec/services/message_templates/hook_execution_service_spec.rb b/spec/services/message_templates/hook_execution_service_spec.rb
index b80c42fd8..13a820f17 100644
--- a/spec/services/message_templates/hook_execution_service_spec.rb
+++ b/spec/services/message_templates/hook_execution_service_spec.rb
@@ -111,6 +111,35 @@ describe MessageTemplates::HookExecutionService do
end
end
+ context 'when message is an auto reply email' do
+ it 'does not call any template hooks' do
+ contact = create(:contact)
+ conversation = create(:conversation, contact: contact)
+ conversation.inbox.update(greeting_enabled: true, enable_email_collect: true, greeting_message: 'Hi, this is a greeting message')
+
+ message = create(:message, conversation: conversation, content_type: :incoming_email)
+ message.content_attributes = { email: { auto_reply: true } }
+ message.save!
+
+ greeting_service = double
+ email_collect_service = double
+ out_of_office_service = double
+
+ allow(MessageTemplates::Template::Greeting).to receive(:new).and_return(greeting_service)
+ allow(greeting_service).to receive(:perform).and_return(true)
+ allow(MessageTemplates::Template::EmailCollect).to receive(:new).and_return(email_collect_service)
+ allow(email_collect_service).to receive(:perform).and_return(true)
+ allow(MessageTemplates::Template::OutOfOffice).to receive(:new).and_return(out_of_office_service)
+ allow(out_of_office_service).to receive(:perform).and_return(true)
+
+ described_class.new(message: message).perform
+
+ expect(MessageTemplates::Template::Greeting).not_to have_received(:new)
+ expect(MessageTemplates::Template::EmailCollect).not_to have_received(:new)
+ expect(MessageTemplates::Template::OutOfOffice).not_to have_received(:new)
+ end
+ end
+
context 'when it is after working hours' do
it 'calls ::MessageTemplates::Template::OutOfOffice' do
contact = create(:contact)
From 855dd590abeb2e11121ce199a1960eb9a664c724 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth
Date: Tue, 5 Aug 2025 13:55:24 +0530
Subject: [PATCH 08/15] fix: Use WhatsApp profile name for contacts created via
Twilio (#12105)
- Use `ProfileName` parameter from Twilio WhatsApp webhooks when
creating contacts
- Fall back to formatted phone number for regular SMS contacts
---
.../twilio/incoming_message_service.rb | 6 ++-
.../twilio/incoming_message_service_spec.rb | 46 +++++++++++++++++++
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/app/services/twilio/incoming_message_service.rb b/app/services/twilio/incoming_message_service.rb
index a11b99744..29bd05f8c 100644
--- a/app/services/twilio/incoming_message_service.rb
+++ b/app/services/twilio/incoming_message_service.rb
@@ -88,12 +88,16 @@ class Twilio::IncomingMessageService
def contact_attributes
{
- name: formatted_phone_number,
+ name: contact_name,
phone_number: phone_number,
additional_attributes: additional_attributes
}
end
+ def contact_name
+ params[:ProfileName].presence || formatted_phone_number
+ end
+
def additional_attributes
if twilio_channel.sms?
{
diff --git a/spec/services/twilio/incoming_message_service_spec.rb b/spec/services/twilio/incoming_message_service_spec.rb
index 94fc3fdbf..63f721dde 100644
--- a/spec/services/twilio/incoming_message_service_spec.rb
+++ b/spec/services/twilio/incoming_message_service_spec.rb
@@ -282,5 +282,51 @@ describe Twilio::IncomingMessageService do
expect(message.attachments.first.file_type).to eq('location')
end
end
+
+ context 'when ProfileName is provided for WhatsApp' do
+ it 'uses ProfileName as contact name' do
+ params = {
+ SmsSid: 'SMxx',
+ From: '+1234567890',
+ AccountSid: 'ACxxx',
+ MessagingServiceSid: twilio_channel.messaging_service_sid,
+ Body: 'Hello with profile name',
+ ProfileName: 'John Doe'
+ }
+
+ described_class.new(params: params).perform
+ contact = twilio_channel.inbox.contacts.find_by(phone_number: '+1234567890')
+ expect(contact.name).to eq('John Doe')
+ end
+
+ it 'falls back to formatted phone number when ProfileName is blank' do
+ params = {
+ SmsSid: 'SMxx',
+ From: '+1234567890',
+ AccountSid: 'ACxxx',
+ MessagingServiceSid: twilio_channel.messaging_service_sid,
+ Body: 'Hello without profile name',
+ ProfileName: ''
+ }
+
+ described_class.new(params: params).perform
+ contact = twilio_channel.inbox.contacts.find_by(phone_number: '+1234567890')
+ expect(contact.name).to eq('1234567890')
+ end
+
+ it 'uses formatted phone number when ProfileName is not provided' do
+ params = {
+ SmsSid: 'SMxx',
+ From: '+1234567890',
+ AccountSid: 'ACxxx',
+ MessagingServiceSid: twilio_channel.messaging_service_sid,
+ Body: 'Regular SMS message'
+ }
+
+ described_class.new(params: params).perform
+ contact = twilio_channel.inbox.contacts.find_by(phone_number: '+1234567890')
+ expect(contact.name).to eq('1234567890')
+ end
+ end
end
end
From d5286c95354050fd796d36691b3fcfb7061aa29b Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Wed, 6 Aug 2025 13:11:22 +0530
Subject: [PATCH 09/15] fix: Installation name not showing (#12096)
---
.../dashboard/components/ui/Wizard.vue | 4 -
.../widget-preview/components/Widget.vue | 14 ++-
.../dashboard/settings/inbox/ChannelList.vue | 16 ++--
.../settings/inbox/InboxChannels.vue | 14 +--
.../settings/inbox/channels/Facebook.vue | 22 ++---
.../settings/inbox/channels/Instagram.vue | 2 -
.../integrations/DashboardApps/Index.vue | 2 -
.../dashboard/settings/integrations/Index.vue | 6 +-
.../settings/integrations/Integration.vue | 11 +--
.../settings/integrations/IntegrationItem.vue | 6 +-
.../settings/integrations/ShowIntegration.vue | 3 -
.../Slack/SelectChannelWarning.vue | 12 +--
.../settings/integrations/Webhooks/Index.vue | 7 +-
.../integrations/Webhooks/NewWebHook.vue | 15 +--
.../dashboard/settings/profile/Index.vue | 16 ++--
app/javascript/shared/components/Branding.vue | 11 ++-
.../composables/specs/useBranding.spec.js | 96 +++++++++++++++++++
.../shared/composables/useBranding.js | 26 +++++
.../shared/mixins/globalConfigMixin.js | 12 ---
.../v3/views/auth/reset/password/Index.vue | 17 +---
app/javascript/v3/views/auth/signup/Index.vue | 14 ++-
.../auth/signup/components/Signup/Form.vue | 2 -
app/javascript/v3/views/login/Index.vue | 14 +--
23 files changed, 215 insertions(+), 127 deletions(-)
create mode 100644 app/javascript/shared/composables/specs/useBranding.spec.js
create mode 100644 app/javascript/shared/composables/useBranding.js
delete mode 100644 app/javascript/shared/mixins/globalConfigMixin.js
diff --git a/app/javascript/dashboard/components/ui/Wizard.vue b/app/javascript/dashboard/components/ui/Wizard.vue
index 2219a07c1..6ab196d9d 100644
--- a/app/javascript/dashboard/components/ui/Wizard.vue
+++ b/app/javascript/dashboard/components/ui/Wizard.vue
@@ -1,9 +1,5 @@
-
-
{{ currentContact.name }}
@@ -325,24 +301,27 @@ export default {
-
+
+
-
-
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
index e36e94ac6..9a245ec8c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
@@ -263,7 +263,7 @@ export default {
From ca13664ef93f56e3db8cee2c1ca2da74fefdc3ce Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 7 Aug 2025 09:50:24 +0530
Subject: [PATCH 11/15] chore: Replace Thumbnail with Avatar in conversation
card (#12112)
---
.../Contacts/ContactsCard/ContactsCard.vue | 1 +
.../components-next/avatar/Avatar.vue | 67 +++++++++++------
.../components-next/icon/ChannelIcon.vue | 3 +-
.../components-next/icon/provider.js | 14 ++--
.../icon/specs/provider.spec.js | 71 +++++++++++++++++++
.../components/widgets/InboxName.vue | 30 +++-----
.../widgets/conversation/ConversationCard.vue | 61 +++++++++-------
.../SearchResultConversationItem.vue | 2 +-
8 files changed, 176 insertions(+), 73 deletions(-)
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
index 0932a79c7..0e893b767 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
@@ -98,6 +98,7 @@ const onClickViewDetails = () => emit('showContact', props.id);
:src="thumbnail"
:size="48"
:status="availabilityStatus"
+ hide-offline-status
rounded-full
/>
diff --git a/app/javascript/dashboard/components-next/avatar/Avatar.vue b/app/javascript/dashboard/components-next/avatar/Avatar.vue
index 65859b1c7..08224995c 100644
--- a/app/javascript/dashboard/components-next/avatar/Avatar.vue
+++ b/app/javascript/dashboard/components-next/avatar/Avatar.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
import { removeEmoji } from 'shared/helpers/emoji';
import Icon from 'dashboard/components-next/icon/Icon.vue';
+import ChannelIcon from 'dashboard/components-next/icon/ChannelIcon.vue';
import wootConstants from 'dashboard/constants/globals';
const props = defineProps({
@@ -33,10 +34,18 @@ const props = defineProps({
validator: value =>
!value || wootConstants.AVAILABILITY_STATUS_KEYS.includes(value),
},
+ inbox: {
+ type: Object,
+ default: null,
+ },
iconName: {
type: String,
default: null,
},
+ hideOfflineStatus: {
+ type: Boolean,
+ default: false,
+ },
});
const emit = defineEmits(['upload', 'delete']);
@@ -66,11 +75,11 @@ const AVATAR_COLORS = {
default: { bg: '#E8E8E8', text: '#60646C' },
};
-const STATUS_CLASSES = {
+const STATUS_CLASSES = computed(() => ({
online: 'bg-n-teal-10',
busy: 'bg-n-amber-10',
- offline: 'bg-n-slate-10',
-};
+ ...(props.hideOfflineStatus ? {} : { offline: 'bg-n-slate-10' }),
+}));
const showDefaultAvatar = computed(() => !props.src && !props.name);
@@ -178,11 +187,18 @@ watch(
+
+
@@ -239,24 +255,33 @@ watch(
-
-
-
-
-
-
-
+
+
-
+
+ {{
+ $t(
+ 'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_EMBEDDED_SIGNUP_DESCRIPTION'
+ )
+ }}
+
+
+ {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_RECONFIGURE_BUTTON') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
-
-
-
+
+ {{
+ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON')
+ }}
+
+
+
+
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my code
- [ ] I have commented on my code, particularly in hard-to-understand
areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream
modules
---
app/javascript/dashboard/components/ChatListHeader.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/javascript/dashboard/components/ChatListHeader.vue b/app/javascript/dashboard/components/ChatListHeader.vue
index 04a22806d..cc53e2e39 100644
--- a/app/javascript/dashboard/components/ChatListHeader.vue
+++ b/app/javascript/dashboard/components/ChatListHeader.vue
@@ -98,7 +98,7 @@ const toggleConversationLayout = () => {
/>
@@ -124,7 +124,7 @@ const toggleConversationLayout = () => {
/>
@@ -150,7 +150,7 @@ const toggleConversationLayout = () => {
/>
-
-
+
+
@@ -150,7 +150,7 @@ const toggleConversationLayout = () => {
/>
{{ currentContact.name }} @@ -325,24 +301,27 @@ export default {
-
+
+
-
-
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
index e36e94ac6..9a245ec8c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
@@ -263,7 +263,7 @@ export default {
From ca13664ef93f56e3db8cee2c1ca2da74fefdc3ce Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 7 Aug 2025 09:50:24 +0530
Subject: [PATCH 11/15] chore: Replace Thumbnail with Avatar in conversation
card (#12112)
---
.../Contacts/ContactsCard/ContactsCard.vue | 1 +
.../components-next/avatar/Avatar.vue | 67 +++++++++++------
.../components-next/icon/ChannelIcon.vue | 3 +-
.../components-next/icon/provider.js | 14 ++--
.../icon/specs/provider.spec.js | 71 +++++++++++++++++++
.../components/widgets/InboxName.vue | 30 +++-----
.../widgets/conversation/ConversationCard.vue | 61 +++++++++-------
.../SearchResultConversationItem.vue | 2 +-
8 files changed, 176 insertions(+), 73 deletions(-)
diff --git a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
index 0932a79c7..0e893b767 100644
--- a/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
+++ b/app/javascript/dashboard/components-next/Contacts/ContactsCard/ContactsCard.vue
@@ -98,6 +98,7 @@ const onClickViewDetails = () => emit('showContact', props.id);
:src="thumbnail"
:size="48"
:status="availabilityStatus"
+ hide-offline-status
rounded-full
/>
diff --git a/app/javascript/dashboard/components-next/avatar/Avatar.vue b/app/javascript/dashboard/components-next/avatar/Avatar.vue
index 65859b1c7..08224995c 100644
--- a/app/javascript/dashboard/components-next/avatar/Avatar.vue
+++ b/app/javascript/dashboard/components-next/avatar/Avatar.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
import { removeEmoji } from 'shared/helpers/emoji';
import Icon from 'dashboard/components-next/icon/Icon.vue';
+import ChannelIcon from 'dashboard/components-next/icon/ChannelIcon.vue';
import wootConstants from 'dashboard/constants/globals';
const props = defineProps({
@@ -33,10 +34,18 @@ const props = defineProps({
validator: value =>
!value || wootConstants.AVAILABILITY_STATUS_KEYS.includes(value),
},
+ inbox: {
+ type: Object,
+ default: null,
+ },
iconName: {
type: String,
default: null,
},
+ hideOfflineStatus: {
+ type: Boolean,
+ default: false,
+ },
});
const emit = defineEmits(['upload', 'delete']);
@@ -66,11 +75,11 @@ const AVATAR_COLORS = {
default: { bg: '#E8E8E8', text: '#60646C' },
};
-const STATUS_CLASSES = {
+const STATUS_CLASSES = computed(() => ({
online: 'bg-n-teal-10',
busy: 'bg-n-amber-10',
- offline: 'bg-n-slate-10',
-};
+ ...(props.hideOfflineStatus ? {} : { offline: 'bg-n-slate-10' }),
+}));
const showDefaultAvatar = computed(() => !props.src && !props.name);
@@ -178,11 +187,18 @@ watch(
+
@@ -239,24 +255,33 @@ watch(
-
@@ -124,7 +124,7 @@ const toggleConversationLayout = () => {
/>
+
-
+
+
+
diff --git a/app/javascript/dashboard/components-next/icon/ChannelIcon.vue b/app/javascript/dashboard/components-next/icon/ChannelIcon.vue
index 11117cc18..68102dbd3 100644
--- a/app/javascript/dashboard/components-next/icon/ChannelIcon.vue
+++ b/app/javascript/dashboard/components-next/icon/ChannelIcon.vue
@@ -1,4 +1,5 @@
diff --git a/app/javascript/dashboard/components-next/icon/provider.js b/app/javascript/dashboard/components-next/icon/provider.js
index 36dd6216e..887368438 100644
--- a/app/javascript/dashboard/components-next/icon/provider.js
+++ b/app/javascript/dashboard/components-next/icon/provider.js
@@ -22,15 +22,21 @@ export function useChannelIcon(inbox) {
};
const channelIcon = computed(() => {
- const type = inbox.channel_type;
+ const inboxDetails = inbox.value || inbox;
+ const type = inboxDetails.channel_type;
let icon = channelTypeIconMap[type];
- if (type === 'Channel::Email' && inbox.provider) {
- if (Object.keys(providerIconMap).includes(inbox.provider)) {
- icon = providerIconMap[inbox.provider];
+ if (type === 'Channel::Email' && inboxDetails.provider) {
+ if (Object.keys(providerIconMap).includes(inboxDetails.provider)) {
+ icon = providerIconMap[inboxDetails.provider];
}
}
+ // Special case for Twilio whatsapp
+ if (type === 'Channel::TwilioSms' && inboxDetails.medium === 'whatsapp') {
+ icon = 'i-ri-whatsapp-fill';
+ }
+
return icon ?? 'i-ri-global-fill';
});
diff --git a/app/javascript/dashboard/components-next/icon/specs/provider.spec.js b/app/javascript/dashboard/components-next/icon/specs/provider.spec.js
index 5860e30ea..b0b820f25 100644
--- a/app/javascript/dashboard/components-next/icon/specs/provider.spec.js
+++ b/app/javascript/dashboard/components-next/icon/specs/provider.spec.js
@@ -25,6 +25,77 @@ describe('useChannelIcon', () => {
expect(icon).toBe('i-ri-phone-fill');
});
+ it('returns correct icon for Line channel', () => {
+ const inbox = { channel_type: 'Channel::Line' };
+ const { value: icon } = useChannelIcon(inbox);
+ expect(icon).toBe('i-ri-line-fill');
+ });
+
+ it('returns correct icon for SMS channel', () => {
+ const inbox = { channel_type: 'Channel::Sms' };
+ const { value: icon } = useChannelIcon(inbox);
+ expect(icon).toBe('i-ri-chat-1-fill');
+ });
+
+ it('returns correct icon for Telegram channel', () => {
+ const inbox = { channel_type: 'Channel::Telegram' };
+ const { value: icon } = useChannelIcon(inbox);
+ expect(icon).toBe('i-ri-telegram-fill');
+ });
+
+ it('returns correct icon for Twitter channel', () => {
+ const inbox = { channel_type: 'Channel::TwitterProfile' };
+ const { value: icon } = useChannelIcon(inbox);
+ expect(icon).toBe('i-ri-twitter-x-fill');
+ });
+
+ it('returns correct icon for WebWidget channel', () => {
+ const inbox = { channel_type: 'Channel::WebWidget' };
+ const { value: icon } = useChannelIcon(inbox);
+ expect(icon).toBe('i-ri-global-fill');
+ });
+
+ it('returns correct icon for Instagram channel', () => {
+ const inbox = { channel_type: 'Channel::Instagram' };
+ const { value: icon } = useChannelIcon(inbox);
+ expect(icon).toBe('i-ri-instagram-fill');
+ });
+
+ describe('TwilioSms channel', () => {
+ it('returns chat icon for regular Twilio SMS channel', () => {
+ const inbox = { channel_type: 'Channel::TwilioSms' };
+ const { value: icon } = useChannelIcon(inbox);
+ expect(icon).toBe('i-ri-chat-1-fill');
+ });
+
+ it('returns WhatsApp icon for Twilio SMS with WhatsApp medium', () => {
+ const inbox = {
+ channel_type: 'Channel::TwilioSms',
+ medium: 'whatsapp',
+ };
+ const { value: icon } = useChannelIcon(inbox);
+ expect(icon).toBe('i-ri-whatsapp-fill');
+ });
+
+ it('returns chat icon for Twilio SMS with non-WhatsApp medium', () => {
+ const inbox = {
+ channel_type: 'Channel::TwilioSms',
+ medium: 'sms',
+ };
+ const { value: icon } = useChannelIcon(inbox);
+ expect(icon).toBe('i-ri-chat-1-fill');
+ });
+
+ it('returns chat icon for Twilio SMS with undefined medium', () => {
+ const inbox = {
+ channel_type: 'Channel::TwilioSms',
+ medium: undefined,
+ };
+ const { value: icon } = useChannelIcon(inbox);
+ expect(icon).toBe('i-ri-chat-1-fill');
+ });
+ });
+
describe('Email channel', () => {
it('returns mail icon for generic email channel', () => {
const inbox = { channel_type: 'Channel::Email' };
diff --git a/app/javascript/dashboard/components/widgets/InboxName.vue b/app/javascript/dashboard/components/widgets/InboxName.vue
index cf48b0837..66b80f69b 100644
--- a/app/javascript/dashboard/components/widgets/InboxName.vue
+++ b/app/javascript/dashboard/components/widgets/InboxName.vue
@@ -1,29 +1,19 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON')
+ }}
+
+
+
+
+
+
-
+
+ {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_RECONFIGURE_BUTTON') }}
+
+
+ + {{ + $t( + 'INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_EMBEDDED_SIGNUP_DESCRIPTION' + ) + }} +
+
- {{ $t('INBOX_MGMT.SETTINGS_POPUP.WHATSAPP_SECTION_UPDATE_BUTTON') }}
-
-
-