{
+
+ create: async ({ commit }, botData) => {
commit(types.SET_AGENT_BOT_UI_FLAG, { isCreating: true });
try {
- const response = await AgentBotsAPI.create(agentBotObj);
+ // Create FormData for file upload
+ const formData = new FormData();
+ formData.append('name', botData.name);
+ formData.append('description', botData.description);
+ formData.append('bot_type', botData.bot_type || 'webhook');
+ formData.append('outgoing_url', botData.outgoing_url);
+
+ // Add avatar file if available
+ if (botData.avatar) {
+ formData.append('avatar', botData.avatar);
+ }
+
+ const response = await AgentBotsAPI.create(formData);
commit(types.ADD_AGENT_BOT, response.data);
return response.data;
} catch (error) {
@@ -61,10 +75,22 @@ export const actions = {
}
return null;
},
- update: async ({ commit }, { id, ...agentBotObj }) => {
+
+ update: async ({ commit }, { id, data }) => {
commit(types.SET_AGENT_BOT_UI_FLAG, { isUpdating: true });
try {
- const response = await AgentBotsAPI.update(id, agentBotObj);
+ // Create FormData for file upload
+ const formData = new FormData();
+ formData.append('name', data.name);
+ formData.append('description', data.description);
+ formData.append('bot_type', data.bot_type || 'webhook');
+ formData.append('outgoing_url', data.outgoing_url);
+
+ if (data.avatar) {
+ formData.append('avatar', data.avatar);
+ }
+
+ const response = await AgentBotsAPI.update(id, formData);
commit(types.EDIT_AGENT_BOT, response.data);
} catch (error) {
throwErrorMessage(error);
@@ -72,6 +98,7 @@ export const actions = {
commit(types.SET_AGENT_BOT_UI_FLAG, { isUpdating: false });
}
},
+
delete: async ({ commit }, id) => {
commit(types.SET_AGENT_BOT_UI_FLAG, { isDeleting: true });
try {
@@ -83,6 +110,20 @@ export const actions = {
commit(types.SET_AGENT_BOT_UI_FLAG, { isDeleting: false });
}
},
+
+ deleteAgentBotAvatar: async ({ commit }, id) => {
+ commit(types.SET_AGENT_BOT_UI_FLAG, { isUpdatingAvatar: true });
+ try {
+ await AgentBotsAPI.deleteAgentBotAvatar(id);
+ // Update the thumbnail to empty string after deletion
+ commit(types.UPDATE_AGENT_BOT_AVATAR, { id, thumbnail: '' });
+ } catch (error) {
+ throwErrorMessage(error);
+ } finally {
+ commit(types.SET_AGENT_BOT_UI_FLAG, { isUpdatingAvatar: false });
+ }
+ },
+
show: async ({ commit }, id) => {
commit(types.SET_AGENT_BOT_UI_FLAG, { isFetchingItem: true });
try {
@@ -150,6 +191,12 @@ export const mutations = {
[inboxId]: agentBotId,
};
},
+ [types.UPDATE_AGENT_BOT_AVATAR]($state, { id, thumbnail }) {
+ const botIndex = $state.records.findIndex(bot => bot.id === id);
+ if (botIndex !== -1) {
+ $state.records[botIndex].thumbnail = thumbnail || '';
+ }
+ },
};
export default {
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index 75837b004..18c292f76 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -122,6 +122,20 @@ export const getters = {
item => item.channel_type !== INBOX_TYPES.EMAIL
);
},
+ getFacebookInboxByInstagramId: $state => instagramId => {
+ return $state.records.find(
+ item =>
+ item.instagram_id === instagramId &&
+ item.channel_type === INBOX_TYPES.FB
+ );
+ },
+ getInstagramInboxByInstagramId: $state => instagramId => {
+ return $state.records.find(
+ item =>
+ item.instagram_id === instagramId &&
+ item.channel_type === INBOX_TYPES.INSTAGRAM
+ );
+ },
};
const sendAnalyticsEvent = channelType => {
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index 496ccbf29..bb5364bb5 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -1,5 +1,6 @@
/* eslint no-console: 0 */
import * as types from '../mutation-types';
+import { STATUS } from '../constants';
import Report from '../../api/reports';
import { downloadCsvFile, generateFileName } from '../../helper/downloadHelper';
import AnalyticsHelper from '../../helper/AnalyticsHelper';
@@ -9,6 +10,8 @@ import liveReports from '../../api/liveReports';
const state = {
fetchingStatus: false,
+ accountSummaryFetchingStatus: STATUS.FINISHED,
+ botSummaryFetchingStatus: STATUS.FINISHED,
accountReport: {
isFetching: {
conversations_count: false,
@@ -74,6 +77,12 @@ const getters = {
getBotSummary(_state) {
return _state.botSummary;
},
+ getAccountSummaryFetchingStatus(_state) {
+ return _state.accountSummaryFetchingStatus;
+ },
+ getBotSummaryFetchingStatus(_state) {
+ return _state.botSummaryFetchingStatus;
+ },
getAccountConversationMetric(_state) {
return _state.overview.accountConversationMetric;
},
@@ -122,6 +131,7 @@ export const actions = {
});
},
fetchAccountSummary({ commit }, reportObj) {
+ commit(types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FETCHING);
Report.getSummary(
reportObj.from,
reportObj.to,
@@ -132,12 +142,14 @@ export const actions = {
)
.then(accountSummary => {
commit(types.default.SET_ACCOUNT_SUMMARY, accountSummary.data);
+ commit(types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FINISHED);
})
.catch(() => {
- commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
+ commit(types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FAILED);
});
},
fetchBotSummary({ commit }, reportObj) {
+ commit(types.default.SET_BOT_SUMMARY_STATUS, STATUS.FETCHING);
Report.getBotSummary({
from: reportObj.from,
to: reportObj.to,
@@ -146,9 +158,10 @@ export const actions = {
})
.then(botSummary => {
commit(types.default.SET_BOT_SUMMARY, botSummary.data);
+ commit(types.default.SET_BOT_SUMMARY_STATUS, STATUS.FINISHED);
})
.catch(() => {
- commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
+ commit(types.default.SET_BOT_SUMMARY_STATUS, STATUS.FAILED);
});
},
fetchAccountConversationMetric({ commit }, params = {}) {
@@ -277,6 +290,12 @@ const mutations = {
[types.default.TOGGLE_ACCOUNT_REPORT_LOADING](_state, { metric, value }) {
_state.accountReport.isFetching[metric] = value;
},
+ [types.default.SET_BOT_SUMMARY_STATUS](_state, status) {
+ _state.botSummaryFetchingStatus = status;
+ },
+ [types.default.SET_ACCOUNT_SUMMARY_STATUS](_state, status) {
+ _state.accountSummaryFetchingStatus = status;
+ },
[types.default.TOGGLE_HEATMAP_LOADING](_state, flag) {
_state.overview.uiFlags.isFetchingAccountConversationsHeatmap = flag;
},
diff --git a/app/javascript/dashboard/store/modules/specs/agentBots/agentBots.spec.js b/app/javascript/dashboard/store/modules/specs/agentBots/agentBots.spec.js
index 90cae45d9..b2fa47313 100644
--- a/app/javascript/dashboard/store/modules/specs/agentBots/agentBots.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agentBots/agentBots.spec.js
@@ -1,7 +1,7 @@
import axios from 'axios';
import { actions } from '../../agentBots';
import types from '../../../mutation-types';
-import { agentBotRecords } from './fixtures';
+import { agentBotRecords, agentBotData } from './fixtures';
const commit = vi.fn();
global.axios = axios;
@@ -30,16 +30,22 @@ describe('#actions', () => {
describe('#create', () => {
it('sends correct actions if API is success', async () => {
axios.post.mockResolvedValue({ data: agentBotRecords[0] });
- await actions.create({ commit }, agentBotRecords[0]);
+ await actions.create({ commit }, agentBotData);
+
expect(commit.mock.calls).toEqual([
[types.SET_AGENT_BOT_UI_FLAG, { isCreating: true }],
[types.ADD_AGENT_BOT, agentBotRecords[0]],
[types.SET_AGENT_BOT_UI_FLAG, { isCreating: false }],
]);
+
+ expect(axios.post.mock.calls.length).toBe(1);
+ const formDataArg = axios.post.mock.calls[0][1];
+ expect(formDataArg instanceof FormData).toBe(true);
});
+
it('sends correct actions if API is error', async () => {
axios.post.mockRejectedValue({ message: 'Incorrect header' });
- await expect(actions.create({ commit })).rejects.toThrow(Error);
+ await expect(actions.create({ commit }, {})).rejects.toThrow(Error);
expect(commit.mock.calls).toEqual([
[types.SET_AGENT_BOT_UI_FLAG, { isCreating: true }],
[types.SET_AGENT_BOT_UI_FLAG, { isCreating: false }],
@@ -50,17 +56,29 @@ describe('#actions', () => {
describe('#update', () => {
it('sends correct actions if API is success', async () => {
axios.patch.mockResolvedValue({ data: agentBotRecords[0] });
- await actions.update({ commit }, agentBotRecords[0]);
+ await actions.update(
+ { commit },
+ {
+ id: agentBotRecords[0].id,
+ data: agentBotData,
+ }
+ );
+
expect(commit.mock.calls).toEqual([
[types.SET_AGENT_BOT_UI_FLAG, { isUpdating: true }],
[types.EDIT_AGENT_BOT, agentBotRecords[0]],
[types.SET_AGENT_BOT_UI_FLAG, { isUpdating: false }],
]);
+
+ expect(axios.patch.mock.calls.length).toBe(1);
+ const formDataArg = axios.patch.mock.calls[0][1];
+ expect(formDataArg instanceof FormData).toBe(true);
});
+
it('sends correct actions if API is error', async () => {
axios.patch.mockRejectedValue({ message: 'Incorrect header' });
await expect(
- actions.update({ commit }, agentBotRecords[0])
+ actions.update({ commit }, { id: 1, data: {} })
).rejects.toThrow(Error);
expect(commit.mock.calls).toEqual([
[types.SET_AGENT_BOT_UI_FLAG, { isUpdating: true }],
@@ -68,7 +86,6 @@ describe('#actions', () => {
]);
});
});
-
describe('#delete', () => {
it('sends correct actions if API is success', async () => {
axios.delete.mockResolvedValue({ data: agentBotRecords[0] });
diff --git a/app/javascript/dashboard/store/modules/specs/agentBots/fixtures.js b/app/javascript/dashboard/store/modules/specs/agentBots/fixtures.js
index e13735b14..d41585904 100644
--- a/app/javascript/dashboard/store/modules/specs/agentBots/fixtures.js
+++ b/app/javascript/dashboard/store/modules/specs/agentBots/fixtures.js
@@ -1,15 +1,35 @@
export const agentBotRecords = [
{
+ account_id: 1,
id: 11,
name: 'Agent Bot 11',
description: 'Agent Bot Description',
- type: 'csml',
+ bot_type: 'webhook',
+ thumbnail: 'https://example.com/thumbnail.jpg',
+ bot_config: {},
+ outgoing_url: 'https://example.com/outgoing',
+ access_token: 'hN8QwG769RqBXmme',
+ system_bot: false,
},
{
+ account_id: 1,
id: 12,
name: 'Agent Bot 12',
description: 'Agent Bot Description 12',
- type: 'csml',
+ bot_type: 'webhook',
+ thumbnail: 'https://example.com/thumbnail.jpg',
+ bot_config: {},
+ outgoing_url: 'https://example.com/outgoing',
+ access_token: 'hN8QwG769RqBXmme',
+ system_bot: false,
},
];
+
+export const agentBotData = {
+ name: 'Test Bot',
+ description: 'Test Description',
+ outgoing_url: 'https://test.com',
+ bot_type: 'webhook',
+ avatar: new File([''], 'filename'),
+};
diff --git a/app/javascript/dashboard/store/modules/specs/agentBots/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/agentBots/mutations.spec.js
index aff191ecf..6a8d36a75 100644
--- a/app/javascript/dashboard/store/modules/specs/agentBots/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agentBots/mutations.spec.js
@@ -51,4 +51,16 @@ describe('#mutations', () => {
expect(state.agentBotInbox).toEqual({ 3: 2 });
});
});
+ describe('#UPDATE_AGENT_BOT_AVATAR', () => {
+ it('update agent bot avatar', () => {
+ const state = { records: [agentBotRecords[0]] };
+ mutations[types.UPDATE_AGENT_BOT_AVATAR](state, {
+ id: 11,
+ thumbnail: 'https://example.com/thumbnail.jpg',
+ });
+ expect(state.records[0].thumbnail).toEqual(
+ 'https://example.com/thumbnail.jpg'
+ );
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/modules/specs/inboxes/fixtures.js b/app/javascript/dashboard/store/modules/specs/inboxes/fixtures.js
index f7b06d232..382df4828 100644
--- a/app/javascript/dashboard/store/modules/specs/inboxes/fixtures.js
+++ b/app/javascript/dashboard/store/modules/specs/inboxes/fixtures.js
@@ -9,6 +9,7 @@ export default [
widget_color: null,
website_token: null,
enable_auto_assignment: true,
+ instagram_id: 123456789,
},
{
id: 2,
@@ -62,4 +63,12 @@ export default [
channel_type: 'Channel::Sms',
provider: 'default',
},
+ {
+ id: 7,
+ channel_id: 7,
+ name: 'Test Instagram 1',
+ channel_type: 'Channel::Instagram',
+ instagram_id: 123456789,
+ provider: 'default',
+ },
];
diff --git a/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js b/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
index a22f5ebe9..f9ed57d63 100644
--- a/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/inboxes/getters.spec.js
@@ -26,7 +26,7 @@ describe('#getters', () => {
it('dialogFlowEnabledInboxes', () => {
const state = { records: inboxList };
- expect(getters.dialogFlowEnabledInboxes(state).length).toEqual(6);
+ expect(getters.dialogFlowEnabledInboxes(state).length).toEqual(7);
});
it('getInbox', () => {
@@ -43,6 +43,7 @@ describe('#getters', () => {
widget_color: null,
website_token: null,
enable_auto_assignment: true,
+ instagram_id: 123456789,
});
});
@@ -64,4 +65,32 @@ describe('#getters', () => {
isDeleting: false,
});
});
+
+ it('getFacebookInboxByInstagramId', () => {
+ const state = { records: inboxList };
+ expect(getters.getFacebookInboxByInstagramId(state)(123456789)).toEqual({
+ id: 1,
+ channel_id: 1,
+ name: 'Test FacebookPage 1',
+ channel_type: 'Channel::FacebookPage',
+ avatar_url: 'random_image.png',
+ page_id: '12345',
+ widget_color: null,
+ website_token: null,
+ enable_auto_assignment: true,
+ instagram_id: 123456789,
+ });
+ });
+
+ it('getInstagramInboxByInstagramId', () => {
+ const state = { records: inboxList };
+ expect(getters.getInstagramInboxByInstagramId(state)(123456789)).toEqual({
+ id: 7,
+ channel_id: 7,
+ name: 'Test Instagram 1',
+ channel_type: 'Channel::Instagram',
+ instagram_id: 123456789,
+ provider: 'default',
+ });
+ });
});
diff --git a/app/javascript/dashboard/store/modules/specs/reports/actions.spec.js b/app/javascript/dashboard/store/modules/specs/reports/actions.spec.js
index da3c715c4..41e5a1d79 100644
--- a/app/javascript/dashboard/store/modules/specs/reports/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/reports/actions.spec.js
@@ -1,14 +1,122 @@
import axios from 'axios';
import { actions } from '../../reports';
+import * as types from '../../../mutation-types';
+import { STATUS } from '../../../constants';
import * as DownloadHelper from 'dashboard/helper/downloadHelper';
+import { flushPromises } from '@vue/test-utils';
global.open = vi.fn();
global.axios = axios;
+global.URL.createObjectURL = vi.fn();
vi.mock('axios');
vi.spyOn(DownloadHelper, 'downloadCsvFile');
describe('#actions', () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
+ describe('#fetchAccountSummary', () => {
+ it('sends correct actions if API is success', async () => {
+ const commit = vi.fn();
+ const reportObj = {
+ from: 1630504922510,
+ to: 1630504922510,
+ type: 'account',
+ id: 1,
+ groupBy: 'day',
+ businessHours: true,
+ };
+ const summaryData = {
+ conversations_count: 10,
+ incoming_messages_count: 20,
+ outgoing_messages_count: 15,
+ avg_first_response_time: 30,
+ avg_resolution_time: 60,
+ resolutions_count: 5,
+ bot_resolutions_count: 2,
+ bot_handoffs_count: 1,
+ reply_time: 25,
+ };
+ axios.get.mockResolvedValue({ data: summaryData });
+
+ actions.fetchAccountSummary({ commit }, reportObj);
+ await flushPromises();
+
+ expect(commit.mock.calls).toEqual([
+ [types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FETCHING],
+ [types.default.SET_ACCOUNT_SUMMARY, summaryData],
+ [types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FINISHED],
+ ]);
+ });
+
+ it('sends correct actions if API fails', async () => {
+ const commit = vi.fn();
+ const reportObj = {
+ from: 1630504922510,
+ to: 1630504922510,
+ };
+ axios.get.mockRejectedValue(new Error('API Error'));
+
+ actions.fetchAccountSummary({ commit }, reportObj);
+ await flushPromises();
+
+ expect(commit.mock.calls).toEqual([
+ [types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FETCHING],
+ [types.default.SET_ACCOUNT_SUMMARY_STATUS, STATUS.FAILED],
+ ]);
+ });
+ });
+
+ describe('#fetchBotSummary', () => {
+ it('sends correct actions if API is success', async () => {
+ const commit = vi.fn();
+ const reportObj = {
+ from: 1630504922510,
+ to: 1630504922510,
+ groupBy: 'day',
+ businessHours: true,
+ };
+ const summaryData = {
+ bot_resolutions_count: 10,
+ bot_handoffs_count: 5,
+ previous: {
+ bot_resolutions_count: 8,
+ bot_handoffs_count: 4,
+ },
+ };
+ axios.get.mockResolvedValue({ data: summaryData });
+
+ actions.fetchBotSummary({ commit }, reportObj);
+ await flushPromises();
+
+ expect(commit.mock.calls).toEqual([
+ [types.default.SET_BOT_SUMMARY_STATUS, STATUS.FETCHING],
+ [types.default.SET_BOT_SUMMARY, summaryData],
+ [types.default.SET_BOT_SUMMARY_STATUS, STATUS.FINISHED],
+ ]);
+ });
+
+ it('sends correct actions if API fails', async () => {
+ const commit = vi.fn();
+ const reportObj = {
+ from: 1630504922510,
+ to: 1630504922510,
+ };
+ const error = new Error('API error');
+ axios.get.mockRejectedValueOnce(error);
+
+ actions.fetchBotSummary({ commit }, reportObj);
+ await flushPromises();
+
+ expect(commit.mock.calls).toEqual([
+ [types.default.SET_BOT_SUMMARY_STATUS, STATUS.FETCHING],
+ [types.default.SET_BOT_SUMMARY_STATUS, STATUS.FAILED],
+ ]);
+ });
+ });
+
describe('#downloadAgentReports', () => {
it('open CSV download prompt if API is success', async () => {
const data = `Agent name,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
@@ -20,7 +128,9 @@ describe('#actions', () => {
to: 1630504922510,
fileName: 'agent-report-01-09-2021.csv',
};
- await actions.downloadAgentReports(1, param);
+ actions.downloadAgentReports(1, param);
+ await flushPromises();
+
expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
param.fileName,
data
@@ -39,7 +149,9 @@ describe('#actions', () => {
type: 'label',
fileName: 'label-report-01-09-2021.csv',
};
- await actions.downloadLabelReports(1, param);
+ actions.downloadLabelReports(1, param);
+ await flushPromises();
+
expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
param.fileName,
data
@@ -59,7 +171,9 @@ describe('#actions', () => {
to: 1635013800,
fileName: 'inbox-report-24-10-2021.csv',
};
- await actions.downloadInboxReports(1, param);
+ actions.downloadInboxReports(1, param);
+ await flushPromises();
+
expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
param.fileName,
data
@@ -78,7 +192,9 @@ describe('#actions', () => {
to: 1635013800,
fileName: 'inbox-report-24-10-2021.csv',
};
- await actions.downloadInboxReports(1, param);
+ actions.downloadInboxReports(1, param);
+ await flushPromises();
+
expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
param.fileName,
data
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 68b565dfa..a74207e92 100644
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -189,6 +189,8 @@ export default {
SET_ACCOUNT_SUMMARY: 'SET_ACCOUNT_SUMMARY',
SET_BOT_SUMMARY: 'SET_BOT_SUMMARY',
TOGGLE_ACCOUNT_REPORT_LOADING: 'TOGGLE_ACCOUNT_REPORT_LOADING',
+ SET_BOT_SUMMARY_STATUS: 'SET_BOT_SUMMARY_STATUS',
+ SET_ACCOUNT_SUMMARY_STATUS: 'SET_ACCOUNT_SUMMARY_STATUS',
SET_ACCOUNT_CONVERSATION_METRIC: 'SET_ACCOUNT_CONVERSATION_METRIC',
TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING:
'TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING',
@@ -299,6 +301,7 @@ export default {
EDIT_AGENT_BOT: 'EDIT_AGENT_BOT',
DELETE_AGENT_BOT: 'DELETE_AGENT_BOT',
SET_AGENT_BOT_INBOX: 'SET_AGENT_BOT_INBOX',
+ UPDATE_AGENT_BOT_AVATAR: 'UPDATE_AGENT_BOT_AVATAR',
// MACROS
SET_MACROS_UI_FLAG: 'SET_MACROS_UI_FLAG',
diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index 66e25902b..21b2fb8d4 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -22,7 +22,11 @@ import {
} from './bubbleHelpers';
import { isWidgetColorLighter } from 'shared/helpers/colorHelper';
import { dispatchWindowEvent } from 'shared/helpers/CustomEventHelper';
-import { CHATWOOT_ERROR, CHATWOOT_READY } from '../widget/constants/sdkEvents';
+import {
+ CHATWOOT_ERROR,
+ CHATWOOT_POSTBACK,
+ CHATWOOT_READY,
+} from '../widget/constants/sdkEvents';
import { SET_USER_ERROR } from '../widget/constants/errorTypes';
import { getUserCookieName, setCookieWithDomain } from './cookieHelpers';
import {
@@ -205,7 +209,7 @@ export const IFrameHelper = {
postback(data) {
dispatchWindowEvent({
- eventName: 'chatwoot:postback',
+ eventName: CHATWOOT_POSTBACK,
data,
});
},
diff --git a/app/javascript/sdk/bubbleHelpers.js b/app/javascript/sdk/bubbleHelpers.js
index 609fe04da..05c67f478 100644
--- a/app/javascript/sdk/bubbleHelpers.js
+++ b/app/javascript/sdk/bubbleHelpers.js
@@ -1,6 +1,11 @@
import { addClasses, removeClasses, toggleClass } from './DOMHelpers';
import { IFrameHelper } from './IFrameHelper';
import { isExpandedView } from './settingsHelper';
+import {
+ CHATWOOT_CLOSED,
+ CHATWOOT_OPENED,
+} from '../widget/constants/sdkEvents';
+import { dispatchWindowEvent } from 'shared/helpers/CustomEventHelper';
export const bubbleSVG =
'M240.808 240.808H122.123C56.6994 240.808 3.45695 187.562 3.45695 122.122C3.45695 56.7031 56.6994 3.45697 122.124 3.45697C187.566 3.45697 240.808 56.7031 240.808 122.122V240.808Z';
@@ -65,22 +70,30 @@ export const createBubbleHolder = hideMessageBubble => {
body.appendChild(bubbleHolder);
};
+const handleBubbleToggle = newIsOpen => {
+ IFrameHelper.events.onBubbleToggle(newIsOpen);
+
+ if (newIsOpen) {
+ dispatchWindowEvent({ eventName: CHATWOOT_OPENED });
+ } else {
+ dispatchWindowEvent({ eventName: CHATWOOT_CLOSED });
+ chatBubble.focus();
+ }
+};
+
export const onBubbleClick = (props = {}) => {
const { toggleValue } = props;
const { isOpen } = window.$chatwoot;
- if (isOpen !== toggleValue) {
- const newIsOpen = toggleValue === undefined ? !isOpen : toggleValue;
- window.$chatwoot.isOpen = newIsOpen;
+ if (isOpen === toggleValue) return;
- toggleClass(chatBubble, 'woot--hide');
- toggleClass(closeBubble, 'woot--hide');
- toggleClass(widgetHolder, 'woot--hide');
- IFrameHelper.events.onBubbleToggle(newIsOpen);
+ const newIsOpen = toggleValue === undefined ? !isOpen : toggleValue;
+ window.$chatwoot.isOpen = newIsOpen;
- if (!newIsOpen) {
- chatBubble.focus();
- }
- }
+ toggleClass(chatBubble, 'woot--hide');
+ toggleClass(closeBubble, 'woot--hide');
+ toggleClass(widgetHolder, 'woot--hide');
+
+ handleBubbleToggle(newIsOpen);
};
export const onClickChatBubble = () => {
diff --git a/app/javascript/sdk/sdk.js b/app/javascript/sdk/sdk.js
index 95d132258..095fe80ca 100644
--- a/app/javascript/sdk/sdk.js
+++ b/app/javascript/sdk/sdk.js
@@ -51,6 +51,7 @@ export const SDK_CSS = `
user-select: none;
width: 64px;
z-index: 2147483000 !important;
+ overflow: hidden;
}
.woot-widget-bubble.woot-widget-bubble--flat {
diff --git a/app/javascript/shared/constants/messages.js b/app/javascript/shared/constants/messages.js
index b827216a5..e0a57b11c 100644
--- a/app/javascript/shared/constants/messages.js
+++ b/app/javascript/shared/constants/messages.js
@@ -44,6 +44,7 @@ export const ALLOWED_FILE_TYPES =
'video/*,' +
'.3gpp,' +
'text/csv, text/plain, application/json, application/pdf, text/rtf,' +
+ 'application/xml, text/xml,' +
'application/zip, application/x-7z-compressed application/vnd.rar application/x-tar,' +
'application/msword, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/vnd.oasis.opendocument.text,' +
'application/vnd.openxmlformats-officedocument.presentationml.presentation, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,' +
diff --git a/app/javascript/shared/helpers/MessageTypeHelper.js b/app/javascript/shared/helpers/MessageTypeHelper.js
index 4ec3f8bbc..1e6cf454c 100644
--- a/app/javascript/shared/helpers/MessageTypeHelper.js
+++ b/app/javascript/shared/helpers/MessageTypeHelper.js
@@ -4,8 +4,20 @@ export const isASubmittedFormMessage = (message = {}) =>
export const MESSAGE_MAX_LENGTH = {
GENERAL: 10000,
- FACEBOOK: 1000,
+ // https://developers.facebook.com/docs/messenger-platform/reference/send-api#request
+ FACEBOOK: 2000,
+ // https://developers.facebook.com/docs/instagram-platform/instagram-api-with-instagram-login/messaging-api#send-a-text-message
+ INSTAGRAM: 1000,
+ // https://www.twilio.com/docs/glossary/what-sms-character-limit
TWILIO_SMS: 320,
+ // https://help.twilio.com/articles/360033806753-Maximum-Message-Length-with-Twilio-Programmable-Messaging
TWILIO_WHATSAPP: 1600,
+ // https://developers.facebook.com/docs/whatsapp/cloud-api/reference/messages#text-object
+ WHATSAPP_CLOUD: 4096,
+ // https://support.bandwidth.com/hc/en-us/articles/360010235373-What-are-Bandwidth-s-SMS-character-limits-and-concatenation-practices
+ BANDWIDTH_SMS: 160,
+ // https://core.telegram.org/bots/api#sendmessage
+ TELEGRAM: 4096,
+ LINE: 2000,
EMAIL: 25000,
};
diff --git a/app/javascript/shared/helpers/Validators.js b/app/javascript/shared/helpers/Validators.js
index 6502fef39..1c10121f1 100644
--- a/app/javascript/shared/helpers/Validators.js
+++ b/app/javascript/shared/helpers/Validators.js
@@ -100,3 +100,10 @@ export const getRegexp = regexPatternValue => {
regexPatternValue.slice(lastSlash + 1)
);
};
+
+/**
+ * Checks if a string is a valid slug (letters, numbers, hyphens only, no spaces or other symbols).
+ * @param {string} value - The slug to validate.
+ * @returns {boolean} True if the slug is valid, false otherwise.
+ */
+export const isValidSlug = value => /^[a-zA-Z0-9-]+$/.test(value);
diff --git a/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js b/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js
index fc15b772c..4546b43a8 100644
--- a/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js
+++ b/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js
@@ -9,6 +9,7 @@ import {
isNumber,
isDomain,
getRegexp,
+ isValidSlug,
} from '../Validators';
describe('#shouldBeUrl', () => {
@@ -153,3 +154,24 @@ describe('#getRegexp', () => {
expect(regex.test('12-34-5678')).toBe(false);
});
});
+
+describe('#isValidSlug', () => {
+ it('should return true for valid slugs', () => {
+ expect(isValidSlug('abc')).toEqual(true);
+ expect(isValidSlug('abc-123')).toEqual(true);
+ expect(isValidSlug('a-b-c')).toEqual(true);
+ expect(isValidSlug('123')).toEqual(true);
+ expect(isValidSlug('abc123-def')).toEqual(true);
+ });
+ it('should return false for invalid slugs', () => {
+ expect(isValidSlug('abc_def')).toEqual(false);
+ expect(isValidSlug('abc def')).toEqual(false);
+ expect(isValidSlug('abc@def')).toEqual(false);
+ expect(isValidSlug('abc.def')).toEqual(false);
+ expect(isValidSlug('abc/def')).toEqual(false);
+ expect(isValidSlug('abc!def')).toEqual(false);
+ expect(isValidSlug('abc--def!')).toEqual(false);
+ expect(isValidSlug('abc-def ')).toEqual(false);
+ expect(isValidSlug(' abc-def')).toEqual(false);
+ });
+});
diff --git a/app/javascript/shared/mixins/inboxMixin.js b/app/javascript/shared/mixins/inboxMixin.js
index f2fb2a36a..59bc23025 100644
--- a/app/javascript/shared/mixins/inboxMixin.js
+++ b/app/javascript/shared/mixins/inboxMixin.js
@@ -127,7 +127,7 @@ export default {
this.isATwilioWhatsAppChannel
);
},
- isAInstagramChannel() {
+ isAnInstagramChannel() {
return this.channelType === INBOX_TYPES.INSTAGRAM;
},
},
diff --git a/app/javascript/shared/store/globalConfig.js b/app/javascript/shared/store/globalConfig.js
index 5a266bd21..608a31ec1 100644
--- a/app/javascript/shared/store/globalConfig.js
+++ b/app/javascript/shared/store/globalConfig.js
@@ -5,7 +5,6 @@ const {
AZURE_APP_ID: azureAppId,
BRAND_NAME: brandName,
CHATWOOT_INBOX_TOKEN: chatwootInboxToken,
- CSML_EDITOR_HOST: csmlEditorHost,
CREATE_NEW_ACCOUNT_FROM_DASHBOARD: createNewAccountFromDashboard,
DIRECT_UPLOADS_ENABLED: directUploadsEnabled,
DISPLAY_MANIFEST: displayManifest,
@@ -29,7 +28,6 @@ const state = {
azureAppId,
brandName,
chatwootInboxToken,
- csmlEditorHost,
deploymentEnv,
createNewAccountFromDashboard,
directUploadsEnabled: directUploadsEnabled === 'true',
diff --git a/app/javascript/widget/constants/sdkEvents.js b/app/javascript/widget/constants/sdkEvents.js
index 766fa1742..305aa16d7 100644
--- a/app/javascript/widget/constants/sdkEvents.js
+++ b/app/javascript/widget/constants/sdkEvents.js
@@ -1,4 +1,7 @@
export const CHATWOOT_ERROR = 'chatwoot:error';
export const CHATWOOT_ON_MESSAGE = 'chatwoot:on-message';
export const CHATWOOT_ON_START_CONVERSATION = 'chatwoot:on-start-conversation';
+export const CHATWOOT_POSTBACK = 'chatwoot:postback';
export const CHATWOOT_READY = 'chatwoot:ready';
+export const CHATWOOT_OPENED = 'chatwoot:opened';
+export const CHATWOOT_CLOSED = 'chatwoot:closed';
diff --git a/app/jobs/agent_bots/csml_job.rb b/app/jobs/agent_bots/csml_job.rb
deleted file mode 100644
index d0975e364..000000000
--- a/app/jobs/agent_bots/csml_job.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class AgentBots::CsmlJob < ApplicationJob
- queue_as :high
-
- def perform(event, agent_bot, message)
- event_data = { message: message }
- Integrations::Csml::ProcessorService.new(
- event_name: event, agent_bot: agent_bot, event_data: event_data
- ).perform
- end
-end
diff --git a/app/jobs/webhooks/instagram_events_job.rb b/app/jobs/webhooks/instagram_events_job.rb
index eb08f2ebb..3db8b6ba9 100644
--- a/app/jobs/webhooks/instagram_events_job.rb
+++ b/app/jobs/webhooks/instagram_events_job.rb
@@ -24,6 +24,11 @@ class Webhooks::InstagramEventsJob < MutexApplicationJob
private
def process_single_entry(entry)
+ if test_event?(entry)
+ process_test_event(entry)
+ return
+ end
+
process_messages(entry)
end
@@ -46,6 +51,20 @@ class Webhooks::InstagramEventsJob < MutexApplicationJob
messaging[:message].present? && messaging[:message][:is_echo].present?
end
+ def test_event?(entry)
+ entry[:changes].present?
+ end
+
+ def process_test_event(entry)
+ messaging = extract_messaging_from_test_event(entry)
+
+ Instagram::TestEventService.new(messaging).perform if messaging.present?
+ end
+
+ def extract_messaging_from_test_event(entry)
+ entry[:changes].first&.dig(:value) if entry[:changes].present?
+ end
+
def instagram_id(messaging)
if agent_message_via_echo?(messaging)
messaging[:sender][:id]
diff --git a/app/listeners/agent_bot_listener.rb b/app/listeners/agent_bot_listener.rb
index 5b8ac6cc5..f519c7ec3 100644
--- a/app/listeners/agent_bot_listener.rb
+++ b/app/listeners/agent_bot_listener.rb
@@ -59,14 +59,10 @@ class AgentBotListener < BaseListener
true
end
- def process_message_event(method_name, agent_bot, message, event)
- case agent_bot.bot_type
- when 'webhook'
- payload = message.webhook_data.merge(event: method_name)
- process_webhook_bot_event(agent_bot, payload)
- when 'csml'
- process_csml_bot_event(event.name, agent_bot, message)
- end
+ def process_message_event(method_name, agent_bot, message, _event)
+ # Only webhook bots are supported
+ payload = message.webhook_data.merge(event: method_name)
+ process_webhook_bot_event(agent_bot, payload)
end
def process_webhook_bot_event(agent_bot, payload)
@@ -74,8 +70,4 @@ class AgentBotListener < BaseListener
AgentBots::WebhookJob.perform_later(agent_bot.outgoing_url, payload)
end
-
- def process_csml_bot_event(event, agent_bot, message)
- AgentBots::CsmlJob.perform_later(event, agent_bot, message)
- end
end
diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
index b55f848d5..d544f30df 100644
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -1,4 +1,8 @@
class ConversationReplyMailer < ApplicationMailer
+ # We needs to expose large attachments to the view as links
+ # Small attachments are linked as mail attachments directly
+ attr_reader :large_attachments
+
include ConversationReplyMailerHelper
default from: ENV.fetch('MAILER_SENDER_EMAIL', 'Chatwoot
')
layout :choose_layout
diff --git a/app/mailers/conversation_reply_mailer_helper.rb b/app/mailers/conversation_reply_mailer_helper.rb
index 198e9f2a1..d34369832 100644
--- a/app/mailers/conversation_reply_mailer_helper.rb
+++ b/app/mailers/conversation_reply_mailer_helper.rb
@@ -17,11 +17,44 @@ module ConversationReplyMailerHelper
google_smtp_settings
set_delivery_method
- Rails.logger.info("Email sent from #{email_from} to #{to_emails} with subject #{mail_subject}")
-
+ # Email type detection logic:
+ # - email_reply: Sets @message with a single message
+ # - Other actions: Set @messages with a collection of messages
+ #
+ # So this check implicitly determines we're handling an email_reply
+ # and not one of the other email types (summary, transcript, etc.)
+ process_attachments_as_files_for_email_reply if @message&.attachments.present?
mail(@options)
end
+ def process_attachments_as_files_for_email_reply
+ # Attachment processing for direct email replies (when replying to a single message)
+ #
+ # How attachments are handled:
+ # 1. Total file size (<20MB): Added directly to the email as proper attachments
+ # 2. Total file size (>20MB): Added to @large_attachments to be displayed as links in the email
+
+ @options[:attachments] = []
+ @large_attachments = []
+ current_total_size = 0
+
+ @message.attachments.each do |attachment|
+ raw_data = attachment.file.download
+ attachment_name = attachment.file.filename.to_s
+ file_size = raw_data.bytesize
+
+ # Attach files directly until we hit 20MB total
+ # After reaching 20MB, send remaining files as links
+ if current_total_size + file_size <= 20.megabytes
+ mail.attachments[attachment_name] = raw_data
+ @options[:attachments] << { name: attachment_name }
+ current_total_size += file_size
+ else
+ @large_attachments << attachment
+ end
+ end
+ end
+
private
def google_smtp_settings
@@ -52,6 +85,8 @@ module ConversationReplyMailerHelper
tls: false,
enable_starttls_auto: true,
openssl_verify_mode: 'none',
+ open_timeout: 15,
+ read_timeout: 15,
authentication: 'xoauth2'
}
end
diff --git a/app/models/agent_bot.rb b/app/models/agent_bot.rb
index 07119fbca..be63aebc5 100644
--- a/app/models/agent_bot.rb
+++ b/app/models/agent_bot.rb
@@ -25,9 +25,8 @@ class AgentBot < ApplicationRecord
has_many :inboxes, through: :agent_bot_inboxes
has_many :messages, as: :sender, dependent: :nullify
belongs_to :account, optional: true
- enum bot_type: { webhook: 0, csml: 1 }
+ enum bot_type: { webhook: 0 }
- validate :validate_agent_bot_config
validates :outgoing_url, length: { maximum: Limits::URL_LENGTH_LIMIT }
def available_name
@@ -51,9 +50,7 @@ class AgentBot < ApplicationRecord
}
end
- private
-
- def validate_agent_bot_config
- errors.add(:bot_config, 'Invalid Bot Configuration') unless AgentBots::ValidateBotService.new(agent_bot: self).perform
+ def system_bot?
+ account.nil?
end
end
diff --git a/app/models/channel/api.rb b/app/models/channel/api.rb
index a2bf9da48..17270e560 100644
--- a/app/models/channel/api.rb
+++ b/app/models/channel/api.rb
@@ -33,10 +33,6 @@ class Channel::Api < ApplicationRecord
'API'
end
- def messaging_window_enabled?
- additional_attributes.present? && additional_attributes['agent_reply_time_window'].present?
- end
-
private
def ensure_valid_agent_reply_time_window
diff --git a/app/models/channel/facebook_page.rb b/app/models/channel/facebook_page.rb
index 1755889f8..1b6e151cb 100644
--- a/app/models/channel/facebook_page.rb
+++ b/app/models/channel/facebook_page.rb
@@ -32,10 +32,6 @@ class Channel::FacebookPage < ApplicationRecord
'Facebook'
end
- def messaging_window_enabled?
- false
- end
-
def create_contact_inbox(instagram_id, name)
@contact_inbox = ::ContactInboxWithContactBuilder.new({
source_id: instagram_id,
diff --git a/app/models/channel/twilio_sms.rb b/app/models/channel/twilio_sms.rb
index 20ebe519e..b5767964a 100644
--- a/app/models/channel/twilio_sms.rb
+++ b/app/models/channel/twilio_sms.rb
@@ -41,10 +41,6 @@ class Channel::TwilioSms < ApplicationRecord
medium == 'sms' ? 'Twilio SMS' : 'Whatsapp'
end
- def messaging_window_enabled?
- medium == 'whatsapp'
- end
-
def send_message(to:, body:, media_url: nil)
params = send_message_from.merge(to: to, body: body)
params[:media_url] = media_url if media_url.present?
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index ef4364fb7..849ed1ca8 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -54,10 +54,6 @@ class Channel::Whatsapp < ApplicationRecord
end
end
- def messaging_window_enabled?
- provider != 'baileys'
- end
-
def mark_message_templates_updated
# rubocop:disable Rails/SkipsModelValidations
update_column(:message_templates_last_updated, Time.zone.now)
diff --git a/app/models/concerns/channelable.rb b/app/models/concerns/channelable.rb
index 0b23283e1..e3e9eba94 100644
--- a/app/models/concerns/channelable.rb
+++ b/app/models/concerns/channelable.rb
@@ -7,10 +7,6 @@ module Channelable
after_update :create_audit_log_entry
end
- def messaging_window_enabled?
- false
- end
-
def create_audit_log_entry; end
end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 32a214759..f8810824c 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -115,14 +115,7 @@ class Conversation < ApplicationRecord
delegate :auto_resolve_duration, to: :account
def can_reply?
- channel = inbox&.channel
-
- return can_reply_on_instagram? if additional_attributes['type'] == 'instagram_direct_message'
-
- return true unless channel&.messaging_window_enabled?
-
- messaging_window = inbox.api? ? channel.additional_attributes['agent_reply_time_window'].to_i : 24
- last_message_in_messaging_window?(messaging_window)
+ Conversations::MessageWindowService.new(self).can_reply?
end
def language
@@ -137,24 +130,6 @@ class Conversation < ApplicationRecord
messages&.incoming&.last
end
- def last_message_in_messaging_window?(time)
- return false if last_incoming_message.nil?
-
- Time.current < last_incoming_message.created_at + time.hours
- end
-
- def can_reply_on_instagram?
- global_config = GlobalConfig.get('ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT')
-
- return false if last_incoming_message.nil?
-
- if global_config['ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT']
- Time.current < last_incoming_message.created_at + 7.days
- else
- last_message_in_messaging_window?(24)
- end
- end
-
def toggle_status
# FIXME: implement state machine with aasm
self.status = open? ? :resolved : :open
diff --git a/app/services/agent_bots/validate_bot_service.rb b/app/services/agent_bots/validate_bot_service.rb
deleted file mode 100644
index d8c0b8a9c..000000000
--- a/app/services/agent_bots/validate_bot_service.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-class AgentBots::ValidateBotService
- pattr_initialize [:agent_bot]
- def perform
- return true unless agent_bot.bot_type == 'csml'
-
- validate_csml_bot
- end
-
- private
-
- def csml_client
- @csml_client ||= CsmlEngine.new
- end
-
- def csml_bot_payload
- {
- id: agent_bot[:name],
- name: agent_bot[:name],
- default_flow: 'Default',
- flows: [
- {
- id: SecureRandom.uuid,
- name: 'Default',
- content: agent_bot.bot_config['csml_content'],
- commands: []
- }
- ]
- }
- end
-
- def validate_csml_bot
- response = csml_client.validate(csml_bot_payload)
- response.blank? || response['valid']
- rescue StandardError => e
- ChatwootExceptionTracker.new(e, account: agent_bot&.account).capture_exception
- false
- end
-end
diff --git a/app/services/conversations/message_window_service.rb b/app/services/conversations/message_window_service.rb
new file mode 100644
index 000000000..132050865
--- /dev/null
+++ b/app/services/conversations/message_window_service.rb
@@ -0,0 +1,66 @@
+class Conversations::MessageWindowService
+ MESSAGING_WINDOW_24_HOURS = 24.hours
+ MESSAGING_WINDOW_7_DAYS = 7.days
+
+ def initialize(conversation)
+ @conversation = conversation
+ end
+
+ def can_reply?
+ return true if messaging_window.blank?
+
+ last_message_in_messaging_window?(messaging_window)
+ end
+
+ private
+
+ def messaging_window
+ case @conversation.inbox.channel_type
+ when 'Channel::Api'
+ api_messaging_window
+ when 'Channel::FacebookPage'
+ messenger_messaging_window
+ when 'Channel::Instagram'
+ instagram_messaging_window
+ when 'Channel::Whatsapp'
+ return if @conversation.inbox.channel.provider == 'baileys'
+
+ MESSAGING_WINDOW_24_HOURS
+ when 'Channel::TwilioSms'
+ twilio_messaging_window
+ end
+ end
+
+ def last_message_in_messaging_window?(time)
+ return false if last_incoming_message.nil?
+
+ Time.current < last_incoming_message.created_at + time
+ end
+
+ def api_messaging_window
+ return if @conversation.inbox.channel.additional_attributes['agent_reply_time_window'].blank?
+
+ @conversation.inbox.channel.additional_attributes['agent_reply_time_window'].to_i.hours
+ end
+
+ # Check medium of the inbox to determine the messaging window
+ def twilio_messaging_window
+ @conversation.inbox.channel.medium == 'whatsapp' ? MESSAGING_WINDOW_24_HOURS : nil
+ end
+
+ def messenger_messaging_window
+ meta_messaging_window('ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT')
+ end
+
+ def instagram_messaging_window
+ meta_messaging_window('ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT')
+ end
+
+ def meta_messaging_window(config_key)
+ GlobalConfigService.load(config_key, nil) ? MESSAGING_WINDOW_7_DAYS : MESSAGING_WINDOW_24_HOURS
+ end
+
+ def last_incoming_message
+ @last_incoming_message ||= @conversation.messages&.incoming&.last
+ end
+end
diff --git a/app/services/instagram/test_event_service.rb b/app/services/instagram/test_event_service.rb
new file mode 100644
index 000000000..6fe242494
--- /dev/null
+++ b/app/services/instagram/test_event_service.rb
@@ -0,0 +1,79 @@
+class Instagram::TestEventService
+ def initialize(messaging)
+ @messaging = messaging
+ end
+
+ def perform
+ Rails.logger.info("Processing Instagram test webhook event, #{@messaging}")
+
+ return false unless test_webhook_event?
+
+ create_test_text
+ end
+
+ private
+
+ def test_webhook_event?
+ @messaging[:sender][:id] == '12334' && @messaging[:recipient][:id] == '23245'
+ end
+
+ def create_test_text
+ # As of now, we are using the last created instagram channel as the test channel,
+ # since we don't have any other channel for testing purpose at the time of meta approval
+ channel = Channel::Instagram.last
+
+ @inbox = ::Inbox.find_by(channel: channel)
+ return unless @inbox
+
+ @contact = create_test_contact
+
+ @conversation ||= create_test_conversation(conversation_params)
+
+ @message = @conversation.messages.create!(test_message_params)
+ end
+
+ def create_test_contact
+ @contact_inbox = @inbox.contact_inboxes.where(source_id: @messaging[:sender][:id]).first
+ unless @contact_inbox
+ @contact_inbox ||= @inbox.channel.create_contact_inbox(
+ 'sender_username', 'sender_username'
+ )
+ end
+
+ @contact_inbox.contact
+ end
+
+ def create_test_conversation(conversation_params)
+ Conversation.find_by(conversation_params) || build_conversation(conversation_params)
+ end
+
+ def test_message_params
+ {
+ account_id: @conversation.account_id,
+ inbox_id: @conversation.inbox_id,
+ message_type: 'incoming',
+ source_id: @messaging[:message][:mid],
+ content: @messaging[:message][:text],
+ sender: @contact
+ }
+ end
+
+ def build_conversation(conversation_params)
+ Conversation.create!(
+ conversation_params.merge(
+ contact_inbox_id: @contact_inbox.id
+ )
+ )
+ end
+
+ def conversation_params
+ {
+ account_id: @inbox.account_id,
+ inbox_id: @inbox.id,
+ contact_id: @contact.id,
+ additional_attributes: {
+ type: 'instagram_direct_message'
+ }
+ }
+ end
+end
diff --git a/app/views/api/v1/models/_agent_bot.json.jbuilder b/app/views/api/v1/models/_agent_bot.json.jbuilder
index eafa31cd6..2547bb2a8 100644
--- a/app/views/api/v1/models/_agent_bot.json.jbuilder
+++ b/app/views/api/v1/models/_agent_bot.json.jbuilder
@@ -1,8 +1,10 @@
json.id resource.id
json.name resource.name
json.description resource.description
-json.outgoing_url resource.outgoing_url
+json.thumbnail resource.avatar_url
+json.outgoing_url resource.outgoing_url unless resource.system_bot?
json.bot_type resource.bot_type
json.bot_config resource.bot_config
json.account_id resource.account_id
json.access_token resource.access_token if resource.access_token.present?
+json.system_bot resource.system_bot?
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 8bae33f93..018d50304 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -56,6 +56,7 @@ end
## Instagram Attributes
json.reauthorization_required resource.channel.try(:reauthorization_required?) if resource.instagram?
+json.instagram_id resource.channel.try(:instagram_id) if resource.instagram?
## Twilio Attributes
json.messaging_service_sid resource.channel.try(:messaging_service_sid)
diff --git a/app/views/layouts/portal.html.erb b/app/views/layouts/portal.html.erb
index 5d8983621..c4135fd37 100644
--- a/app/views/layouts/portal.html.erb
+++ b/app/views/layouts/portal.html.erb
@@ -39,6 +39,10 @@ By default, it renders:
<% else %>
<%= @portal.page_title%>
<% end %>
+
+ <% if @portal.logo.present? %>
+
+ <% end %>
<% unless @theme_from_params.blank? %>
<%# this adds the theme from params, ensuring that there a localstorage value set %>
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index 4312638ed..4be41f8b2 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -35,6 +35,7 @@
hostURL: '<%= ENV.fetch('FRONTEND_URL', '') %>',
helpCenterURL: '<%= ENV.fetch('HELPCENTER_URL', '') %>',
fbAppId: '<%= @global_config['FB_APP_ID'] %>',
+ instagramAppId: '<%= @global_config['INSTAGRAM_APP_ID'] %>',
googleOAuthClientId: '<%= ENV.fetch('GOOGLE_OAUTH_CLIENT_ID', nil) %>',
googleOAuthCallbackUrl: '<%= ENV.fetch('GOOGLE_OAUTH_CALLBACK_URL', nil) %>',
fbApiVersion: '<%= @global_config['FACEBOOK_API_VERSION'] %>',
diff --git a/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb b/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
index 0ea0f301b..29ee49f67 100644
--- a/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/conversation_transcript.html.erb
@@ -32,9 +32,10 @@
<% if message.content %>
<%= ChatwootMarkdownRenderer.new(message.content).render_message %>
<% end %>
- <% if message.attachments %>
+ <% if message.attachments.present? %>
+ Attachments:
<% message.attachments.each do |attachment| %>
- Attachment [Click here to view]
+ <%= attachment.file.filename.to_s %>
<% end %>
<% end %>
diff --git a/app/views/mailers/conversation_reply_mailer/email_reply.html.erb b/app/views/mailers/conversation_reply_mailer/email_reply.html.erb
index 1d943c27e..319ba4b4e 100644
--- a/app/views/mailers/conversation_reply_mailer/email_reply.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/email_reply.html.erb
@@ -1,8 +1,9 @@
<% if @message.content %>
<%= ChatwootMarkdownRenderer.new(@message.content).render_message %>
<% end %>
-<% if @message.attachments %>
- <% @message.attachments.each do |attachment| %>
- attachment [click here to view]
+<% if @large_attachments.present? %>
+
Attachments:
+ <% @large_attachments.each do |attachment| %>
+ <%= attachment.file.filename.to_s %>
<% end %>
<% end %>
diff --git a/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb b/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
index 6c498d793..fd0bf068f 100644
--- a/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/reply_with_summary.html.erb
@@ -20,9 +20,10 @@
<% if message.content.present? %>
<% end %>
- This message contains <%= message.attachments.count > 1 ? 'attachments' : 'an attachment' %>.
- <% message.attachments.each do |attachment| %>
-
- View the attachment here.
+ Attachments:
+ <% message.attachments.each_with_index do |attachment, index| %>
+ <% if index > 0 %>
<% end %>
+ <%= attachment.file.filename.to_s %>
<% end %>
<% end %>
diff --git a/app/views/mailers/conversation_reply_mailer/reply_without_summary.html.erb b/app/views/mailers/conversation_reply_mailer/reply_without_summary.html.erb
index 3c9b8034a..4c043a11e 100644
--- a/app/views/mailers/conversation_reply_mailer/reply_without_summary.html.erb
+++ b/app/views/mailers/conversation_reply_mailer/reply_without_summary.html.erb
@@ -3,9 +3,10 @@
<% if message.content %>
<%= ChatwootMarkdownRenderer.new(message.content).render_message %>
<% end %>
- <% if message.attachments %>
+ <% if message.attachments.present? %>
+ Attachments:
<% message.attachments.each do |attachment| %>
- attachment [click here to view]
+ <%= attachment.file.filename.to_s %>
<% end %>
<% end %>
diff --git a/app/views/widget_tests/index.html.erb b/app/views/widget_tests/index.html.erb
index 45769bb45..2809b6944 100644
--- a/app/views/widget_tests/index.html.erb
+++ b/app/views/widget_tests/index.html.erb
@@ -66,6 +66,13 @@ window.addEventListener('chatwoot:postback', function(e) {
console.log('chatwoot:postback', e.detail)
})
+window.addEventListener('chatwoot:opened', function() {
+ console.log('chatwoot:opened')
+})
+
+window.addEventListener('chatwoot:closed', function() {
+ console.log('chatwoot:closed')
+})
window.addEventListener('chatwoot:on-start-conversation', function(e) {
console.log('chatwoot:on-start-conversation', e.detail)
diff --git a/config/app.yml b/config/app.yml
index df6fc62c0..9afc3f7bc 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
shared: &shared
- version: '4.0.4'
+ version: '4.1.0'
development:
<<: *shared
diff --git a/config/features.yml b/config/features.yml
index 8923bc064..ce26092b6 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -37,7 +37,7 @@
help_url: https://chwt.app/hc/help-center
- name: agent_bots
display_name: Agent Bots
- enabled: false
+ enabled: true
help_url: https://chwt.app/hc/agent-bots
- name: macros
display_name: Macros
@@ -149,7 +149,8 @@
enabled: true
- name: report_v4
display_name: Report V4
- enabled: false
+ enabled: true
+ deprecated: true
- name: contact_chatwoot_support_team
display_name: Contact Chatwoot Support Team
enabled: true
@@ -161,7 +162,7 @@
- name: search_with_gin
display_name: Search messages with GIN
enabled: false
+ chatwoot_internal: true
- name: channel_instagram
display_name: Instagram Channel
- enabled: false
- chatwoot_internal: true
+ enabled: true
diff --git a/db/migrate/20250410061725_convert_csml_bots_to_webhook_bots.rb b/db/migrate/20250410061725_convert_csml_bots_to_webhook_bots.rb
new file mode 100644
index 000000000..f4a953965
--- /dev/null
+++ b/db/migrate/20250410061725_convert_csml_bots_to_webhook_bots.rb
@@ -0,0 +1,13 @@
+class ConvertCsmlBotsToWebhookBots < ActiveRecord::Migration[7.0]
+ def up
+ # Find all CSML bots (bot_type = 1) and convert them to webhook (bot_type = 0)
+ AgentBot.where(bot_type: 1).find_each do |bot|
+ bot.update(bot_type: 0, bot_config: {})
+ end
+ end
+
+ def down
+ # This migration is not reversible - we've removed CSML support
+ raise ActiveRecord::IrreversibleMigration
+ end
+end
diff --git a/db/migrate/20250416182131_flip_chatwoot_v4_default_feature_flag_installation_config.rb b/db/migrate/20250416182131_flip_chatwoot_v4_default_feature_flag_installation_config.rb
new file mode 100644
index 000000000..115aff9c2
--- /dev/null
+++ b/db/migrate/20250416182131_flip_chatwoot_v4_default_feature_flag_installation_config.rb
@@ -0,0 +1,24 @@
+class FlipChatwootV4DefaultFeatureFlagInstallationConfig < ActiveRecord::Migration[7.0]
+ def up
+ # Update the default feature flag config to enable chatwoot_v4
+ config = InstallationConfig.find_by(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS')
+ if config && config.value.present?
+ features = config.value.map do |f|
+ if f['name'] == 'chatwoot_v4'
+ f.merge('enabled' => true)
+ else
+ f
+ end
+ end
+ config.value = features
+ config.save!
+ end
+
+ # Enable chatwoot_v4 for all accounts in batches of 100
+ Account.find_in_batches(batch_size: 100) do |accounts|
+ accounts.each { |account| account.enable_features!('chatwoot_v4') }
+ end
+
+ GlobalConfig.clear_cache
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3f982d11e..a11c24872 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2025_04_02_233933) do
+ActiveRecord::Schema[7.0].define(version: 2025_04_16_182131) do
# These extensions should be enabled to support this database
enable_extension "pg_stat_statements"
enable_extension "pg_trgm"
diff --git a/enterprise/LICENSE b/enterprise/LICENSE
index 7ffa68d10..dd92c09e9 100644
--- a/enterprise/LICENSE
+++ b/enterprise/LICENSE
@@ -1,5 +1,5 @@
The Chatwoot Enterprise license (the “Enterprise License”)
-Copyright (c) 2017-2021 Chatwoot Inc
+Copyright (c) 2017-2025 Chatwoot Inc
With regard to the Chatwoot Software:
diff --git a/lib/csml_engine.rb b/lib/csml_engine.rb
deleted file mode 100644
index 5e238ac2d..000000000
--- a/lib/csml_engine.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-class CsmlEngine
- API_KEY_HEADER = 'X-Api-Key'.freeze
-
- def initialize
- @host_url = GlobalConfigService.load('CSML_BOT_HOST', '')
- @api_key = GlobalConfigService.load('CSML_BOT_API_KEY', '')
-
- raise ArgumentError, 'Missing Credentials' if @host_url.blank? || @api_key.blank?
- end
-
- def status
- response = HTTParty.get("#{@host_url}/status")
- process_response(response)
- end
-
- def run(bot, params)
- payload = {
- bot: bot,
- event: {
- request_id: SecureRandom.uuid,
- client: params[:client],
- payload: params[:payload],
- metadata: params[:metadata],
- ttl_duration: 4000
- }
- }
- response = post('run', payload)
- process_response(response)
- end
-
- def validate(bot)
- response = post('validate', bot)
- process_response(response)
- end
-
- private
-
- def process_response(response)
- return response.parsed_response if response.success?
-
- { error: response.parsed_response, status: response.code }
- end
-
- def post(path, payload)
- HTTParty.post(
- "#{@host_url}/#{path}", {
- headers: { API_KEY_HEADER => @api_key, 'Content-Type' => 'application/json' },
- body: payload.to_json
- }
- )
- end
-end
diff --git a/lib/integrations/bot_processor_service.rb b/lib/integrations/bot_processor_service.rb
index 401c519ce..95b2a111b 100644
--- a/lib/integrations/bot_processor_service.rb
+++ b/lib/integrations/bot_processor_service.rb
@@ -1,5 +1,4 @@
class Integrations::BotProcessorService
- # TODO: In CSML processor service, the argument is agent bot, update initializers accordingly.
pattr_initialize [:event_name!, :hook!, :event_data!]
def perform
diff --git a/lib/integrations/csml/processor_service.rb b/lib/integrations/csml/processor_service.rb
deleted file mode 100644
index 3a8f21077..000000000
--- a/lib/integrations/csml/processor_service.rb
+++ /dev/null
@@ -1,142 +0,0 @@
-class Integrations::Csml::ProcessorService < Integrations::BotProcessorService
- pattr_initialize [:event_name!, :event_data!, :agent_bot!]
-
- private
-
- def csml_client
- @csml_client ||= CsmlEngine.new
- end
-
- def get_response(session_id, content)
- csml_client.run(
- bot_payload,
- {
- client: client_params(session_id),
- payload: message_payload(content),
- metadata: metadata_params
- }
- )
- end
-
- def client_params(session_id)
- {
- bot_id: "chatwoot-bot-#{conversation.inbox.id}",
- channel_id: "chatwoot-bot-inbox-#{conversation.inbox.id}",
- user_id: session_id
- }
- end
-
- def message_payload(content)
- {
- content_type: 'text',
- content: { text: content }
- }
- end
-
- def metadata_params
- {
- conversation: conversation,
- contact: conversation.contact
- }
- end
-
- def bot_payload
- {
- id: "chatwoot-csml-bot-#{agent_bot.id}",
- name: "chatwoot-csml-bot-#{agent_bot.id}",
- default_flow: 'chatwoot_bot_flow',
- flows: [
- {
- id: "chatwoot-csml-bot-flow-#{agent_bot.id}-inbox-#{conversation.inbox.id}",
- name: 'chatwoot_bot_flow',
- content: agent_bot.bot_config['csml_content'],
- commands: []
- }
- ]
- }
- end
-
- def process_response(message, response)
- csml_messages = response['messages']
- has_conversation_ended = response['conversation_end']
-
- process_action(message, 'handoff') if has_conversation_ended.present?
-
- return if csml_messages.blank?
-
- # We do not support wait, typing now.
- csml_messages.each do |csml_message|
- create_messages(csml_message, conversation)
- end
- end
-
- def create_messages(message, conversation)
- message_payload = message['payload']
-
- case message_payload['content_type']
- when 'text'
- process_text_messages(message_payload, conversation)
- when 'question'
- process_question_messages(message_payload, conversation)
- when 'image'
- process_image_messages(message_payload, conversation)
- end
- end
-
- def process_text_messages(message_payload, conversation)
- conversation.messages.create!(
- {
- message_type: :outgoing,
- account_id: conversation.account_id,
- inbox_id: conversation.inbox_id,
- content: message_payload['content']['text'],
- sender: agent_bot
- }
- )
- end
-
- def process_question_messages(message_payload, conversation)
- buttons = message_payload['content']['buttons'].map do |button|
- { title: button['content']['title'], value: button['content']['payload'] }
- end
- conversation.messages.create!(
- {
- message_type: :outgoing,
- account_id: conversation.account_id,
- inbox_id: conversation.inbox_id,
- content: message_payload['content']['title'],
- content_type: 'input_select',
- content_attributes: { items: buttons },
- sender: agent_bot
- }
- )
- end
-
- def prepare_attachment(message_payload, message, account_id)
- attachment_params = { file_type: :image, account_id: account_id }
- attachment_url = message_payload['content']['url']
- attachment = message.attachments.new(attachment_params)
- attachment_file = Down.download(attachment_url)
- attachment.file.attach(
- io: attachment_file,
- filename: attachment_file.original_filename,
- content_type: attachment_file.content_type
- )
- end
-
- def process_image_messages(message_payload, conversation)
- message = conversation.messages.new(
- {
- message_type: :outgoing,
- account_id: conversation.account_id,
- inbox_id: conversation.inbox_id,
- content: '',
- content_type: 'text',
- sender: agent_bot
- }
- )
-
- prepare_attachment(message_payload, message, conversation.account_id)
- message.save!
- end
-end
diff --git a/lib/integrations/google_translate/processor_service.rb b/lib/integrations/google_translate/processor_service.rb
index a1a3e6401..33fe56770 100644
--- a/lib/integrations/google_translate/processor_service.rb
+++ b/lib/integrations/google_translate/processor_service.rb
@@ -1,15 +1,19 @@
require 'google/cloud/translate/v3'
+
class Integrations::GoogleTranslate::ProcessorService
pattr_initialize [:message!, :target_language!]
def perform
- return if message.content.blank?
return if hook.blank?
+ content = translation_content
+ return if content.blank?
+
response = client.translate_text(
- contents: [message.content],
+ contents: [content],
target_language_code: target_language,
- parent: "projects/#{hook.settings['project_id']}"
+ parent: "projects/#{hook.settings['project_id']}",
+ mime_type: mime_type
)
return if response.translations.first.blank?
@@ -19,6 +23,43 @@ class Integrations::GoogleTranslate::ProcessorService
private
+ def email_channel?
+ message&.inbox&.email?
+ end
+
+ def email_content
+ @email_content ||= {
+ html: message.content_attributes.dig('email', 'html_content', 'full'),
+ text: message.content_attributes.dig('email', 'text_content', 'full'),
+ content_type: message.content_attributes.dig('email', 'content_type')
+ }
+ end
+
+ def html_content_available?
+ email_content[:html].present?
+ end
+
+ def plain_text_content_available?
+ email_content[:content_type]&.include?('text/plain') &&
+ email_content[:text].present?
+ end
+
+ def translation_content
+ return message.content unless email_channel?
+ return email_content[:html] if html_content_available?
+ return email_content[:text] if plain_text_content_available?
+
+ message.content
+ end
+
+ def mime_type
+ if email_channel? && html_content_available?
+ 'text/html'
+ else
+ 'text/plain'
+ end
+ end
+
def hook
@hook ||= message.account.hooks.find_by(app_id: 'google_translate')
end
diff --git a/package.json b/package.json
index 937cacec3..5c5239f55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@chatwoot/chatwoot",
- "version": "4.0.4",
+ "version": "4.1.0",
"license": "MIT",
"scripts": {
"eslint": "eslint app/**/*.{js,vue}",
@@ -34,7 +34,7 @@
"@breezystack/lamejs": "^1.2.7",
"@chatwoot/ninja-keys": "1.2.3",
"@chatwoot/prosemirror-schema": "1.1.1-next",
- "@chatwoot/utils": "^0.0.42",
+ "@chatwoot/utils": "^0.0.43",
"@formkit/core": "^1.6.7",
"@formkit/vue": "^1.6.7",
"@hcaptcha/vue3-hcaptcha": "^1.3.0",
@@ -138,7 +138,7 @@
"prosemirror-model": "^1.22.3",
"size-limit": "^8.2.4",
"tailwindcss": "^3.4.13",
- "vite": "^5.4.17",
+ "vite": "^5.4.18",
"vite-plugin-ruby": "^5.0.0",
"vitest": "3.0.5"
},
@@ -154,7 +154,7 @@
"pnpm": {
"overrides": {
"vite-node": "2.0.1",
- "vite": "5.4.17",
+ "vite": "5.4.18",
"vitest": "3.0.5"
}
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fd45c7647..07d58cbcf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,7 +6,7 @@ settings:
overrides:
vite-node: 2.0.1
- vite: 5.4.17
+ vite: 5.4.18
vitest: 3.0.5
importers:
@@ -23,8 +23,8 @@ importers:
specifier: 1.1.1-next
version: 1.1.1-next
'@chatwoot/utils':
- specifier: ^0.0.42
- version: 0.0.42
+ specifier: ^0.0.43
+ version: 0.0.43
'@formkit/core':
specifier: ^1.6.7
version: 1.6.7
@@ -72,7 +72,7 @@ importers:
version: 8.20.5(vue@3.5.12(typescript@5.6.2))
'@vitejs/plugin-vue':
specifier: ^5.1.4
- version: 5.1.4(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
+ version: 5.1.4(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
'@vue/compiler-sfc':
specifier: ^3.5.8
version: 3.5.8
@@ -238,7 +238,7 @@ importers:
version: 1.8.1(tailwindcss@3.4.13)
'@histoire/plugin-vue':
specifier: 0.17.15
- version: 0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
+ version: 0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))
'@iconify-json/logos':
specifier: ^1.2.3
version: 1.2.3
@@ -301,7 +301,7 @@ importers:
version: 6.0.0
histoire:
specifier: 0.17.15
- version: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ version: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
husky:
specifier: ^7.0.0
version: 7.0.4
@@ -330,11 +330,11 @@ importers:
specifier: ^3.4.13
version: 3.4.13
vite:
- specifier: 5.4.17
- version: 5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+ specifier: 5.4.18
+ version: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
vite-plugin-ruby:
specifier: ^5.0.0
- version: 5.0.0(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ version: 5.0.0(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
vitest:
specifier: 3.0.5
version: 3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0)
@@ -406,8 +406,8 @@ packages:
'@chatwoot/prosemirror-schema@1.1.1-next':
resolution: {integrity: sha512-/M2qZ+ZF7GlQNt1riwVP499fvp3hxSqd5iy8hxyF9pkj9qQ+OKYn5JK+v3qwwqQY3IxhmNOn1Lp6tm7vstrd9Q==}
- '@chatwoot/utils@0.0.42':
- resolution: {integrity: sha512-TrEywcG1zjgBScVrQla7GMJwXsbLyc5u/verm/LbLrGxizU2NcNoJecRvJOUgL65kYVEtcO9//+gIDswwqnt6g==}
+ '@chatwoot/utils@0.0.43':
+ resolution: {integrity: sha512-kMIXAGebCak9qOi68QnGer+rQLLo/z2N9cR+7tvGdZCW0ThDiVCF7JbHYHVDlYsdDFIx0FLlyIdCfEbooVT2Dw==}
engines: {node: '>=10'}
'@codemirror/commands@6.7.0':
@@ -860,7 +860,7 @@ packages:
'@histoire/shared@0.17.17':
resolution: {integrity: sha512-ueGtURysonT0MujCObPCR57+mgZluMEXCrbc2FBgKAD/DoAt38tNwSGsmLldk2O6nTr7lr6ClbVSgWrLwgY6Xw==}
peerDependencies:
- vite: 5.4.17
+ vite: 5.4.18
'@histoire/vendors@0.17.17':
resolution: {integrity: sha512-QZvmffdoJlLuYftPIkOU5Q2FPAdG2JjMuQ5jF7NmEl0n1XnmbMqtRkdYTZ4eF6CO1KLZ0Zyf6gBQvoT1uWNcjA==}
@@ -1039,103 +1039,103 @@ packages:
'@rails/ujs@7.1.400':
resolution: {integrity: sha512-YwvXm3BR5tn+VCAKYGycLejMRVZE3Ionj5gFjEeGXCZnI0Rpi+7dKpmyu90kdUY7dRUFpHTdu9zZceEzFLl38w==}
- '@rollup/rollup-android-arm-eabi@4.39.0':
- resolution: {integrity: sha512-lGVys55Qb00Wvh8DMAocp5kIcaNzEFTmGhfFd88LfaogYTRKrdxgtlO5H6S49v2Nd8R2C6wLOal0qv6/kCkOwA==}
+ '@rollup/rollup-android-arm-eabi@4.40.0':
+ resolution: {integrity: sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==}
cpu: [arm]
os: [android]
- '@rollup/rollup-android-arm64@4.39.0':
- resolution: {integrity: sha512-It9+M1zE31KWfqh/0cJLrrsCPiF72PoJjIChLX+rEcujVRCb4NLQ5QzFkzIZW8Kn8FTbvGQBY5TkKBau3S8cCQ==}
+ '@rollup/rollup-android-arm64@4.40.0':
+ resolution: {integrity: sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==}
cpu: [arm64]
os: [android]
- '@rollup/rollup-darwin-arm64@4.39.0':
- resolution: {integrity: sha512-lXQnhpFDOKDXiGxsU9/l8UEGGM65comrQuZ+lDcGUx+9YQ9dKpF3rSEGepyeR5AHZ0b5RgiligsBhWZfSSQh8Q==}
+ '@rollup/rollup-darwin-arm64@4.40.0':
+ resolution: {integrity: sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==}
cpu: [arm64]
os: [darwin]
- '@rollup/rollup-darwin-x64@4.39.0':
- resolution: {integrity: sha512-mKXpNZLvtEbgu6WCkNij7CGycdw9cJi2k9v0noMb++Vab12GZjFgUXD69ilAbBh034Zwn95c2PNSz9xM7KYEAQ==}
+ '@rollup/rollup-darwin-x64@4.40.0':
+ resolution: {integrity: sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==}
cpu: [x64]
os: [darwin]
- '@rollup/rollup-freebsd-arm64@4.39.0':
- resolution: {integrity: sha512-jivRRlh2Lod/KvDZx2zUR+I4iBfHcu2V/BA2vasUtdtTN2Uk3jfcZczLa81ESHZHPHy4ih3T/W5rPFZ/hX7RtQ==}
+ '@rollup/rollup-freebsd-arm64@4.40.0':
+ resolution: {integrity: sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==}
cpu: [arm64]
os: [freebsd]
- '@rollup/rollup-freebsd-x64@4.39.0':
- resolution: {integrity: sha512-8RXIWvYIRK9nO+bhVz8DwLBepcptw633gv/QT4015CpJ0Ht8punmoHU/DuEd3iw9Hr8UwUV+t+VNNuZIWYeY7Q==}
+ '@rollup/rollup-freebsd-x64@4.40.0':
+ resolution: {integrity: sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==}
cpu: [x64]
os: [freebsd]
- '@rollup/rollup-linux-arm-gnueabihf@4.39.0':
- resolution: {integrity: sha512-mz5POx5Zu58f2xAG5RaRRhp3IZDK7zXGk5sdEDj4o96HeaXhlUwmLFzNlc4hCQi5sGdR12VDgEUqVSHer0lI9g==}
+ '@rollup/rollup-linux-arm-gnueabihf@4.40.0':
+ resolution: {integrity: sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==}
cpu: [arm]
os: [linux]
- '@rollup/rollup-linux-arm-musleabihf@4.39.0':
- resolution: {integrity: sha512-+YDwhM6gUAyakl0CD+bMFpdmwIoRDzZYaTWV3SDRBGkMU/VpIBYXXEvkEcTagw/7VVkL2vA29zU4UVy1mP0/Yw==}
+ '@rollup/rollup-linux-arm-musleabihf@4.40.0':
+ resolution: {integrity: sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==}
cpu: [arm]
os: [linux]
- '@rollup/rollup-linux-arm64-gnu@4.39.0':
- resolution: {integrity: sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==}
+ '@rollup/rollup-linux-arm64-gnu@4.40.0':
+ resolution: {integrity: sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==}
cpu: [arm64]
os: [linux]
- '@rollup/rollup-linux-arm64-musl@4.39.0':
- resolution: {integrity: sha512-vYanR6MtqC7Z2SNr8gzVnzUul09Wi1kZqJaek3KcIlI/wq5Xtq4ZPIZ0Mr/st/sv/NnaPwy/D4yXg5x0B3aUUA==}
+ '@rollup/rollup-linux-arm64-musl@4.40.0':
+ resolution: {integrity: sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==}
cpu: [arm64]
os: [linux]
- '@rollup/rollup-linux-loongarch64-gnu@4.39.0':
- resolution: {integrity: sha512-NMRUT40+h0FBa5fb+cpxtZoGAggRem16ocVKIv5gDB5uLDgBIwrIsXlGqYbLwW8YyO3WVTk1FkFDjMETYlDqiw==}
+ '@rollup/rollup-linux-loongarch64-gnu@4.40.0':
+ resolution: {integrity: sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==}
cpu: [loong64]
os: [linux]
- '@rollup/rollup-linux-powerpc64le-gnu@4.39.0':
- resolution: {integrity: sha512-0pCNnmxgduJ3YRt+D+kJ6Ai/r+TaePu9ZLENl+ZDV/CdVczXl95CbIiwwswu4L+K7uOIGf6tMo2vm8uadRaICQ==}
+ '@rollup/rollup-linux-powerpc64le-gnu@4.40.0':
+ resolution: {integrity: sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==}
cpu: [ppc64]
os: [linux]
- '@rollup/rollup-linux-riscv64-gnu@4.39.0':
- resolution: {integrity: sha512-t7j5Zhr7S4bBtksT73bO6c3Qa2AV/HqiGlj9+KB3gNF5upcVkx+HLgxTm8DK4OkzsOYqbdqbLKwvGMhylJCPhQ==}
+ '@rollup/rollup-linux-riscv64-gnu@4.40.0':
+ resolution: {integrity: sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==}
cpu: [riscv64]
os: [linux]
- '@rollup/rollup-linux-riscv64-musl@4.39.0':
- resolution: {integrity: sha512-m6cwI86IvQ7M93MQ2RF5SP8tUjD39Y7rjb1qjHgYh28uAPVU8+k/xYWvxRO3/tBN2pZkSMa5RjnPuUIbrwVxeA==}
+ '@rollup/rollup-linux-riscv64-musl@4.40.0':
+ resolution: {integrity: sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==}
cpu: [riscv64]
os: [linux]
- '@rollup/rollup-linux-s390x-gnu@4.39.0':
- resolution: {integrity: sha512-iRDJd2ebMunnk2rsSBYlsptCyuINvxUfGwOUldjv5M4tpa93K8tFMeYGpNk2+Nxl+OBJnBzy2/JCscGeO507kA==}
+ '@rollup/rollup-linux-s390x-gnu@4.40.0':
+ resolution: {integrity: sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==}
cpu: [s390x]
os: [linux]
- '@rollup/rollup-linux-x64-gnu@4.39.0':
- resolution: {integrity: sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==}
+ '@rollup/rollup-linux-x64-gnu@4.40.0':
+ resolution: {integrity: sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==}
cpu: [x64]
os: [linux]
- '@rollup/rollup-linux-x64-musl@4.39.0':
- resolution: {integrity: sha512-ThFdkrFDP55AIsIZDKSBWEt/JcWlCzydbZHinZ0F/r1h83qbGeenCt/G/wG2O0reuENDD2tawfAj2s8VK7Bugg==}
+ '@rollup/rollup-linux-x64-musl@4.40.0':
+ resolution: {integrity: sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==}
cpu: [x64]
os: [linux]
- '@rollup/rollup-win32-arm64-msvc@4.39.0':
- resolution: {integrity: sha512-jDrLm6yUtbOg2TYB3sBF3acUnAwsIksEYjLeHL+TJv9jg+TmTwdyjnDex27jqEMakNKf3RwwPahDIt7QXCSqRQ==}
+ '@rollup/rollup-win32-arm64-msvc@4.40.0':
+ resolution: {integrity: sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==}
cpu: [arm64]
os: [win32]
- '@rollup/rollup-win32-ia32-msvc@4.39.0':
- resolution: {integrity: sha512-6w9uMuza+LbLCVoNKL5FSLE7yvYkq9laSd09bwS0tMjkwXrmib/4KmoJcrKhLWHvw19mwU+33ndC69T7weNNjQ==}
+ '@rollup/rollup-win32-ia32-msvc@4.40.0':
+ resolution: {integrity: sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==}
cpu: [ia32]
os: [win32]
- '@rollup/rollup-win32-x64-msvc@4.39.0':
- resolution: {integrity: sha512-yAkUOkIKZlK5dl7u6dg897doBgLXmUHhIINM2c+sND3DZwnrdQkkSiDh7N75Ll4mM4dxSkYfXqU9fW3lLkMFug==}
+ '@rollup/rollup-win32-x64-msvc@4.40.0':
+ resolution: {integrity: sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==}
cpu: [x64]
os: [win32]
@@ -1800,7 +1800,7 @@ packages:
resolution: {integrity: sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==}
engines: {node: ^18.0.0 || >=20.0.0}
peerDependencies:
- vite: 5.4.17
+ vite: 5.4.18
vue: ^3.2.25
'@vitest/coverage-v8@3.0.5':
@@ -1819,7 +1819,7 @@ packages:
resolution: {integrity: sha512-CLPNBFBIE7x6aEGbIjaQAX03ZZlBMaWwAjBdMkIf/cAn6xzLTiM3zYqO/WAbieEjsAZir6tO71mzeHZoodThvw==}
peerDependencies:
msw: ^2.4.9
- vite: 5.4.17
+ vite: 5.4.18
peerDependenciesMeta:
msw:
optional: true
@@ -3100,7 +3100,7 @@ packages:
resolution: {integrity: sha512-DiRMSIgj340z+zikqf0f3Pj0CTv2/xtdBMBIAO1EARat+QXxMwumbfK41Gi7f9IIBr+UVmomNcwFxVY2EM/vrw==}
hasBin: true
peerDependencies:
- vite: 5.4.17
+ vite: 5.4.18
hotkeys-js@3.8.7:
resolution: {integrity: sha512-ckAx3EkUr5XjDwjEHDorHxRO2Kb7z6Z2Sxul4MbBkN8Nho7XDslQsgMJT+CiJ5Z4TgRxxvKHEpuLE3imzqy4Lg==}
@@ -4344,8 +4344,8 @@ packages:
deprecated: Rimraf versions prior to v4 are no longer supported
hasBin: true
- rollup@4.39.0:
- resolution: {integrity: sha512-thI8kNc02yNvnmJp8dr3fNWJ9tCONDhp6TV35X6HkKGGs9E6q7YWCHbe5vKiTa7TAiNcFEmXKj3X/pG2b3ci0g==}
+ rollup@4.40.0:
+ resolution: {integrity: sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==}
engines: {node: '>=18.0.0', npm: '>=8.0.0'}
hasBin: true
@@ -4863,10 +4863,10 @@ packages:
vite-plugin-ruby@5.0.0:
resolution: {integrity: sha512-c8PjTp21Ah/ttgnNUyu0qvCXZI08Jr9I24oUKg3TRIRhF5GcOZ++6wtlTCrNFd9COEQbpXHxlRIXd/MEg0iZJw==}
peerDependencies:
- vite: 5.4.17
+ vite: 5.4.18
- vite@5.4.17:
- resolution: {integrity: sha512-5+VqZryDj4wgCs55o9Lp+p8GE78TLVg0lasCH5xFZ4jacZjtqZa6JUw9/p0WeAojaOfncSM6v77InkFPGnvPvg==}
+ vite@5.4.18:
+ resolution: {integrity: sha512-1oDcnEp3lVyHCuQ2YFelM4Alm2o91xNoMncRm1U7S+JdYfYOvbiGZ3/CxGttrOu2M/KcGz7cRC2DoNUA6urmMA==}
engines: {node: ^18.0.0 || >=20.0.0}
hasBin: true
peerDependencies:
@@ -5255,7 +5255,7 @@ snapshots:
prosemirror-utils: 1.2.2(prosemirror-model@1.22.3)(prosemirror-state@1.4.3)
prosemirror-view: 1.34.1
- '@chatwoot/utils@0.0.42':
+ '@chatwoot/utils@0.0.43':
dependencies:
date-fns: 2.30.0
@@ -5672,10 +5672,10 @@ snapshots:
highlight.js: 11.10.0
vue: 3.5.12(typescript@5.6.2)
- '@histoire/app@0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+ '@histoire/app@0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
dependencies:
- '@histoire/controls': 0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
- '@histoire/shared': 0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ '@histoire/controls': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
'@histoire/vendors': 0.17.17
'@types/flexsearch': 0.7.6
flexsearch: 0.7.21
@@ -5683,7 +5683,7 @@ snapshots:
transitivePeerDependencies:
- vite
- '@histoire/controls@0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+ '@histoire/controls@0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
dependencies:
'@codemirror/commands': 6.7.0
'@codemirror/lang-json': 6.0.1
@@ -5692,26 +5692,26 @@ snapshots:
'@codemirror/state': 6.4.1
'@codemirror/theme-one-dark': 6.1.2
'@codemirror/view': 6.34.1
- '@histoire/shared': 0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
'@histoire/vendors': 0.17.17
transitivePeerDependencies:
- vite
- '@histoire/plugin-vue@0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
+ '@histoire/plugin-vue@0.17.15(histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)))(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
dependencies:
- '@histoire/controls': 0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
- '@histoire/shared': 0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ '@histoire/controls': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
'@histoire/vendors': 0.17.17
change-case: 4.1.2
globby: 13.2.2
- histoire: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ histoire: 0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
launch-editor: 2.9.1
pathe: 1.1.2
vue: 3.5.12(typescript@5.6.2)
transitivePeerDependencies:
- vite
- '@histoire/shared@0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+ '@histoire/shared@0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
dependencies:
'@histoire/vendors': 0.17.17
'@types/fs-extra': 9.0.13
@@ -5719,7 +5719,7 @@ snapshots:
chokidar: 3.6.0
pathe: 1.1.2
picocolors: 1.1.0
- vite: 5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+ vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
'@histoire/vendors@0.17.17': {}
@@ -5944,64 +5944,64 @@ snapshots:
'@rails/ujs@7.1.400': {}
- '@rollup/rollup-android-arm-eabi@4.39.0':
+ '@rollup/rollup-android-arm-eabi@4.40.0':
optional: true
- '@rollup/rollup-android-arm64@4.39.0':
+ '@rollup/rollup-android-arm64@4.40.0':
optional: true
- '@rollup/rollup-darwin-arm64@4.39.0':
+ '@rollup/rollup-darwin-arm64@4.40.0':
optional: true
- '@rollup/rollup-darwin-x64@4.39.0':
+ '@rollup/rollup-darwin-x64@4.40.0':
optional: true
- '@rollup/rollup-freebsd-arm64@4.39.0':
+ '@rollup/rollup-freebsd-arm64@4.40.0':
optional: true
- '@rollup/rollup-freebsd-x64@4.39.0':
+ '@rollup/rollup-freebsd-x64@4.40.0':
optional: true
- '@rollup/rollup-linux-arm-gnueabihf@4.39.0':
+ '@rollup/rollup-linux-arm-gnueabihf@4.40.0':
optional: true
- '@rollup/rollup-linux-arm-musleabihf@4.39.0':
+ '@rollup/rollup-linux-arm-musleabihf@4.40.0':
optional: true
- '@rollup/rollup-linux-arm64-gnu@4.39.0':
+ '@rollup/rollup-linux-arm64-gnu@4.40.0':
optional: true
- '@rollup/rollup-linux-arm64-musl@4.39.0':
+ '@rollup/rollup-linux-arm64-musl@4.40.0':
optional: true
- '@rollup/rollup-linux-loongarch64-gnu@4.39.0':
+ '@rollup/rollup-linux-loongarch64-gnu@4.40.0':
optional: true
- '@rollup/rollup-linux-powerpc64le-gnu@4.39.0':
+ '@rollup/rollup-linux-powerpc64le-gnu@4.40.0':
optional: true
- '@rollup/rollup-linux-riscv64-gnu@4.39.0':
+ '@rollup/rollup-linux-riscv64-gnu@4.40.0':
optional: true
- '@rollup/rollup-linux-riscv64-musl@4.39.0':
+ '@rollup/rollup-linux-riscv64-musl@4.40.0':
optional: true
- '@rollup/rollup-linux-s390x-gnu@4.39.0':
+ '@rollup/rollup-linux-s390x-gnu@4.40.0':
optional: true
- '@rollup/rollup-linux-x64-gnu@4.39.0':
+ '@rollup/rollup-linux-x64-gnu@4.40.0':
optional: true
- '@rollup/rollup-linux-x64-musl@4.39.0':
+ '@rollup/rollup-linux-x64-musl@4.40.0':
optional: true
- '@rollup/rollup-win32-arm64-msvc@4.39.0':
+ '@rollup/rollup-win32-arm64-msvc@4.40.0':
optional: true
- '@rollup/rollup-win32-ia32-msvc@4.39.0':
+ '@rollup/rollup-win32-ia32-msvc@4.40.0':
optional: true
- '@rollup/rollup-win32-x64-msvc@4.39.0':
+ '@rollup/rollup-win32-x64-msvc@4.40.0':
optional: true
'@rtsao/scc@1.1.0': {}
@@ -6802,9 +6802,9 @@ snapshots:
global: 4.4.0
is-function: 1.0.2
- '@vitejs/plugin-vue@5.1.4(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
+ '@vitejs/plugin-vue@5.1.4(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))(vue@3.5.12(typescript@5.6.2))':
dependencies:
- vite: 5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+ vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
vue: 3.5.12(typescript@5.6.2)
'@vitest/coverage-v8@3.0.5(vitest@3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0))':
@@ -6832,13 +6832,13 @@ snapshots:
chai: 5.1.2
tinyrainbow: 2.0.0
- '@vitest/mocker@3.0.5(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
+ '@vitest/mocker@3.0.5(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))':
dependencies:
'@vitest/spy': 3.0.5
estree-walker: 3.0.3
magic-string: 0.30.17
optionalDependencies:
- vite: 5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+ vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
'@vitest/pretty-format@3.0.5':
dependencies:
@@ -8393,12 +8393,12 @@ snapshots:
highlight.js@11.10.0: {}
- histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
+ histoire@0.17.15(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
dependencies:
'@akryum/tinypool': 0.3.1
- '@histoire/app': 0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
- '@histoire/controls': 0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
- '@histoire/shared': 0.17.17(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ '@histoire/app': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ '@histoire/controls': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ '@histoire/shared': 0.17.17(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
'@histoire/vendors': 0.17.17
'@types/flexsearch': 0.7.6
'@types/markdown-it': 12.2.3
@@ -8425,7 +8425,7 @@ snapshots:
sade: 1.8.1
shiki-es: 0.2.0
sirv: 2.0.4
- vite: 5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+ vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
vite-node: 2.0.1(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
transitivePeerDependencies:
- '@types/node'
@@ -9766,30 +9766,30 @@ snapshots:
dependencies:
glob: 7.2.3
- rollup@4.39.0:
+ rollup@4.40.0:
dependencies:
'@types/estree': 1.0.7
optionalDependencies:
- '@rollup/rollup-android-arm-eabi': 4.39.0
- '@rollup/rollup-android-arm64': 4.39.0
- '@rollup/rollup-darwin-arm64': 4.39.0
- '@rollup/rollup-darwin-x64': 4.39.0
- '@rollup/rollup-freebsd-arm64': 4.39.0
- '@rollup/rollup-freebsd-x64': 4.39.0
- '@rollup/rollup-linux-arm-gnueabihf': 4.39.0
- '@rollup/rollup-linux-arm-musleabihf': 4.39.0
- '@rollup/rollup-linux-arm64-gnu': 4.39.0
- '@rollup/rollup-linux-arm64-musl': 4.39.0
- '@rollup/rollup-linux-loongarch64-gnu': 4.39.0
- '@rollup/rollup-linux-powerpc64le-gnu': 4.39.0
- '@rollup/rollup-linux-riscv64-gnu': 4.39.0
- '@rollup/rollup-linux-riscv64-musl': 4.39.0
- '@rollup/rollup-linux-s390x-gnu': 4.39.0
- '@rollup/rollup-linux-x64-gnu': 4.39.0
- '@rollup/rollup-linux-x64-musl': 4.39.0
- '@rollup/rollup-win32-arm64-msvc': 4.39.0
- '@rollup/rollup-win32-ia32-msvc': 4.39.0
- '@rollup/rollup-win32-x64-msvc': 4.39.0
+ '@rollup/rollup-android-arm-eabi': 4.40.0
+ '@rollup/rollup-android-arm64': 4.40.0
+ '@rollup/rollup-darwin-arm64': 4.40.0
+ '@rollup/rollup-darwin-x64': 4.40.0
+ '@rollup/rollup-freebsd-arm64': 4.40.0
+ '@rollup/rollup-freebsd-x64': 4.40.0
+ '@rollup/rollup-linux-arm-gnueabihf': 4.40.0
+ '@rollup/rollup-linux-arm-musleabihf': 4.40.0
+ '@rollup/rollup-linux-arm64-gnu': 4.40.0
+ '@rollup/rollup-linux-arm64-musl': 4.40.0
+ '@rollup/rollup-linux-loongarch64-gnu': 4.40.0
+ '@rollup/rollup-linux-powerpc64le-gnu': 4.40.0
+ '@rollup/rollup-linux-riscv64-gnu': 4.40.0
+ '@rollup/rollup-linux-riscv64-musl': 4.40.0
+ '@rollup/rollup-linux-s390x-gnu': 4.40.0
+ '@rollup/rollup-linux-x64-gnu': 4.40.0
+ '@rollup/rollup-linux-x64-musl': 4.40.0
+ '@rollup/rollup-win32-arm64-msvc': 4.40.0
+ '@rollup/rollup-win32-ia32-msvc': 4.40.0
+ '@rollup/rollup-win32-x64-msvc': 4.40.0
fsevents: 2.3.3
rope-sequence@1.3.2: {}
@@ -10378,7 +10378,7 @@ snapshots:
debug: 4.4.0
pathe: 1.1.2
picocolors: 1.1.1
- vite: 5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+ vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
transitivePeerDependencies:
- '@types/node'
- less
@@ -10390,19 +10390,19 @@ snapshots:
- supports-color
- terser
- vite-plugin-ruby@5.0.0(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
+ vite-plugin-ruby@5.0.0(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)):
dependencies:
debug: 4.3.5
fast-glob: 3.3.2
- vite: 5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+ vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
transitivePeerDependencies:
- supports-color
- vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0):
+ vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0):
dependencies:
esbuild: 0.21.5
postcss: 8.5.3
- rollup: 4.39.0
+ rollup: 4.40.0
optionalDependencies:
'@types/node': 22.7.0
fsevents: 2.3.3
@@ -10412,7 +10412,7 @@ snapshots:
vitest@3.0.5(@types/node@22.7.0)(jsdom@24.1.3)(sass@1.79.3)(terser@5.33.0):
dependencies:
'@vitest/expect': 3.0.5
- '@vitest/mocker': 3.0.5(vite@5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
+ '@vitest/mocker': 3.0.5(vite@5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0))
'@vitest/pretty-format': 3.0.5
'@vitest/runner': 3.0.5
'@vitest/snapshot': 3.0.5
@@ -10428,7 +10428,7 @@ snapshots:
tinyexec: 0.3.2
tinypool: 1.0.2
tinyrainbow: 2.0.0
- vite: 5.4.17(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
+ vite: 5.4.18(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
vite-node: 2.0.1(@types/node@22.7.0)(sass@1.79.3)(terser@5.33.0)
why-is-node-running: 2.3.0
optionalDependencies:
diff --git a/spec/assets/large_file.pdf b/spec/assets/large_file.pdf
new file mode 100644
index 000000000..8693adbce
Binary files /dev/null and b/spec/assets/large_file.pdf differ
diff --git a/spec/controllers/api/v1/accounts/agent_bots_controller_spec.rb b/spec/controllers/api/v1/accounts/agent_bots_controller_spec.rb
index 918552406..b5cdff018 100644
--- a/spec/controllers/api/v1/accounts/agent_bots_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/agent_bots_controller_spec.rb
@@ -28,6 +28,31 @@ RSpec.describe 'Agent Bot API', type: :request do
expect(response.body).to include(agent_bot.access_token.token)
expect(response.body).not_to include(global_bot.access_token.token)
end
+
+ it 'properly differentiates between system bots and account bots' do
+ global_bot = create(:agent_bot)
+ get "/api/v1/accounts/#{account.id}/agent_bots",
+ headers: agent.create_new_auth_token,
+ as: :json
+
+ response_data = response.parsed_body
+ # Find the global bot in the response
+ global_bot_response = response_data.find { |bot| bot['id'] == global_bot.id }
+ # Find the account bot in the response
+ account_bot_response = response_data.find { |bot| bot['id'] == agent_bot.id }
+
+ # Verify system_bot attribute and outgoing_url for global bot
+ expect(global_bot_response['system_bot']).to be(true)
+ expect(global_bot_response).not_to include('outgoing_url')
+
+ # Verify account bot has system_bot attribute false and includes outgoing_url
+ expect(account_bot_response['system_bot']).to be(false)
+ expect(account_bot_response).to include('outgoing_url')
+
+ # Verify both bots have thumbnail field
+ expect(global_bot_response).to include('thumbnail')
+ expect(account_bot_response).to include('thumbnail')
+ end
end
end
@@ -60,6 +85,10 @@ RSpec.describe 'Agent Bot API', type: :request do
expect(response).to have_http_status(:success)
expect(response.body).to include(global_bot.name)
expect(response.body).not_to include(global_bot.access_token.token)
+
+ # Test for system_bot attribute and webhook URL not being exposed
+ expect(response.parsed_body['system_bot']).to be(true)
+ expect(response.parsed_body).not_to include('outgoing_url')
end
end
end
@@ -142,7 +171,7 @@ RSpec.describe 'Agent Bot API', type: :request do
expect(response.body).not_to include(global_bot.access_token.token)
end
- it 'updates avatar' do
+ it 'updates avatar and includes thumbnail in response' do
# no avatar before upload
expect(agent_bot.avatar.attached?).to be(false)
file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
@@ -153,6 +182,9 @@ RSpec.describe 'Agent Bot API', type: :request do
expect(response).to have_http_status(:success)
agent_bot.reload
expect(agent_bot.avatar.attached?).to be(true)
+
+ # Verify thumbnail is included in the response
+ expect(response.parsed_body).to include('thumbnail')
end
it 'updated avatar with avatar_url' do
diff --git a/spec/controllers/devise/omniauth_callbacks_controller_spec.rb b/spec/controllers/devise/omniauth_callbacks_controller_spec.rb
index b6c5cd781..3513b9c34 100644
--- a/spec/controllers/devise/omniauth_callbacks_controller_spec.rb
+++ b/spec/controllers/devise/omniauth_callbacks_controller_spec.rb
@@ -56,6 +56,23 @@ RSpec.describe 'DeviseOverrides::OmniauthCallbacksController', type: :request do
end
end
+ it 'blocks personal accounts signup with different Gmail case variations' do
+ with_modified_env ENABLE_ACCOUNT_SIGNUP: 'true' do
+ # Test different case variations of Gmail
+ ['personal@Gmail.com', 'personal@GMAIL.com', 'personal@Gmail.COM'].each do |email|
+ set_omniauth_config(email)
+ get '/omniauth/google_oauth2/callback'
+
+ # expect a 302 redirect to auth/google_oauth2/callback
+ expect(response).to redirect_to('http://www.example.com/auth/google_oauth2/callback')
+ follow_redirect!
+
+ # expect a 302 redirect to app/login with error disallowing personal accounts
+ expect(response).to redirect_to(%r{/app/login\?error=business-account-only$})
+ end
+ end
+ end
+
# This test does not affect line coverage, but it is important to ensure that the logic
# does not allow any signup if the ENV explicitly disables it
it 'blocks signup if ENV disabled' do
diff --git a/spec/controllers/public/api/v1/portals_controller_spec.rb b/spec/controllers/public/api/v1/portals_controller_spec.rb
index 9ee26f2f9..abf9f493a 100644
--- a/spec/controllers/public/api/v1/portals_controller_spec.rb
+++ b/spec/controllers/public/api/v1/portals_controller_spec.rb
@@ -30,6 +30,32 @@ RSpec.describe Public::Api::V1::PortalsController, type: :request do
expect(json_response['error']).to eql "Domain: www.example.com is not registered with us. \
Please send us an email at support@chatwoot.com with the custom domain name and account API key"
end
+
+ context 'when portal has a logo' do
+ it 'includes the logo as favicon' do
+ # Attach a test image to the portal
+ file = Rails.root.join('spec/assets/sample.png').open
+ portal.logo.attach(io: file, filename: 'sample.png', content_type: 'image/png')
+ file.close
+
+ get "/hc/#{portal.slug}/en"
+
+ expect(response).to have_http_status(:success)
+ expect(response.body).to include(' 'random_api_key', 'Content-Type' => 'application/json' }
- }
- )
- expect(csml_request).to have_received(:success?)
- expect(csml_request).to have_received(:parsed_response)
- expect(response).to eq({ 'success': true })
- end
- end
-
- context 'when validate is called' do
- it 'returns api response if client response is valid' do
- allow(HTTParty).to receive(:post).and_return(csml_request)
- allow(SecureRandom).to receive(:uuid).and_return('xxxx-yyyy-wwww-cccc')
- allow(csml_request).to receive(:success?).and_return(true)
- allow(csml_request).to receive(:parsed_response).and_return({ 'success': true })
-
- payload = { flow: 'default' }
- response = described_class.new.validate(payload)
-
- expect(HTTParty).to have_received(:post)
- .with(
- 'https://csml.chatwoot.dev/validate', {
- body: payload.to_json,
- headers: { 'X-Api-Key' => 'random_api_key', 'Content-Type' => 'application/json' }
- }
- )
- expect(csml_request).to have_received(:success?)
- expect(csml_request).to have_received(:parsed_response)
- expect(response).to eq({ 'success': true })
- end
- end
- end
-end
diff --git a/spec/lib/integrations/csml/processor_service_spec.rb b/spec/lib/integrations/csml/processor_service_spec.rb
deleted file mode 100644
index a6d213114..000000000
--- a/spec/lib/integrations/csml/processor_service_spec.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-require 'rails_helper'
-
-describe Integrations::Csml::ProcessorService do
- let(:account) { create(:account) }
- let(:inbox) { create(:inbox, account: account) }
- let(:agent_bot) { create(:agent_bot, :skip_validate, bot_type: 'csml', account: account) }
- let(:agent_bot_inbox) { create(:agent_bot_inbox, agent_bot: agent_bot, inbox: inbox, account: account) }
- let(:conversation) { create(:conversation, account: account, status: :pending) }
- let(:message) { create(:message, account: account, conversation: conversation) }
- let(:event_name) { 'message.created' }
- let(:event_data) { { message: message } }
-
- describe '#perform' do
- let(:csml_client) { double }
- let(:processor) { described_class.new(event_name: event_name, agent_bot: agent_bot, event_data: event_data) }
-
- before do
- allow(CsmlEngine).to receive(:new).and_return(csml_client)
- end
-
- context 'when a conversation is completed from CSML' do
- it 'open the conversation and handsoff it to an agent' do
- csml_response = ActiveSupport::HashWithIndifferentAccess.new(conversation_end: true)
- allow(csml_client).to receive(:run).and_return(csml_response)
-
- processor.perform
- expect(conversation.reload.status).to eql('open')
- end
- end
-
- context 'when a new message is returned from CSML' do
- it 'creates a text message' do
- csml_response = ActiveSupport::HashWithIndifferentAccess.new(
- messages: [
- { payload: { content_type: 'text', content: { text: 'hello payload' } } }
- ]
- )
- allow(csml_client).to receive(:run).and_return(csml_response)
- processor.perform
- expect(conversation.messages.last.content).to eql('hello payload')
- end
-
- it 'creates a question message' do
- csml_response = ActiveSupport::HashWithIndifferentAccess.new(
- messages: [{
- payload: {
- content_type: 'question',
- content: { title: 'Question Payload', buttons: [{ content: { title: 'Q1', payload: 'q1' } }] }
- }
- }]
- )
- allow(csml_client).to receive(:run).and_return(csml_response)
- processor.perform
- expect(conversation.messages.last.content).to eql('Question Payload')
- expect(conversation.messages.last.content_type).to eql('input_select')
- expect(conversation.messages.last.content_attributes).to eql({ items: [{ title: 'Q1', value: 'q1' }] }.with_indifferent_access)
- end
- end
-
- context 'when conversation status is not pending' do
- let(:conversation) { create(:conversation, account: account, status: :open) }
-
- it 'returns nil' do
- expect(processor.perform).to be_nil
- end
- end
-
- context 'when message is private' do
- let(:message) { create(:message, account: account, conversation: conversation, private: true) }
-
- it 'returns nil' do
- expect(processor.perform).to be_nil
- end
- end
-
- context 'when message type is template (not outgoing or incoming)' do
- let(:message) { create(:message, account: account, conversation: conversation, message_type: :template) }
-
- it 'returns nil' do
- expect(processor.perform).to be_nil
- end
- end
-
- context 'when message updated' do
- let(:event_name) { 'message.updated' }
-
- context 'when content_type is input_select' do
- let(:message) do
- create(:message, account: account, conversation: conversation, private: true,
- submitted_values: [{ 'title' => 'Support', 'value' => 'selected_gas' }])
- end
-
- it 'returns submitted value for message content' do
- expect(processor.send(:message_content, message)).to eql('selected_gas')
- end
- end
-
- context 'when content_type is not input_select' do
- let(:message) { create(:message, account: account, conversation: conversation, message_type: :outgoing, content_type: :text) }
- let(:event_name) { 'message.updated' }
-
- it 'returns nil' do
- expect(processor.perform).to be_nil
- end
- end
- end
- end
-end
diff --git a/spec/listeners/agent_bot_listener_spec.rb b/spec/listeners/agent_bot_listener_spec.rb
index 5e17bfbef..2dc2b41df 100644
--- a/spec/listeners/agent_bot_listener_spec.rb
+++ b/spec/listeners/agent_bot_listener_spec.rb
@@ -37,15 +37,6 @@ describe AgentBotListener do
listener.message_created(event)
end
end
-
- context 'when agent bot csml type is configured' do
- it 'sends message to agent bot' do
- agent_bot_csml = create(:agent_bot, :skip_validate, bot_type: 'csml')
- create(:agent_bot_inbox, inbox: inbox, agent_bot: agent_bot_csml)
- expect(AgentBots::CsmlJob).to receive(:perform_later).with('message.created', agent_bot_csml, message).once
- listener.message_created(event)
- end
- end
end
describe '#webwidget_triggered' do
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index c07bbe284..e03997f60 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -153,6 +153,74 @@ RSpec.describe ConversationReplyMailer do
it 'updates the source_id' do
expect(mail.message_id).to eq message.source_id
end
+
+ context 'with email attachments' do
+ it 'includes small attachments as email attachments' do
+ message_with_attachment = create(:message, conversation: conversation, account: account, message_type: 'outgoing',
+ content: 'Message with small attachment')
+ attachment = message_with_attachment.attachments.new(account_id: account.id, file_type: :file)
+ attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+ attachment.save!
+
+ mail = described_class.email_reply(message_with_attachment).deliver_now
+
+ # Should be attached to the email
+ expect(mail.attachments.map(&:filename).map(&:to_s)).to include('avatar.png')
+ # Should not be in large_attachments
+ expect(mail.body.encoded).not_to include('Attachments:')
+ end
+
+ it 'renders large attachments as links in the email body' do
+ message_with_large_attachment = create(:message, conversation: conversation, account: account, message_type: 'outgoing',
+ content: 'Message with large attachment')
+ attachment = message_with_large_attachment.attachments.new(account_id: account.id, file_type: :file)
+ attachment.file.attach(io: Rails.root.join('spec/assets/large_file.pdf').open, filename: 'large_file.pdf', content_type: 'application/pdf')
+ attachment.save!
+
+ mail = described_class.email_reply(message_with_large_attachment).deliver_now
+
+ # Should NOT be attached to the email
+ expect(mail.attachments.map(&:filename).map(&:to_s)).not_to include('large_file.pdf')
+ # Should be rendered as a link in the body
+ expect(mail.body.encoded).to include('Attachments:')
+ expect(mail.body.encoded).to include('large_file.pdf')
+ # Should render a link with large_file.pdf as the link text
+ expect(mail.body.encoded).to match(%r{]*>large_file\.pdf})
+ # Small file should not be rendered as a link in the body
+ expect(mail.body.encoded).not_to match(%r{]*>avatar\.png})
+ end
+
+ it 'handles both small and large attachments correctly' do
+ message_with_mixed_attachments = create(:message, conversation: conversation, account: account, message_type: 'outgoing',
+ content: 'Message with mixed attachments')
+
+ # Small attachment
+ small_attachment = message_with_mixed_attachments.attachments.new(account_id: account.id, file_type: :file)
+ small_attachment.file.attach(io: Rails.root.join('spec/assets/avatar.png').open, filename: 'avatar.png', content_type: 'image/png')
+ small_attachment.save!
+
+ # Large attachment
+ large_attachment = message_with_mixed_attachments.attachments.new(account_id: account.id, file_type: :file)
+ large_attachment.file.attach(io: Rails.root.join('spec/assets/large_file.pdf').open, filename: 'large_file.pdf',
+ content_type: 'application/pdf')
+ large_attachment.save!
+
+ mail = described_class.email_reply(message_with_mixed_attachments).deliver_now
+
+ # Small file should be attached
+ expect(mail.attachments.map(&:filename).map(&:to_s)).to include('avatar.png')
+ # Large file should NOT be attached
+ expect(mail.attachments.map(&:filename).map(&:to_s)).not_to include('large_file.pdf')
+
+ # Large file should be rendered as a link in the body
+ expect(mail.body.encoded).to include('Attachments:')
+ expect(mail.body.encoded).to include('large_file.pdf')
+ # Should render a link with large_file.pdf as the link text
+ expect(mail.body.encoded).to match(%r{]*>large_file\.pdf})
+ # Small file should not be rendered as a link in the body
+ expect(mail.body.encoded).not_to match(%r{]*>avatar\.png})
+ end
+ end
end
context 'when smtp enabled for email channel' do
diff --git a/spec/models/agent_bot_spec.rb b/spec/models/agent_bot_spec.rb
index 280446f7c..d3e5e2d64 100644
--- a/spec/models/agent_bot_spec.rb
+++ b/spec/models/agent_bot_spec.rb
@@ -39,4 +39,23 @@ RSpec.describe AgentBot do
expect(message.reload.sender).to be_nil
end
end
+
+ describe '#system_bot?' do
+ context 'when account_id is nil' do
+ let(:agent_bot) { create(:agent_bot, account_id: nil) }
+
+ it 'returns true' do
+ expect(agent_bot.system_bot?).to be true
+ end
+ end
+
+ context 'when account_id is present' do
+ let(:account) { create(:account) }
+ let(:agent_bot) { create(:agent_bot, account: account) }
+
+ it 'returns false' do
+ expect(agent_bot.system_bot?).to be false
+ end
+ end
+ end
end
diff --git a/spec/models/channel/twilio_sms_spec.rb b/spec/models/channel/twilio_sms_spec.rb
index 3da078708..6d52b4768 100644
--- a/spec/models/channel/twilio_sms_spec.rb
+++ b/spec/models/channel/twilio_sms_spec.rb
@@ -3,28 +3,6 @@
require 'rails_helper'
RSpec.describe Channel::TwilioSms do
- describe '#has_24_hour_messaging_window?' do
- context 'with medium whatsapp' do
- let!(:whatsapp_channel) { create(:channel_twilio_sms, medium: :whatsapp) }
-
- it 'returns true' do
- expect(whatsapp_channel.messaging_window_enabled?).to be true
- expect(whatsapp_channel.name).to eq 'Whatsapp'
- expect(whatsapp_channel.medium).to eq 'whatsapp'
- end
- end
-
- context 'with medium sms' do
- let!(:sms_channel) { create(:channel_twilio_sms, medium: :sms) }
-
- it 'returns false' do
- expect(sms_channel.messaging_window_enabled?).to be false
- expect(sms_channel.name).to eq 'Twilio SMS'
- expect(sms_channel.medium).to eq 'sms'
- end
- end
- end
-
describe '#validations' do
context 'with phone number blank' do
let!(:sms_channel) { create(:channel_twilio_sms, medium: :sms, phone_number: nil) }
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 77ba4c27c..2047e3e61 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -585,116 +585,6 @@ RSpec.describe Conversation do
end
end
- describe '#can_reply?' do
- describe 'on channels without 24 hour restriction' do
- let(:conversation) { create(:conversation) }
-
- it 'returns true' do
- expect(conversation.can_reply?).to be true
- end
-
- it 'return true for facebook channels' do
- stub_request(:post, /graph.facebook.com/)
- facebook_channel = create(:channel_facebook_page)
- facebook_inbox = create(:inbox, channel: facebook_channel, account: facebook_channel.account)
- fb_conversation = create(:conversation, inbox: facebook_inbox, account: facebook_channel.account)
-
- expect(fb_conversation.can_reply?).to be true
- expect(facebook_channel.messaging_window_enabled?).to be false
- end
- end
-
- describe 'on channels with 24 hour restriction' do
- before do
- stub_request(:post, /graph.facebook.com/)
- end
-
- let!(:facebook_channel) { create(:channel_facebook_page) }
- let!(:facebook_inbox) { create(:inbox, channel: facebook_channel, account: facebook_channel.account) }
- let!(:conversation) { create(:conversation, inbox: facebook_inbox, account: facebook_channel.account) }
-
- context 'when instagram channel' do
- it 'return true with HUMAN_AGENT if it is outside of 24 hour window' do
- InstallationConfig.where(name: 'ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT').first_or_create!(value: true)
-
- conversation.update!(additional_attributes: { type: 'instagram_direct_message' })
- create(
- :message,
- account: conversation.account,
- inbox: facebook_inbox,
- conversation: conversation,
- created_at: 48.hours.ago
- )
-
- expect(conversation.can_reply?).to be true
- end
-
- it 'return false without HUMAN_AGENT if it is outside of 24 hour window' do
- InstallationConfig.where(name: 'ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT').first_or_create!(value: false)
-
- conversation.update!(additional_attributes: { type: 'instagram_direct_message' })
- create(
- :message,
- account: conversation.account,
- inbox: facebook_inbox,
- conversation: conversation,
- created_at: 48.hours.ago
- )
-
- expect(conversation.can_reply?).to be false
- end
- end
- end
-
- describe 'on API channels' do
- let!(:api_channel) { create(:channel_api, additional_attributes: {}) }
- let!(:api_channel_with_limit) { create(:channel_api, additional_attributes: { agent_reply_time_window: '12' }) }
-
- context 'when agent_reply_time_window is not configured' do
- it 'return true irrespective of the last message time' do
- conversation = create(:conversation, inbox: api_channel.inbox)
- create(
- :message,
- account: conversation.account,
- inbox: api_channel.inbox,
- conversation: conversation,
- created_at: 13.hours.ago
- )
-
- expect(api_channel.additional_attributes['agent_reply_time_window']).to be_nil
- expect(conversation.can_reply?).to be true
- end
- end
-
- context 'when agent_reply_time_window is configured' do
- it 'return false if it is outside of agent_reply_time_window' do
- conversation = create(:conversation, inbox: api_channel_with_limit.inbox)
- create(
- :message,
- account: conversation.account,
- inbox: api_channel_with_limit.inbox,
- conversation: conversation,
- created_at: 13.hours.ago
- )
-
- expect(api_channel_with_limit.additional_attributes['agent_reply_time_window']).to eq '12'
- expect(conversation.can_reply?).to be false
- end
-
- it 'return true if it is inside of agent_reply_time_window' do
- conversation = create(:conversation, inbox: api_channel_with_limit.inbox)
- create(
- :message,
- account: conversation.account,
- inbox: api_channel_with_limit.inbox,
- conversation: conversation
- )
- expect(conversation.can_reply?).to be true
- end
- end
- end
- end
-
describe '#delete conversation' do
include ActiveJob::TestHelper
@@ -918,4 +808,25 @@ RSpec.describe Conversation do
end
end
end
+
+ describe '#can_reply?' do
+ let(:conversation) { create(:conversation) }
+ let(:message_window_service) { instance_double(Conversations::MessageWindowService) }
+
+ before do
+ allow(Conversations::MessageWindowService).to receive(:new).with(conversation).and_return(message_window_service)
+ end
+
+ it 'delegates to MessageWindowService' do
+ allow(message_window_service).to receive(:can_reply?).and_return(true)
+ expect(conversation.can_reply?).to be true
+ expect(message_window_service).to have_received(:can_reply?)
+ end
+
+ it 'returns false when MessageWindowService returns false' do
+ allow(message_window_service).to receive(:can_reply?).and_return(false)
+ expect(conversation.can_reply?).to be false
+ expect(message_window_service).to have_received(:can_reply?)
+ end
+ end
end
diff --git a/spec/services/agent_bots/validate_bot_service_spec.rb b/spec/services/agent_bots/validate_bot_service_spec.rb
deleted file mode 100644
index 005d5b94e..000000000
--- a/spec/services/agent_bots/validate_bot_service_spec.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'rails_helper'
-
-describe AgentBots::ValidateBotService do
- describe '#perform' do
- it 'returns true if bot_type is not csml' do
- agent_bot = create(:agent_bot)
- valid = described_class.new(agent_bot: agent_bot).perform
- expect(valid).to be true
- end
-
- it 'returns true if validate csml returns true' do
- agent_bot = create(:agent_bot, :skip_validate, bot_type: 'csml', bot_config: {})
- csml_client = double
- csml_response = double
- allow(CsmlEngine).to receive(:new).and_return(csml_client)
- allow(csml_client).to receive(:validate).and_return(csml_response)
- allow(csml_response).to receive(:blank?).and_return(false)
- allow(csml_response).to receive(:[]).with('valid').and_return(true)
-
- valid = described_class.new(agent_bot: agent_bot).perform
- expect(valid).to be true
- expect(CsmlEngine).to have_received(:new)
- end
- end
-end
diff --git a/spec/services/conversations/message_window_service_spec.rb b/spec/services/conversations/message_window_service_spec.rb
new file mode 100644
index 000000000..70f5cb415
--- /dev/null
+++ b/spec/services/conversations/message_window_service_spec.rb
@@ -0,0 +1,645 @@
+require 'rails_helper'
+
+RSpec.describe Conversations::MessageWindowService do
+ describe 'on API channels' do
+ let!(:api_channel) { create(:channel_api, additional_attributes: {}) }
+ let!(:api_channel_with_limit) { create(:channel_api, additional_attributes: { agent_reply_time_window: '12' }) }
+
+ context 'when agent_reply_time_window is not configured' do
+ it 'return true irrespective of the last message time' do
+ conversation = create(:conversation, inbox: api_channel.inbox)
+ create(
+ :message,
+ account: conversation.account,
+ inbox: api_channel.inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+
+ expect(api_channel.additional_attributes['agent_reply_time_window']).to be_nil
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ context 'when agent_reply_time_window is configured' do
+ it 'return false if it is outside of agent_reply_time_window' do
+ conversation = create(:conversation, inbox: api_channel_with_limit.inbox)
+ create(
+ :message,
+ account: conversation.account,
+ inbox: api_channel_with_limit.inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+
+ expect(api_channel_with_limit.additional_attributes['agent_reply_time_window']).to eq '12'
+ expect(service.can_reply?).to be false
+ end
+
+ it 'return true if it is inside of agent_reply_time_window' do
+ conversation = create(:conversation, inbox: api_channel_with_limit.inbox)
+ create(
+ :message,
+ account: conversation.account,
+ inbox: api_channel_with_limit.inbox,
+ conversation: conversation
+ )
+ service = described_class.new(conversation)
+
+ expect(service.can_reply?).to be true
+ end
+ end
+ end
+
+ describe 'on Facebook channels' do
+ before do
+ stub_request(:post, /graph.facebook.com/)
+ end
+
+ let!(:facebook_channel) { create(:channel_facebook_page) }
+ let!(:facebook_inbox) { create(:inbox, channel: facebook_channel, account: facebook_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: facebook_inbox, account: facebook_channel.account) }
+
+ context 'when the HUMAN_AGENT is enabled' do
+ it 'return false if the last message is outgoing' do
+ with_modified_env ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT: 'true' do
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+ end
+
+ it 'return true if the last message is incoming and within the messaging window (with in 24 hours)' do
+ with_modified_env ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT: 'true' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: facebook_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ it 'return true if the last message is incoming and within the messaging window (with in 7 days)' do
+ with_modified_env ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT: 'true' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: facebook_inbox,
+ conversation: conversation,
+ created_at: 5.days.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ it 'return false if the last message is incoming and outside the messaging window (8 days ago )' do
+ with_modified_env ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT: 'true' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: facebook_inbox,
+ conversation: conversation,
+ created_at: 8.days.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+ end
+
+ it 'return true if last message is outgoing but previous incoming message is within window' do
+ with_modified_env ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT: 'true' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: facebook_inbox,
+ conversation: conversation,
+ message_type: :incoming,
+ created_at: 6.hours.ago
+ )
+
+ create(
+ :message,
+ account: conversation.account,
+ inbox: facebook_inbox,
+ conversation: conversation,
+ message_type: :outgoing,
+ created_at: 1.hour.ago
+ )
+
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ it 'considers only the last incoming message for determining time window' do
+ with_modified_env ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT: 'true' do
+ # Old message outside window
+ create(
+ :message,
+ account: conversation.account,
+ inbox: facebook_inbox,
+ conversation: conversation,
+ created_at: 10.days.ago
+ )
+
+ # Recent message within window
+ create(
+ :message,
+ account: conversation.account,
+ inbox: facebook_inbox,
+ conversation: conversation,
+ created_at: 6.hours.ago
+ )
+
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+ end
+
+ context 'when the HUMAN_AGENT is disabled' do
+ with_modified_env ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT: 'false' do
+ it 'return false if the last message is outgoing' do
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+
+ it 'return false if the last message is incoming and outside the messaging window ( 8 days ago )' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: facebook_inbox,
+ conversation: conversation,
+ created_at: 4.days.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+
+ it 'return true if the last message is incoming and within the messaging window (24 hours limit)' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: facebook_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+ end
+ end
+
+ describe 'on Instagram channels' do
+ let!(:instagram_channel) { create(:channel_instagram) }
+ let!(:instagram_inbox) { create(:inbox, channel: instagram_channel, account: instagram_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: instagram_inbox, account: instagram_channel.account) }
+
+ context 'when the HUMAN_AGENT is enabled' do
+ it 'return false if the last message is outgoing' do
+ with_modified_env ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT: 'true' do
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+ end
+
+ it 'return true if the last message is incoming and within the messaging window (with in 24 hours)' do
+ with_modified_env ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT: 'true' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: instagram_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ it 'return true if the last message is incoming and within the messaging window (with in 7 days)' do
+ with_modified_env ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT: 'true' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: instagram_inbox,
+ conversation: conversation,
+ created_at: 6.days.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ it 'return false if the last message is incoming and outside the messaging window (8 days ago)' do
+ with_modified_env ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT: 'true' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: instagram_inbox,
+ conversation: conversation,
+ created_at: 8.days.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+ end
+
+ it 'return true if last message is outgoing but previous incoming message is within window' do
+ with_modified_env ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT: 'true' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: instagram_inbox,
+ conversation: conversation,
+ message_type: :incoming,
+ created_at: 6.hours.ago
+ )
+
+ create(
+ :message,
+ account: conversation.account,
+ inbox: instagram_inbox,
+ conversation: conversation,
+ message_type: :outgoing,
+ created_at: 1.hour.ago
+ )
+
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ it 'considers only the last incoming message for determining time window' do
+ with_modified_env ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT: 'true' do
+ # Old message outside window
+ create(
+ :message,
+ account: conversation.account,
+ inbox: instagram_inbox,
+ conversation: conversation,
+ created_at: 10.days.ago
+ )
+
+ # Recent message within window
+ create(
+ :message,
+ account: conversation.account,
+ inbox: instagram_inbox,
+ conversation: conversation,
+ created_at: 6.hours.ago
+ )
+
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ it 'return true if the last message is incoming and exactly at the edge of 24-hour window with HUMAN_AGENT disabled' do
+ with_modified_env ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT: 'true' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: instagram_inbox,
+ conversation: conversation,
+ created_at: 24.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+ end
+
+ context 'when the HUMAN_AGENT is disabled' do
+ it 'return false if the last message is outgoing' do
+ with_modified_env ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT: 'false' do
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+ end
+
+ it 'return false if the last message is incoming and outside the messaging window (8 days ago)' do
+ with_modified_env ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT: 'false' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: instagram_inbox,
+ conversation: conversation,
+ created_at: 9.days.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+ end
+
+ it 'return true if the last message is incoming and within the messaging window (24 hours limit)' do
+ with_modified_env ENABLE_INSTAGRAM_CHANNEL_HUMAN_AGENT: 'false' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: instagram_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+ end
+ end
+
+ describe 'on WhatsApp Cloud channels' do
+ let!(:whatsapp_channel) { create(:channel_whatsapp, provider: 'whatsapp_cloud', sync_templates: false, validate_provider_config: false) }
+ let!(:whatsapp_inbox) { create(:inbox, channel: whatsapp_channel, account: whatsapp_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: whatsapp_inbox, account: whatsapp_channel.account) }
+
+ it 'return false if the last message is outgoing' do
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+
+ it 'return true if the last message is incoming and within the messaging window (with in 24 hours)' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+
+ it 'return false if the last message is incoming and outside the messaging window (24 hours limit)' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ created_at: 25.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+
+ it 'return true if last message is outgoing but previous incoming message is within window' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ message_type: :incoming,
+ created_at: 6.hours.ago
+ )
+
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ message_type: :outgoing,
+ created_at: 1.hour.ago
+ )
+
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+
+ it 'considers only the last incoming message for determining time window' do
+ # Old message outside window
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ created_at: 10.days.ago
+ )
+
+ # Recent message within window
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ created_at: 6.hours.ago
+ )
+
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ describe 'on WhatsApp Baileys channels' do
+ let!(:whatsapp_channel) { create(:channel_whatsapp, provider: 'baileys', sync_templates: false, validate_provider_config: false) }
+ let!(:whatsapp_inbox) { create(:inbox, channel: whatsapp_channel, account: whatsapp_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: whatsapp_inbox, account: whatsapp_channel.account) }
+
+ it 'return true irrespective of the last message time' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ created_at: 25.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ describe 'on Web widget channels' do
+ let!(:widget_channel) { create(:channel_widget) }
+ let!(:widget_inbox) { create(:inbox, channel: widget_channel, account: widget_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: widget_inbox, account: widget_channel.account) }
+
+ it 'return true irrespective of the last message time' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: widget_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ describe 'on SMS channels' do
+ let!(:sms_channel) { create(:channel_sms) }
+ let!(:sms_inbox) { create(:inbox, channel: sms_channel, account: sms_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: sms_inbox, account: sms_channel.account) }
+
+ it 'return true irrespective of the last message time' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: sms_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ describe 'on Telegram channels' do
+ let!(:telegram_channel) { create(:channel_telegram) }
+ let!(:telegram_inbox) { create(:inbox, channel: telegram_channel, account: telegram_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: telegram_inbox, account: telegram_channel.account) }
+
+ it 'return true irrespective of the last message time' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: telegram_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ describe 'on Email channels' do
+ let!(:email_channel) { create(:channel_email) }
+ let!(:email_inbox) { create(:inbox, channel: email_channel, account: email_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: email_inbox, account: email_channel.account) }
+
+ it 'return true irrespective of the last message time' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: email_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ describe 'on Line channels' do
+ let!(:line_channel) { create(:channel_line) }
+ let!(:line_inbox) { create(:inbox, channel: line_channel, account: line_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: line_inbox, account: line_channel.account) }
+
+ it 'return true irrespective of the last message time' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: line_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ describe 'on Twilio SMS channels' do
+ let!(:twilio_sms_channel) { create(:channel_twilio_sms) }
+ let!(:twilio_sms_inbox) { create(:inbox, channel: twilio_sms_channel, account: twilio_sms_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: twilio_sms_inbox, account: twilio_sms_channel.account) }
+
+ it 'return true irrespective of the last message time' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: twilio_sms_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+
+ describe 'on WhatsApp Twilio channels' do
+ let!(:whatsapp_channel) { create(:channel_twilio_sms, medium: :whatsapp) }
+ let!(:whatsapp_inbox) { create(:inbox, channel: whatsapp_channel, account: whatsapp_channel.account) }
+ let!(:conversation) { create(:conversation, inbox: whatsapp_inbox, account: whatsapp_channel.account) }
+
+ it 'return false if the last message is outgoing' do
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+
+ it 'return true if the last message is incoming and within the messaging window (with in 24 hours)' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ created_at: 13.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+
+ it 'return false if the last message is incoming and outside the messaging window (24 hours limit)' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ created_at: 25.hours.ago
+ )
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be false
+ end
+
+ it 'return true if last message is outgoing but previous incoming message is within window' do
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ message_type: :incoming,
+ created_at: 6.hours.ago
+ )
+
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ message_type: :outgoing,
+ created_at: 1.hour.ago
+ )
+
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+
+ it 'considers only the last incoming message for determining time window' do
+ # Old message outside window
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ created_at: 10.days.ago
+ )
+
+ # Recent message within window
+ create(
+ :message,
+ account: conversation.account,
+ inbox: whatsapp_inbox,
+ conversation: conversation,
+ created_at: 6.hours.ago
+ )
+
+ service = described_class.new(conversation)
+ expect(service.can_reply?).to be true
+ end
+ end
+end
diff --git a/spec/services/instagram/test_event_service_spec.rb b/spec/services/instagram/test_event_service_spec.rb
new file mode 100644
index 000000000..a783197e6
--- /dev/null
+++ b/spec/services/instagram/test_event_service_spec.rb
@@ -0,0 +1,71 @@
+require 'rails_helper'
+
+describe Instagram::TestEventService do
+ let(:account) { create(:account) }
+ let(:instagram_channel) { create(:channel_instagram, account: account) }
+ let(:inbox) { create(:inbox, channel: instagram_channel, account: account) }
+
+ describe '#perform' do
+ context 'when validating test webhook event' do
+ let(:test_messaging) do
+ {
+ 'sender': {
+ 'id': '12334'
+ },
+ 'recipient': {
+ 'id': '23245'
+ },
+ 'timestamp': '1527459824',
+ 'message': {
+ 'mid': 'random_mid',
+ 'text': 'random_text'
+ }
+ }.with_indifferent_access
+ end
+
+ it 'creates test message for valid test webhook event' do
+ # Ensure inbox exists before test
+ inbox
+
+ service = described_class.new(test_messaging)
+
+ expect { service.perform }.to change(Message, :count).by(1)
+
+ message = Message.last
+ expect(message.content).to eq('random_text')
+ expect(message.source_id).to eq('random_mid')
+ expect(message.message_type).to eq('incoming')
+ end
+
+ it 'creates a contact with sender_username' do
+ # Ensure inbox exists before test
+ inbox
+
+ service = described_class.new(test_messaging)
+ service.perform
+
+ contact = Contact.last
+ expect(contact.name).to eq('sender_username')
+ end
+
+ it 'returns false for non-test webhook events' do
+ invalid_messaging = test_messaging.deep_dup
+ invalid_messaging[:sender][:id] = 'different_id'
+
+ service = described_class.new(invalid_messaging)
+
+ expect(service.perform).to be(false)
+ end
+
+ it 'returns nil when no Instagram channel exists' do
+ # Delete all inboxes and channels
+ Inbox.destroy_all
+ Channel::Instagram.destroy_all
+
+ service = described_class.new(test_messaging)
+
+ expect(service.perform).to be_nil
+ end
+ end
+ end
+end